瀏覽代碼

8月6,75号打印单

yq1 10 月之前
父節點
當前提交
d916483a09
共有 1 個文件被更改,包括 17 次插入14 次删除
  1. 17 14
      src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue

+ 17 - 14
src/xt_pages/dialysis/batch_print/batch_print_order_seventyfive.vue 查看文件

@@ -597,14 +597,13 @@
597 597
                   style="width: 100px; text-align: center"
598 598
                 > 
599 599
                   <span style="display: inline-block;height: 30px;"></span>
600
-                  <span v-if="setAdminUserES(record.prescription.creater) == ''">
601
-                    {{ getAdminUser(record.prescription.creater)}}
600
+                  <span v-if="setAdminUserES(record.prescription,'creater') == ''">
601
+                    {{ getAdminUser(record.prescription,'creater')}}
602 602
                   </span>
603 603
                   <span style="display: inline-block;" v-else>
604
-                    <img style="height:30px;" :src="setAdminUserES(record.prescription.creater)" alt srcset />
604
+                    <img style="height:30px;" :src="setAdminUserES(record.prescription,'creater')" alt srcset />
605 605
                   </span>
606 606
                 </div>
607
-
608 607
               </div>
609 608
             </div>
610 609
             <!-- 特殊医嘱 -->
@@ -937,7 +936,7 @@
937 936
                   alt=""
938 937
                   srcset=""
939 938
                   v-else
940
-                  style="height: 40px"
939
+                  style="height: 30px"
941 940
                 />
942 941
                 </div>
943 942
               </div>
@@ -1405,15 +1404,19 @@ export default {
1405 1404
             for(let j=0;j<this.records[i].monitor_records.length;j++){
1406 1405
               this.records[i].monitor_records[j].end = ""
1407 1406
               if (this.records[i].dialysis_order &&this.records[i].monitor_records[j].operate_time ==  this.records[i].dialysis_order.end_time) {
1408
-              this.records[i].monitor_records[j].end = "【结束透析】";
1409
-              tempmonitorflag = false;
1410
-            }
1411
-            if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1412
-              this.records[i].monitor_records[j].end = "【结束透析】";
1413
-             }
1414
-             if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1415
-               this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
1416
-             }
1407
+                console.log('1111111',this.records[i].dialysis_order.end_time);
1408
+                
1409
+                this.records[i].monitor_records[j].end = "【结束透析】";
1410
+                tempmonitorflag = false;
1411
+              }
1412
+              if (tempmonitorflag && j == this.records[i].monitor_records.length - 1) {
1413
+                console.log('222222');
1414
+                this.records[i].monitor_records[j].end = "【结束透析】";
1415
+              }
1416
+              // if(this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end == ""){
1417
+              //   console.log('33333',this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end);
1418
+              //   this.records[i].monitor_records[this.records[i].monitor_records.length - 1].end = "【结束透析】"
1419
+              // }
1417 1420
             }
1418 1421
           }
1419 1422
           for (const recordIndex in this.records) {