no message

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/basicInfo.js

@@ -307,7 +307,7 @@ export default {
             rules: this.formOptions.gpsAddress.isRules,
             errLabel: '省'
           },
-          options: this.provinceList.map((v, i) => ({ value: v.id, label: v.name })),
+          options: [...this.provinceList.map((v, i) => ({ value: v.id, label: v.name })), ...this.provinceList_cp],
           attributes: {
             disabled: !this.formOptions.gpsAddress.isEdit,
             clearable: true,
@@ -317,7 +317,10 @@ export default {
           events: {
             change: val => {
               // 获取省名称
-              this.orderInfo.province = this.provinceList.find(item => item.id === val)?.name || ''
+              this.orderInfo.province =
+                [...this.provinceList.map((v, i) => ({ value: v.id, label: v.name })), ...this.provinceList_cp].find(
+                  item => item.id === val
+                )?.name || ''
               // 清除市区街道以及详细地址数据
               this.delDataK(1)
               lbsAmapRegion({ pid: val }).then(res => {
@@ -337,7 +340,12 @@ export default {
             rules: this.formOptions.gpsAddress.isRules,
             errLabel: '市'
           },
-          options: this.cityList.map((v, i) => ({ value: v.id, label: v.name })),
+          options: [
+            ...this.cityList.map((v, i) => ({ value: v.id, label: v.name })),
+            ...this.cityList_cp.filter(_ => {
+              return this.provinceList_cp.find(item => item.value === this.orderInfo.provinceId)
+            })
+          ],
           attributes: {
             disabled: !this.formOptions.gpsAddress.isEdit,
             clearable: true,
@@ -347,7 +355,12 @@ export default {
           events: {
             change: val => {
               // 获取市名称
-              this.orderInfo.city = this.cityList.find(item => item.id === val).name
+              this.orderInfo.city = [
+                ...this.cityList.map((v, i) => ({ value: v.id, label: v.name })),
+                ...this.cityList_cp.filter(_ => {
+                  return this.provinceList_cp.find(item => item.value === this.orderInfo.provinceId)
+                })
+              ].find(item => item.id === val).name
               // 清除区街道以及详细地址数据
               this.delDataK(2)
               lbsAmapRegion({ pid: val }).then(res => {
@@ -356,6 +369,7 @@ export default {
             }
           }
         },
+
         {
           isShow: this.formOptions.gpsAddress.isShow,
           name: 'el-select',
@@ -367,7 +381,12 @@ export default {
             rules: this.formOptions.gpsAddress.isRules,
             errLabel: '区'
           },
-          options: this.areaList.map((v, i) => ({ value: v.id, label: v.name })),
+          options: [
+            ...this.areaList.map((v, i) => ({ value: v.id, label: v.name })),
+            ...this.areaList_cp.filter(_ => {
+              return this.cityList_cp.find(item => item.value === this.orderInfo.cityId)
+            })
+          ],
           attributes: {
             disabled: !this.formOptions.gpsAddress.isEdit,
             clearable: true,
@@ -377,7 +396,12 @@ export default {
           events: {
             change: val => {
               // 获取区名称
-              this.orderInfo.area = this.areaList.find(item => item.id === val).name
+              this.orderInfo.area = [
+                ...this.areaList.map((v, i) => ({ value: v.id, label: v.name })),
+                ...this.areaList_cp.filter(_ => {
+                  return this.cityList_cp.find(item => item.value === this.orderInfo.cityId)
+                })
+              ].find(item => item.id === val).name
               // 清除街道以及详细地址数据
               this.delDataK(3)
               lbsAmapRegion({ pid: val }).then(res => {
@@ -397,7 +421,12 @@ export default {
             rules: this.formOptions.gpsAddress.isRules,
             errLabel: '街道'
           },
-          options: this.streetList.map((v, i) => ({ value: v.id, label: v.name })),
+          options: [
+            ...this.streetList.map((v, i) => ({ value: v.id, label: v.name })),
+            ...this.streetList_cp.filter(_ => {
+              return this.areaList_cp.find(item => item.value === this.orderInfo.areaId)
+            })
+          ],
           attributes: {
             disabled: !this.formOptions.gpsAddress.isEdit,
             clearable: true,
@@ -407,7 +436,12 @@ export default {
           events: {
             change: val => {
               // 获取街道名称
-              this.orderInfo.street = this.streetList.find(item => item.id === val).name
+              this.orderInfo.street = [
+                ...this.streetList.map((v, i) => ({ value: v.id, label: v.name })),
+                ...this.streetList_cp.filter(_ => {
+                  return this.areaList_cp.find(item => item.value === this.orderInfo.areaId)
+                })
+              ].find(item => item.id === val).name
               // 清除详细地址数据
               this.delDataK(4)
             }

src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -8,7 +8,7 @@ import {
   email
 } from '@/components/template/rules_verify.js'
 import { orderBaseDetail, orderBaseProductList } from '@/api/workOrderPool.js'
-
+import md5 from 'md5'
 var initdata_ = {
   // 基础信息--------------------
   // 维保项目
@@ -86,7 +86,11 @@ export default {
   },
   data() {
     return {
-      orderInfo: null
+      orderInfo: null,
+      provinceList_cp: [],
+      cityList_cp: [],
+      areaList_cp: [],
+      streetList_cp: []
     }
   },
   watch: {
@@ -428,6 +432,23 @@ export default {
             orderBaseId: this.id
           })
         ]).then(([res, res1]) => {
+          if (md5(res.data.province) == res.data.provinceId || res.data.provinceId == 0) {
+            res.data.provinceId = md5(res.data.province)
+            this.provinceList_cp = [{ value: res.data.provinceId, label: res.data.province }]
+          }
+          if (md5(res.data.city) == res.data.cityId || res.data.cityId == 0) {
+            res.data.cityId = md5(res.data.city)
+            this.cityList_cp = [{ value: res.data.cityId, label: res.data.city }]
+          }
+          if (md5(res.data.area) == res.data.areaId || res.data.areaId == 0) {
+            res.data.areaId = md5(res.data.area)
+            this.areaList_cp = [{ value: res.data.areaId, label: res.data.area }]
+          }
+          if (md5(res.data.street) == res.data.streetId || res.data.streetId == 0) {
+            res.data.streetId = md5(res.data.street)
+            this.streetList_cp = [{ value: res.data.streetId, label: res.data.street }]
+          }
+          console.log(res.data)
           this.orderInfo = {
             ...res.data,
             orderWorkers_cp: [...(res.data.orderWorkers || []).map(item => ({ ...item }))],

src/views/workOrder/workOrderPool/index.vue

@@ -657,6 +657,7 @@ export default {
   display: flex;
   justify-content: flex-start;
   align-items: center;
+  z-index: -1;
 }
 .tubiao2 {
   position: absolute;
@@ -668,5 +669,6 @@ export default {
   display: flex;
   justify-content: flex-start;
   align-items: center;
+  z-index: -1;
 }
 </style>