Merge remote-tracking branch 'origin/master'

src/App.vue

@@ -6,6 +6,6 @@
 
 <script>
 export default  {
-  name:  'App'
+  name:  'App',
 }
 </script>

src/api/label/label.js

@@ -146,4 +146,12 @@ export function getConsume(data) {
     method: 'get',
     params: data
   })
+}
+
+export function getOilNameList(data) {
+  return request({
+    url: '/station/price/oilNameList',
+    method: 'get',
+    params: data
+  })
 }

src/views/label/Label_Batch.vue

@@ -1,375 +1,401 @@
 <template>
   <div class="app-container">
-  <div class="card card-body">
-  
-    <div class="container ">
-      <div class="row">
-        <div class="col-sm col-md-3 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">油品：</span>
-            </div>
-            <select
-              class="custom-select"
-              id="inputGroupSelect01"
-              style="width: 80px"
-              v-model="queryParams.oilName"
-            >
-              <option selected>Choose...</option>
-              <option value="1">One</option>
-              <option value="2">Two</option>
-              <option value="3">Three</option>
-            </select>
-          </div>
-        </div>
-        <div class="col-sm col-md-7">
-        </div>
-      </div>
-      <div class="row">
-        <div class="col-sm col-md-3 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">标签：</span>
-            </div>
-            <select
-              class="custom-select"
-              id="inputGroupSelect01"
-              style="width: 80px"
-              v-model="queryParams.labelId"
-            >
-              <option selected>Choose...</option>
-              <option value="1">One</option>
-              <option value="2">Two</option>
-              <option value="3">Three</option>
-            </select>
-          </div>
-        </div>
-        <div class="col-sm col-md-8">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">日期：</span>
-              <el-date-picker
-                v-model="queryParams.data"
-                type="datetimerange"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                size="mini"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="margin-top: 2px; max-width: 350px"
-              >
-              </el-date-picker>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="row ">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油频率：</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.startCountNum"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">次</span>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">
-                &lt;= 加油次数 &lt;
-              </span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.endCountNum"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">次</span>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div class="row">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px">
+    <div class="card card-body">
+      <div class="container">
+        <div class="row">
+          <div class="col-sm col-md-3 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">油品：</span>
+              </div>
               <select
-                class="custom-select custom-select-sm"
+                class="custom-select"
                 id="inputGroupSelect01"
-                v-model="queryParams.amtFlag"
+                style="width: 80px"
+                v-model="queryParams.oilName"
               >
-                <option value="1">或者</option>
-                <option value="2">并且</option>
+                <option :value="undefined" selected>全部</option>
+                <option :value="ele.oilName" v-for="ele in oilList" :key="ele.oilName">{{ele.oilName}}</option>
+
               </select>
             </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油金额：</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.startAmt"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">
-                &lt;= 加油金额 &lt;
-              </span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.endAmt"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
-            </div>
           </div>
+          <div class="col-sm col-md-7"></div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px">
+        <div class="row">
+          <div class="col-sm col-md-3 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">标签：</span>
+              </div>
               <select
-                class="custom-select custom-select-sm"
+                class="custom-select"
                 id="inputGroupSelect01"
-                v-model="queryParams.litersFlag"
+                style="width: 80px"
+                v-model="queryParams.labelId"
               >
-                <option value="1">或者</option>
-                <option value="2">并且</option>
+                <option :value="undefined" selected>全部</option>
+                <option :value="ele.id" v-for="ele in labelList" :key="ele.id">{{ele.labelName}}</option>              
               </select>
             </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油升数：</span
-              >
+          </div>
+          <div class="col-sm col-md-8">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">日期：</span>
+                <el-date-picker
+                  v-model="queryParams.data"
+                  type="datetimerange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="mini"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  style="margin-top: 2px; max-width: 350px"
+                >
+                </el-date-picker>
+              </div>
             </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.startLiters"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">升</span>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油频率：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.startCountNum"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">次</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">
+                  &lt;= 加油次数 &lt;
+                </span>
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.endCountNum"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">次</span>
+              </div>
             </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">
-                &lt;= 加油升数 &lt;
-              </span>
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px">
+                <select
+                  class="custom-select custom-select-sm"
+                  id="inputGroupSelect01"
+                  v-model="queryParams.amtFlag"
+                >
+                  <option value="1">或者</option>
+                  <option value="2">并且</option>
+                </select>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油金额：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.startAmt"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">
+                  &lt;= 加油金额 &lt;
+                </span>
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.endAmt"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
             </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.endLiters"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">升</span>
