Bläddra i källkod

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

test_user 2 år sedan
förälder
incheckning
c32143cf90

Filskillnaden har hållits tillbaka eftersom den är för stor
+ 918 - 462
src/xt_pages/dialysis/batch_print/batch_print_order_fiftyThree.vue


+ 1 - 13
src/xt_pages/dialysis/batch_print/batch_print_order_twelve.vue Visa fil

@@ -1041,19 +1041,7 @@
1041 1041
                     <td colspan="3" style="width:130px;height:40px">
1042 1042
                       执行时间
1043 1043
                     </td>
1044
-                    <!-- <td style="width:60px;height:60px">
1045
-              <p style="height:20px;line-height:20px">核对</p>
1046
-            </td>
1047
-            <td style="width:60px;height:40px">
1048
-              <p style="height:20px;line-height:20px">上次透后体重</p>
1049
-            </td>
1050
-            <td style="width:60px;height:40px">
1051
-              {{
1052
-                assessmentafter.weight_after
1053
-                  ? assessmentafter.weight_after
1054
-                  : "0"
1055
-              }}kg
1056
-            </td> -->
1044
+             
1057 1045
                   </tr>
1058 1046
 
1059 1047
                   <tr

+ 1 - 1
src/xt_pages/dialysis/bloodPresssWatch.vue Visa fil

@@ -338,7 +338,7 @@
338 338
           type="primary"
339 339
           >批量打印</el-button>
340 340
       </template>
341
-         <template v-if="this.template_id == 53">
341
+      <template v-if="this.template_id == 53">
342 342
         <el-button
343 343
           size="small"
344 344
           icon="el-icon-printer"

+ 11 - 11
src/xt_pages/dialysis/template/DialysisPrintOrderTwentyFour.vue Visa fil

@@ -605,17 +605,17 @@
605 605
                           <tr>
606 606
                               <td width='70'>抗凝方式</td>
607 607
                               <td width='100'>
608
-                                  <label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box>
609
-                                  <label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box>
610
-                                  <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box>
611
-                                  <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box>
612
-                                  <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box>
613
-                                  <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box>
614
-                                  <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box>
615
-                                  <label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box>
616
-                                  <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box>
617
-                                  <label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box>
618
-                                  <label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box>
608
+                                <span v-if="prescription.anticoagulant == 3"><label-box :isChecked="prescription.anticoagulant == 3 ? true : false" showValue="低分子肝素"></label-box></span>  
609
+                                <span v-if="prescription.anticoagulant == 4"><label-box :isChecked="prescription.anticoagulant == 4 ? true : false" showValue="阿加曲班"></label-box></span>  
610
+                                <span v-if="prescription.anticoagulant == 5"> <label-box :isChecked="prescription.anticoagulant == 5 ? true : false" showValue="枸橼酸钠"></label-box></span> 
611
+                                <span v-if="prescription.anticoagulant == 6"> <label-box :isChecked="prescription.anticoagulant == 6 ? true : false" showValue="低分子肝素钙"></label-box></span> 
612
+                                <span v-if="prescription.anticoagulant == 7"> <label-box :isChecked="prescription.anticoagulant == 7 ? true : false" showValue="低分子肝素钠"></label-box></span> 
613
+                                <span v-if="prescription.anticoagulant == 8"> <label-box :isChecked="prescription.anticoagulant == 8 ? true : false" showValue="依诺肝素"></label-box></span>  
614
+                                <span v-if="prescription.anticoagulant == 9"> <label-box :isChecked="prescription.anticoagulant == 9 ? true : false" showValue="达肝素"></label-box></span> 
615
+                                <span v-if="prescription.anticoagulant == 10"><label-box :isChecked="prescription.anticoagulant == 10 ? true : false" showValue="体外抗凝"></label-box></span>  
616
+                                <span v-if="prescription.anticoagulant == 11"> <label-box :isChecked="prescription.anticoagulant == 11 ? true : false" showValue="那屈肝素"></label-box></span>  
617
+                                <span v-if="prescription.anticoagulant == 12"><label-box :isChecked="prescription.anticoagulant == 12 ? true : false" showValue="无抗凝剂"></label-box></span>  
618
+                                <span v-if="prescription.anticoagulant == 13"><label-box :isChecked="prescription.anticoagulant == 13 ? true : false" showValue="那屈肝素钙"></label-box></span>  
619 619
                               </td>
620 620
                               <!-- <td width='100'>
621 621
                                   <div class="under-line">

+ 1 - 1
src/xt_pages/management/home.vue Visa fil

@@ -1319,7 +1319,7 @@
1319 1319
                                    <el-col :span="8">
1320 1320
                                       <el-form-item label="空气滤网清洁:">
1321 1321
                                         <el-checkbox v-model="userform.clean">清洁</el-checkbox>
1322
-                                      <span class="warn" v-show="warnShowThree">您已个月未清洁,请检查</span>
1322
+                                      <span class="warn" v-show="warnShowThree">您已个月未清洁,请检查</span>
1323 1323
                                       </el-form-item>
