|
@@ -788,7 +788,7 @@
|
788
|
788
|
</tr>
|
789
|
789
|
|
790
|
790
|
<tr v-for="monitor in monitors" :key="monitor.id">
|
791
|
|
- <td>
|
|
791
|
+ <td style="height:40px;">
|
792
|
792
|
|
793
|
793
|
<!-- <template>
|
794
|
794
|
<span v-if="monitor.monitoring_date">
|
|
@@ -857,13 +857,13 @@
|
857
|
857
|
<!-- <template v-for="group in doctor_advices" > -->
|
858
|
858
|
|
859
|
859
|
<tr v-for="(advice, advice_index) in doctor_advices" :key="advice_index">
|
860
|
|
- <td height="32px">
|
|
860
|
+ <td height="40px">
|
861
|
861
|
<span v-if="advice.start_time">
|
862
|
862
|
{{ getTime(advice.start_time, "{h}:{i}") }}
|
863
|
863
|
</span>
|
864
|
864
|
<!-- <span v-else> <br/> </span> -->
|
865
|
865
|
</td>
|
866
|
|
- <td height="32px" colspan="2" class="advice-name" style="padding-left:7px;">
|
|
866
|
+ <td height="40px" colspan="2" class="advice-name" style="padding-left:7px;">
|
867
|
867
|
<span v-if="advice.parent_id > 0">---></span>
|
868
|
868
|
<span>{{ advice.advice_name }}</span>
|
869
|
869
|
<span v-if="advice && advice.advice_desc">({{ advice.advice_desc }}{{ advice.drug_spec_unit }})</span>
|
|
@@ -879,15 +879,15 @@
|
879
|
879
|
<span v-if="advice.remark.length > 0">({{advice.remark}})</span>
|
880
|
880
|
</td> -->
|
881
|
881
|
<!-- <td width="10%" v-if="(advice.children && advice.children.length > 0 || advice.parent_id > 0) && advice.isShow == 2" ></td> -->
|
882
|
|
- <td height="32px">
|
|
882
|
+ <td height="40px">
|
883
|
883
|
<span v-if="setAdminUserES(advice.advice_doctor) == ''">{{ getAdminUser(advice.advice_doctor) }}</span>
|
884
|
884
|
<img style="height:30px;" :src="setAdminUserES(advice.advice_doctor)" alt="" srcset="" v-else />
|
885
|
885
|
</td>
|
886
|
|
- <td height="32px">
|
|
886
|
+ <td height="40px">
|
887
|
887
|
<span v-if="setAdminUserES(advice.execution_staff) == ''">{{ getAdminUser(advice.execution_staff) }}</span>
|
888
|
888
|
<img style="height:30px;" :src="setAdminUserES(advice.execution_staff)" alt srcset v-else />
|
889
|
889
|
</td>
|
890
|
|
- <td height="32px">
|
|
890
|
+ <td height="40px">
|
891
|
891
|
<span v-if="advice.execution_time">{{ getTime(advice.execution_time, "{h}:{i}") }}</span>
|
892
|
892
|
</td>
|
893
|
893
|
</tr>
|
|
@@ -2071,6 +2071,8 @@ export default {
|
2071
|
2071
|
this.doctor_advices.push(obj1)
|
2072
|
2072
|
this.doctor_advices.push(obj2)
|
2073
|
2073
|
this.doctor_advices.push(obj3)
|
|
2074
|
+ this.doctor_advices.push(obj3)
|
|
2075
|
+ this.doctor_advices.push(obj3)
|
2074
|
2076
|
}
|
2075
|
2077
|
if (this.doctor_advices.length === 1) {
|
2076
|
2078
|
var obj = { advice_name: '', start_time: '' }
|
|
@@ -2079,17 +2081,40 @@ export default {
|
2079
|
2081
|
this.doctor_advices.push(obj)
|
2080
|
2082
|
this.doctor_advices.push(obj1)
|
2081
|
2083
|
this.doctor_advices.push(obj2)
|
|
2084
|
+ this.doctor_advices.push(obj2)
|
|
2085
|
+ this.doctor_advices.push(obj2)
|
2082
|
2086
|
}
|
2083
|
2087
|
if (this.doctor_advices.length === 2) {
|
2084
|
2088
|
var obj = { advice_name: '', start_time: '' }
|
2085
|
2089
|
var obj1 = { advice_name: '', start_time: '' }
|
2086
|
2090
|
this.doctor_advices.push(obj)
|
2087
|
2091
|
this.doctor_advices.push(obj1)
|
|
2092
|
+ this.doctor_advices.push(obj1)
|
|
2093
|
+ this.doctor_advices.push(obj1)
|
2088
|
2094
|
}
|
2089
|
2095
|
if (this.doctor_advices.length === 3) {
|
2090
|
2096
|
// eslint-disable-next-line no-redeclare
|
2091
|
2097
|
var obj = { advice_name: '', start_time: '' }
|
2092
|
2098
|
this.doctor_advices.push(obj)
|
|
2099
|
+ this.doctor_advices.push(obj)
|
|
2100
|
+ this.doctor_advices.push(obj)
|
|
2101
|
+ }
|
|
2102
|
+ if (this.doctor_advices.length === 2) {
|
|
2103
|
+ // eslint-disable-next-line no-redeclare
|
|
2104
|
+ var obj = { advice_name: '', start_time: '' }
|
|
2105
|
+ this.doctor_advices.push(obj)
|
|
2106
|
+ this.doctor_advices.push(obj)
|
|
2107
|
+ this.doctor_advices.push(obj)
|
|
2108
|
+ this.doctor_advices.push(obj)
|
|
2109
|
+ }
|
|
2110
|
+ if (this.doctor_advices.length === 1) {
|
|
2111
|
+ // eslint-disable-next-line no-redeclare
|
|
2112
|
+ var obj = { advice_name: '', start_time: '' }
|
|
2113
|
+ this.doctor_advices.push(obj)
|
|
2114
|
+ this.doctor_advices.push(obj)
|
|
2115
|
+ this.doctor_advices.push(obj)
|
|
2116
|
+ this.doctor_advices.push(obj)
|
|
2117
|
+ this.doctor_advices.push(obj)
|
2093
|
2118
|
}
|
2094
|
2119
|
|
2095
|
2120
|
if (this.doctor_advices.length > 0) {
|