+          </div>
+        </div>
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px">
+                <select
+                  class="custom-select custom-select-sm"
+                  id="inputGroupSelect01"
+                  v-model="queryParams.litersFlag"
+                >
+                  <option value="1">或者</option>
+                  <option value="2">并且</option>
+                </select>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油升数：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.startLiters"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">升</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">
+                  &lt;= 加油升数 &lt;
+                </span>
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.endLiters"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">升</span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="row mb-0 mt-3" v-show="queryParams.secondFlag==0">
-        <div class="col-sm-4 offset-sm-3">
-          <el-button type="info" size="mini" icon="el-icon-arrow-down" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" @click="toggleQuery">展开查询</el-button>
+        <div class="row mb-0 mt-3" v-show="queryParams.secondFlag == 0">
+          <div class="col-sm-4 offset-sm-3">
+            <el-button
+              type="info"
+              size="mini"
+              icon="el-icon-arrow-down"
+              data-toggle="collapse"
+              data-target="#collapseExample"
+              aria-expanded="false"
+              aria-controls="collapseExample"
+              @click="toggleQuery"
+              >展开查询</el-button
+            >
+          </div>
+          <div class="col-sm-4">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              @click="getList"
+              >立刻查询</el-button
+            >
+          </div>
         </div>
-        <div class="col-sm-4">
-           <el-button type="primary" size="mini" icon="el-icon-search" @click="getList">立刻查询</el-button>
-        </div>         
       </div>
 
-    </div>
-
-    <div class="container collapse " id="collapseExample">
+      <div class="container collapse" id="collapseExample">
         <hr />
-      <div class="row">
-        <div class="col-sm col-md-8 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">时间：</span>
-              <el-date-picker
-                v-model="queryParams.secondDate"
-                type="datetimerange"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                size="mini"
-                range-separator="至"
-                start-placeholder="开始日期"
-                end-placeholder="结束日期"
-                style="margin-top: 2px; max-width: 350px"
-              >
-              </el-date-picker>
+        <div class="row">
+          <div class="col-sm col-md-8 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">时间：</span>
+                <el-date-picker
+                  v-model="queryParams.secondDate"
+                  type="datetimerange"
+                  value-format="yyyy-MM-dd HH:mm:ss"
+                  size="mini"
+                  range-separator="至"
+                  start-placeholder="开始日期"
+                  end-placeholder="结束日期"
+                  style="margin-top: 2px; max-width: 350px"
+                >
+                </el-date-picker>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px"></div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油频率：</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model="queryParams.secondStartCountNum"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">次</span>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >&lt; 加油次数 &lt;=</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model="queryParams.secondEndCountNum"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">次</span>
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px"></div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油频率：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model="queryParams.secondStartCountNum"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">次</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >&lt; 加油次数 &lt;=</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model="queryParams.secondEndCountNum"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">次</span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
 
-      <div class="row">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px">
-              <select
-                class="custom-select custom-select-sm"
-                id="inputGroupSelect01"
-                v-model="queryParams.secondAmtFlag"
-              >
-                <option value="1">或者</option>
-                <option value="2">并且</option>
-              </select>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油金额：</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.secondStartAmt"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">
-                &lt; 加油金额 &lt;=
-              </span>
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.secondEndAmt"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px">
+                <select
+                  class="custom-select custom-select-sm"
+                  id="inputGroupSelect01"
+                  v-model="queryParams.secondAmtFlag"
+                >
+                  <option value="1">或者</option>
+                  <option value="2">并且</option>
+                </select>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油金额：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.secondStartAmt"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">
+                  &lt; 加油金额 &lt;=
+                </span>
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.secondEndAmt"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="row">
-        <div class="col-sm col-md-9 offset-md-1">
-          <div class="input-group input-group-sm flex-nowrap">
-            <div class="input-group-prepend" style="width: 80px">
-              <select
-                class="custom-select custom-select-sm"
-                id="inputGroupSelect01"
-                v-model="queryParams.secondLitersFlag"
-              >
-                <option value="1">或者</option>
-                <option value="2">并且</option>
-              </select>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >加油升数：</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.secondStartLiters"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
-            </div>
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping"
-                >&lt; 加油升数 &lt;=</span
-              >
-            </div>
-            <input
-              type="text"
-              class="form-control"
-              aria-label="Username"
-              aria-describedby="addon-wrapping"
-              v-model.number="queryParams.secondEndLiters"
-            />
-            <div class="input-group-prepend">
-              <span class="input-group-text" id="addon-wrapping">元</span>
+        <div class="row">
+          <div class="col-sm col-md-9 offset-md-1">
+            <div class="input-group input-group-sm flex-nowrap">
+              <div class="input-group-prepend" style="width: 80px">
+                <select
+                  class="custom-select custom-select-sm"
+                  id="inputGroupSelect01"
+                  v-model="queryParams.secondLitersFlag"
+                >
+                  <option value="1">或者</option>
+                  <option value="2">并且</option>
+                </select>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >加油升数：</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.secondStartLiters"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping"
+                  >&lt; 加油升数 &lt;=</span
+                >
+              </div>
+              <input
+                type="text"
+                class="form-control"
+                aria-label="Username"
+                aria-describedby="addon-wrapping"
+                v-model.number="queryParams.secondEndLiters"
+              />
+              <div class="input-group-prepend">
+                <span class="input-group-text" id="addon-wrapping">元</span>
+              </div>
             </div>
           </div>
         </div>
