前端汽运结算报表编辑结算重量扣款，司机车队列

src/views/statisticalReport/autoSettlementList.vue

@@ -103,14 +103,14 @@
             <!--改结算重量-->
             <i @click="changesettlementWeight(scope.row)" v-if="
               (scope.row.settlementWeightchange &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (scope.row.settlementWeightchange &&
                 scope.row.status == '已驳回')
             " class="iconfont icon-dui"></i>
             <img v-if="
               (!scope.row.settlementWeightchange &&
                 scope.row.settlementWeight &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (!scope.row.settlementWeightchange &&
                 scope.row.settlementWeight &&
                 scope.row.status == '已驳回')
@@ -125,14 +125,14 @@
             <!--改扣款-->
             <i @click="changedeductionAmount(scope.row)" v-if="
               (scope.row.deductionAmountchange &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (scope.row.deductionAmountchange &&
                 scope.row.status == '已驳回')
             " class="iconfont icon-dui"></i>
             <img v-if="
               (!scope.row.deductionAmountchange &&
                 scope.row.deductionAmount &&
-                scope.row.approveStatus == '待物流部审核') ||
+                scope.row.status == '待请款') ||
               (!scope.row.deductionAmountchange &&
                 scope.row.deductionAmount &&
                 scope.row.status == '已驳回')
@@ -163,7 +163,14 @@
           </template>
         </el-table-column>
         <el-table-column width="150" class="table_td" label="付款日期" prop="paymentDate"></el-table-column>
-        <el-table-column class="table_td" label="账户" prop="">
+        <el-table-column width="150" class="table_td" label="司机/车队" prop="name">
+          <template
+            slot-scope="scope">
+            {{ scope.row.name }}
+            <span v-if="scope.row.fleetFlag==1">(队)</span>
+          </template>
+        </el-table-column>
+        <!-- <el-table-column class="table_td" label="账户" prop="">
           <template slot-scope="scope">
             <div style="
                 display: inline-block;
@@ -175,7 +182,7 @@
               查看
             </div>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column label="状态" prop="status" width="100px">
           <template slot-scope="scope">
             <span v-if="scope.row.approveStatus != null">{{
@@ -309,7 +316,7 @@
     <!--付款截图 -->
     <WinseaContentModal v-model="paymentImg" title="付款截图信息" @on-cancel="handleClose2">
       <p>查看付款截图</p>
-      <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
+      <ws-upload :editable='false' ref="upload" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .xls, .xlsx" :comp-id="compId" :appendix-ids="paymentScreenshot1" :size-limit="size"
        />
       <!-- <div v-for="item in paymentScreenshot1">
         <img style="width: 100px; height: 100px" :src="item" alt="" />
@@ -921,7 +928,7 @@ export default {
       } else {
         this.paymentImg = true
       }
-      this.paymentScreenshot1 = row.paymentScreenshot.split('$')
+      this.paymentScreenshot1 = row.paymentScreenshot
     },
     //审核
     audit(item, index, status, status2, reason) {
@@ -1007,6 +1014,10 @@ export default {
             this.$message.warning('请选择待请款的条目')
             return
           }
+          if(!this.modification[i].unloadingWeight){
+            this.$message.warning('请选择已卸车的车辆')
+            return
+          }
         }
         
         this.$confirm(`是否确定请款？`, {