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

@@ -1174,7 +1174,7 @@
                       </div>
 
                       <div class="inline_block" style="flex: 1">
-                        <span>透析中入量(L):</span>
+                        <span>透析中入量(g):</span>
                         <div class="under_line"
                           style="width: 70px; text-align: center"
                         >

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyFive.vue

@@ -386,10 +386,10 @@
                           class="inline_block"
                           style="margin-left: 10px; flex: 1"
                         >
-                          穿刺针：
+                          穿刺针:
                           <div
                             class="under_line"
-                            style="width: 100px; text-align: center"
+                            style="width: 120px; text-align: center;white-space:normal;"
                           >
                             {{
                               record.assessment_before_dislysis &&
@@ -1634,8 +1634,7 @@
                           </tr>
   
                           <template v-if="record.advices">
-                            <tr
-                              v-for="(advice, advice_index) in record.advices"
+                            <tr v-for="(advice, advice_index) in record.advices"
                               :key="advice_index"
                             >
                               <td height="35px">
@@ -3106,7 +3105,7 @@
                 this.records[recordIndex].advices &&
                 this.records[recordIndex].advices.length < 12
               ) {
-                delghTwo = 12 - this.records[recordIndex].advices.length;
+                delghTwo = 8 - this.records[recordIndex].advices.length;
               } else {
                 delghTwo = 0;
               }

src/xt_pages/dialysis/batch_print/batch_print_order_sixtyeight.vue

@@ -3119,12 +3119,12 @@
               </tbody>
             </table>
           </div>
-          <div style="position: relative;left: 70%;top: 30px;">
+          <div style="position: relative;left: 70%;top: 0px;width: 250px;">
             患者签名：
             <div class="under_line" style="width: 120px;">
               <img
                 v-if="record.dialysis_order.url!=''"
-                style="height: 50px"
+                style="height: 60px"
                 :src="record.dialysis_order == null? 0: record.dialysis_order.url"
                 alt=""
                 srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyFive.vue

@@ -120,30 +120,29 @@
             </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; display: inline-block"
+          >
+            身份证：
+            <div
+              class="under_line"
+              style="
+                width: 860px;
+                line-height: 25px;
+                text-align: left;
+                margin-left: 2px;
+                display: inline-block;
+                white-space: normal;
+              "
             >
-              <div
-                class="inline_block"
-                style="flex: 1; display: inline-block"
-              >
-                身份证：
-                <div
-                  class="under_line"
-                  style="
-                    width: 860px;
-                    line-height: 25px;
-                    text-align: left;
-                    margin-left: 2px;
-                    display: inline-block;
-                    white-space: normal;
-                  "
-                >
-                  {{ patientInfo.id_card_no }}
-                </div>
-              </div>
+              {{ patientInfo.id_card_no }}
             </div>
+          </div>
+        </div>
         <div class="row">
           <div class="inline_block">
             入科方式：
@@ -358,10 +357,10 @@
                       class="inline_block"
                       style="margin-left: 10px; flex: 1"
                     >
-                      穿刺针：
+                      穿刺针:
                       <div
                         class="under_line"
-                        style="width: 100px; text-align: center"
+                        style="width: 120px; text-align: center;white-space:normal;"
                       >
                         {{
                           predialysis.puncture_needle

src/xt_pages/dialysis/template/DialysisPrintOrderSixtyeight.vue

@@ -2624,12 +2624,12 @@
         </div>
 
          <!-- 患者签名 -->
-         <div style="position: relative; left: 70%;top: 20px;">
+         <div style="position: relative; left: 70%;top: 10px;width: 250px;">
           患者签名：
           <div class="under_line" style="width: 120px;">
             <img
               v-if="dialysisOrder != null&& dialysisOrder.url!=''"
-              style="height: 50px"
+              style="height: 60px"
               :src="dialysisOrder == null? 0: dialysisOrder.url"
               alt=""
               srcset=""

src/xt_pages/dialysis/template/DialysisPrintOrderThirtyOne.vue

@@ -592,7 +592,7 @@
                         <div>
                           <span class="under_line" style="width:50px;display:inline-block">
                             {{ afterdialysis.dialysis_during ? afterdialysis.dialysis_during : '/' }}
-                          </span><span v-if="org_id==10028">ml</span><span v-else>g</span>
+                          </span><span>g</span>
                         </div>
                       </td>
                       <td width="100" style="border:none;padding-left:5px">透析器凝血:</td>

src/xt_pages/dialysis/template/DialysisPrintOrdereighty.vue

@@ -1029,7 +1029,7 @@
                     </div>
 
                     <div class="inline_block" style="flex: 1">
-                      透析中入量(L):
+                      透析中入量(g):
                       <div class="under_line"
                         style="width: 70px; text-align: center"
                       >