加气站收尾

src/views/label/Label_Batch.vue

@@ -315,7 +315,7 @@
     </div>
  
     <hr />
-    <el-table :data="labelList">
+    <el-table :data="labelList" >
       <af-table-column align="center" prop="id" type="selection" />
       <af-table-column label="姓名" align="center" prop="id" />
       <af-table-column label="当前归属的标签" align="center" prop="id" />
@@ -505,6 +505,9 @@ export default {
     this.getList();
   },
   methods: {
+    selectionChange(selection){
+      console.log(selection);
+    },
     usageTypeFotmat(row, column) {
       if (row.usageType === "+") {
         return "充值";

src/views/overview/Overview_LngSummary.vue

@@ -37,7 +37,7 @@
             <div style="line-height: 62px; font-size: 2vw">
               {{ form.zongliters }}
             </div>
-            <div style="font-size: 2vw">总销量(L)</div>
+            <div style="font-size: 2vw">总销量(Kg)</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="6">
@@ -50,30 +50,24 @@
         </el-col>
         <el-col :xs="12" :sm="12" :lg="6">
           <div class="flex qiyou">
-            <div style="font-size: 28px; margin-top: -20px">汽油</div>
-            <div class="flex-qy" style="margin-top: 30px">
-              <div class="flex-qy-sx" style="margin-right: 10px">
-                <div style="font-size: 1.5vw">{{ form.qyliters }}</div>
-                <div style="font-size: 1.5vw">升数(L)</div>
-              </div>
-              <div class="flex-qy-sx" style="margin-left: 10px">
-                <div style="font-size: 1.5vw">{{ form.qyamt }}</div>
-                <div style="font-size: 1.5vw">金额(元)</div>
-              </div>
+            <div style="line-height: 62px; font-size: 2vw">
+              {{ form.countNum }}
             </div>
+            <div style="font-size: 2vw">订单量(单)</div>
           </div>
         </el-col>
         <el-col :xs="12" :sm="12" :lg="6">
           <div class="flex chaiyou">
-            <div style="font-size: 28px; margin-top: -20px">柴油</div>
+            <div style="font-size: 28px; margin-top: -20px">LNG</div>
             <div class="flex-qy" style="margin-top: 30px">
               <div class="flex-qy-sx" style="margin-right: 10px">
-                <div style="font-size: 1.5vw">{{ form.cyliters }}</div>
-                <div style="font-size: 1.5vw">升数(L)</div>
+                <div style="font-size: 1.5vw">{{ !lngData.orderLiters ? 0 : lngData.orderLiters}}</div>
+                <div style="font-size: 1.5vw">升数(Kg)</div>
               </div>
               <div class="flex-qy-sx" style="margin-left: 10px">
-                <div style="font-size: 1.5vw">{{ form.cyamt }}</div>
+                <div style="font-size: 1.5vw">{{ !lngData.sellAmt ? 0 : lngData.orderLiters }}</div>
                 <div style="font-size: 1.5vw">金额(元)</div>
+                
               </div>
             </div>
           </div>
@@ -252,6 +246,7 @@ export default {
         otherAmt: 0,
         memberAmt: 0,
         posAmt: 0,
+        countNum:0
       },
 
       // 今日数据
@@ -264,6 +259,7 @@ export default {
       },
       // 表单校验
       rules: {},
+      lngData:{}
     };
   },
   created() {
@@ -273,23 +269,23 @@ export default {
     /** 查询优惠劵管理列表 */
     getList(query) {
       listSum(query).then((response) => {
-        if (response.data!=null ) {
-          this.form.zongAmt = response.data.amt;
+        if (response.data != null ) {
+          this.form.zongAmt = response.data.sellAmt;
           this.form.zongliters = response.data.orderLiters;
+          this.form.countNum = response.data.countNum
         }
       });
       listOilType(query).then((response) => {
-        if (response.hasOwnProperty("rows")) {
-          for (let i in response.rows) {
-            if (response.rows[i].oilType === "1") {
-              this.form.qyamt = response.rows[i].amt;
-              this.form.qyliters = response.rows[i].orderLiters;
-            } else if (response.rows[i].oilType === "2") {
-              this.form.cyamt = response.rows[i].amt;
-              this.form.cyliters = response.rows[i].orderLiters;
-            }
-          }
+        if(response.code == 200) {
+          this.lngData = response.rows.filter((ele)=>{
+            return ele.oilType == '4'
+          })[0]
+          this.lngData = this.lngData == undefined ?  {} : this.lngData
+        }else{
+          throw new Error("")
         }
+      }).catch(() => {
+        this.msgError("拉取overview不同油品的数据失败")
       });
       listViewData(query).then((response) => {
         if (response.data!=null ) {

src/views/system/dept/index.vue

@@ -47,6 +47,7 @@
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
       <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="deptId" label="ID" width="110"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="100"></el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" width="200">