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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1071,6 +1071,7 @@ export default {
       }
     },
     waterContentChange(type) {
+      // debugger
           //客户
           if(this.serviceManagementType==3){
           getcustomer({
@@ -1109,17 +1110,17 @@ export default {
         } else {
           this.deptBudgetList.type = '干粮'
         }
-        if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
-          getDryGrainPrice({
-            warehouseId: this.cangid,
-            goodsName: this.deptBudgetList.goodsName
-          })
-            .toPromise()
-            .then((response) => {
-              this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-              this.dryGrainPrice=response
-            })
-        }
+        // if (!this.deptBudgetList.dryGrainPrice || this.deptBudgetList.dryGrainPrice == 0) {
+        //   getDryGrainPrice({
+        //     warehouseId: this.cangid,
+        //     goodsName: this.deptBudgetList.goodsName
+        //   })
+        //     .toPromise()
+        //     .then((response) => {
+        //       this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+        //       this.dryGrainPrice=response
+        //     })
+        // }
         // debugger
         for (var i = 0; i < this.purchasePriceList.length; i++) {
           if (this.purchasePriceList[i].goodsName == this.deptBudgetList.goodsName) {
@@ -1152,30 +1153,44 @@ export default {
                 .buckleMiscellaneous) / 100 * parseFloat(this.deptBudgetList.dryGrainPrice ? this.deptBudgetList
                   .dryGrainPrice : 0)).toFixed(4)
               }
+              if (!this.deptBudgetList.tidalGrainPrice) {
+									this.deptBudgetList.tidalGrainPrice = ''
+								}
+              if(this.deptBudgetList.type == '干粮'){
+                this.deptBudgetList.dryGrainPrice = response
+                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
+              }
             } else {
-              if (this.inspect.type == '干粮') {
-                if (response == 0) {
-                  getDryGrainPrice({
-                    warehouseId: this.cangid,
-                    goodsName: this.deptBudgetList.goodsName
-                  })
-                    .toPromise()
-                    .then((response) => {
-                      this.$set(this.deptBudgetList, 'dryGrainPrice', response)
-                      this.dryGrainPrice=response
-                    })
-                } else {
-                  if(response>0){
-                  this.deptBudgetList.dryGrainPrice = response
-                  this.dryGrainPrice = response
-                  }
-                }
-              } else {
-                if(response>0){
+              if(this.deptBudgetList.type == '干粮'){
+                this.deptBudgetList.dryGrainPrice = response
+                this.dryGrainPrice = this.deptBudgetList.dryGrainPrice 
+              }else{
                 this.deptBudgetList.tidalGrainPrice = response
-                this.tidalGrainPrice = response
-                }
+                this.tidalGrainPrice = this.deptBudgetList.tidalGrainPrice 
               }
+              // if (this.inspect.type == '干粮') {
+              //   if (response == 0) {
+              //     getDryGrainPrice({
+              //       warehouseId: this.cangid,
+              //       goodsName: this.deptBudgetList.goodsName
+              //     })
+              //       .toPromise()
+              //       .then((response) => {
+              //         this.$set(this.deptBudgetList, 'dryGrainPrice', response)
+              //         this.dryGrainPrice=response
+              //       })
+              //   } else {
+              //     if(response>0){
+              //     this.deptBudgetList.dryGrainPrice = response
+              //     this.dryGrainPrice = response
+              //     }
+              //   }
+              // } else {
+              //   if(response>0){
+              //   this.deptBudgetList.tidalGrainPrice = response
+              //   this.tidalGrainPrice = response
+              //   }
+              // }
             }
           })
       }

src/views/warehousenew/warehousingOrder.vue

@@ -1136,6 +1136,9 @@ export default {
       for (const key in this.multipleSelection1) {
         var array = this.multipleSelection1[key]
         for (let i = 0; i < array.length; i++) {
+          if(array[i].surplusWeight <=0){
+            continue
+          }
           arr.push(array[i])
           if (arr3.length == 0) {
             arr3.push(array[i])