修改

src/views/statisticalReport/autoSettlementList.vue

@@ -149,7 +149,18 @@
           class="table_td"
           prop="lossWeight"
           label="损耗(吨)"
-        ></el-table-column>
+          ><template slot-scope="scope">
+            <span v-if="scope.row.unloadingWeight == '未卸车'">--</span>
+            <span
+              v-if="
+                scope.row.lossWeight > 0 &&
+                scope.row.lossWeight > scope.row.loadingWeight / 1000
+              "
+              style="color: #f10404; font-weight: 600"
+              >{{ scope.row.lossWeight }}</span
+            >
+          </template>
+        </el-table-column>
         <el-table-column
           width="120"
           class="table_td"
@@ -274,9 +285,7 @@
           ><template slot-scope="scope">
             {{ scope.row.alreadyInvoice }}
             <img
-            v-if="
-                scope.row.amountEdPayable > 0
-              "
+              v-if="scope.row.amountEdPayable > 0"
               width="17"
               height="18"
               style="vertical-align: text-top; position: relative; top: -1px"
@@ -394,7 +403,9 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible2 = false">取 消</el-button>
-        <el-button type="primary" @click="submitBatchInvoice()">提 交</el-button>
+        <el-button type="primary" @click="submitBatchInvoice()"
+          >提 交</el-button
+        >
       </div>
     </el-dialog>
     <!-- 开发票 -->
@@ -424,13 +435,18 @@
     <!--账户-->
     <el-dialog
       width="30%"
-      title="的账户"
+      title="账户信息"
       :visible.sync="dialogFormVisible8"
       :append-to-body="true"
     >
-      <span>账户-1</span>
+      <h3 style="margin-left: 30px">{{ customerlist.name }}的账户</h3>
+      <!-- <div v-for="(item, index) in item" :key="index"> -->
+      <h4 style="margin-left: 30px">账户-</h4>
+      <div class="anniu">
+        <el-radio v-model="radio" label="1">本次收款账户</el-radio>
+      </div>
       <el-form class="customer" :model="form">
-        <el-form-item label="账户类型" :label-width="formLabelWidth" >
+        <el-form-item label="账户类型" :label-width="formLabelWidth">
           {{ customerlist.accountType }}
         </el-form-item>
         <el-form-item label="银行卡号" :label-width="formLabelWidth">
@@ -464,6 +480,7 @@
           {{ customerlist.compName }}
         </el-form-item>
       </el-form>
+      <!-- </div> -->
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible8 = false">取 消</el-button>
       </div>
@@ -478,7 +495,6 @@ import {
   autocontract,
   autopaymoney,
   openinvoicelist,
-  //   getorder,
   // postaudit,
   //   getselectctcontractno,
 } from '@/model/statisticalReport/index'
@@ -548,7 +564,8 @@ export default {
       currentPage: 1,
       pageSize: 10,
       searchType: '1',
-      manualFlag:'',
+      manualFlag: '',
+      radio: '1',
       searchTypeText: '未完成',
       searchKeyWord: '',
       customerlist: {},
@@ -671,8 +688,7 @@ export default {
     handlepayment() {
       this.amountNotPayable = 0
       this.money = this.money
-      this.autoSettlementList =
-        this.warehouseList.records[0].autoSettlementList
+      this.autoSettlementList = this.warehouseList.records[0].autoSettlementList
       this.amountEdPayable = this.warehouseList.records[0].amountEdPayable
       this.paymentDate = this.paymentDate
       if (this.modification.length == 0) {
@@ -837,8 +853,7 @@ export default {
     //批量开发票
     handleninvoice() {
       this.amountEdPayable = 0
-      this.autoSettlementList =
-        this.warehouseList.records[0].autoSettlementList
+      this.autoSettlementList = this.warehouseList.records[0].autoSettlementList
       for (var i = 0; i < this.modification.length; i++) {
         this.amountEdPayable += this.modification[i].amountEdPayable
       }
@@ -884,13 +899,17 @@ export default {
         return
       }
       if (
-        this.settlementWeight&&String(this.settlementWeight).indexOf('.') != -1 &&
+        (this.settlementWeight &&
+          String(this.settlementWeight).indexOf('.') != -1 &&
           String(this.settlementWeight).length -
             (String(this.settlementWeight).indexOf('.') + 1) >
-            2||this.settlementWeight&&this.settlementWeight>100||this.settlementWeight&&this.settlementWeight<1) {
+            2) ||
+        (this.settlementWeight && this.settlementWeight > 100) ||
+        (this.settlementWeight && this.settlementWeight < 1)
+      ) {
         this.$message({
           message: '结算重量输入错误',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
@@ -922,13 +941,17 @@ export default {
         return
       }
       if (
-        this.deductionAmount&&String(this.deductionAmount).indexOf('.') != -1 &&
+        (this.deductionAmount &&
+          String(this.deductionAmount).indexOf('.') != -1 &&
           String(this.deductionAmount).length -
             (String(this.deductionAmount).indexOf('.') + 1) >
-            2||this.deductionAmount&&this.deductionAmount>100000||this.deductionAmount&&this.deductionAmount<1) {
+            2) ||
+        (this.deductionAmount && this.deductionAmount > 100000) ||
+        (this.deductionAmount && this.deductionAmount < 1)
+      ) {
         this.$message({
           message: '扣款金额输入错误',
-          type: 'warning'
+          type: 'warning',
         })
         return
       }
@@ -1043,15 +1066,6 @@ export default {
     },
     contractchange(e) {
       this.contractNo = e
-      getorder({
-        contractNo: this.contractNo,
-      })
-        .toPromise()
-        .then((response) => {
-          if (response != null) {
-            this.orderList = response
-          }
-        })
       this.getList()
     },
     updated() {
@@ -1099,7 +1113,7 @@ export default {
         pageSize: this.pageSize,
         searchType: this.searchType,
         contractNo: this.contractNo,
-        manualFlag: this. manualFlag,
+        manualFlag: this.manualFlag,
       })
         .toPromise()
         .then((response) => {
@@ -1120,7 +1134,7 @@ export default {
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,
         pageSize: this.pageSize,
-        roleFlag: this.roleFlag,
+        // roleFlag: this.roleFlag,
       })
         .toPromise()
         .then((response) => {
@@ -1319,6 +1333,11 @@ export default {
   height: 12px;
   background: #e9ecf7;
 }
+.anniu {
+  margin-left: 40%;
+  margin-top: -7%;
+  margin-bottom: 6%;
+}
 // .el-row{
 //     height: 150px;
 // }