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

src/views/houseSelfCollect/inspectionManagementNew.vue

@@ -1100,7 +1100,7 @@ export default {
 				this.deptBudgetList.waterPriceDeduction=0
 				this.deptBudgetList.qualityPriceIncrease=0
 				this.deptBudgetList.qualityPriceDeduction=0
-      // if(this.deptBudgetList.inOutType=="收购入库"){ //收购入库  价格取至合同
+      // if(this.deptBudgetList.inOutType!="收购入库"){ //非收购入库  价格取至合同
       //   return
       // }
       if (this.deptBudgetList.goodsName && type != 'water') {
@@ -1155,6 +1155,7 @@ export default {
         })
           .toPromise()
           .then((response) => {
+            debugger
             if (this.deptBudgetList.paramType == '1') {
               if(this.deptBudgetList.buckleMiscellaneous){
                 this.deptBudgetList.tidalGrainPrice = parseFloat(parseFloat(response) - parseFloat(this.deptBudgetList
@@ -1165,7 +1166,7 @@ export default {
                   .dryGrainPrice : 0)).toFixed(4)
               }
             } else {
-              if (this.inspect.type == '干粮') {
+              if (this.deptBudgetList.type == '干粮') {
                 if (response == 0) {
                   getDryGrainPrice({
                     warehouseId: this.cangid,

src/views/houseSelfCollect/settlement.vue

@@ -356,7 +356,7 @@
           },
           unitDeduction: 0
         },
-        ganwater:14,
+        ganwater:15,
         disabled: false,
         types: '',
         isShowPrint: false,
@@ -789,7 +789,7 @@
             this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
             if (this.paymentList.qualityInspectionManagement.paramType == '2') {
               this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                  .qualityInspectionManagement.waterContent - 14) *
+                  .qualityInspectionManagement.waterContent - 15) *
                 this.paymentList.buckleWeightRatio
               this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
                 .qualityInspectionManagement.weightDeduction.toFixed(2)
@@ -1076,7 +1076,7 @@
       buckleWeightRatiochange(e) {
         if (this.paymentList.buckleWeightRatio >= 0 && this.paymentList.buckleWeightRatio <= 2) {
           this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList.qualityInspectionManagement
-              .waterContent - 14) * this.paymentList
+              .waterContent - 15) * this.paymentList
             .buckleWeightRatio
           this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement
             .weightDeduction.toFixed(2)

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -696,10 +696,10 @@
           })
       },
       dialogVisibleconfirm1(){
-        if(this.contractNo == this.contractNum){
-          this.$message.error('已是该任务号无需修改')
-          return
-        }
+        // if(this.contractNo == this.contractNum){
+        //   this.$message.error('已是该任务号无需修改')
+        //   return
+        // }
         this.$confirm(`确定修改任务号？`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',

src/views/outboundManagement/weighingManagementrecord.vue

@@ -966,10 +966,10 @@
           })
       },
       dialogVisibleconfirm1(){
-        if(this.contractNo == this.contractNum){
-          this.$message.error('已是该任务号无需修改')
-          return
-        }
+        // if(this.contractNo == this.contractNum){
+        //   this.$message.error('已是该任务号无需修改')
+        //   return
+        // }
         this.$confirm(`确定修改任务号？`, {
             cancelButtonText: '取消',
             confirmButtonText: '确定',