Merge branch '20230223_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20230223_pc_vue_new_branch

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

@@ -70,7 +70,7 @@
           label="穿刺者"
           v-if="isShowFiled('穿刺者')"
           prop="puncture_nurse_id"
-          :rules="isCheckmust('穿刺者')"
+         
         >
           <el-select
             v-model="form.puncture_nurse_id"

src/xt_pages/dialysis/signPrint.vue

@@ -15,12 +15,13 @@
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
                         <div>医嘱内容:{{ it.advice_name }} 
-                           <span v-if="it.prescribing_number>0">
+                           <span v-if="it.prescribing_number>0 && org_id !=0 && org_id!=10440">
                             {{it.prescribing_number}}{{ it.prescribing_number_unit }}
                           </span> 
                         </div>  
-                        <div>给药途径:{{it.execution_frequency}}</div>  
-                        <div>执行频率:{{it.delivery_way}}</div>  
+                        <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}{{it.single_dose_unit }}</div>  
+                        <div>执行频率:{{it.execution_frequency}}</div>  
+                        <div>给药途径:{{it.delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
                     </div>  
                 </div>
@@ -34,8 +35,9 @@
                         <div>分区/床位号:{{item.device_number.zone.name}}/{{item.device_number.number}}</div>  
                         <div>姓名:{{item.patient.name}}</div>  
                         <div>医嘱内容:{{getAdvice(item.doctor_advice)}} 
-                           <span v-if="it.prescribing_number >0"> {{it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
+                           <span v-if="it.prescribing_number >0&& org_id !=0 && org_id!=10440"> {{it.prescribing_number}}{{ it.prescribing_number_unit }}</span>
                         </div>  
+                        <div v-if=" org_id ==0 || org_id==10440">单次用量:{{it.single_dose}}&nbsp;{{it.single_dose_unit }}</div>
                         <div>给药途径:{{item.doctor_advice[0].execution_frequency}}</div>  
                         <div>执行频率:{{item.doctor_advice[0].delivery_way}}</div>  
                         <div>打印时间:{{time}}</div>   
@@ -76,6 +78,7 @@ export default {
             delivery_way:"",
             list:[],
             execution_frequency:"",
+            org_id:0,
         }
     },
     methods:{
@@ -642,6 +645,7 @@ export default {
     created(){
       var time = this.$route.query.time
       var delivery_way = this.$route.query.delivery_way
+      this.org_id = this.$store.getters.xt_user.org.id
       console.log("delivery_Way",delivery_way)
       this.delivery_way = delivery_way
       var execution_frequency = this.$route.query.execution_frequency

src/xt_pages/dialysis/template/DialysisPrintOrderSix.vue

@@ -907,10 +907,10 @@
                         class="under_line"
                         style="width: 100px; text-align: center"
                       >
-                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 ">{{
+                        <span v-if="org_id == 10290 || org_id == 10318 || org_id== 10217 || org_id== 10188 || org_id== 9956 || org_id == 10440 ">{{
                           lastafterdialysis.weight_after
                         }}</span>
-                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956">{{
+                        <span v-if="org_id != 10290 && org_id != 10318  && org_id!= 10217 && org_id!=10188 && org_id!=9956 && org_id != 10440">{{
                           predialysis.weight_after_last_transparency
                             ? predialysis.weight_after_last_transparency
                             : "未称重"
@@ -2567,6 +2567,53 @@
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
+                   <div v-if="org_id == 0 || org_id == 10440">
+                    
+                  
+
+                    <div class="inline_block" style="flex: 1">
+                      上机护士：
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                      >
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+                  
+                  
+                  </div>
+                  <div v-if="org_id!=0 && org_id!=10440">
                     <div class="inline_block" style="flex: 1">
                       穿刺护士：
                       <div
@@ -2606,6 +2653,58 @@
                         />
                       </div>
                     </div>
+                  </div>
+                   
+                  <div v-if="org_id==0||org_id==10440">
+                    
+                    <div class="inline_block" style="flex: 1">                 
+                     <div>
+                      <span>责任护士：</span> 
+                      <div
+                        class="under_line"
+                        style="width: 80px; text-align: center"
+                       
+                      >
+                    
+                        <span
+                          style="height: 30px; display: inline-block"
+                          v-if="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            ) == ''
+                          "
+                        >
+                          {{
+                            getAdminUser(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          }}</span
+                        >
+                        <img
+                          style="height: 30px"
+                          :src="
+                            setAdminUserES(
+                              dialysisOrder == null
+                                ? 0
+                                : dialysisOrder.start_nurse
+                            )
+                          "
+                          alt=""
+                          srcset=""
+                          v-else
+                        />
+                      </div>
+                    </div>
+
+                    </div>
+
+                  </div>
+
+                  <div v-if="org_id!=0&&org_id!=10440">
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10414">责任护士：</span> 
                       <span v-else>治疗护士：</span> 
@@ -2647,6 +2746,10 @@
                         />
                       </div>
                     </div>
+                  </div>
+                  
+
+
                     <div class="inline_block" style="flex: 1">
                       <span v-if="org_id==10387" >核对护士：</span> 
                       <span v-else >核对人员：</span>