2 Комити a7c4f8bd88 ... eba91cd406

Аутор SHA1 Порука Датум
  yq1 eba91cd406 Merge remote-tracking branch 'origin/20230223_pc_vue_new_branch' into 20230223_pc_vue_new_branch пре 1 месец
  yq1 5f4a2f67b7 9月11,武穴结算单 пре 1 месец

+ 3 - 3
src/xt_pages/outpatientCharges/listPrint.vue Прегледај датотеку

@@ -186,7 +186,7 @@
186 186
                     obj['spec'] = ''
187 187
                     obj['unit'] =  infos.project.project.unit
188 188
                     obj['is_total']= 0
189
-
189
+                    obj['record_date'] = infos.project.record_date
190 190
 
191 191
                   }else if (infos.project.type == 3){
192 192
                     obj['name'] = infos.project.good_info.good_name
@@ -194,7 +194,7 @@
194 194
                     obj['code'] = infos.project.good_info.medical_insurance_number
195 195
                     obj['unit'] = infos.project.good_info.packing_unit
196 196
                     obj['is_total']= 0
197
-
197
+                    obj['record_date'] = infos.project.record_date
198 198
                   }
199 199
 
200 200
                 }
@@ -207,7 +207,7 @@
207 207
                   obj['feedetl_sn'] =  infos.feedetl_sn
208 208
                   obj['spec'] =  infos.advice.drug.dose +  infos.advice.drug.dose_unit+"*" + infos.advice.drug.min_number +  infos.advice.drug.min_unit+"/"+infos.advice.drug.max_unit
209 209
                   obj['is_total']= 0
210
-
210
+                  obj['record_date'] = infos.advice.record_date
211 211
                   // v-if="scope.row.min_unit != scope.row.dose_unit">{{ scope.row.dose }}{{ scope.row.dose_unit }}&nbsp;* &nbsp;</span>{{ scope.row.min_number }}{{ scope.row.min_unit }}/{{ scope.row.max_unit }}
212 212
 
213 213
 

+ 4 - 2
src/xt_pages/outpatientCharges/listTemplate/listPrintforu.vue Прегледај датотеку

@@ -24,7 +24,7 @@
24 24
         
25 25
         <table class="listTable" style="text-align: center;">
26 26
             <tr style="border-bottom: 1px solid black;">
27
-              <td style="width:12%" v-if="org_id==10489">开方日期</td>
27
+              <td style="width:12%" v-if="org_id==10489 || org_id==0">开方日期</td>
28 28
               <td style="width:20%">医保编码</td>
29 29
               <td style="width:20%">项目名称</td>
30 30
               <td style="width:13%">规格</td>
@@ -35,7 +35,9 @@
35 35
               <td style="width:8%">自付比例</td>
36 36
             </tr>
37 37
             <tr v-for="(item,index) in list" style="line-height: 30px;">
38
-                <td style="width:12%" v-if="org_id==10489">{{getTimes(order.settle_accounts_date) }}</td>
38
+                <td style="width:12%" v-if="org_id==10489|| org_id==0">
39
+                  <span v-if="item.code!=undefined">{{getTimes(item.record_date) }}</span>
40
+                </td>
39 41
                 <td style="width:20%">{{item.code}}</td>
40 42
                 <td style="width:20%">{{item.name}}</td>
41 43
                 <td style="width:13%">{{item.spec}}</td>