前端gjy

src/views/contractManagement/purchaseContractAdd.vue

@@ -876,6 +876,20 @@ export default {
         })
         return
       }
+      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.weight) {
         this.$message({
           message: '请输入重量！',

src/views/contractManagement/purchaseContractEdit.vue

@@ -267,7 +267,7 @@
             size="large"
             placeholder="请选择交货地所在地区"
             style="width: 200%"
-            @change="handleChange"
+            @change="handleChange1"
           />
         </ws-form-item>
         <!-- 交货地详细地址 -->
@@ -559,7 +559,6 @@ export default {
       size: 10,
       // 提交类型
       submitType: true,
-      options_: regionData,
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       ruleDeptBudget: [],
       deptBudgetList: {
@@ -616,7 +615,6 @@ export default {
             response.unitContractPrice = String(response.unitContractPrice)
           }
           var tmp = []
-          console.log(TextToCode[response.sourceProvince])
           tmp[0] = TextToCode[response.sourceProvince].code
           tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
           tmp[2] =
@@ -940,14 +938,28 @@ export default {
 
       if (!this.deptBudgetList.sourceGoods) {
         this.$message({
-          message: '请输入货源地！',
+          message: '请输入货源详细地址！',
           type: 'warning',
         })
         return
       }
       if (!this.deptBudgetList.placeDelivery) {
         this.$message({
-          message: '请输入交货地！',
+          message: '请输入交货详细地址！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions.length == 0) {
+        this.$message({
+          message: '请选择货源所在地区！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择交货所在地区！',
           type: 'warning',
         })
         return

src/views/contractManagement/salesContract.vue

@@ -461,9 +461,8 @@ export default {
         .then((response) => {
           for (var i = 0; i < response.records.length; i++) {
             if (response.records[i].addressUrl != null) {
-              response.records[i].addressUrlArray = response.records[
-                i
-              ].addressUrl.split(',')
+              response.records[i].addressUrlArray =
+                response.records[i].addressUrl.split(',')
             } else {
               response.records[i].addressUrlArray = []
             }
@@ -559,7 +558,7 @@ export default {
     handleEdit(row) {
       this.$router.push({
         name: 'salesContractEdit',
-        params: { id: row.id },
+        query: { id: row.id },
       })
     },
 
@@ -620,7 +619,7 @@ export default {
 
     handleDelete(row) {
       var handleDelete = ' '
-      if (row.handleDelete =='') {
+      if (row.handleDelete == '') {
       }
       this.$confirm(`此操作永久删除该仓库全部信息，是否确认删除`, {
         cancelButtonText: '取消',

src/views/contractManagement/salesContractAdd.vue

@@ -889,6 +889,20 @@ export default {
         })
         return
       }
+      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.weight) {
         this.$message({
           message: '请输入重量！',

src/views/contractManagement/salesContractEdit.vue

@@ -77,7 +77,7 @@
           <!--交货方式-->
           <ws-form-item label="交货方式" span="1" prop="contractNo">
             <div class="unchanged">
-              {{deptBudgetList.deliverType}}
+              {{ deptBudgetList.deliverType }}
             </div>
             <span class="unchangeable">*</span>
           </ws-form-item>
@@ -248,15 +248,15 @@
           </ws-form-item>
           <!-- 货源所在地区 -->
           <ws-form-item label="货源所在地区" span="1" prop="packingMethod">
-           <el-cascader
-            :options="options_"
-            v-model="selectedOptions"
-            clearable
-            size="large"
-            placeholder="请选择货源所在地区"
-            style="width: 200%"
-            @change="handleChange"
-          />
+            <el-cascader
+              :options="options_"
+              v-model="selectedOptions"
+              clearable
+              size="large"
+              placeholder="请选择货源所在地区"
+              style="width: 200%"
+              @change="handleChange"
+            />
           </ws-form-item>
           <!-- 货源详细地址 -->
           <ws-form-item label="货源详细地址" span="1" prop="totalContractPrice">
@@ -270,14 +270,14 @@
           <!-- 交货地所在地区 -->
           <ws-form-item label="交货地所在地区" span="1" prop="packingMethod">
             <el-cascader
-            :options="options_"
-            v-model="selectedOptions"
-            clearable
-            size="large"
-            placeholder="请选择交货地所在地区"
-            style="width: 200%"
-            @change="handleChange"
-          />
+              :options="options_"
+              v-model="selectedOptions1"
+              clearable
+              size="large"
+              placeholder="请选择交货地所在地区"
+              style="width: 200%"
+              @change="handleChange1"
+            />
           </ws-form-item>
           <!-- 交货地详细地址 -->
           <ws-form-item
@@ -559,7 +559,7 @@
 <script>
 // import { getVesselOne } from '@/model/procurement/basic'
 // import { dayjs } from 'base-core-lib'
-import { regionData} from 'element-china-area-data'
+import { regionData, CodeToText, TextToCode } from 'element-china-area-data'
 import WsUpload from '@/components/WsUpload'
 import {
   examineList,
@@ -598,7 +598,9 @@ export default {
       year: '',
       // 提交类型
       submitType: true,
-      options_:regionData,
+      options_: regionData,
+      selectedOptions: [],
+      selectedOptions1: [],
       tableData: [{ date: 1111, name: 'qqqq', address: 'errrtt' }],
       pickerBeginDateBefore: {
         disabledDate: (time) => {
@@ -658,11 +660,34 @@ export default {
     returnsales() {
       this.$router.push({ path: 'salesContract' })
     },
+    handleChange(value) {
+      this.selectedOptions = value
+    },
+    handleChange1(value) {
+      this.selectedOptions1 = value
+    },
     loaddata() {
       // 数据
-      examineList({ id: this.$route.params.id })
+      examineList({ id: this.$route.query.id })
         .toPromise()
         .then((response) => {
+          var tmp = []
+          tmp[0] = TextToCode[response.sourceProvince].code
+          tmp[1] = TextToCode[response.sourceProvince][response.sourceCity].code
+          tmp[2] =
+            TextToCode[response.sourceProvince][response.sourceCity][
+              response.sourceArea
+            ].code
+          this.selectedOptions = tmp
+          var tmp1 = []
+          tmp1[0] = TextToCode[response.deliveryProvince].code
+          tmp1[1] =
+            TextToCode[response.deliveryProvince][response.deliveryCity].code
+          tmp1[2] =
+            TextToCode[response.deliveryProvince][response.deliveryCity][
+              response.deliveryArea
+            ].code
+          this.selectedOptions1 = tmp1
           this.deptBudgetList = response
         })
       // 包装方式
@@ -922,14 +947,28 @@ export default {
 
       if (!this.deptBudgetList.sourceGoods) {
         this.$message({
-          message: '请输入货源地！',
+          message: '请输入货源详细地址！',
           type: 'warning',
         })
         return
       }
       if (!this.deptBudgetList.placeDelivery) {
         this.$message({
-          message: '请输入交货地！',
+          message: '请输入交货详细地址！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions.length == 0) {
+        this.$message({
+          message: '请选择货源所在地区！',
+          type: 'warning',
+        })
+        return
+      }
+      if (this.selectedOptions1.length == 0) {
+        this.$message({
+          message: '请选择交货所在地区！',
           type: 'warning',
         })
         return
@@ -1245,6 +1284,16 @@ export default {
       }
       this.$refs.deptBudgetList.validate((valid) => {
         if (valid) {
+          this.deptBudgetList.sourceProvince =
+            CodeToText[this.selectedOptions[0]]
+          this.deptBudgetList.sourceCity = CodeToText[this.selectedOptions[1]]
+          this.deptBudgetList.sourceArea = CodeToText[this.selectedOptions[2]]
+          this.deptBudgetList.deliveryProvince =
+            CodeToText[this.selectedOptions1[0]]
+          this.deptBudgetList.deliveryCity =
+            CodeToText[this.selectedOptions1[1]]
+          this.deptBudgetList.deliveryArea =
+            CodeToText[this.selectedOptions1[2]]
           this.deptBudgetList.compId = this.compId
           this.deptBudgetList.contractType = 1
           editInfo(this.deptBudgetList)