Merge remote-tracking branch 'origin/master'

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

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

@@ -78,14 +78,17 @@
               :prop="'settingList.'+index+'.price'"
               :rules="[
                 { required: true, message: '请输入项目单价', trigger: 'change' },
-
+                { validator: validatePrice, trigger: 'change, blur' }
               ]"
             >
               <el-input-number
                 v-model="item.price"
                 :min="0"
+                :max="9999.99"
                 controls-position="right"
                 style="width: 240px"
+                placeholder="0.00"
+                :precision="2"
                 @keydown.native="keydown($event)"
               />
               元
@@ -122,6 +125,10 @@
               :ref="'settingList.'+index+'.sort'"
               label="权重"
               :prop="'settingList.'+index+'.sort'"
+              :rules="[
+                { required: true, message: '请输入权重', trigger: 'change' },
+                { validator: validWeigh, trigger: 'change, blur' }
+              ]"
             >
               <el-input-number
                 v-model="item.sort"
@@ -256,6 +263,15 @@ export default {
       })
     },
 
+    /** 项目单价校验 */
+    validatePrice: function(rule, value, callback) {
+      console.log('value', value)
+      if (value === 0) {
+        callback(new Error('项目单价不能为0.00'))
+      } else {
+        callback()
+      }
+    },
     // 是权重不可以输入小数
     handleBlur() {
       const parsedValue = parseFloat(this.form.sort)

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

@@ -265,22 +265,13 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持服务地区">
-<!--                  <el-input-->
-<!--                    disabled-->
-<!--                    type="textarea"-->
-<!--                    placeholder="暂无数据"-->
-<!--                    maxlength="200"-->
-<!--                    style="width:705%;"-->
-<!--                    :rows="4"-->
-<!--                  />-->
-                  <el-select v-model="form.serviceArea" multiple placeholder="请选择支持服务地区" disabled style="width: 300px">
-                    <el-option
-                      v-for="dict in dict.type.service_area"
-                      :key="dict.label"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                  <el-input
+                    v-model.trim="form.serviceAreaList"
+                    type="textarea"
+                    style="width:705%;;"
+                    :row="4"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -288,14 +279,13 @@
             <el-row>
               <el-col>
                 <el-form-item label="支持检查类型">
-                  <el-select v-model="form.checkType" multiple placeholder="请选择支持检查类型" style="width: 300px" disabled>
-                    <el-option
-                      v-for=" dict in dict.type.exam_type"
-                      :key="dict.label"
-                      :label="dict.label"
-                      :value="dict.value"
-                    />
-                  </el-select>
+                  <el-input
+                    v-model.trim="form.checkTypeList"
+                    type="textarea"
+                    style="width:705%;;"
+                    :row="4"
+                    disabled
+                  />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -1081,6 +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.checkType = response.data.checkType.split(',')
         }
 

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

@@ -127,7 +127,7 @@
     </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-column type="selection" width="50" align="center" :reserve-selection="true" />
+      <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 />
       <el-table-column label="设备ID" align="left" prop="deviceCode" show-overflow-tooltip />