Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,7 @@
         />
       </el-form-item>
       <el-form-item v-if="userType==='00'">
-        <el-select v-model="queryParams.isPrivate" placeholder="平台自有设备">
+        <el-select v-model="queryParams.isPrivate" placeholder="平台自有设备" clearable>
           <el-option
             v-for="item in option"
             :key="item.value"
@@ -21,10 +21,11 @@
         </el-select>
       </el-form-item>
       <el-form-item v-if="userType==='3'">
-        <el-select v-model="queryParams.isPrivate" placeholder="医院自有设备">
+        <el-select v-model="queryParams.isPrivate" placeholder="医院自有设备" clearable>
           <el-option
             v-for="item in optionh"
             :key="item.value"
+            collapse-tagscollapse-tags
             :label="item.label"
             :value="item.value"
           />
@@ -230,10 +231,9 @@
             plain
             size="mini"
             type="primary"
-            icon="el-icon-edit"
             class="el-button--primary--solid"
             @click="editDevice(scope.row)"
-          >编辑
+          ><svg-icon icon-class="liebiao_icon_bianji" style="font-size: 11px;vertical-align: top;" />编辑
           </el-button>
         </template>
       </el-table-column>

src/views/service-management/hospitalization-management/hospitalization-management.vue

@@ -30,7 +30,7 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="wardRuleId">
-        <el-select v-model="queryParams.wardId" multiple placeholder="病房号">
+        <el-select v-model="queryParams.wardId" multiple placeholder="病房号" collapse-tags clearable>
           <el-option
             v-for="(item, index) in wardSelectList"
             :key="index"

src/views/service-management/medical-record-management/check-item.vue

@@ -45,7 +45,7 @@
               >
                 <el-input
                   v-model.trim="item.name"
-                  :disabled="item.isUpdate === '1'"
+                  :disabled="item.isUpdate === '1' || (currentUser.userType !== '00' && item.itemType === '2')"
                   placeholder="请输入项目名称"
                   maxlength="10"
                 />
@@ -137,6 +137,7 @@
                   v-model="item.supportInsure"
                   style="width: 100%"
                   placeholder="请选择是否支持保险支付"
+                  :disabled="currentUser.userType !== '00' && item.itemType === '2'"
                 >
                   <el-option
                     v-for="items in insuranceOptions"
@@ -161,7 +162,7 @@
                   v-model="item.sort"
                   :min="0"
                   :max="9999"
-                  :disabled="item.itemType === '2'"
+                  :disabled="currentUser.userType !== '00' && item.itemType === '2'"
                   controls-position="right"
                   style="width: 100%;"
                   @keydown.native="handleKeyDownSort"
@@ -180,6 +181,7 @@
               >
                 <el-select
                   v-model="item.status"
+                  :disabled="currentUser.userType !== '00' && item.itemType === '2'"
                   style="width: 100%"
                   placeholder="请选择状态"
                 >
@@ -208,7 +210,7 @@
                   v-model.trim="item.content"
                   type="textarea"
                   :rows="2"
-                  :disabled="item.isUpdate === '1'"
+                  :disabled="item.isUpdate === '1' || (currentUser.userType !== '00' && item.itemType === '2')"
                   placeholder="请输入检查项目描述"
                   maxlength="60"
                   show-word-limit
@@ -285,10 +287,15 @@ export default {
       fullscreenLoading: false,
       isPlatRole: false,
       // 临时数组(用于预约外部服务, 权重为0)
-      temporaryArray: []
+      temporaryArray: [],
+      // 当前用户信息
+      currentUser: {
+        userType: null
+      }
     }
   },
   created() {
+    this.currentUser.userType = this.$store.state.user.userType
     if (this.$store.state.user.userType !== '00') {
       this.getList()
     } else {
@@ -353,6 +360,8 @@ export default {
       if (keyCode === 32 || (keyCode < 90 && keyCode > 65) || keyCode === 229) {
         event.preventDefault()
       }
+      // const prop = 'settingList.' + index + '.price'
+      // this.$refs['form'].validateField(prop)
     },
     // 权重的
     handleKeyDownSort(event) {