ccj 3 vuotta sitten
vanhempi
commit
2696a8a821

+ 1 - 1
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]

+ 3 - 3
src/views/houseSelfCollect/settlement.vue

@@ -483,13 +483,13 @@ export default {
           }
           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)
           }
@@ -694,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',