Browse Source

Merge remote-tracking branch 'origin/20201109_pc_vue_new_branch' into 20201109_pc_vue_new_branch

XMLWAN 3 years ago
parent
commit
232a67c2f3

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

@@ -169,11 +169,11 @@
169 169
                                    抗凝方式:
170 170
                                 </div>
171 171
                                 <div style="height:40px;line-height:40px;">
172
-                                    肝素钠( <span style="width:50px;display:inline-block;"><span v-if="prescription.anticoagulant == '低分子肝素钠'">√</span></span> )
173
-                                    低分子肝素( <span style="width:50px;display:inline-block;"><span v-if="prescription.anticoagulant == '低分子肝素'">√</span></span> )
172
+                                    肝素钠( <span style="width:50px;display:inline-block;"><span v-if="prescription.anticoagulant == '普通肝素'">√</span></span> )
173
+                                    低分子肝素( <span style="width:50px;display:inline-block;"><span v-if="prescription.anticoagulant == '低分子肝素钠' || prescription.anticoagulant == '低分子肝素钙'">√</span></span> )
174 174
                                 </div>
175 175
                                 <div style="height:40px;line-height:40px;">
176
-                                    其他( <span style="width:120px;display:inline-block;"><span v-if="prescription.anticoagulant != '低分子肝素' && prescription.anticoagulant != '低分子肝素钠' && prescription.anticoagulant != '无肝素'">{{ prescription.anticoagulant }}</span></span> )
176
+                                    其他( <span style="width:120px;display:inline-block;"><span v-if="prescription.anticoagulant != '低分子肝素' && prescription.anticoagulant != '低分子肝素钙' && prescription.anticoagulant != '无肝素' && prescription.anticoagulant != '普通肝素'">{{ prescription.anticoagulant ? prescription.anticoagulant : "" }}</span></span> )
177 177
                                 </div>
178 178
                                 <div style="height:40px;line-height:40px;">
179 179
                                     首剂量
@@ -380,10 +380,10 @@
380 380
                 </div>
381 381
                 <div class="inline_block" style="margin-right:30px;">
382 382
                     凝血分级
383
-                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器0') > -1 ? true : false) :false" showValue="0"></label-box>
384
-                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+') > -1 ? true : false) :false" showValue="1"></label-box>
385
-                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器++') > -1 ? true : false) :false" showValue="2"></label-box>
386
-                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor.indexOf('透析器+++') > -1 ? true : false) :false" showValue="3"></label-box>
383
+                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器0' ? true : false) :false" showValue="0"></label-box>
384
+                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+' ? true : false) :false" showValue="1"></label-box>
385
+                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器++' ? true : false) :false" showValue="2"></label-box>
386
+                    <label-box :isChecked="afterdialysis.cruor ? (afterdialysis.cruor == '透析器+++' ? true : false) :false" showValue="3"></label-box>
387 387
                 </div>
388 388
             </div>
389 389
             <div class="row" style="height:80px;">

+ 1 - 1
src/xt_pages/stock/stockOutOrderDetailPrint.vue View File

@@ -63,7 +63,7 @@
63 63
                         <div v-if="orgId == 10024" style="display:flex;margin-top:1px;float:right;">
64 64
                           <div style="width:50px;">科室:</div><div style="width:60px;"></div>
65 65
                           <div style="width:70px;">领料人:</div><div style="width:60px;"></div>
66
-                          <div style="width:80px;">审批:</div><div style="width:100px;"></div>
66
+                          <div style="width:80px;">审批:</div><div style="width:100px;">肖庆娥</div>
67 67
                           <div style="width:50px;">会计:</div><div style="width:100px;">徐立琼</div>
68 68
                           <div style="width:50px;">审核:</div><div style="width:100px;">徐立琼</div>
69 69
                           <div style="width:70px;">制单人:</div><div style="width:100px;">徐立琼</div>