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

@@ -411,7 +411,7 @@ export default {
           { 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' }
         ]
       },
@@ -597,7 +597,7 @@ export default {
       if (this.form.serviceArea.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持检查项目'))
+        callback(new Error('请选择支持服务地区'))
       }
     },
     // 支持检查类型表单校验
@@ -757,5 +757,21 @@ export default {
 ::v-deep .el-table--enable-row-hover .el-table__body tr:hover > td .el-table__cell {
   background-color: #F6FCF5 !important;
 }
+
+//el.time-select-item.selected{
+//  color: #5FB54B;
+//  font-weight: bold;
+//}
+
+/* 修改下拉框文字样式 */
+::v-deep .el-time-select__input {
+  font-size: 16px;
+  color: #5FB54B;
+}
+
+/* 修改下拉框背景颜色 */
+::v-deep .el-picker-panel {
+  background-color: #5FB54B;
+}
 </style>
 

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

@@ -570,7 +570,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区" prop="serviceArea">
-                  <el-select v-model="form.serviceArea" placeholder="请选择" style="width: 300px" multiple collapse-tags clearable>
+                  <el-select v-model="form.serviceArea" placeholder="请选择支持服务地区" style="width: 300px" multiple collapse-tags clearable>
                     <el-option
                       v-for="dictServiceArea in dict.type.service_area"
                       :key="dictServiceArea.label"
@@ -585,7 +585,7 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持检查项目" prop="checkType">
-                  <el-select v-model="form.checkType" multiple placeholder="请选择" style="width: 300px" collapse-tags clearable>
+                  <el-select v-model="form.checkType" multiple placeholder="请选择支持检查项目" style="width: 300px" collapse-tags clearable>
                     <el-option
                       v-for="(item,index) in dict.type.exam_type"
                       :key="index.label"
@@ -715,8 +715,8 @@ export default {
           { required: true, message: '请选择设备类型', trigger: 'change' }
         ],
         selectedOptions: [
-          { required: true, message: '请选择服务地点', trigger: 'blur' },
-          { type: 'number', validator: this.validaddress, trigger: 'change' }
+          // { required: true, message: '请选择服务地点', trigger: 'blur' },
+          { required: true, type: 'number', validator: this.validaddress, trigger: 'change' }
         ],
         // addressCode: [
         //   { required: true, message: '请选择服务地点', trigger: 'change,blur' }
@@ -758,7 +758,7 @@ export default {
           { 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' }
         ]
       },
@@ -918,7 +918,7 @@ export default {
       if (this.form.serviceArea.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持检查项目'))
+        callback(new Error('请选择支持服务地区'))
       }
     },
     // 支持检查类型表单校验
@@ -927,7 +927,7 @@ export default {
       if (this.form.checkType.length > 0) {
         callback()
       } else {
-        callback(new Error('请选择支持服务地区'))
+        callback(new Error('请选择支持检查项目'))
       }
     },
     // 四个时间的表单校验