Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

public/static/payprint.html

@@ -880,7 +880,7 @@
         }
 
         document.title = this.printData.compName + '结算凭证'
-        // window.print()
+        window.print()
         window.onafterprint = function(event) {
           window.history.back(-1)
         }

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>
@@ -393,7 +393,7 @@ import download from '../../components/WsDownload/download'
    promises.push(promise);
   }
   Promise.all(promises).then(() => {
-   zip.generateAsync({ type: "blob" }).then(content => {
+   zip.generateAsync({ type: 'blob' }).then(content => {
    _this.title = '正在压缩';
    // 生成二进制流
    FileSaver.saveAs(content, filename); // 利用file-saver保存文件 自定义文件名
@@ -409,8 +409,8 @@ import download from '../../components/WsDownload/download'
   return new Promise((resolve, reject) => {
    //通过请求获取文件blob格式
    let xmlhttp = new XMLHttpRequest();
-   xmlhttp.open("GET", url, true);
-   xmlhttp.responseType = "blob";
+   xmlhttp.open('GET', url, true);
+   xmlhttp.responseType = 'blob';
    xmlhttp.onload = function () {
    if (this.status == 200) {
     resolve(this.response);
@@ -534,6 +534,7 @@ import download from '../../components/WsDownload/download'
                   return prev
                 }
               }, 0)
+              sums[index] = sums[index].toFixed(3)
             } else {
               sums[index] = '元'
             }
@@ -582,7 +583,7 @@ import download from '../../components/WsDownload/download'
                 this.selectCustomerList.push(response)
                 index2++;
                 if (index1 == this.modification.length && index2 == this.modification.length) {
-                  this.printData.compName = ""
+                  this.printData.compName = ''
                   // this.isShowPrint = true
                   this.printBig();
                 }
@@ -602,7 +603,7 @@ import download from '../../components/WsDownload/download'
                       '日'
                     this.selectPrintList.push(response)
                     if (index1 == this.modification.length && index2 == this.modification.length) {
-                      this.printData.compName = ""
+                      this.printData.compName = ''
                       // this.isShowPrint = true
                       this.printBig();
                     }

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))