|
|
@@ -104,49 +104,6 @@
|
|
104
|
104
|
|
|
105
|
105
|
</el-table>
|
|
106
|
106
|
|
|
107
|
|
-<!-- <el-table :data="tableDataTwo" border :row-style="{ color: '#303133' }" ref="table"-->
|
|
108
|
|
-<!-- :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}"-->
|
|
109
|
|
-<!-- highlight-current-row>-->
|
|
110
|
|
-
|
|
111
|
|
-<!-- <el-table-column align="center" prop="name" label="患者名字">-->
|
|
112
|
|
-<!-- <template slot-scope="scope">{{ scope.row.patient_name }}</template>-->
|
|
113
|
|
-<!-- </el-table-column>-->
|
|
114
|
|
-
|
|
115
|
|
-<!-- <el-table-column align="center" prop="name" label="创建时间">-->
|
|
116
|
|
-<!-- <template slot-scope="scope">{{scope.row.record_date)}}</template>-->
|
|
117
|
|
-<!-- </el-table-column>-->
|
|
118
|
|
-<!--<!– <el-table-column align="center" prop="name" label="创建医生">–>-->
|
|
119
|
|
-<!--<!– <template slot-scope="scope">{{scope.row.doctor_name}}</template>–>-->
|
|
120
|
|
-<!--<!– </el-table-column>–>-->
|
|
121
|
|
-<!-- <el-table-column align="center" prop="name" label="项目名称">-->
|
|
122
|
|
-<!-- <template slot-scope="scope">-->
|
|
123
|
|
-<!-- <div>{{scope.row.project_name}}</div>-->
|
|
124
|
|
-<!-- </template>-->
|
|
125
|
|
-<!-- </el-table-column>-->
|
|
126
|
|
-
|
|
127
|
|
-<!-- <el-table-column-->
|
|
128
|
|
-<!-- align="center"-->
|
|
129
|
|
-<!-- label="操作"-->
|
|
130
|
|
-<!-- width="180"-->
|
|
131
|
|
-<!-- class-name="small-padding fixed-width"-->
|
|
132
|
|
-<!-- >-->
|
|
133
|
|
-<!-- <template slot-scope="scope">-->
|
|
134
|
|
-<!-- <el-tooltip class="item" effect="dark" content="打印" placement="top">-->
|
|
135
|
|
-<!-- <el-button-->
|
|
136
|
|
-<!-- type="primary"-->
|
|
137
|
|
-<!-- size="small"-->
|
|
138
|
|
-<!-- icon="el-icon-printer"-->
|
|
139
|
|
-<!-- @click="Print(scope.row, scope.$index)"-->
|
|
140
|
|
-<!-- >-->
|
|
141
|
|
-
|
|
142
|
|
-<!-- <!– icon="el-icon-edit-outline" –>-->
|
|
143
|
|
-<!-- </el-button>-->
|
|
144
|
|
-<!-- </el-tooltip>-->
|
|
145
|
|
-<!-- </template>-->
|
|
146
|
|
-<!-- </el-table-column>-->
|
|
147
|
|
-
|
|
148
|
|
-
|
|
149
|
|
-<!-- </el-table>-->
|
|
150
|
107
|
|
|
151
|
108
|
<el-pagination
|
|
152
|
109
|
v-if="isShow"
|
|
|
@@ -177,11 +134,11 @@
|
|
177
|
134
|
<div>{{getTime(current_ctime,'{m}-{d}')}}</div>
|
|
178
|
135
|
<div>{{getTime(current_ctime,'{h}:{i}')}}</div>
|
|
179
|
136
|
</div>
|
|
180
|
|
- <img style="width:300px;height:200px;margin-left:10px;" id="barcode">
|
|
|
137
|
+ <img v-if="$store.getters.xt_user.org.id != 0 && $store.getters.xt_user.org.id != 10138" style="width:300px;height:200px;margin-left:10px;" id="barcode">
|
|
181
|
138
|
</div>
|
|
182
|
139
|
<div style="margin-bottom:5px;">{{current_number}}</div>
|
|
183
|
140
|
<div style="display:flex;">
|
|
184
|
|
- <div style="padding-left:20px;">{{current_project_name}}</div>
|
|
|
141
|
+ <div style="font-size:24px;padding-left:20px;">{{current_project_name}}</div>
|
|
185
|
142
|
<div style="font-size:24px;margin-left:20px;">{{current_name}}</div>
|
|
186
|
143
|
</div>
|
|
187
|
144
|
</div>
|
|
|
@@ -250,6 +207,10 @@
|
|
250
|
207
|
},
|
|
251
|
208
|
methods: {
|
|
252
|
209
|
printTwo(){
|
|
|
210
|
+ if(this.selecting_schs.length == 0){
|
|
|
211
|
+ this.$message.error("请选择需要组合打印的记录")
|
|
|
212
|
+ return
|
|
|
213
|
+ }
|
|
253
|
214
|
let patient_ids = []
|
|
254
|
215
|
for(let i = 0; i < this.selecting_schs.length; i++){
|
|
255
|
216
|
patient_ids.push(this.selecting_schs[i].patient_id)
|
|
|
@@ -259,43 +220,51 @@
|
|
259
|
220
|
this.$message.error("请选择同一患者打印")
|
|
260
|
221
|
return
|
|
261
|
222
|
}else{
|
|
262
|
|
- let ids = []
|
|
263
|
223
|
var name = ""
|
|
264
|
224
|
var patient_name = ""
|
|
265
|
225
|
var team_ids = ""
|
|
266
|
|
- var project_ids = ""
|
|
267
|
|
-
|
|
|
226
|
+ var ids = ""
|
|
268
|
227
|
|
|
|
228
|
+ var project_ids = ""
|
|
269
|
229
|
for(let i = 0; i < this.selecting_schs.length; i++){
|
|
270
|
|
- ids.push(this.selecting_schs[i].id)
|
|
|
230
|
+ if(ids.length == 0){
|
|
|
231
|
+ ids = this.selecting_schs[i].id
|
|
|
232
|
+ }else{
|
|
|
233
|
+ ids = ids + "," + this.selecting_schs[i].id
|
|
|
234
|
+ }
|
|
271
|
235
|
patient_name = this.selecting_schs[0].patient_name
|
|
272
|
236
|
if(name.length == 0){
|
|
273
|
237
|
name = this.selecting_schs[i].project_name
|
|
274
|
238
|
}else{
|
|
275
|
239
|
name = name + "," + this.selecting_schs[i].project_name
|
|
276
|
|
-
|
|
277
|
240
|
}
|
|
278
|
|
-
|
|
279
|
241
|
if(team_ids.length == 0){
|
|
280
|
|
- if(this.selecting_schs[i].team_id > 0) {
|
|
281
|
|
- team_ids = this.selecting_schs[i].team_id
|
|
|
242
|
+ if(this.selecting_schs[i].item_id > 0) {
|
|
|
243
|
+ team_ids = this.selecting_schs[i].item_id
|
|
282
|
244
|
}
|
|
283
|
245
|
}else{
|
|
284
|
|
- if(this.selecting_schs[i].team_id > 0) {
|
|
285
|
|
- team_ids = team_ids + "," + this.selecting_schs[i].team_id
|
|
|
246
|
+ if(this.selecting_schs[i].item_id > 0) {
|
|
|
247
|
+ team_ids = team_ids + "," + this.selecting_schs[i].item_id
|
|
286
|
248
|
}
|
|
287
|
249
|
}
|
|
288
|
250
|
|
|
289
|
251
|
if(project_ids.length == 0){
|
|
290
|
|
- if(this.selecting_schs[i].team_id > 0) {
|
|
291
|
|
- project_ids = this.selecting_schs[i].project_ids
|
|
|
252
|
+ console.log(this.selecting_schs[i])
|
|
|
253
|
+ if(this.selecting_schs[i].item_id == 0) {
|
|
|
254
|
+ project_ids = this.selecting_schs[i].project_id
|
|
|
255
|
+ console.log(project_ids)
|
|
|
256
|
+
|
|
292
|
257
|
}
|
|
293
|
258
|
}else{
|
|
294
|
|
- if(this.selecting_schs[i].team_id > 0) {
|
|
295
|
|
- project_ids = project_ids + "," + this.selecting_schs[i].project_ids
|
|
|
259
|
+ if(this.selecting_schs[i].item_id == 0) {
|
|
|
260
|
+ project_ids = project_ids + "," + this.selecting_schs[i].project_id
|
|
|
261
|
+ console.log(project_ids)
|
|
|
262
|
+
|
|
296
|
263
|
}
|
|
297
|
264
|
}
|
|
298
|
265
|
}
|
|
|
266
|
+ console.log(project_ids)
|
|
|
267
|
+
|
|
299
|
268
|
let params = {
|
|
300
|
269
|
patient_id: patient_ids[0],
|
|
301
|
270
|
ids: ids,
|
|
|
@@ -341,6 +310,7 @@
|
|
341
|
310
|
is_team:0,
|
|
342
|
311
|
record_date:this.chargeDate,
|
|
343
|
312
|
}
|
|
|
313
|
+
|
|
344
|
314
|
this.current_params = params
|
|
345
|
315
|
console.log(this.current_params)
|
|
346
|
316
|
if(!this.current_params.is_combination_print){
|
|
|
@@ -361,10 +331,10 @@
|
|
361
|
331
|
this.$message.error(response.data.msg)
|
|
362
|
332
|
return false
|
|
363
|
333
|
} else {
|
|
364
|
|
- this.current_ctime = row.ctime
|
|
365
|
|
- this.current_number = row.number
|
|
366
|
|
- this.current_project_name = row.project_name
|
|
367
|
|
- this.current_name = row.patient_name
|
|
|
334
|
+ this.current_ctime = response.data.data.hlpsi.ctime
|
|
|
335
|
+ this.current_number = ""
|
|
|
336
|
+ this.current_project_name = name
|
|
|
337
|
+ this.current_name = patient_name
|
|
368
|
338
|
this.$nextTick(() => {
|
|
369
|
339
|
JsBarcode('#barcode',response.data.data.hlpsi.id, {
|
|
370
|
340
|
format: 'CODE39',
|
|
|
@@ -392,10 +362,10 @@
|
|
392
|
362
|
this.$message.error(response.data.msg)
|
|
393
|
363
|
return false
|
|
394
|
364
|
} else {
|
|
395
|
|
- this.current_ctime = row.ctime
|
|
396
|
|
- this.current_number = row.number
|
|
397
|
|
- this.current_project_name = row.project_name
|
|
398
|
|
- this.current_name = row.patient_name
|
|
|
365
|
+ this.current_ctime = response.data.data.hlpsi.ctime
|
|
|
366
|
+ this.current_number =""
|
|
|
367
|
+ this.current_project_name = name
|
|
|
368
|
+ this.current_name = patient_name
|
|
399
|
369
|
this.$nextTick(() => {
|
|
400
|
370
|
JsBarcode('#barcode',response.data.data.hlpsi.id, {
|
|
401
|
371
|
format: 'CODE39',
|
