Browse Source

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

28169 1 year ago
parent
commit
ccd4818375

+ 9 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue View File

302
                       >
302
                       >
303
                         导管:
303
                         导管:
304
                         <div
304
                         <div
305
-                          class="under_line"
306
-                          style="width: 200px; text-align: center"
305
+                          style="width: 90%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
307
                         >
306
                         >
308
                           {{
307
                           {{
309
                             record.assessment_before_dislysis &&
308
                             record.assessment_before_dislysis &&
1911
                       <div class="inline_block" style="flex: 1">
1910
                       <div class="inline_block" style="flex: 1">
1912
                         导管:
1911
                         导管:
1913
                         <div
1912
                         <div
1914
-                          class="under_line"
1915
-                          style="min-width: 120px; text-align: center"
1913
+                          style="width: 70%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
1916
                         >
1914
                         >
1917
                           {{
1915
                           {{
1918
                             record.assessment_after_dislysis &&
1916
                             record.assessment_after_dislysis &&
3065
   white-space: nowrap;
3063
   white-space: nowrap;
3066
   width: 50%;
3064
   width: 50%;
3067
 }
3065
 }
3068
-
3066
+.under_line2 {
3067
+  display: inline-block;
3068
+  border-bottom: 1px solid #999;
3069
+  text-align: center;
3070
+  /* white-space: nowrap; */
3071
+  width: 50%;
3072
+}
3069
 .under_line::before {
3073
 .under_line::before {
3070
   content: "\00A0";
3074
   content: "\00A0";
3071
 }
3075
 }

+ 14 - 7
src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue View File

280
                     >
280
                     >
281
                       导管:
281
                       导管:
282
                       <div
282
                       <div
283
-                        class="under_line"
284
-                        style="width: 200px; text-align: center"
283
+
284
+                        style="width: 90%; text-align: left;display: inline-block;border-bottom: 1px solid #999;"
285
                       >
285
                       >
286
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
286
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
287
                       </div>
287
                       </div>
876
                             ? prescription.dialysis_dialyszers
876
                             ? prescription.dialysis_dialyszers
877
                             : ""
877
                             : ""
878
                         }}
878
                         }}
879
-                      
879
+
880
                          <span v-if="prescription&&prescription.dialysis_strainer!=''"></span>
880
                          <span v-if="prescription&&prescription.dialysis_strainer!=''"></span>
881
-                       
881
+
882
                       </div>
882
                       </div>
883
                     </div>
883
                     </div>
884
 
884
 
902
                         class="under_line"
902
                         class="under_line"
903
                         style="width: 70px; text-align: center"
903
                         style="width: 70px; text-align: center"
904
                       >
904
                       >
905
-                      {{ 
905
+                      {{
906
                            prescription.dialysis_strainer?
906
                            prescription.dialysis_strainer?
907
                            prescription.dialysis_strainer:"/"
907
                            prescription.dialysis_strainer:"/"
908
                          }}
908
                          }}
909
                       </div>
909
                       </div>
910
                     </div>
910
                     </div>
911
 
911
 
912
-                   
912
+
913
 
913
 
914
                   </div>
914
                   </div>
915
 
915
 
2191
                     </div>
2191
                     </div>
2192
                     <div class="inline_block" style="flex:1;">
2192
                     <div class="inline_block" style="flex:1;">
2193
                       导管:
2193
                       导管:
2194
-                      <div class="under_line" style="min-width: 120px;text-align: center">
2194
+                      <div style="width: 80%;text-align: left;display: inline-block;border-bottom: 1px solid #999; ">
2195
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
2195
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
2196
                       </div>
2196
                       </div>
2197
                     </div>
2197
                     </div>
4174
   white-space: nowrap;
4174
   white-space: nowrap;
4175
   width: 50%;
4175
   width: 50%;
4176
 }
4176
 }
4177
+.under_line2 {
4178
+  display: inline-block;
4179
+  border-bottom: 1px solid #999;
4180
+  text-align: center;
4181
+  /* white-space: nowrap; */
4182
+  width: 50%;
4183
+}
4177
 
4184
 
4178
 .under_line::before {
4185
 .under_line::before {
4179
   content: "\00A0";
4186
   content: "\00A0";

File diff suppressed because it is too large
+ 616 - 612
src/xt_pages/workforce/components/editTableData.vue