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/batch_print/batch_print_order_seventy.vue

                           }}
                         </div>
                       </div>
-
+                      <div
+                        class="inline_block"
+                        style="flex: 1"
+                      >
+                        导管：
+                        <div
+                          style="width: 90%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        >
+                          {{
+                            record.assessment_before_dislysis &&
+                            record.assessment_before_dislysis.catheter
+                              ? record.assessment_before_dislysis.catheter
+                              : "/"
+                          }}
+                        </div>
+                      </div>
 
                     </div>
-                    <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
+                    <!-- <div class="row" style="padding: 2px 0;line-height:23px;display:flex;">
                       <div
                         class="inline_block"
                         style="flex: 1"
                           }}
                         </div>
                       </div>
-                    </div>
+                    </div> -->
                     <!-- 穿刺 -->
                     <div class="row"
                       style="padding: 2px 0; line-height: 23px; display: flex"
                                 alt=""
                                 srcset=""
                                 v-else
-                                style="height: 40px"
+                                :style="{'height': org_id==10597 ? '25px' : '30px'}"
                               />
                             </td>
 
                                 alt=""
                                 srcset=""
                                 v-else
-                                style="height: 40px"
+                                :style="{'height': org_id==10597 ? '25px' : '30px'}"
                               />
                             </td>
                             <td height="35px">
                           }}
                         </div>
                       </div>
+                      <div class="inline_block" style="flex: 1">
+                        导管：
+                        <div
+                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
+                        >
+                          {{
+                            record.assessment_after_dislysis &&
+                            record.assessment_after_dislysis.catheter
+                              ? record.assessment_after_dislysis.catheter
+                              : "/"
+                          }}
+                        </div>
+                      </div>
                       <div class="inline_block" style="flex: 1">
                         KTV(在线)：
                         <div
                           }}
                         </div>
                       </div>
-                      
                     </div>
 
-                    <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
+                    <!-- <div class="row" style="padding: 2px 0; line-height: 23px; display: flex">
                       <div class="inline_block" style="flex: 1">
                         导管：
                         <div
                           }}
                         </div>
                       </div>
-                    </div>
+                    </div> -->
 
                     <div
                       class="row"
                             alt=""
                             srcset=""
                             v-else
-                            style="height: 40px"
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
                           />
                         </div>
                       </div>
                             alt=""
                             srcset=""
                             v-else
-                            style="height: 40px"
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
                           />
                         </div>
                       </div>
                             }}
                           </span>
                           <img
-                            style="height: 30px"
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
                             :src="setAdminUserES(record.check, 'creater')"
                             alt=""
                             srcset=""
                             }}
                           </span>
                           <img
-                            style="height: 30px"
+                          :style="{'height': org_id==10597 ? '25px' : '30px'}"
                             :src="setAdminUserES(record.check, 'creater')"
                             alt=""
                             srcset=""
                             }}
                           </span>
                           <img
-                            style="height: 30px"
+                          :style="{'height': org_id==10597 ? '25px' : '30px'}"
                             :src="setAdminUserES(record.check, 'modifier')"
                             alt=""
                             srcset=""
                             }}
                           </span>
                           <img
-                            style="height: 30px"
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
                             :src="setAdminUserES(record.check, 'creater')"
                             alt=""
                             srcset=""
                             alt=""
                             srcset=""
                             v-else
-                            style="height: 40px"
+                            :style="{'height': org_id==10597 ? '25px' : '30px'}"
                           />
                         </div>
                       </div>
                               alt=""
                               srcset=""
                               v-else
-                              style="height: 40px"
+                              :style="{'height': org_id==10597 ? '25px' : '30px'}"
                             />
                           </template>
                         </div>

src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue

                       </div>
                     </div>
 
-                    <!-- <div
+                    <div
                       class="inline_block"
                       style=" flex: 1"
                     >
                       >
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
-                    </div> -->
+                    </div>
                   </div>
-                  <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
+                  <!-- <div class="row" style="padding: 2px 0;line-height:23px;display:flex;" >
 
                     <div class="inline_block" style="flex:1;" >
                       导管：
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
                       </div>
                     </div>
-                  </div>
+                  </div> -->
 
                   <div
                     class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
 
-                    <!-- <div class="inline_block" style="">
-                      内瘘：
-                      <div
-                        class="under_line"
-                        style="
-                          width: 150px;
-                          text-align: center;
-                          white-space: normal;
-                        "
-                      >
-                        {{
-                          predialysis.internal_fistula
-                            ? predialysis.internal_fistula
-                            : "/"
-                        }}
-                      </div>
-                    </div>
-
-                    <div
-                      class="inline_block"
-                      style=" flex: 1"
-                    >
-                      导管：
-                      <div
-                        class="under_line"
-                        style="width: 130px; text-align: center"
-                      >
-                        {{ predialysis.catheter ? predialysis.catheter : "/" }}
-                      </div>
-                    </div> -->
                      <div
                       class="inline_block"
                       style=" flex: 1"
                               >{{ getAdminUser(advice.advice_doctor) }}
                             </span>
                             <img
