Kaynağa Gözat

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

28169 1 yıl önce
ebeveyn
işleme
ccd4818375

+ 9 - 5
src/xt_pages/dialysis/batch_print/batch_print_order_seventy.vue Dosyayı Görüntüle

@@ -302,8 +302,7 @@
302 302
                       >
303 303
                         导管:
304 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 308
                             record.assessment_before_dislysis &&
@@ -1911,8 +1910,7 @@
1911 1910
                       <div class="inline_block" style="flex: 1">
1912 1911
                         导管:
1913 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 1916
                             record.assessment_after_dislysis &&
@@ -3065,7 +3063,13 @@ export default {
3065 3063
   white-space: nowrap;
3066 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 3073
 .under_line::before {
3070 3074
   content: "\00A0";
3071 3075
 }

+ 14 - 7
src/xt_pages/dialysis/template/DialysisPrintOrderSeventy.vue Dosyayı Görüntüle

@@ -280,8 +280,8 @@
280 280
                     >
281 281
                       导管:
282 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 286
                         {{ predialysis.catheter ? predialysis.catheter : "/" }}
287 287
                       </div>
@@ -876,9 +876,9 @@
876 876
                             ? prescription.dialysis_dialyszers
877 877
                             : ""
878 878
                         }}
879
-                      
879
+
880 880
                          <span v-if="prescription&&prescription.dialysis_strainer!=''"></span>
881
-                       
881
+
882 882
                       </div>
883 883
                     </div>
884 884
 
@@ -902,14 +902,14 @@
902 902
                         class="under_line"
903 903
                         style="width: 70px; text-align: center"
904 904
                       >
905
-                      {{ 
905
+                      {{
906 906
                            prescription.dialysis_strainer?
907 907
                            prescription.dialysis_strainer:"/"
908 908
                          }}
909 909
                       </div>
910 910
                     </div>
911 911
 
912
-                   
912
+
913 913
 
914 914
                   </div>
915 915
 
@@ -2191,7 +2191,7 @@
2191 2191
                     </div>
2192 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 2195
                         {{ afterdialysis.catheter ? afterdialysis.catheter : "/" }}
2196 2196
                       </div>
2197 2197
                     </div>
@@ -4174,6 +4174,13 @@ export default {
4174 4174
   white-space: nowrap;
4175 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 4185
 .under_line::before {
4179 4186
   content: "\00A0";

Dosya farkı çok büyük olduğundan ihmal edildi
+ 616 - 612
src/xt_pages/workforce/components/editTableData.vue