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

src/views/houseSelfCollect/inspectInfo.vue

@@ -273,6 +273,8 @@
         }
       },
       closePrint(){
+           this.types = ""
+        this.inspect = [] 
         this.isShowPrint = false
         this.$router.push({path:'inspectionManagement'})
       },

src/views/houseSelfCollect/paymentManagement.vue

@@ -286,7 +286,6 @@ export default {
     })
       .toPromise()
       .then((response) => {
-        this.warehouseList = response
         this.warehouseList = response
         this.warehouseNameKey = this.warehouseList[0].id
         this.warehouseName = this.warehouseList[0].warehouseName
@@ -361,6 +360,7 @@ export default {
           data = this.warehouseList[i]
         }
       }
+      debugger
       for (let i = 0; i < data.purchasePriceList.length; i++) {
         if (data.purchasePriceList[i].goodsName == row.goodsName) {
           data1 = data.purchasePriceList[i]

src/views/houseSelfCollect/settlement.vue

@@ -473,20 +473,23 @@ export default {
           this.paymentList = response
           this.paymentList.qualityInspectionManagement.waterMin=this.$route.query.waterMin
           this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
-          this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+        this.paymentList.qualityInspectionManagement.weightDeduction=this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
+         this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+         this.paymentList.base = this.paymentList.base.toFixed(2)
           this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+           this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
           if(!this.paymentList.solidGrainPrice){
             this.paymentList.solidGrainPrice=this.paymentList.qualityInspectionManagement.tidalGrainPrice/this.paymentList.base
           }
           if(this.paymentList.type =='潮粮'){
             this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.tidalGrainPrice*this.paymentList.weighingManagement.netWeight
-            this.paymentList.calculationPayable =  this.paymentList.grainMoney
+            this.paymentList.calculationPayable =  this.paymentList.grainMoney.toFixed(2)
               this.paymentList.actualPayment = this.paymentList.calculationPayable
               this.actualPayment( this.paymentList.actualPayment)
           }else{
             // this.paymentList.grainMoney=this.paymentList.qualityInspectionManagement.solidGrainPrice*this.paymentList.weighingManagement.netWeight
              this.paymentList.grainMoney = this.paymentList.qualityInspectionManagement.dryGrainPrice * this.paymentList.weighingManagement.netWeight
-              this.paymentList.calculationPayable =  this.paymentList.grainMoney
+              this.paymentList.calculationPayable =  this.paymentList.grainMoney.toFixed(2)
                 this.paymentList.actualPayment = this.paymentList.calculationPayable
                 this.actualPayment( this.paymentList.actualPayment)
           }
@@ -498,7 +501,8 @@ export default {
      this.paymentList.capitalize=this.convertCurrency(e)
     },
     grainMoney(){
-       this.paymentList.calculationPayable=(Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy))-this.paymentList.weighingDeduction-this.paymentList.freightDeduction-this.paymentList.unloadDeduction-this.paymentList.otherDeduction-this.paymentList.qualityDeduction
+       this.paymentList.calculationPayable=(Number(this.paymentList.grainMoney)+Number(this.paymentList.weighingSubsidy)+Number(this.paymentList.freightSubsidy)+Number(this.paymentList.unloadSubsidy)+Number(this.paymentList.otherSubsidy))-this.paymentList.weighingDeduction-this.paymentList.freightDeduction-this.paymentList.unloadDeduction-this.paymentList.otherDeduction-this.paymentList.qualityDeduction.toFixed(2)
+       this.paymentList.calculationPayable =  this.paymentList.calculationPayable.toFixed(2)
       this.paymentList.actualPayment = this.paymentList.calculationPayable
       this.actualPayment( this.paymentList.actualPayment)
       // this.paymentList.calculationPayable=num.toFixed(2)
@@ -690,7 +694,7 @@ export default {
           })
           return
         }
-        if (this.paymentList.remarks.length > 20) {
+        if (this.paymentList.remarks&&this.paymentList.remarks.length > 20) {
           this.$message({
             message: '记事字数应在0-20个字',
             type: 'warning',
@@ -719,8 +723,11 @@ export default {
     buckleWeightRatiochange(e){
       if(this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2){
         this.paymentList.qualityInspectionManagement.weightDeduction=(this.paymentList.qualityInspectionManagement.waterContent-this.paymentList.qualityInspectionManagement.waterMin)*this.paymentList.buckleWeightRatio
+        this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement.weightDeduction.toFixed(2)
       this.paymentList.base=(100-this.paymentList.qualityInspectionManagement.weightDeduction)/100
+      this.paymentList.base = this.paymentList.base.toFixed(2)
       this.paymentList.pureWeight=this.paymentList.base*this.paymentList.weighingManagement.netWeight
+       this.paymentList.pureWeight =  this.paymentList.pureWeight.toFixed(2)
 
       }else{
          this.$message({
@@ -750,7 +757,7 @@ export default {
   border: none;
 }
 /deep/.ws-info-table .el-form-item .el-form-item__label {
-  width: 30%;
+  width: 40%;
   text-align: center;
   background: #ffffff;
   font-size: 14px;

src/views/houseSelfCollect/weightCheck.vue

@@ -216,6 +216,7 @@ export default {
     this.warehouseId = this.$route.query.warehouseId
     this.weighingList.grossWeight = this.$route.query.grossWeight
     this.purchasePriceList = this.$route.query.purchasePriceList
+    console.log(this.purchasePriceList,"上限")
     this.allowEdit = this.$route.query.allowEdit
     if( this.allowEdit == 0){
       this.disabled = true
@@ -378,6 +379,7 @@ export default {
               .toPromise()
               .then((response) => {
                 for (let i = 0; i < this.purchasePriceList.length; i++) {
+                  console.log(this.purchasePriceList,"shangxiang")
                   if (
                     this.weighingList.goodsName == this.purchasePriceList[i].goodsName
                   ) {