-                              style="height: 30px"
+                            :style="{'height': org_id==10597 ? '25px':'30px'}"
                               :src="setAdminUserES(advice.advice_doctor)"
                               alt=""
                               srcset=""
                               >{{ getAdminUser(advice.execution_staff) }}</span
                             >
                             <img
-                              style="height: 30px"
+                              :style="{'height': org_id==10597 ? '25px':'30px'}"
                               :src="setAdminUserES(advice.execution_staff)"
                               alt=""
                               srcset=""
                         getAdminUser(advice.advice_doctor)
                       }}</span>
                       <img
-                        style="height: 30px"
+                        :style="{'height': org_id==10597 ? '25px':'30px'}"
                         :src="setAdminUserES(advice.advice_doctor)"
                         alt=""
                         srcset=""
                       getAdminUser(advice.execution_staff)
                     }}</span>
                     <img
-                      style="height: 30px"
+                      :style="{'height': org_id==10597 ? '25px':'30px'}"
                       :src="setAdminUserES(advice.execution_staff)"
                       alt=""
                       srcset=""
                         }}
                       </div>
                     </div>
+                    <div class="inline_block" style="flex:1;">
+                      导管：
+                      <div style="width: 80%;text-align: left;display: inline-block;border-bottom: 1px solid #999; ">
+                        {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
+                      </div>
+                    </div>
                     <div class="inline_block" style="flex:1;">
                       KTV(在线)：
                       <div class="under_line" style="min-width: 50px;text-align: center">
                       </div>
                     </div>
                   </div>
-                  <div class="row"
+
+                  <!-- <div class="row"
                     style="padding: 2px 0; line-height: 23px; display: flex"
                   >
                     <div class="inline_block" style="flex:1;">
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
                       </div>
                     </div>
-                  </div>
+                  </div> -->
 
                   <div
                     class="row"
                             }}</span
                           >
                           <img
-                            style="height: 35px"
+                            :style="{'height':org_id==10597 ? '25px':'35px'}"
                             :src="
                               setAdminUserES(
                                 dialysisOrder == null
                             }}</span
                           >
                           <img
-                            style="height: 30px"
+                            :style="{'height':org_id==0 ? '25px':'35px'}"
                             :src="
                               setAdminUserES(
                                 dialysisOrder == null
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          :style="{'height':org_id==10597 ? '25px':'35px'}"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          :style="{'height':org_id==10597 ? '25px':'35px'}"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           {{ getAdminUser(check == null ? 0 : check.modifier) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          :style="{'height':org_id==10597 ? '25px':'35px'}"
                           :src="
                             setAdminUserES(check == null ? 0 : check.modifier)
                           "
                           {{ getAdminUser(check == null ? 0 : check.creater) }}
                         </span>
                         <img
-                          style="height: 30px"
+                          :style="{'height':org_id==10597 ? '25px':'35px'}"
                           :src="
                             setAdminUserES(check == null ? 0 : check.creater)
                           "
                           }}
                         </span>
                         <img
-                          style="height: 30px"
+                        :style="{'height':org_id==10597 ? '25px':'30px'}"
                           :src="
                             setAdminUserES(
                               dialysisOrder == null
                           {{ getAdminUser(prescription.creater) }}
                         </span>
                         <img
-                          style="height: 40px"
+                        :style="{'height':org_id==10597 ? '25px':'35px'}"
                           :src="setAdminUserES(prescription.creater)"
                           alt=""
                           srcset=""
               </td>
 
               <td height="32px">
-                <span
+                <!-- <span v-if> -->
+                  <span
                   v-if="setAdminUserES(advice.advice_doctor) == ''"
                   >{{ getAdminUser(advice.advice_doctor) }}</span
-                >
-                <img
-                  style="height: 30px"
-                  :src="setAdminUserES(advice.advice_doctor)"
-                  alt=""
-                  srcset=""
-                  v-else
-                />
+                  >
+                  <img
+                    :style="{'height': org_id==10597 ? '25px':'30px'}"
+                    :src="setAdminUserES(advice.advice_doctor)"
+                    alt=""
+                    srcset=""
+                    v-else
+                  />
+                <!-- </span> -->
+                
               </td>
 
               <td height="32px">
                   >{{ getAdminUser(advice.execution_staff) }}</span
                 >
                 <img
-                  style="height: 30px"
+                  :style="{'height': org_id==10597 ? '25px':'30px'}"
                   :src="setAdminUserES(advice.execution_staff)"
                   alt=""
                   srcset=""
           </tbody>
      </table>
 
-
-
-
-
-
     </div>
   </div>
 </template>