Merge branch '2022-10-17_vue_schedule_branch' of http://git.shengws.com/csx/Vue_New into 20220812

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

@@ -594,7 +594,7 @@
           <el-table-column
             prop="displacement_flow_quantity"
             align="center"
-            label="电导度(mS/m)"
+            label="电导度(mS/cm)"
             width="100"
             v-if="isShow('电导度')"
           >
@@ -1322,7 +1322,7 @@
           </el-col>
 
           <el-col :span="8" v-if="isShow('电导度')">
-            <el-form-item label="电导度(mS/m)：">
+            <el-form-item label="电导度(mS/cm)：">
               <el-input v-model="form.conductivity"></el-input>
             </el-form-item>
           </el-col>

src/xt_pages/dialysis/details/dialysisMonitoring.vue

@@ -26,7 +26,7 @@
           <th v-if=" isShow('置换量') && ((template_id == 6 && org_id != 9919 && org_id !=10191) || org_id == 9779 || template_id == 11 || template_id == 20 || template_id == 26 || template_id == 29 || template_id == 46 || template_id == 48 || template_id == 53 || template_id == 54 || template_id == 56 || this.$store.getters.xt_user.template_info.org_id == 10340 || this.$store.getters.xt_user.template_info.org_id == 10432  || this.$store.getters.xt_user.template_info.org_id == 10445 )" width="92px"  > 置换量(ml)  </th>
           <th v-if=" isShow('置换量') && ((template_id != 6 || org_id == 9919 || org_id == 10191) && org_id != 9779 && template_id != 11 && template_id != 20 && template_id != 26 && template_id != 29 && template_id != 46 && template_id != 48 && template_id != 53 && template_id != 54 && template_id != 56 && this.$store.getters.xt_user.template_info.org_id != 10340 && this.$store.getters.xt_user.template_info.org_id != 10432  && this.$store.getters.xt_user.template_info.org_id != 10445)" width="92px" > 置换量(L) </th>
           <th v-if=" isShow('SpO₂') && template_id != 6 && template_id != 10 && template_id != 11  " width="92px" > SpO₂(%) </th>
-          <th v-if="isShow('电导度')" width="92px">电导度(mS/m)</th>
+          <th v-if="isShow('电导度')" width="92px">电导度(mS/cm)</th>
           <th v-if="isShow('置换液流量') && template_id != 27" width="92px">置换液流量(ml/h)</th>
           <th v-if="isShow('置换液流量') && template_id == 27" width="92px">置换液流量(ml/min)</th>
           <th v-if="isShow('透析液流量')" width="92px">透析液流量(ml/h)</th>

src/xt_pages/dialysis/schedualPatient.vue

@@ -184,6 +184,7 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
           {value: 1,label: '待开处方'},
           {value: 2,label: '待开小结'},
           {value: 3,label: '待医嘱核对'},
+          {value:4,label:'待消毒'},
         ],
         treatStateVal: 0,
         allPatient:[],
@@ -825,6 +826,18 @@ import { getDialysisRecordInitData, getDialysisSchedules } from '@/api/dialysis_
             }
           }
           arr2 = arr
+        }else if(this.treatStateVal == 4){
+         let arr = []
+          arr = JSON.parse(JSON.stringify(arr1))
+          for (let i = 0; i < arr.length; i++) {
+            for (let j = 0; j < arr[i].schedules.length; j++) {
+              if (arr[i].schedules.length > 0 && (arr[i].schedules[j].device_information != null)) {
+                // 删除元素后改变i的值
+                arr[i].schedules.splice(j--, 1);
+              }
+            }
+          }
+          arr2 = arr
         }
 
 

src/xt_pages/outpatientDoctorStation/template/printOne.vue

@@ -143,7 +143,7 @@
               {{ doc_name }}
             </span>
             <img
-              style="height: 30px"
+              style="height: 50px"
               :src="setAdminUserES(item.creator,item.doctor)"
               alt=""
               srcset=""

src/xt_pages/stock/drugs/drugStockOutOrderDetailPrint.vue

@@ -7,7 +7,7 @@
     </div>
     <div class="app-container ">
       <div id="dialysis-print-box">
-        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877">
+        <div v-if="orgId!=9671 && orgId!=9675 && orgId!=10210 && orgId!=10188 && orgId!=10127 && orgId!=10164 && orgId!=3877 && orgId!=10387">
         <div class="dialysis-print-order" v-for="(it,index) in tableList" :key="index">
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>
@@ -78,7 +78,7 @@
       </div> 
 
 
-      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877">
+      <div v-if="orgId == 9671 || orgId == 9675 ||  orgId == 10210 || orgId == 10188 || orgId == 10127 || orgId ==10164 || orgId ==3877 || orgId == 10387">
        <div class="dialysis-print-order" v-for="(it,index) in tableData" :key="index" >
          <div class="order-yy-name" style="font-size:22px;font-weight:bold;letter-spacing:0px;margin-top:40px">{{orgName}}</div>
           <div class="order-title" style="font-weight:500;font-size:18px;">药品出库登记表</div>

src/xt_pages/stock/query/goodNewQuery.vue

@@ -681,11 +681,10 @@ export default {
        if(response.data.state == 1){
          this.dialogVisible = true
          var list = response.data.data.list
+         console.log("list2332323232wo",list)
          this.tableData = list
          this.totalone = response.data.data.total
       
-        //  this.flushList =  response.data.data.flushList
-        
        }
      })