更新

src/views/houseSelfCollect/paymentManagement.vue

@@ -589,6 +589,7 @@
               obj.tare = v.皮重
               obj.netWeight = v.净重
               obj.dryGrainPrice = v.单价
+              obj.money = v.粮款
               obj.qualityDate = _this.formatDate(v.日期, '-')
               obj.deductionAmount = v.扣款
               obj.goodsName = v.货名

src/views/houseSelfCollect/settlement.vue

@@ -407,14 +407,20 @@
             this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
             this.paymentList.base = this.paymentList.base.toFixed(3)
             if (this.paymentList.type == '潮粮') {
+              if(this.paymentList.base > 1){
+                this.paymentList.base = 1
+              }
               this.paymentList.pureWeight = this.paymentList.base * this.paymentList.weighingManagement.netWeight
               this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
             }
 
           } else {
             if (this.paymentList.type == '潮粮') {
-              this.paymentList.pureWeight = this.paymentList.weighingManagement.netWeight * (100 - this.paymentList
-                .param) / 100
+              let paramtmp = (100 - this.paymentList.param) / 100
+              if(paramtmp > 1){
+                paramtmp = 1
+              }
+              this.paymentList.pureWeight = this.paymentList.weighingManagement.netWeight * paramtmp
               this.paymentList.pureWeight = Math.round(this.paymentList.pureWeight)
             }
           }
@@ -686,6 +692,9 @@
             .weightDeduction.toFixed(2)
           this.paymentList.base = (100 - this.paymentList.qualityInspectionManagement.weightDeduction) / 100
           this.paymentList.base = this.paymentList.base.toFixed(3)
+          if(this.paymentList.base > 1){
+            this.paymentList.base = 1
+          }
           this.paymentList.pureWeight = this.paymentList.base * this.paymentList.weighingManagement.netWeight
           this.paymentList.solidGrainPrice = (Number(this.paymentList.grainMoney) / Number(this.paymentList.pureWeight))
             .toFixed(4)