-      </div>
-      <div class="row mb-0 mt-3" v-show="queryParams.secondFlag==1">
-        <div class="col-sm-4 offset-sm-3">
-          <el-button type="info" size="mini" icon="el-icon-arrow-up" data-toggle="collapse" data-target="#collapseExample" aria-expanded="false" aria-controls="collapseExample" @click="toggleQuery">展开查询</el-button>
+        <div class="row mb-0 mt-3" v-show="queryParams.secondFlag == 1">
+          <div class="col-sm-4 offset-sm-3">
+            <el-button
+              type="info"
+              size="mini"
+              icon="el-icon-arrow-up"
+              data-toggle="collapse"
+              data-target="#collapseExample"
+              aria-expanded="false"
+              aria-controls="collapseExample"
+              @click="toggleQuery"
+              >展开查询</el-button
+            >
+          </div>
+          <div class="col-sm-4">
+            <el-button
+              type="primary"
+              size="mini"
+              icon="el-icon-search"
+              @click="getList"
+              >立刻查询</el-button
+            >
+          </div>
         </div>
-        <div class="col-sm-4">
-           <el-button type="primary" size="mini" icon="el-icon-search" @click="getList">立刻查询</el-button>
-        </div>         
       </div>
     </div>
-</div>
     <el-table :data="userList" @selection-change="selectionChange" class="mt-5">
       <af-table-column align="center" prop="id" type="selection" />
       <af-table-column label="姓名" align="center" prop="customerName" />
@@ -443,7 +469,7 @@
       </af-table-column>
     </el-table>
     <pagination
-      v-show="total > 10"
+      v-show="total > 1"
       :total="total"
       :pageSizes="[10, 50, 100, 200]"
       :page.sync="queryParams.pageNum"
@@ -569,7 +595,7 @@
           </af-table-column>
         </el-table>
         <pagination
-          v-show="orderList.length>0"
+          v-show="orderList.length > 0"
           :total="orderTotal"
           :page.sync="orderQuery.pageNum"
           :limit.sync="orderQuery.pageSize"
