期货销售接口

src/views/contractManagement/futuresPurchaseContract.vue

@@ -159,7 +159,6 @@
             @click="editClick(scope.row)"
             alt=""
           />
-          <!-- <i class="el-icon-edit" @click="editClick(scope.row)"></i> -->
         </template>
       </el-table-column>
       <el-table-column prop="signingDate" label="签订日期"> </el-table-column>

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -1127,13 +1127,20 @@ export default {
         })
         return
       }
-      if (this.selectedOptions1.length == 0) {
+      if (this.selectedOptions.length == 0) {
         this.$message({
           message: '请选择交货所在地区！',
           type: 'warning',
         })
         return
       }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择产地！',
+          type: 'warning',
+        })
+        return
+      }
       
       if (!this.deptBudgetList.deliveryDateStart) {
         this.$message({
@@ -1188,6 +1195,13 @@ export default {
         })
         return
       }
+      if (!this.deptBudgetList.contractGoodsInfo.transgene) {
+        this.$message({
+          message: '请选择转基因',
+          type: 'warning',
+        })
+        return
+      }
       if (
         !this.deptBudgetList.contractGoodsInfo.impurity ||
         (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -1251,13 +1251,20 @@ export default {
         })
         return
       }
-      if (this.selectedOptions1.length == 0) {
+      if (this.selectedOptions.length == 0) {
         this.$message({
           message: '请选择交货所在地区！',
           type: 'warning',
         })
         return
       }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择产地！',
+          type: 'warning',
+        })
+        return
+      }
 
       if (!this.deptBudgetList.deliveryDateStart) {
         this.$message({
@@ -1312,6 +1319,13 @@ export default {
         })
         return
       }
+      if (!this.deptBudgetList.contractGoodsInfo.transgene) {
+        this.$message({
+          message: '请选择转基因',
+          type: 'warning',
+        })
+        return
+      }
       if (
         !this.deptBudgetList.contractGoodsInfo.impurity ||
         (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -1074,21 +1074,6 @@ export default {
         })
         return
       }
-      if (
-        isNaN(this.deptBudgetList.warehousingFee) ||
-        (String(this.deptBudgetList.warehousingFee).indexOf('.') != -1 &&
-          String(this.deptBudgetList.warehousingFee).length -
-            (String(this.deptBudgetList.warehousingFee).indexOf('.') + 1) >
-            3) ||
-        this.deptBudgetList.warehousingFee < 0 ||
-        this.deptBudgetList.warehousingFee > 1000
-      ) {
-        this.$message({
-          message: '入库费输入错误！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.measurementStandard) {
         this.$message({
           message: '请输入计量标准！',
@@ -1120,13 +1105,20 @@ export default {
         })
         return
       }
-      if (this.selectedOptions1.length == 0) {
+      if (this.selectedOptions.length == 0) {
         this.$message({
           message: '请选择交货所在地区！',
           type: 'warning',
         })
         return
       }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择产地！',
+          type: 'warning',
+        })
+        return
+      }
       
       if (!this.deptBudgetList.deliveryDateStart) {
         this.$message({
@@ -1181,6 +1173,13 @@ export default {
         })
         return
       }
+      if (!this.deptBudgetList.contractGoodsInfo.transgene) {
+        this.$message({
+          message: '请选择转基因',
+          type: 'warning',
+        })
+        return
+      }
       if (
         !this.deptBudgetList.contractGoodsInfo.impurity ||
         (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=
@@ -1299,7 +1298,8 @@ export default {
             ).indexOf('.') +
               1) >
             2)
-      ) {
+      ) 
+      {
         this.$message({
           message: '合同收入金额输入错误',
           type: 'warning',
@@ -1374,7 +1374,7 @@ export default {
           this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions[1]]
         
           this.deptBudgetList.compId = this.compId
-          this.deptBudgetList.contractType = 2
+          this.deptBudgetList.contractType = 1
           this.deptBudgetList.goodsType = 2
            if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
             this.deptBudgetList.deliveryArea = "特别行政区"

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -743,6 +743,10 @@ export default {
           tmp[0] = TextToCode[response.deliveryProvince].code
           tmp[1] =
             TextToCode[response.deliveryProvince][response.deliveryCity].code
+          tmp[2] =
+            TextToCode[response.deliveryProvince][response.deliveryCity][
+              response.deliveryArea
+            ].code
 
           if (tmp[0] == 810000 || tmp[0] == 820000) {
             tmp[2] = null
@@ -752,11 +756,12 @@ export default {
                 response.deliveryArea
               ].code
           }
-          this.selectedOptions1 = tmp1
+          this.selectedOptions = tmp
           var tmp1 = []
           tmp1[0] = TextToCode[response.contractGoodsInfo.outputPrivate].code
           tmp1[1] =
             TextToCode[response.contractGoodsInfo.outputPrivate][response.contractGoodsInfo.outputCity].code
+          this.selectedOptions1 = tmp1
           if (this.deptBudgetList.deliverType == 1) {
             this.deptBudgetList.deliverType1 = '我方自提'
           } else if (this.deptBudgetList.deliverType == 2) {
@@ -1187,28 +1192,6 @@ export default {
         })
         return
       }
-      if (!this.deptBudgetList.warehousingFee) {
-        this.$message({
-          message: '请输入入库费！',
-          type: 'warning',
-        })
-        return
-      }
-      if (
-        isNaN(this.deptBudgetList.warehousingFee) ||
-        (String(this.deptBudgetList.warehousingFee).indexOf('.') != -1 &&
-          String(this.deptBudgetList.warehousingFee).length -
-            (String(this.deptBudgetList.warehousingFee).indexOf('.') + 1) >
-            3) ||
-        this.deptBudgetList.warehousingFee < 0 ||
-        this.deptBudgetList.warehousingFee > 1000
-      ) {
-        this.$message({
-          message: '入库费输入错误！',
-          type: 'warning',
-        })
-        return
-      }
       if (!this.deptBudgetList.measurementStandard) {
         this.$message({
           message: '请输入计量标准！',
@@ -1240,13 +1223,20 @@ export default {
         })
         return
       }
-      if (this.selectedOptions1.length == 0) {
+      if (this.selectedOptions.length == 0) {
         this.$message({
           message: '请选择交货所在地区！',
           type: 'warning',
         })
         return
       }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择产地！',
+          type: 'warning',
+        })
+        return
+      }
       
       if (!this.deptBudgetList.deliveryDateStart) {
         this.$message({
@@ -1301,6 +1291,13 @@ export default {
         })
         return
       }
+      if (!this.deptBudgetList.contractGoodsInfo.transgene) {
+        this.$message({
+          message: '请选择转基因',
+          type: 'warning',
+        })
+        return
+      }
       if (
         !this.deptBudgetList.contractGoodsInfo.impurity ||
         (String(this.deptBudgetList.contractGoodsInfo.impurity).indexOf('.') !=
@@ -1492,7 +1489,8 @@ export default {
           this.deptBudgetList.deliveryCity = CodeToText[this.selectedOptions[1]]
         
           this.deptBudgetList.compId = this.compId
-          this.deptBudgetList.contractType = 2
+          this.deptBudgetList.contractType = 1
+          this.deptBudgetList.goodsType = 2
            if(this.deptBudgetList.deliveryProvince =="澳门特别行政区" || this.deptBudgetList.deliveryProvince == "澳门特别行政区"){
             this.deptBudgetList.deliveryArea = "特别行政区"
           }else{