Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

# Conflicts:
#	vue.config.js

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: '扣重比不能为空',

src/views/statisticalReport/autoSettlementList.vue

@@ -1252,6 +1252,7 @@ export default {
     },
     //列表
     getList() {
+      console.log(this.contractNo,"this.contractNo值")
       autoList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         currentPage: this.currentPage,

vue.config.js

@@ -142,11 +142,6 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         target: 'http://192.168.1.122:8090/',
-        // target: 'http://192.168.1.115:8090/',
-        // target: 'http://192.168.1.122:8090/',
-        // target: 'http://192.168.1.115:8090/',
-        // target: 'http://192.168.1.122:9100/',
-        // target: 'http://192.168.1.121:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',