Merge remote-tracking branch 'origin/main'

SC-web/src/views/scm/basicInformation/poundlist/PurchaseOrderForm.vue

@@ -846,21 +846,21 @@
         });
         this.dataForm.purchaseorder_item0List.forEach((item, index)=>{
           if(row.vehicleId == item.vehicleId){
-            item.amount = parseFloat(item.settlement) * parseFloat(item.price);//金额
-            item.notAmount = item.amount * (100 - rate) / 100;//不含税金额
+			item.amount = this.jnpf.floatMul(item.settlement, item.price);//重量
+			item.notAmount = this.jnpf.floatDiv(this.jnpf.floatMul(item.amount, this.jnpf.floatSub(100, rate)), 100);//不含税金额
           }
           if(item.advance == '1'){//垫资
-            advanceAmount = advanceAmount + item.amount;//垫资金额
+			advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//垫资金额
           }
-          settlement = settlement + parseFloat(item.settlement);//重量
-          amount = amount + item.amount;//金额
-          notAmount = notAmount + parseFloat(item.notAmount);//不含税金额
+		  settlement = this.jnpf.floatAdd(settlement, item.settlement);//重量
+		  amount = this.jnpf.floatAdd(amount, item.amount);//金额
+		  notAmount = this.jnpf.floatAdd(notAmount, item.notAmount);//不含税金额
         });
         this.dataForm.advanceAmount = advanceAmount;
         this.dataForm.num = settlement;
         this.dataForm.amount = amount;
         this.dataForm.notAmount = notAmount;
-        this.dataForm.rate = amount - notAmount;
+        this.dataForm.rate = this.jnpf.floatSub(amount, notAmount);
       },
       changeContract(a, b) {
         this.dataForm.supplierId = b.code;
@@ -924,11 +924,11 @@
         var notAmount = 0;
         itemArr.forEach((item, index)=>{
           if(item.advance == '1'){//垫资
-            advanceAmount = advanceAmount + item.amount;//垫资金额
+            advanceAmount = this.jnpf.floatAdd(advanceAmount, item.amount);//垫资金额
           }
-          settlement = settlement + item.settlement;//重量
-          amount = amount + item.amount;//金额
-          notAmount = notAmount + item.notAmount;//不含税金额
+          settlement = this.jnpf.floatAdd(settlement, item.settlement);//重量
+          amount = this.jnpf.floatAdd(amount, item.amount);//金额
+		  notAmount = this.jnpf.floatAdd(notAmount, item.notAmount);//不含税金额
           item.poundlistId = item.id;
           item.id = '';
         });
@@ -936,7 +936,7 @@
         this.dataForm.num = settlement;
         this.dataForm.amount = amount;
         this.dataForm.notAmount = notAmount;
-        this.dataForm.rate = amount - notAmount;
+        this.dataForm.rate = this.jnpf.floatSub(amount, notAmount);
         this.dataForm.purchaseorder_item0List = itemArr;
         let param = {
           param : 'cgdj'

SC-web/src/views/scm/basicInformation/purchaseorder/index.vue

@@ -572,14 +572,14 @@
         var statusFlag = true;
         for(var i=0;i<this.multipleSelectionItem.length;i++){
           supplierIdArr.push(this.multipleSelectionItem[i].supplierId);
-          if(this.multipleSelectionItem[i].status != '2' || this.multipleSelectionItem[i].isPayment == '1'){
+          if(this.multipleSelectionItem[i].isPayment == '1'){
             statusFlag = false;
           }
         }
         if(!statusFlag){
           this.$message({
           	type: 'error',
-          	message: '存在订单未付款或请先入库',
+          	message: '存在订单未付款',
           	duration: 1500
           })
           return