Browse Source

no message

linwenxin 6 months ago
parent
commit
4e9269dc59

+ 4 - 5
src/views/workOrder/workOrderPool/detailModule/workOrderInfo/mixins/workOrderLogic.js

@@ -432,23 +432,22 @@ export default {
             orderBaseId: this.id
           })
         ]).then(([res, res1]) => {
-          if (md5(res.data.province) == res.data.provinceId || res.data.provinceId == 0) {
+          if (res.data.province && (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) {
+          if (res.data.city && (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) {
+          if (res.data.area && (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) {
+          if (res.data.street && (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 }))],