Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/equipment-management/equipment-management/equipment-detail.vue

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

@@ -370,7 +370,8 @@ export default {
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         selectedOptions: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' }
+          { required: true, message: '请选择服务地点', trigger: 'blur' },
+          { type: 'number', validator: this.validaddress, trigger: 'change' }
         ],
         useNum: [
           { required: true, message: '请输入服务单位时段服务数', trigger: 'change,blur' },
@@ -405,10 +406,12 @@ export default {
           { min: 2, max: 200, message: '备注长度必须介于2~200之间', trigger: 'blur' }
         ],
         serviceArea: [
-          { required: true, message: '请选择支持服务地区', trigger: 'blur' }
+          { required: true, message: '请选择支持服务地区', trigger: 'blur' },
+          { type: 'number', validator: this.validserviceArea, trigger: 'change' }
         ],
         checkType: [
-          { required: true, message: '请选择支持检查类型', trigger: 'blur' }
+          { required: true, message: '请选择支持检查类型', trigger: 'blur' },
+          { type: 'number', validator: this.validcheckType, trigger: 'change' }
         ]
       },
       // 是否医院自有设备
@@ -574,6 +577,33 @@ export default {
       }
       console.log('中文', this.addForm)
     },
+    // 服务地点表单校验
+    validaddress(rule, value, callback) {
+      console.log('validaddress', this.form.selectedOptions)
+      if (this.form.selectedOptions.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择服务地点'))
+      }
+    },
+    // 支持服务地区表单校验
+    validserviceArea(rule, value, callback) {
+      console.log('validaddress', this.form.serviceArea)
+      if (this.form.serviceArea.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持检查项目'))
+      }
+    },
+    // 支持检查类型表单校验
+    validcheckType(rule, value, callback) {
+      console.log('validaddress', this.form.checkType)
+      if (this.form.checkType.length > 0) {
+        callback()
+      } else {
+        callback(new Error('请选择支持服务地区'))
+      }
+    },
     // 四个时间的表单校验
     validateMorningStart(rule, value, callback) {
       // // TODO: please clear this log

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

@@ -266,7 +266,7 @@
               <el-col>
                 <el-form-item label="支持服务地区">
                   <el-input
-                    v-model.trim="form.serviceAreaList"
+                    v-model.trim="form.serviceAreaText"
                     type="textarea"
                     style="width:705%;;"
                     :row="4"
@@ -278,11 +278,11 @@
             <!--            9-->
             <el-row>
               <el-col>
-                <el-form-item label="支持检查类型">
+                <el-form-item label="支持检查项目">
                   <el-input
-                    v-model.trim="form.checkTypeList"
+                    v-model.trim="form.checkTypeText"
                     type="textarea"
-                    style="width:705%;;"
+                    style="width:705%;"
                     :row="4"
                     disabled
                   />
@@ -674,8 +674,8 @@ export default {
         deviceName: '',
         // appointmentMethod: '',
         serviceArea: '',
-        serviceAreaList: [],
-        checkTypeList: [],
+        serviceAreaText: [],
+        checkTypeText: [],
         head: '',
         phone: '',
         deviceType: '',
@@ -1058,8 +1058,8 @@ export default {
         // }
         // if (this.form.serviceArea != null && this.form.serviceArea !== '') {
         console.log('this.form.serviceArea', this.form.serviceArea)
-        this.form.serviceAreaList = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
-        console.log(' this.form.serviceAreaList', this.form.serviceAreaList)
+        this.form.serviceAreaText = selectDictLabels(this.dict.type.service_area, this.form.serviceArea)
+        console.log(' this.form.serviceAreaText', this.form.serviceAreaText)
         this.form.serviceArea = response.data.serviceArea.split(',')
 
         // this.getDicts('service_area').then(response => {
@@ -1071,8 +1071,8 @@ export default {
         // })
         // }
         if (this.form.checkType != null && this.form.checkType !== '') {
-          this.form.checkTypeList = selectDictLabels(this.dict.type.check_type, this.form.checkType)
-          console.log(' this.form.checkTypeList', this.form.checkTypeList)
+          this.form.checkTypeText = selectDictLabels(this.dict.type.exam_type, this.form.checkType)
+          console.log(' this.form.checkTypeText', this.form.checkTypeText)
           this.form.checkType = response.data.checkType.split(',')
         }
 

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

@@ -87,13 +87,13 @@
         >新增设备
         </el-button>
         <el-button
-          icon="el-icon-top-left"
+          icon="el-icon-finished"
           class="fourWordsBtn"
           @click="selectAll()"
         >选择全部
         </el-button>
         <el-button
-          icon="el-icon-top-right"
+          icon="el-icon-back"
           class="fourWordsBtn"
           @click="reverseSelect(deviceList)"
         >反向选择
@@ -101,14 +101,14 @@
         <el-button
           v-hasPermi="['business:device:import']"
           class="fourWordsBtn"
-          icon="el-icon-bottom-left"
+          icon="el-icon-download"
           @click="handleImport"
         >批量导入
         </el-button>
         <el-button
           v-hasPermi="['business:device:export']"
           class="fourWordsBtn"
-          icon="el-icon-top-right"
+          icon="el-icon-upload2"
           @click="handleExport"
         >批量导出
         </el-button>
@@ -126,7 +126,7 @@
       </el-col>
     </el-row>
 
-    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" border :row-key="getRowKeys" @selection-change="handleSelectionChange">
+    <el-table ref="table" v-loading="loading" :data="deviceList" :header-cell-style="{ background:'#E8E9E8'}" :row-key="getRowKeys" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="47" align="center" :reserve-selection="true" />
       <el-table-column type="index" label="序号" width="50" />
       <el-table-column label="设备名称" align="left" prop="deviceName" show-overflow-tooltip />