|
@@ -753,8 +753,7 @@
|
753
|
753
|
<td style="font-size: 16px" width="10%">执行人员</td>
|
754
|
754
|
</tr>
|
755
|
755
|
|
756
|
|
- <tr
|
757
|
|
- v-for="(advice, advice_index) in doctor_advices"
|
|
756
|
+ <tr v-for="(advice, advice_index) in doctor_advices"
|
758
|
757
|
:key="advice_index"
|
759
|
758
|
>
|
760
|
759
|
<td height="32px">
|
|
@@ -1368,7 +1367,7 @@
|
1368
|
1367
|
治疗医生:
|
1369
|
1368
|
<div class="under_line"
|
1370
|
1369
|
style="width: 80px; text-align: center"
|
1371
|
|
- >
|
|
1370
|
+ >
|
1372
|
1371
|
<!-- {{ getAdminUser(prescription.creater) }} -->
|
1373
|
1372
|
<span style="height: 30px; display: inline-block"
|
1374
|
1373
|
v-if=" setAdminUserES(prescription.creater) == ''"
|
|
@@ -1998,7 +1997,7 @@ export default {
|
1998
|
1997
|
return "";
|
1999
|
1998
|
}
|
2000
|
1999
|
for (let i = 0; i < this.adminUser.length; i++) {
|
2001
|
|
- if (this.adminUser[i].id == id) {
|
|
2000
|
+ if (this.adminUser[i].id == id) {
|
2002
|
2001
|
return this.adminUser[i].name;
|
2003
|
2002
|
}
|
2004
|
2003
|
}
|
|
@@ -2352,10 +2351,12 @@ export default {
|
2352
|
2351
|
this.loading = false;
|
2353
|
2352
|
this.doctor_advices =
|
2354
|
2353
|
response.data.data.advices == null ? [] : response.data.data.advices;
|
|
2354
|
+ const advices = response.data.data.doctorAdevieInfo
|
2355
|
2355
|
for (let index = 0; index < this.doctor_advices.length; index++) {
|
2356
|
2356
|
this.doctor_advices[index]["isShow"] = 2;
|
2357
|
2357
|
}
|
2358
|
|
- console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices)
|
|
2358
|
+ this.doctor_advices = this.doctor_advices.concat(advices)
|
|
2359
|
+ console.log("haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",this.doctor_advices,advices)
|
2359
|
2360
|
|
2360
|
2361
|
if(this.org_id == 10489 ){
|
2361
|
2362
|
let projectsOne = [];
|
|
@@ -2560,27 +2561,29 @@ export default {
|
2560
|
2561
|
}
|
2561
|
2562
|
this.doctor_advices = []
|
2562
|
2563
|
this.doctor_advices = docArr
|
|
2564
|
+ console.log('222222222222',docArr);
|
|
2565
|
+
|
2563
|
2566
|
}
|
2564
|
2567
|
|
2565
|
|
- if (this.doctor_advices.length + this.projectsOne.length <= 6) {
|
2566
|
|
- var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
|
2567
|
|
- this.print_length = 6;
|
2568
|
|
-
|
2569
|
|
- for (let index = 0; index < nl; index++) {
|
2570
|
|
- if (
|
2571
|
|
- this.projectsOne[index] == undefined ||
|
2572
|
|
- this.projectsOne[index].length <= 0
|
2573
|
|
- ) {
|
2574
|
|
- this.projectsOne.push([]);
|
2575
|
|
- } else {
|
2576
|
|
- continue;
|
2577
|
|
- }
|
2578
|
|
- }
|
2579
|
|
- }
|
|
2568
|
+ // if (this.doctor_advices.length + this.projectsOne.length <= 6) {
|
|
2569
|
+ // var nl = 6 - (this.doctor_advices.length + this.projectsOne.length);
|
|
2570
|
+ // this.print_length = 6;
|
|
2571
|
+
|
|
2572
|
+ // for (let index = 0; index < nl; index++) {
|
|
2573
|
+ // if (
|
|
2574
|
+ // this.projectsOne[index] == undefined ||
|
|
2575
|
+ // this.projectsOne[index].length <= 0
|
|
2576
|
+ // ) {
|
|
2577
|
+ // this.projectsOne.push([]);
|
|
2578
|
+ // } else {
|
|
2579
|
+ // continue;
|
|
2580
|
+ // }
|
|
2581
|
+ // }
|
|
2582
|
+ // }
|
2580
|
2583
|
|
2581
|
2584
|
|
2582
|
2585
|
this.totollength = this.doctor_advices.length + this.monitors.length;
|
2583
|
|
- console.log("this.totollength",this.totollength)
|
|
2586
|
+ console.log("this.totollength",this.totollength,this.doctor_advices)
|
2584
|
2587
|
|
2585
|
2588
|
|
2586
|
2589
|
if (this.totollength > 18) {
|