Browse Source

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

XMLWAN 3 years ago
parent
commit
16645f6e7b

+ 15 - 0
src/xt_pages/dialysis/template/DialysisPrintOrderForty.vue View File

880
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
880
         <td>&nbsp;{{monitor.dialysate_temperature}}</td>
881
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
881
         <td>&nbsp;{{monitor.replacement_rate}}</td> -->
882
           <td>
882
           <td>
883
+            <template v-if="(dialysisOrder && monitor.operate_time == dialysisOrder.start_time)">【开始透析】</template>
883
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
884
             &nbsp;{{ monitor.symptom }} &nbsp;{{ monitor.dispose }} &nbsp;{{ monitor.result }}
884
           </td>
885
           </td>
885
           <td>
886
           <td>
2102
                 this.monitors.push([])
2103
                 this.monitors.push([])
2103
               }
2104
               }
2104
             }
2105
             }
2106
+
2107
+            for (let index = 0; index < this.monitors.length; index++) {
2108
+              const monitor = this.monitors[index]
2109
+              this.monitors[index].end = ''
2110
+              if (Object.keys(monitor).length > 0 && index > 1) {
2111
+                if (this.dialysisOrder && monitor.operate_time == this.dialysisOrder.end_time) {
2112
+                  this.monitors[index].end = '【结束透析】'
2113
+                  tempmonitorflag = false
2114
+                }
2115
+                if (tempmonitorflag && index == this.monitors.length - 1) {
2116
+                  this.monitors[index].end = '【结束透析】'
2117
+                }
2118
+              }
2119
+            }
2105
             this.jilurow = this.monitors.length + 1
2120
             this.jilurow = this.monitors.length + 1
2106
 
2121
 
2107
             this.advice_jilurow = this.advices.length + 1
2122
             this.advice_jilurow = this.advices.length + 1

+ 2 - 2
src/xt_pages/outpatientDoctorStation/template/printThree.vue View File

3
   <div id='prescriptionPrint'>
3
   <div id='prescriptionPrint'>
4
     <div v-for="(item,index) in advicePrint" :key="index">
4
     <div v-for="(item,index) in advicePrint" :key="index">
5
       <div id='prescription-print'  v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
5
       <div id='prescription-print'  v-for='(i,pageIndex) in item.pageArr.length' :key="pageIndex" class="prescription-print" style="page-break-after: always;">
6
-          <img src="../../../assets/img/bailinTop.jpg" alt="">
6
+          <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
7
           <div class="printTitle">处方笺</div>
7
           <div class="printTitle">处方笺</div>
8
           <div style="display:flex;">
8
           <div style="display:flex;">
9
             <div style="width:33%;display:flex;">费别:<span class="under_line"></span></div>
9
             <div style="width:33%;display:flex;">费别:<span class="under_line"></span></div>
66
           </div>
66
           </div>
67
           <div>*处方当日有效,特殊情况可适当延长,一般不超过3天</div>
67
           <div>*处方当日有效,特殊情况可适当延长,一般不超过3天</div>
68
           <div>*药品属于特殊商品,非质量问题不允许退换</div>
68
           <div>*药品属于特殊商品,非质量问题不允许退换</div>
69
-          <img src="../../../assets/img/bailinBottom.jpg" alt="">
69
+          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
70
           <!-- <div class="doctorBox">
70
           <!-- <div class="doctorBox">
71
               <p>医师:{{item.doctor?item.doctor:""}}</p>
71
               <p>医师:{{item.doctor?item.doctor:""}}</p>
72
               <p>日期:{{getTime(item.ctime)?getTime(item.ctime):""}}</p>
72
               <p>日期:{{getTime(item.ctime)?getTime(item.ctime):""}}</p>

+ 2 - 2
src/xt_pages/outpatientDoctorStation/treatTemplate/printTwo.vue View File

2
    <div id='prescriptionPrint'>
2
    <div id='prescriptionPrint'>
3
     <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
3
     <div id='prescription-print' class="prescription-print" v-for="(item,index) in advicePrint" :key="index">
4
 
4
 
5
-        <img src="../../../assets/img/bailinTop.jpg" alt="">
5
+        <img src="../../../assets/img/bailinTop.jpg" style="width:100%" alt="">
6
         <div class="printTitle">治疗单</div>
6
         <div class="printTitle">治疗单</div>
7
         <div style="display:flex;">
7
         <div style="display:flex;">
8
             <div style="width:33%;display:flex;">费别:<span class="under_line">深圳医保1档</span></div>
8
             <div style="width:33%;display:flex;">费别:<span class="under_line">深圳医保1档</span></div>
89
           <div style="display:flex;">
89
           <div style="display:flex;">
90
             打印时间:<span style="border-bottom:1px solid #000;">{{getTime(new Date())?getTime(new Date()):""}}</span>
90
             打印时间:<span style="border-bottom:1px solid #000;">{{getTime(new Date())?getTime(new Date()):""}}</span>
91
           </div>
91
           </div>
92
-          <img src="../../../assets/img/bailinBottom.jpg" alt="">
92
+          <img src="../../../assets/img/bailinBottom.jpg" style="width:100%" alt="">
93
           <div style="page-break-after:always"></div>
93
           <div style="page-break-after:always"></div>
94
      </div>
94
      </div>
95
 
95