Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch

src/xt_pages/device/objectTableDisinfectTwo.vue

@@ -1094,19 +1094,19 @@
                                 <td>楼层</td>
                                 <td>湿化瓶<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>止血带<br/>500mg/l含氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>医疗垃圾桶<br/>1000mg/l含<br/>氯制剂</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>体温计<br/>75%酒精浸泡</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                 <td>体温枪<br/>75%酒精擦拭</td>
                                 <td>负责人</td>
-                                <td width="40">检查合格<br/></td>
+                                <td width="40">消毒液浓度合格<br/></td>
                                
                             </tr>
 

src/xt_pages/dialysis/details/dialog/monitor_dialog.vue

@@ -936,7 +936,7 @@
             width="140"
             v-if="
               isShow('KT/V') &&
-              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598)
+              (org_id == 9987 || org_id == 10215 || org_id == 9800 || org_id == 9598 || org_id ==10517)
             "
           >
             <template slot-scope="scope">

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -100,7 +100,7 @@
           <th v-if="isShow('脱水')" width="92px">{{monitor.dehydration ? monitor.dehydration : ""}}</th>
           <th v-if="isShow('滤前压')" width="92px">{{monitor.filter_pressure ? monitor.filter_pressure : ""}}</th>
           
-          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598)">{{ monitor.ktv?monitor.ktv:""}}</td>
+          <td v-if="isShow('KT/V') && (org_id == 9987 || org_id == 10215 || org_id ==  9800 || org_id ==  9598 || org_id ==10517)">{{ monitor.ktv?monitor.ktv:""}}</td>
           <td v-if="isShow('病情变化')">{{ monitor.symptom }}
             <span v-if="(index == monitores.length-1) && (org_id == 0 || org_id == 10340)">累计血容量:{{monitor.accumulated_blood_volume }}L</span>
           </td>

src/xt_pages/user/patients.vue

@@ -270,14 +270,14 @@
       </div> -->
       <div  class="cell clearfix">
         <label class="title"><span class="name">主管护士</span> : </label>
-        <el-select v-model="form.nurse" style="width:200px">
+        <el-select v-model="form.nurse" style="width:200px"  @change="changeNuseSearch">
             <el-option
               placeholder="主管护士"
               v-for="(item,index) in adminUserOptions"
               :key="index"
               :label="item.name"
               :value="item.id"
-              @change="changeNuseSearch"
+             
             
             />
         </el-select>