合同修改，区别现货期货

src/views/contractManagement/purchaseContract.vue

@@ -373,6 +373,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 2,
+      goodsType: 1,
       startDate: null,
       endDate: null,
       addressUrls: [],
@@ -501,6 +502,7 @@ export default {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+        goodsType:this.goodsType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
@@ -636,6 +638,7 @@ export default {
         {
           compId: sessionStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
+          goodsType:this.goodsType,
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           searchType: this.searchType,

src/views/contractManagement/purchaseContractAdd.vue

@@ -1062,7 +1062,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return
@@ -1271,6 +1271,7 @@ export default {
             CodeToText[this.selectedOptions1[1]]
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 2
+          this.deptBudgetList.goodsType = 1
           if (
             this.deptBudgetList.deliveryProvince == '澳门特别行政区' ||
             this.deptBudgetList.deliveryProvince == '澳门特别行政区'

src/views/contractManagement/salesContract.vue

@@ -341,6 +341,7 @@ export default {
       searchTypeText: '未完成',
       searchKeyWord: '',
       contractType: 1,
+      goodsType:1,
       startDate: null,
       endDate: null,
       // 提交类型
@@ -474,6 +475,7 @@ export default {
       getList({
         compId: sessionStorage.getItem('ws-pf_compId'),
         contractType: this.contractType,
+        goodsType:this.goodsType,
         currentPage: this.currentPage,
         pageSize: this.pageSize,
         searchType: this.searchType,
@@ -620,6 +622,7 @@ export default {
         {
           compId: sessionStorage.getItem('ws-pf_compId'),
           contractType: this.contractType,
+          goodsType:this.goodsType,
           currentPage: this.currentPage,
           pageSize: this.pageSize,
           searchType: this.searchType,

src/views/contractManagement/salesContractAdd.vue

@@ -506,7 +506,7 @@
           </ws-form-item>
 
           <!--已完成发货量（吨）-->
-          <ws-form-item
+          <!-- <ws-form-item
             label="已完成发运量（吨）"
             span="1"
             prop="imperfectGrain"
@@ -517,7 +517,7 @@
               maxlength="100"
               size="small"
             />
-          </ws-form-item>
+          </ws-form-item> -->
           <!--双章原件回收情况-->
           <ws-form-item label="双章原件回收情况" span="1" prop="grade">
             <ws-select
@@ -1040,7 +1040,7 @@ export default {
       }
       if (!this.deptBudgetList.contractGoodsInfo.waterContent) {
         this.$message({
-          message: '请选择水分',
+          message: '请输入水分',
           type: 'warning',
         })
         return
@@ -1216,26 +1216,26 @@ export default {
         })
         return
       }
-      if (
-        (this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
-          (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
-        (String(this.deptBudgetList.contractProcessInfo.imperfectGrain).indexOf(
-          '.'
-        ) != -1 &&
-          String(this.deptBudgetList.contractProcessInfo.imperfectGrain)
-            .length -
-            (String(
-              this.deptBudgetList.contractProcessInfo.imperfectGrain
-            ).indexOf('.') +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '已完成发运量输入错误',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   (this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
+      //     (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
+      //   (String(this.deptBudgetList.contractProcessInfo.imperfectGrain).indexOf(
+      //     '.'
+      //   ) != -1 &&
+      //     String(this.deptBudgetList.contractProcessInfo.imperfectGrain)
+      //       .length -
+      //       (String(
+      //         this.deptBudgetList.contractProcessInfo.imperfectGrain
+      //       ).indexOf('.') +
+      //         1) >
+      //       2)
+      // ) {
+      //   this.$message({
+      //     message: '已完成发运量输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (
         (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
           (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||
@@ -1268,6 +1268,7 @@ export default {
 
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
+          this.deptBudgetList.goodsType = 1
 
           if (
             this.deptBudgetList.deliveryProvince == '澳门特别行政区' ||

src/views/contractManagement/salesContractEdit.vue

@@ -474,14 +474,14 @@
           </ws-form-item>
 
           <!--已完成发货量（吨）-->
-          <ws-form-item label="已完成发货量（吨）" span="1" prop="contractNo">
+          <!-- <ws-form-item label="已完成发货量（吨）" span="1" prop="contractNo">
             <ws-input
               v-model="deptBudgetList.contractProcessInfo.imperfectGrain"
               placeholder="请输入已完成发货量（吨）"
               maxlength="100"
               size="small"
             />
-          </ws-form-item>
+          </ws-form-item> -->
           <!--双章原件回收情况-->
           <ws-form-item label="双章原件回收情况" span="1" prop="grade">
             <ws-select
@@ -1258,26 +1258,26 @@ export default {
         })
         return
       }
-      if (
-        (this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
-          (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
-        (String(this.deptBudgetList.contractProcessInfo.imperfectGrain).indexOf(
-          '.'
-        ) != -1 &&
-          String(this.deptBudgetList.contractProcessInfo.imperfectGrain)
-            .length -
-            (String(
-              this.deptBudgetList.contractProcessInfo.imperfectGrain
-            ).indexOf('.') +
-              1) >
-            2)
-      ) {
-        this.$message({
-          message: '已完成发运量输入错误',
-          type: 'warning',
-        })
-        return
-      }
+      // if (
+      //   (this.deptBudgetList.contractProcessInfo.imperfectGrain > 200000) |
+      //     (this.deptBudgetList.contractProcessInfo.imperfectGrain < 0) ||
+      //   (String(this.deptBudgetList.contractProcessInfo.imperfectGrain).indexOf(
+      //     '.'
+      //   ) != -1 &&
+      //     String(this.deptBudgetList.contractProcessInfo.imperfectGrain)
+      //       .length -
+      //       (String(
+      //         this.deptBudgetList.contractProcessInfo.imperfectGrain
+      //       ).indexOf('.') +
+      //         1) >
+      //       2)
+      // ) {
+      //   this.$message({
+      //     message: '已完成发运量输入错误',
+      //     type: 'warning',
+      //   })
+      //   return
+      // }
       if (
         (!this.deptBudgetList.contractProcessInfo.mildewGrain > 1000000000) |
           (this.deptBudgetList.contractProcessInfo.mildewGrain < 0) ||

src/views/contractManagement/salesContractExamine.vue

@@ -293,7 +293,7 @@
               {{ deptBudgetList.contractProcessInfo.mildewGrain }}
             </div>
           </ws-form-item>
-          <ws-form-item
+          <!-- <ws-form-item
             label="已完成发运量（吨）"
             span="1"
             prop="imperfectGrain"
@@ -302,7 +302,7 @@
             <div class="unchanged">
               {{ deptBudgetList.contractProcessInfo.imperfectGrain }}
             </div>
-          </ws-form-item>
+          </ws-form-item> -->
           <ws-form-item label="双章原件回收情况" span="1" prop="grade">
             <div class="unchanged">
               {{ deptBudgetList.contractProcessInfo.grade }}

vue.config.js

@@ -145,7 +145,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-        target: 'http://192.168.1.116:8090/',
+        target: 'http://192.168.1.120:8090/',
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',