更新sdy

src/views/houseSelfCollect/acquisitionManagementAdd.vue

@@ -381,7 +381,8 @@
     },
     mounted() {},
     methods: {
-      paramTypeChange(){
+      paramTypeChange(e){
+        console.log(e)
         // this.makeTableList()
       },
       // 查看/编辑获取数据

src/views/houseSelfCollect/settlement.vue

@@ -163,10 +163,10 @@
             <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.weightDeduction" placeholder="请输入扣重" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="掉水(%)" span="1" prop="waterContent">
+            <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" placeholder="请输入掉水" maxlength="100" size="small" disabled/>
             </ws-form-item>
-            <ws-form-item v-if='paymentList.type=="潮粮"' label="基数" span="1" prop="waterContent">
+            <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.base" placeholder="请输入基数" maxlength="100" size="small" disabled/>
             </ws-form-item>
             <ws-form-item v-if='paymentList.type=="潮粮"' label="毛重（公斤）" span="1" prop="waterContent">
@@ -624,7 +624,7 @@ export default {
           return chineseStr;
         },
     print() {
-      if(this.paymentList.type == '潮粮'){
+      if(this.paymentList.type == '潮粮' && this.paymentList.qualityInspectionManagement.paramType != 1){
         if (!this.paymentList.buckleWeightRatio) {
           this.$message({
             message: '扣重比不能为空',