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_sixtyTwo.vue

@@ -893,7 +893,7 @@
                             record.assessment_after_dislysis.cvc_a ? record.assessment_after_dislysis.cvc_a : "/"
                             }}ml</span
                             >
-                        <span style="padding -left: 15px"
+                        <span style="padding-left: 15px"
                             >V:{{
                             record.assessment_after_dislysis.cvc_v ? record.assessment_after_dislysis.cvc_v : "/"
                             }}ml</span
@@ -1365,65 +1365,61 @@
           <!-- <th>核对者</th> -->
         </tr>
         <tr  v-for="(advice, advice_index) in record.advices" :key="advice_index">
-          <td style="height:30px;line-height:30px">{{ getTime(advice[0].start_time, "{h}:{i}") }}</td>
-          <td> <span
-                    v-if="
-                      setAdminUserES(advice[0], 'advice_doctor') ==
-                                  ''
-                              "
-                              >{{
-                                getAdminUser(advice[0], "advice_doctor")
-                              }}</span
-                            >
-                            <span v-else style="display:flex;align-items:center;height:36px;">
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(advice[0], 'advice_doctor')
-                              "
-                              alt=""
-                              srcset=""
-                              style="height: 30px;margin:0 auto"
-                            /></span>
-            </td>
-          <td style="text-align:left;padding-left:20px"> <span v-if="advice[0].parent_id > 0">└</span>
-                       <span>{{ advice[0].advice_name }}</span>
-                        <span
-                           >{{ advice[0].advice_desc
-                         }}{{ advice[0].drug_spec_unit }}</span
-                            >
-                            <span v-if="advice[0].prescribing_number"
-                              >* {{ advice[0].prescribing_number
-                              }}{{ advice[0].prescribing_number_unit }}</span
-                            >
-                            <span v-if="advice[0].single_dose != 0"> 
-                             <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
-                              }}{{ advice[0].single_dose_unit }}</span
-                            >
-                            <span>{{ advice[0].delivery_way }}</span>
-                            <span>{{ advice[0].execution_frequency }}</span>
-                            </td>
-                  <td>
-                     <span
-                           v-if="
-                             setAdminUserES(advice[0], 'execution_staff') ==
-                                  ''
-                              "
-                              >{{
-                                getAdminUser(advice[0], "execution_staff")
-                              }}</span
-                            >
-                            <span v-else style="display:flex;align-items:center;height:36px;">
-                            <img
-                              class="es-img"
-                              :src="
-                                setAdminUserES(advice[0], 'execution_staff')
-                              "
-                              alt=""
-                              srcset=""
-                              style="height: 30px;margin:0 auto"
-                            /></span>
-                   </td>
+          <td style="height:30px;line-height:30px">{{ getTime(advice[0].start_time, "{y}-{m}-{d} {h}:{i}") }}</td>
+          <td> 
+            <span v-if=" setAdminUserES(advice[0], 'advice_doctor') == ''"
+            >{{
+                getAdminUser(advice[0], "advice_doctor")
+              }}</span>
+              <span v-else style="display:flex;align-items:center;height:36px;">
+              <img
+                class="es-img"
+                :src="
+                  setAdminUserES(advice[0], 'advice_doctor')
+                "
+                alt=""
+                srcset=""
+                style="height: 30px;margin:0 auto"
+              /></span>
+          </td>
+          <td style="text-align:left;padding-left:20px"> 
+            <span v-if="advice[0].parent_id > 0"></span>
+              <span>{{ advice[0].advice_name }}</span>
+              <span >{{ advice[0].advice_desc
+                }}{{ advice[0].drug_spec_unit }}</span
+                  >
+                  <span v-if="advice[0].prescribing_number"
+                    >* {{ advice[0].prescribing_number
+                    }}{{ advice[0].prescribing_number_unit }}</span
+                  >
+                  <span v-if="advice[0].single_dose != 0"> 
+                    <span v-if="advice[0].single_dose >0"> 单次用量 </span>{{ advice[0].single_dose
+                    }}{{ advice[0].single_dose_unit }}</span
+                  >
+                  <span>{{ advice[0].delivery_way }}</span>
+                  <span>{{ advice[0].execution_frequency }}</span>
+          </td>
+          <td>
+            <span
+                  v-if="
+                    setAdminUserES(advice[0], 'execution_staff') ==
+                        ''
+                    "
+                    >{{
+                      getAdminUser(advice[0], "execution_staff")
+                    }}</span
+                  >
+                  <span v-else style="display:flex;align-items:center;height:36px;">
+                  <img
+                    class="es-img"
+                    :src="
+                      setAdminUserES(advice[0], 'execution_staff')
+                    "
+                    alt=""
+                    srcset=""
+                    style="height: 30px;margin:0 auto"
+                  /></span>
+          </td>
           <td>{{getTime(advice[0].execution_time,'{y}-{m}-{d} {h}:{i}')}}</td>
           <!-- <td>
               <span
@@ -1693,9 +1689,9 @@ export default {
 
             var advices = []
             for (const index in this.records[recordIndex].advices) {
-              if (this.records[recordIndex].advices[index].parent_id > 0) {
-                continue
-              }
+              // if (this.records[recordIndex].advices[index].parent_id > 0) {
+              //   continue
+              // }
               var item = this.records[recordIndex].advices[index]
               if (item.id in childMap) {
                 item.children = childMap[item.id]

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyTwo.vue

@@ -1275,7 +1275,7 @@
             </td>
             <td
               class="parent"
-              style="text-align: left; padding-left: 20px !important"
+              style="text-align: left; padding-left: 10px !important"
             >
               <span v-if="advice.parent_id > 0">&nbsp;&nbsp;&nbsp;</span>
               <span>{{ advice.advice_name }}</span>

src/xt_pages/workforce/remind_print.vue

@@ -29,7 +29,7 @@
                   <td width="70" v-if="printObj.name == 1">姓名</td>
                   <td width="100" v-if="printObj.zone == 1">分区</td>
                   <td width="60" v-if="printObj.classes == 1">班次</td>
-                  <td width="60" v-if="printObj.number == 1">机号</td>
+                  <td width="100" v-if="printObj.number == 1">机号</td>
                   <td width="50" v-if="printObj.mode == 1">透析模式</td>
                   <td width="100" v-if="printObj.dialyzers == 1 && printObj.perfusion_apparatus == 1">透析器/灌流器</td>
                   <td width="100" v-if="printObj.anticoagulant==1">抗凝剂(商品名称)</td>