更新

src/views/houseSelfCollect/settlement.vue

@@ -114,7 +114,7 @@
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="干粮水分（%）" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
-                v-model="paymentList.qualityInspectionManagement.waterMin" placeholder="请输入干粮水分" maxlength="100"
+                v-model="ganwater" placeholder="请输入干粮水分" maxlength="100"
                 size="small" disabled />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType == "1"'
@@ -130,7 +130,7 @@
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1'
               label="掉水(%)" span="1" prop="waterContent">
               <ws-input type="number" @mousewheel.native.prevent
-                v-model="paymentList.qualityInspectionManagement.waterContent-paymentList.qualityInspectionManagement.waterMin"
+                v-model="paymentList.qualityInspectionManagement.waterContent-ganwater"
                 placeholder="请输入掉水" maxlength="100" size="small" disabled />
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮" && paymentList.qualityInspectionManagement.paramType != 1'
@@ -305,6 +305,7 @@
           },
           unitDeduction: 0
         },
+        ganwater:14,
         disabled: false,
         types: '',
         isShowPrint: false,
@@ -400,7 +401,7 @@
           this.paymentList.tidalGrainPrice = this.paymentList.tidalGrainPrice.toFixed(4)
           if (this.paymentList.qualityInspectionManagement.paramType == '2') {
             this.paymentList.qualityInspectionManagement.weightDeduction = (this.paymentList
-                .qualityInspectionManagement.waterContent - this.paymentList.qualityInspectionManagement.waterMin) *
+                .qualityInspectionManagement.waterContent - 14) *
               this.paymentList.buckleWeightRatio
             this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList
               .qualityInspectionManagement.weightDeduction.toFixed(2)
@@ -686,7 +687,7 @@
       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
+              .waterContent - 14) * this.paymentList
             .buckleWeightRatio
           this.paymentList.qualityInspectionManagement.weightDeduction = this.paymentList.qualityInspectionManagement
             .weightDeduction.toFixed(2)

src/views/warehousenew/warehousingOrder.vue

@@ -1028,7 +1028,7 @@ export default {
     },
     payout(item) {
       console.log(item)
-      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤') {
+      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤'||localStorage.getItem('ws-pf_roleName').indexOf('专员')> -1) {
         if (Object.keys(this.multipleSelection1).length != 0 && this.multipleSelection1[item.id].length > 0) {
           for (let i = 0; i < this.multipleSelection1[item.id].length; i++) {
             if (item.warehouseName == this.multipleSelection1[item.id][i].warehouseName) {
@@ -1356,7 +1356,7 @@ export default {
       //   })
     },
     selectInit(row, index) {
-      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤') {
+      if (localStorage.getItem('ws-pf_roleName') == '销售内勤' || localStorage.getItem('ws-pf_roleName') == '采购内勤'||localStorage.getItem('ws-pf_roleName').indexOf('专员')> -1) {
         return true
 
       } else if (localStorage.getItem('ws-pf_staffName') == '杜大光') {