Merge remote-tracking branch 'origin/master'

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

@@ -609,7 +609,7 @@ import { listCheckManage } from '@/api/business/manage'
 import { parseTime } from '@/utils/ruoyi'
 export default {
   name: 'EquipmentDetail',
-  dicts: ['device_status', 'device_type', 'exam_type', 'check_type','service_area'],
+  dicts: ['device_status', 'device_type', 'exam_type', 'check_type', 'service_area'],
   props: {
     id: {
       type: Number,
@@ -752,7 +752,7 @@ export default {
       // 预约方式
       options: [{
         value: '1',
-        label: '按时间选择'
+        label: '按时段预约'
       }
         //   {
         //   value: '2',
@@ -916,12 +916,13 @@ export default {
     // 提交
     submitForm() {
       console.log('selectedOptions', this.form.addressCode)
-      if (this.selectedOptions != null) {
+      if (this.form.selectedOptions != null && this.form.selectedOptions !== '') {
         this.form.addressCode = this.form.selectedOptions.join(',')
         console.log('xxaa', this.selectedOptions)
       }
-      // if (this.addtions.names != null) {
-      //   this.form.addressText = this.addtions.names
+      if (this.addtions.names != null) {
+        this.form.addressText = this.addtions.names
+      }
       //   this.form.city = this.city
       //   console.log('city', this.form.city)
       // }
@@ -933,7 +934,8 @@ export default {
         this.form.checkType = this.form.checkType.toString()
         console.log('checkType', this.form.checkType)
       }
-      this.form.useTime = JSON.stringify(this.useTime)
+      this.form.useTime = JSON.stringify(this.form.useTime)
+
       this.$refs['form'].validate(valid => {
         if (valid) {
           updateDevice(this.form).then(response => {
@@ -973,7 +975,7 @@ export default {
         // this.useTime = JSON.parse(response.data.useTime)
         this.form.useTime = JSON.parse(response.data.useTime)
         console.log('详情数据---', this.form)
-        console.log('form.usertadasd', this.form.useTime.ame)
+        console.log('form.usertadasd', this.form.useTime)
         // this.serviceAreaS = this.form.serviceArea.split(';')
         // this.serviceArea = []
         // for (let i = 0; i < this.serviceAreaS.length; i++) {