Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin

src/components/geographicalPosi/index.vue

@@ -121,23 +121,23 @@ export default {
     },
     async open() {
       this.dialogVisible = true
-      if (this.formData.lng && this.formData.lat && this.formData.gpsAddress) {
-        this.changeSearchMapFn(`${this.formData.lng}//${this.formData.lat}//${this.formData.gpsAddress}`)
+      if (this.formData.lng && this.formData.lat && (this.formData.gpsAddress || this.formData.address)) {
+        this.changeSearchMapFn(`${this.formData.lng}//${this.formData.lat}//${(this.formData.gpsAddress || this.formData.address)}`)
       } else {
         var str = ''
-        if (!~(this.formData.gpsAddress || '').indexOf(this.formData.province)) {
+        if (!~(this.formData.gpsAddress || this.formData.address || '').indexOf(this.formData.province)) {
           str += this.formData.province || ''
         }
-        if (!~(this.formData.gpsAddress || '').indexOf(this.formData.city)) {
+        if (!~(this.formData.gpsAddress || this.formData.address || '').indexOf(this.formData.city)) {
           str += this.formData.city || ''
         }
-        if (!~(this.formData.gpsAddress || '').indexOf(this.formData.area)) {
+        if (!~(this.formData.gpsAddress || this.formData.address || '').indexOf(this.formData.area)) {
           str += this.formData.area || ''
         }
-        if (!~(this.formData.gpsAddress || '').indexOf(this.formData.street)) {
+        if (!~(this.formData.gpsAddress || this.formData.address || '').indexOf(this.formData.street)) {
           str += this.formData.street || ''
         }
-        str += this.formData.gpsAddress || ''
+        str += this.formData.gpsAddress || this.formData.address || ''
         await this.remoteMethod(str)
         if (this.mapSearchList.length) {
           var v = this.mapSearchList[0]

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

@@ -225,7 +225,7 @@ export default {
             errLabel: '省'
           },
           options: this.provinceList.map((v, i) => ({ value: v.id, label: v.name })),
-          attributes: { disabled: true, clearable: true, filterable: true, placeholder: '请选择' },
+          attributes: { disabled: !this.formOptions.gpsAddress.isEdit, clearable: true, filterable: true, placeholder: '请选择' },
           events: {
             change: (val) => {
               // 获取省名称
@@ -250,7 +250,7 @@ export default {
             errLabel: '市'
           },
           options: this.cityList.map((v, i) => ({ value: v.id, label: v.name })),
-          attributes: { disabled: true, clearable: true, filterable: true, placeholder: '请选择' },
+          attributes: { disabled: !this.formOptions.gpsAddress.isEdit, clearable: true, filterable: true, placeholder: '请选择' },
           events: {
             change: (val) => {
               // 获取市名称
@@ -275,7 +275,7 @@ export default {
             errLabel: '区'
           },
           options: this.areaList.map((v, i) => ({ value: v.id, label: v.name })),
-          attributes: { disabled: true, clearable: true, filterable: true, placeholder: '请选择' },
+          attributes: { disabled: !this.formOptions.gpsAddress.isEdit, clearable: true, filterable: true, placeholder: '请选择' },
           events: {
             change: (val) => {
               // 获取区名称
@@ -300,7 +300,7 @@ export default {
             errLabel: '街道'
           },
           options: this.streetList.map((v, i) => ({ value: v.id, label: v.name })),
-          attributes: { disabled: true, clearable: true, filterable: true, placeholder: '请选择' },
+          attributes: { disabled: !this.formOptions.gpsAddress.isEdit, clearable: true, filterable: true, placeholder: '请选择' },
           events: {
             change: (val) => {
               // 获取街道名称
@@ -374,7 +374,7 @@ export default {
           isShow: this.formOptions.gpsAddress.isShow,
           name: 'el-input',
           md: 13,
-          formItemAttributes: { label: '', prop: 'gpsAddress', rules: this.formOptions.gpsAddress.isRules, errLabel: 'GPS地址' },
+          formItemAttributes: { label: '', prop: 'gpsAddress', rules: [], errLabel: 'GPS地址' },
           attributes: { disabled: true, placeholder: 'GPS地址' }
         },
         {

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

@@ -282,7 +282,6 @@ export default {
   methods: {
     // 获取工单详情
     getorderDetail(cb) {
-      console.log(this.cloneWorkOrder,"oooo")
       if (this.id) {
         // 编辑详情
         Promise.all([