Merge remote-tracking branch 'origin/master'

src/views/equipment-management/equipment-management/equipment-detail.vue

@@ -669,7 +669,7 @@ import { getAreNameById, getAreTreeStructure, getDevice, updateDevice } from '@/
 import { regionData } from 'element-china-area-data'
 import { getInfo } from '@/api/login'
 import { listCheckManage } from '@/api/business/manage'
-import { isEmpty, parseTime } from '@/utils/ruoyi'
+import { isEmpty, parseStrEmpty, parseTime } from '@/utils/ruoyi'
 import { deepClone } from '@/utils'
 import { listItem } from '@/api/business/item'
 import { mapGetters } from 'vuex'
@@ -1110,15 +1110,17 @@ export default {
         this.addtions.names = addressText
         this.city = city
       })
+      console.log('服务地点名字', this.addtions.names)
     },
 
     // 提交
     submitForm() {
+      console.log('服务地点名字', this.addtions.names)
       const form = deepClone(this.form)
       if (form.selectedOptions != null) {
         form.addressCode = form.selectedOptions.join(',')
       }
-      if (this.addtions.names != null) {
+      if (parseStrEmpty(this.addtions.names) !== '') {
         form.addressText = this.addtions.names
       }
       if (!isEmpty(form.checkType)) {