@@ -586,7 +612,8 @@ import {
   getLabelList,
   delUserLabel,
   addAndDelCustomerLabel,
-  getConsume
+  getConsume,
+  getOilNameList
 } from "@/api/label/label";
 
 export default {
@@ -603,38 +630,37 @@ export default {
         pageSize: 10,
 
         oilName: null,
-        labelId:null,
-        data:null,
+        labelId: null,
+        data: null,
         beginDate: null,
         endDate: null,
-        
-        startCountNum:null,
-        endCountNum:null,
-        
-        amtFlag:'1',
-        startAmt:null,
-        endAmt:null,
-        
-        litersFlag:'1',
-        startLiters:null,
-        endLiters:null,
 
+        startCountNum: null,
+        endCountNum: null,
+
+        amtFlag: "1",
+        startAmt: null,
+        endAmt: null,
 
-        secondFlag:0,
-        secondDate:null,
-        secondBeginDate:null,
-        secondEndDate:null,
+        litersFlag: "1",
+        startLiters: null,
+        endLiters: null,
+
+        secondFlag: 0,
+        secondDate: null,
+        secondBeginDate: null,
+        secondEndDate: null,
 
         secondStartCountNum: null,
         secondEndCountNum: null,
 
-        secondAmtFlag:'1',
-        secondStartAmt:null,
-        secondEndAmt:null,
+        secondAmtFlag: "1",
+        secondStartAmt: null,
+        secondEndAmt: null,
 
-        secondLitersFlag:'1',
-        secondStartLiters:null,
-        secondEndLiters:null,
+        secondLitersFlag: "1",
+        secondStartLiters: null,
+        secondEndLiters: null,
       },
       orderList: [{}],
       orderOpen: false,
@@ -655,17 +681,17 @@ export default {
       checkedUser: [],
       toLabeledDialog: false,
       labelList: [],
+      oilList:[],
       currentLabelId: undefined,
       orderDialog: false,
-      orderTotal:0,
-      orderQuery:{
+      orderTotal: 0,
+      orderQuery: {
         pageNum: 1,
         pageSize: 10,
-        customerPhone:undefined,
+        customerPhone: undefined,
       },
       showQuery: false,
     };
-
   },
   computed: {
     filterSelectedUser() {
@@ -687,29 +713,40 @@ export default {
       .catch(() => {
         this.msgError("拉取标签列表失败，请刷新网页~");
       });
+    getOilNameList().then((res) => {
+        if (res.code == 200) {
+          this.oilList = res.rows;
+        } else {
+          throw new Error("");
+        }
+      })
+      .catch(() => {
+        this.msgError("拉取油品列表失败，请刷新网页~");
+      });
   },
   methods: {
-    getConsume(row){
+    getConsume(row) {
       this.orderQuery.customerPhone = row.phone;
       this.getOrderList();
     },
-    getOrderList(){
-      getConsume(this.orderQuery).then((res)=>{
-        if(res.code == 200){
-          this.orderList = res.rows
-          this.orderTotal = res.total
-          console.log(res);
-          this.orderDialog =  true;
-        }else{
-          throw new Error("");
-        }
-      }).catch(() => {
-        this.msgError("查询近日订单~")
-      })
+    getOrderList() {
+      getConsume(this.orderQuery)
+        .then((res) => {
+          if (res.code == 200) {
+            this.orderList = res.rows;
+            this.orderTotal = res.total;
+            this.orderDialog = true;
+          } else {
+            throw new Error("");
+          }
+        })
+        .catch(() => {
+          this.msgError("查询近日订单~");
+        });
     },
     toLabeledDialogClose() {
-      this.selectedUser = []
-      this.checkedUser = []
+      this.selectedUser = [];
+      this.checkedUser = [];
     },
     handleSubmitLable() {
       const addArr = [];
@@ -741,7 +778,6 @@ export default {
       this.toLabeledDialog = false;
     },
     translationLabel(id) {
-      console.log(this.labelList);
       const label = this.labelList.find((ele) => {
         return id == ele.id;
       });
@@ -752,7 +788,6 @@ export default {
     },
     toUnLableed(row) {
       const delArr = [];
-      console.log(row);
       if (this.selectedUser.length == 0) {
         delArr.push(row.phone);
       } else {
@@ -777,12 +812,10 @@ export default {
         });
     },
     toClearLabel(row) {
-      console.log(row);
       const delArr = [];
       if (this.checkedUser.length == 0) {
-        this.checkedUser = [row]
+        this.checkedUser = [row];
         delArr.push(row.phone);
-        console.log(this.checkedUser)
       } else {
         this.checkedUser.map((ele) => {
           delArr.push(ele.phone);
@@ -836,19 +869,19 @@ export default {
     },
     /** 查询客户电子会员卡充值消费记录列表 */
     getList() {
-      if(this.queryParams.data === null){
-        this.queryParams.beginDate = null
-        this.queryParams.endDate = null
-      }else{
-        this.queryParams.beginDate = this.queryParams.data[0]
-        this.queryParams.endDate = this.queryParams.data[1]
+      if (this.queryParams.data === null) {
+        this.queryParams.beginDate = null;
+        this.queryParams.endDate = null;
+      } else {
+        this.queryParams.beginDate = this.queryParams.data[0];
+        this.queryParams.endDate = this.queryParams.data[1];
       }
-      if(this.queryParams.secondDate === null){
-        this.queryParams.secondBeginDate = null
-        this.queryParams.secondEndDate = null
-      }else{
-        this.queryParams.secondBeginDate = this.queryParams.secondDate[0]
-        this.queryParams.secondEndDate = this.queryParams.secondDate[1]
+      if (this.queryParams.secondDate === null) {
+        this.queryParams.secondBeginDate = null;
+        this.queryParams.secondEndDate = null;
+      } else {
+        this.queryParams.secondBeginDate = this.queryParams.secondDate[0];
+        this.queryParams.secondEndDate = this.queryParams.secondDate[1];
       }
       console.log(this.queryParams);
       getLabelUser(this.queryParams).then((response) => {
@@ -870,7 +903,6 @@ export default {
       this.orderOpen = true;
     },
     toLabeled(idAndPhone) {
-      console.log(11111111);
       const idAndPhoneArr = idAndPhone.match(/\d{1,}/g);
       const id = idAndPhoneArr[0];
       const phone = idAndPhoneArr[1];
@@ -893,13 +925,13 @@ export default {
       this.currentLabelId = id;
       this.toLabeledDialog = true;
     },
-    toggleQuery(){
-      if(this.queryParams.secondFlag == 0){
+    toggleQuery() {
+      if (this.queryParams.secondFlag == 0) {
         this.queryParams.secondFlag = 1;
-      }else{
+      } else {
         this.queryParams.secondFlag = 0;
       }
-    }
+    },
   },
 };
 </script>