Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/statisticalReport/autoSettlementList.vue

@@ -179,7 +179,7 @@
           prop="lossWeight"
           label="损耗(吨)"
           ><template slot-scope="scope">
-            <span v-if="scope.row.unloadingWeight == '未卸车'">--</span>
+            <span v-if="scope.row.unloadingWeight == null">--</span>
             <span
               v-if="
                 scope.row.lossWeight > 0 &&
@@ -300,7 +300,21 @@
           class="table_td"
           label="已付金额(元)"
           prop="amountEdPayable"
-        ></el-table-column>
+        ><template slot-scope="scope">
+            <div
+              style="
+                display: inline-block;
+                color: #5878e8;
+                padding: 0 4px !important;
+                position: relative;
+                font-size: 14px;
+              "
+              @click="lookpaymentScreenshot(scope.row)"
+            >
+            <span>{{scope.row.amountEdPayable}}</span>
+            </div>
+          </template>
+        </el-table-column>
         <el-table-column
           width="100"
           class="table_td"
@@ -534,6 +548,15 @@
       <p>查看卸车磅单</p>
       <img width="100" height="100" :src="unloadingImg1" alt="" />
     </WinseaContentModal>
+    <!--付款截图 -->
+    <WinseaContentModal
+      v-model="paymentImg"
+      title="付款截图信息"
+      @on-cancel="handleClose2"
+    >
+      <p>查看付款截图</p>
+        <img width="100" height="100" :src="paymentScreenshot1" alt="" />
+    </WinseaContentModal>
   </div>
   <!-- </div> -->
 </template>
@@ -623,6 +646,7 @@ export default {
       contractType: 2,
       accessoryTFs: false,
       accesscard: false,
+      paymentImg: false,
       enter: {
         closePositionList: [],
       },
@@ -646,6 +670,7 @@ export default {
       modification: [],
       loadingImg1: [],
       unloadingImg1: [],
+      paymentScreenshot1: [],
       amendlist: {},
       roleFlag: 1,
       alreadyInvoice1: 0,
@@ -737,6 +762,9 @@ export default {
     handleClose1() {
       this.accesscard = false
     },
+    handleClose2() {
+      this.paymentImg = false
+    },
     //账户
     look(item) {
       this.dialogFormVisible8 = true
@@ -1083,6 +1111,17 @@ export default {
       }
       this.unloadingImg1 = row.unloadingImg
     },
+    //付款截图
+    lookpaymentScreenshot(row) {
+      if (row.paymentScreenshot == null || row.paymentScreenshot == '') {
+        EventBus.$emit(
+          this.$message.warning('暂无付款截图信息')
+        )
+      } else {
+        this.paymentImg = true
+      }
+      this.paymentScreenshot1 = row.paymentScreenshot
+    },
     //审核
     audit(item, index, status, status2, reason) {
       if (index < this.modification.length) {