1324 1324
                                      </el-col>
1325 1325
                                    <el-col :span="8">

+ 1 - 1
src/xt_pages/workforce/components/tableWeeks.vue Visa fil

@@ -907,7 +907,7 @@
907 907
             path: '/schedule/remind/print/setting/one?week_type=' + this.week_type + '&week_time=' + this.week_time + '&zone=' + str + '&prestatus=' + this.pre_status+"&type="+1
908 908
           })
909 909
         }
910
-        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340){
910
+        if(this.org_id != 9671 && this.org_id != 9675 && this.org_id != 10340 && this.org_id != 0){
911 911
           var zone = this.zone
912 912
           console.log("zone23232",zone)
913 913
           var newArr = []

+ 23 - 22
src/xt_pages/workforce/remind_print_setting_one.vue Visa fil

@@ -18,22 +18,25 @@
18 18
       <div id="print_content">
19 19
         <div class="print_main_content">
20 20
           <div class="table_panel" v-loding="loading"  element-loading-text="拼命加载中">
21
-            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''">
22
-             
23
-
24
-              <div class="signPrint" style="font-size:16px;">
25
-                <div style="font-size:24px;font-weight: 400;">姓名:
26
-                  <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
27
-                  <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
28
-                  <span v-if="type ==1 && printObj.name == 1">({{ main_collection.patient.dialysis_no }},
29
-                  <span> {{getGender(main_collection.patient.gender)}},</span> 
30
-                    {{getNewAge(main_collection.patient.id_card_no) }}岁)</span> 
31
-                  <span v-if="type ==2 && printObj.name == 1">({{ main_collection.dialysis_no }},
32
-                  <span>{{getGender(main_collection.gender) }},</span>  
33
-                    {{getNewAge(main_collection.id_card_no) }}岁)</span> 
34
-                  
35
-                </div>
36
-                <div class="printCell">
21
+            <div v-for="(main_collection,index) in scheduleData" :key="index" :class="(org_id == 9671 || org_id == 10340) && parseInt((index+1)%8) == 0  ? 'page-break-after':''"
22
+            style="display: inline-block; width: 42%; margin: 0px 35px 20px; 
23
+            border: 1px solid black;
24
+            box-sizing: border-box;">
25
+              <!-- <div style="display: flex;justify-content: space-between;flex-wrap: wrap;">
26
+                box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 20px rgba(0, 0, 0, 0.06) inset; -->
27
+                <div class="signPrint" style="font-size:16px;  ">
28
+                  <div style="font-size:24px;font-weight: 400;">姓名:
29
+                    <span v-if="type ==1 && printObj.name == 1">{{main_collection.patient.name}} </span>
30
+                    <span v-if="type ==2 && printObj.name == 1">{{main_collection.patient}} </span>
31
+                    <span v-if="type ==1 && printObj.name == 1">({{ main_collection.patient.dialysis_no }},
32
+                    <span> {{getGender(main_collection.patient.gender)}},</span> 
33
+                      {{getNewAge(main_collection.patient.id_card_no) }}岁)</span> 
34
+                    <span v-if="type ==2 && printObj.name == 1">({{ main_collection.dialysis_no }},
35
+                    <span>{{getGender(main_collection.gender) }},</span>  
36
+                      {{getNewAge(main_collection.id_card_no) }}岁)</span> 
37
+                    
38
+                  </div>
39
+               <div class="printCell">
37 40
                   透析模式:
38 41
                     <span>{{getModeId(main_collection.mode_id)}}</span>
39 42
                   
@@ -186,9 +189,6 @@
186 189
                     分区/床号:
187 190
                     <span  style="width:auto;">{{main_collection.zone.name}}/</span>
188 191
                     {{ main_collection.number.number }}
189
-                    <!-- <span style="width:auto;" v-if="main_collection.schedule_type == 1">上午</span>
190
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 2">下午</span>
191
-                    <span style="width:auto;" v-if="main_collection.schedule_type == 3">晚上</span> -->
192 192
                   </span>
193 193
                  
194 194
                 </div>
@@ -203,7 +203,8 @@
203 203
                  
204 204
                 </div>
205 205
               
206
-              </div>
206
+                </div> 
207
+              <!-- </div> -->
207 208
            </div>
208 209
           </div>
209 210
         </div>
@@ -815,8 +816,8 @@
815 816
   -webkit-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 60px rgba(0, 0, 0, 0.06) inset;
816 817
   -moz-box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
817 818
   box-shadow: 0 1px 4px rgba(0, 0, 0, 0.27), 0 0 40px rgba(0, 0, 0, 0.06) inset;
818
-  margin-bottom: 20px;
819
-  padding: 20px 10px;
819
+  // margin-bottom: 20px;
820
+  padding: 20px 5px;
820 821
 }
821 822
 .printCell{
822 823
   span{