更新

public/static/payprint1.html

@@ -262,9 +262,8 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td class="col" colspan="3">
-                                    {{printData1[index].warehouseName}}
-                                </td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
                                     {{printData1[index].identityAuthenticationInfo.compAddress}}
@@ -637,7 +636,8 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.compAddress}}

public/static/payprint3.html

@@ -262,9 +262,8 @@
                             </tr>
                             <tr class="row">
                                 <td class="col col-bgc">收货仓库</td>
-                                <td class="col" colspan="3">
-                                    {{printData1[index].warehouseName}}
-                                </td>
+                                <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                                <td v-if="!pengyuPrint" class="col" colspan="3">{{printData1[index].warehouseName}}</td>
                                 <td class="col col-bgc">地址</td>
                                 <td class="col" colspan="4">
                                     {{printData1[index].identityAuthenticationInfo.compAddress}}
@@ -637,7 +636,8 @@
                     </tr>
                     <tr class="row">
                         <td class="col col-bgc">收货仓库</td>
-                        <td class="col" colspan="3">{{printData.warehouseName}}</td>
+                        <td v-if="pengyuPrint" class="col" colspan="3">北京天维康油脂调销中心有限公司</td>
+                        <td v-if="!pengyuPrint" class="col" colspan="3">{{printData.warehouseName}}</td>
                         <td class="col col-bgc">地址</td>
                         <td class="col" colspan="4">
                             {{printData.identityAuthenticationInfo.compAddress}}

src/views/houseSelfCollect/settlement.vue

@@ -401,7 +401,7 @@
             this.paymentList.unloadDeduction = (Number(this.paymentList.netWeight)/1000*5).toFixed(0)
           }
           let compIdTmp  = localStorage.getItem('ws-pf_compId')
-          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分15
+          //白城市鹏羽粮食贸易有限公司 扣重比1.25 干粮水分14.5
           if(compIdTmp == '6a713699e08c4cbc97a87f7648a95e3d' || compIdTmp == '5d164edcef03476dba6630f86dc96496'){
             // this.paymentList.buckleWeightRatio = this.paymentList.qualityInspectionManagement.buckleWeightRatio
             this.paymentList.buckleWeightRatio = 1.25
@@ -409,12 +409,12 @@
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
             if (this.paymentList.qualityInspectionManagement.paramType == '2') {
               this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                  .qualityInspectionManagement.waterContent - 15) *
+                  .qualityInspectionManagement.waterContent - this.ganwater) *
                 this.paymentList.buckleWeightRatio
               this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
-                .qualityInspectionManagement.weightDeduction.toFixed(2)
+                .qualityInspectionManagement.weightDeduction.toFixed(5)
               this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
-              this.paymentList.base = this.paymentList.base.toFixed(3)
+              this.paymentList.base = this.paymentList.base.toFixed(5)
               if (this.paymentList.type == '潮粮') {
                 if(this.paymentList.base > 1){
                   this.paymentList.base = 1