更新

src/views/houseSelfCollect/paymentManagement.vue

@@ -24,7 +24,7 @@
         <!-- <ws-button type="primary" @click="screen(2)">待结算</ws-button>
         <ws-button type="primary" @click="screen(0)">待审核</ws-button>
         <ws-button type="primary"  @click="screen()">全部</ws-button>-->
-        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" v-if="isShowAdopt == 'true'">待审核
+        <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(1)" >待审核
         </ws-button>
         <ws-button :type="searchType == 0 ? 'primary' : ''" @click="screen(7)"
           v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">待付款</ws-button>
@@ -35,6 +35,7 @@
         <ws-button type="primary" @click="reject">驳回</ws-button>
         <ws-button type="primary" @click="adopt">通过</ws-button>
         <ws-button type="primary" @click="invoicingClick" v-hasPermission="`acquisitionManagement.acquisitionPay.finace`">开票</ws-button>
+        <!-- <a href="https://taohaoliang.oss-cn-beijing.aliyuncs.com/FP/7313fc0f25ed41879826bba5c737d688.xml" download='112'>立即下载</a> -->
         <ws-button type="primary" @click="exportlist" v-hasPermission="`acquisitionManagement.acquisitionPay.print`">导出</ws-button>
         <!-- <ws-button type="primary" @click="handlepass" v-if="isShowAdopt">审核</ws-button> -->
         <ws-button type="primary" @click="payment" v-hasPermission="`acquisitionManagement.acquisitionPay.pay`">付款
@@ -391,13 +392,12 @@ import {
         invoicing(data)
           .toPromise()
           .then(response => {
-            debugger
             console.log(response)
             if (response.length > 0) {
               for (let i = 0; i < response.length; i++) {
                 //创建标签下载文件
                 let a = document.createElement('a');
-                a.href = response[i];
+                a.href = '#';
                 a.setAttribute('download', response[i]);
                 a.click();
                 a.remove();
@@ -482,6 +482,7 @@ import {
                   return prev
                 }
               }, 0)
+              sums[index] = sums[index].toFixed(3)
             } else {
               sums[index] = '元'
             }

src/views/houseSelfCollect/weightCheck.vue

@@ -171,7 +171,12 @@
       weighingList: { //深度监听，可监听到对象、数组的变化
         handler(val, oldVal) {
           if (val.tare) {
-            this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
+            if(this.weighingList.buckleMiscellaneous){
+               this.weighingList.netWeight = this.weighingList.grossWeight - val.tare - this.weighingList.buckleMiscellaneous
+            }
+            else{
+              this.weighingList.netWeight = this.weighingList.grossWeight - val.tare
+            }
           }
         },
         deep: true //true 深度监听
@@ -202,6 +207,7 @@
           grossWeight: 0,
           tare: 0,
           buckleMiscellaneous: 0,
+          netWeight:0
         },
         tpyeNo: 1,
         disabled: true,
@@ -523,11 +529,11 @@
         })
       },
       calculation() {
-        if (this.weighingList.grossWeight && this.weighingList.tare) {
-          this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - this.weighingList
-            .buckleMiscellaneous
-          this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
-        }
+        // debugger
+        // if (this.weighingList.grossWeight && this.weighingList.tare) {
+        //   this.weighingList.netWeight = this.weighingList.grossWeight - this.weighingList.tare - parseInt(this.weighingList.buckleMiscellaneous)
+        //   this.weighingList.netWeight = this.weighingList.netWeight.toFixed(2)
+        // }
       },
       printSmall() {
         window.open('../../../../static/weightCheck.html?type=1&tableData=' + JSON.stringify(this.inspect))