修改

src/views/contractManagement/futuresPurchaseContractAdd.vue

@@ -780,7 +780,7 @@ export default {
     },
     loaddata() {
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresPurchaseContractEdit.vue

@@ -780,7 +780,7 @@ export default {
         })
 
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresSalesContractAdd.vue

@@ -85,10 +85,10 @@
         
         <ws-form-item label="交货方式" span="1" prop="seller" class="readonly">
           <el-radio v-model="deptBudgetList.deliverType" label="1"
-            >我方自提</el-radio
+            >我方送货</el-radio
           >
           <el-radio v-model="deptBudgetList.deliverType" label="2"
-            >对方送货</el-radio
+            >对方自提</el-radio
           >
         </ws-form-item>
         <!--卖方-->
@@ -780,7 +780,7 @@ export default {
     },
     loaddata() {
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/futuresSalesContractEdit.vue

@@ -763,9 +763,9 @@ export default {
             TextToCode[response.contractGoodsInfo.outputPrivate][response.contractGoodsInfo.outputCity].code
           this.selectedOptions1 = tmp1
           if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
+            this.deptBudgetList.deliverType1 = '我方送货'
           } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
+            this.deptBudgetList.deliverType1 = '对方自提'
           }
           if(this.deptBudgetList.addressUrl != null){
             this.addressUrls = this.deptBudgetList.addressUrl.split(",")
@@ -774,7 +774,7 @@ export default {
         })
 
       // 包装方式
-      packList({ constId: 'CON1' })
+      packList({ constId: 'PRO2' })
         .toPromise()
         .then((response) => {
           this.packtypeList = response

src/views/contractManagement/salesContractEdit.vue

@@ -688,9 +688,9 @@ export default {
           this.selectedOptions1 = tmp1
           this.deptBudgetList = response
           if (this.deptBudgetList.deliverType == 1) {
-            this.deptBudgetList.deliverType1 = '我方自提'
+            this.deptBudgetList.deliverType1 = '我方送货'
           } else if (this.deptBudgetList.deliverType == 2) {
-            this.deptBudgetList.deliverType1 = '对方送货'
+            this.deptBudgetList.deliverType1 = '对方自提'
           }
           if(this.deptBudgetList.addressUrl != null){
             this.addressUrls = this.deptBudgetList.addressUrl.split(",")

src/views/purchasingManagement/procurementPlanAdd.vue

@@ -833,7 +833,7 @@ export default {
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
             2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning'
         })
         return

src/views/purchasingManagement/procurementPlanEdit.vue

@@ -868,7 +868,7 @@ export default {
             (String(this.dataList.imperfectGrain).indexOf('.') + 1) >
             2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning'
         })
         return

src/views/salesManagement/salesPlanAdd.vue

@@ -805,6 +805,13 @@ export default {
         })
         return
       }
+      if (this.selectedOptions.length == 0) {
+        this.$message({
+          message: '请选择出货库所在地区！',
+          type: 'warning',
+        })
+        return
+      }
       if (!this.dataList.seller) {
         this.$message({
           message: '卖方不能为空！',
@@ -941,7 +948,7 @@ export default {
           2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return

src/views/salesManagement/salesPlanEdit.vue

@@ -850,7 +850,7 @@ export default {
           2||this.dataList.imperfectGrain>40||this.dataList.imperfectGrain<1
       ) {
         this.$message({
-          message: '不完整粒输入错误',
+          message: '不完善粒输入错误',
           type: 'warning',
         })
         return