Browse Source

bug修改

xiaoming_global 5 years ago
parent
commit
bed13e9e00

+ 3 - 1
src/pages/main/dialog/PrescriptionDialog.vue View File

1077
         }
1077
         }
1078
       },
1078
       },
1079
       GetModeByModeId: function (val) {
1079
       GetModeByModeId: function (val) {
1080
+        console.log("val",val)
1080
         let treatment_mode_name = ''
1081
         let treatment_mode_name = ''
1081
         let treatment_mode = this.modeOption
1082
         let treatment_mode = this.modeOption
1082
 
1083
 
1088
         for (let keys in treatment_mode) {
1089
         for (let keys in treatment_mode) {
1089
           if (treatment_mode[keys].id == val) {
1090
           if (treatment_mode[keys].id == val) {
1090
             treatment_mode_name = treatment_mode[keys].name
1091
             treatment_mode_name = treatment_mode[keys].name
1091
-            if (treatment_mode_name == 'HD') {
1092
+            console.log("treatment_mode_name",treatment_mode_name)
1093
+            if (treatment_mode_name == 'HD' || treatment_mode_name == 'HD+HP' || treatment_mode_name == 'HP' || treatment_mode_name == 'HF' || treatment_mode_name == 'SCUF' || treatment_mode_name == 'IUF' || treatment_mode_name == 'HFHD' || treatment_mode_name == 'HFHD +HP' || treatment_mode_name == 'PHF'|| treatment_mode_name == 'HFR' || treatment_mode_name == 'CRRT' || treatment_mode_name == '腹水回收' || treatment_mode_name == 'HD前置换' || treatment_mode_name == 'HD后置换') {
1092
               this.zhiShow = false
1094
               this.zhiShow = false
1093
               this.totalShow = false
1095
               this.totalShow = false
1094
               this.huShow = false
1096
               this.huShow = false

+ 34 - 46
src/pages/main/dialog/new_order/AddNewOrders.vue View File

18
         <div style="overflow: hidden;">
18
         <div style="overflow: hidden;">
19
           <div class="cell" style="margin-top: 0;">
19
           <div class="cell" style="margin-top: 0;">
20
             <label>医嘱类型</label>
20
             <label>医嘱类型</label>
21
-            <el-input
22
-              class="typeInput"
23
-              ref="advice_type"
24
-              value="临时"
25
-              disabled
26
-            ></el-input>
21
+            <el-input class="typeInput" ref="advice_type" value="临时" disabled></el-input>
27
           </div>
22
           </div>
28
           <div class="cell" style="margin-top: 0;">
23
           <div class="cell" style="margin-top: 0;">
29
             <label>开始时间</label>
24
             <label>开始时间</label>
43
             <label>开嘱时间 {{ record_date_str }}</label>
38
             <label>开嘱时间 {{ record_date_str }}</label>
44
           </div>
39
           </div>
45
         </div>
40
         </div>
46
-        <div
47
-          id="newDialogContent"
48
-          class="DialogContent choose"
49
-          style="height: 6.2rem;"
50
-        >
41
+        <div id="newDialogContent" class="DialogContent choose" style="height: 6.2rem;">
51
           <div class="newAddTable">
42
           <div class="newAddTable">
52
             <table class="table">
43
             <table class="table">
53
               <tr>
44
               <tr>
70
                 >
61
                 >
71
                   <td
62
                   <td
72
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
63
                     style="text-align: left; padding-left: 5px; padding-right: 5px;"
73
-                  >
74
-                    {{ advice.title }}
75
-                  </td>
76
-                  <td v-if="advice.advice_desc">
77
-                    {{ advice.advice_desc }}{{ advice.drug_spec_unit }}
78
-                  </td>
64
+                  >{{ advice.title }}</td>
65
+                  <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{ advice.drug_spec_unit }}</td>
79
                   <td v-if="advice.prescribing_number">
66
                   <td v-if="advice.prescribing_number">
80
                     {{ advice.prescribing_number
67
                     {{ advice.prescribing_number
81
                     }}{{ advice.prescribing_number_unit }}
68
                     }}{{ advice.prescribing_number_unit }}
82
                   </td>
69
                   </td>
83
                   <td v-else></td>
70
                   <td v-else></td>
84
-                  <td v-if="advice.single_dose">
85
-                    {{ advice.single_dose }} {{ advice.single_dose_unit }}
86
-                  </td>
71
+                  <td
72
+                    v-if="advice.single_dose"
73
+                  >{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
87
                   <td v-else></td>
74
                   <td v-else></td>
88
                   <td>{{ advice.delivery_way }}</td>
75
                   <td>{{ advice.delivery_way }}</td>
89
                   <td>{{ advice.execution_frequency }}</td>
76
                   <td>{{ advice.execution_frequency }}</td>
100
                 >
87
                 >
101
                   <td
88
                   <td
102
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
89
                     style="text-align: left; padding-right: 5px; padding-left: 25px;"
103
-                  >
104
-                    {{ subdrug.title }}
105
-                  </td>
90
+                  >{{ subdrug.title }}</td>
91
+                  <td>{{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}</td>
106
                   <td>
92
                   <td>
107
-                    {{ subdrug.advice_desc }} {{ subdrug.drug_spec_unit }}
93
+                    <span v-if="subdrug.prescribing_number">
94
+                      {{ subdrug.prescribing_number
95
+                      }}{{ subdrug.prescribing_number_unit }}
96
+                    </span>
108
                   </td>
97
                   </td>
109
                   <td>
98
                   <td>
110
-                    <span v-if="subdrug.prescribing_number"
111
-                      >{{ subdrug.prescribing_number
112
-                      }}{{ subdrug.prescribing_number_unit }}</span
113
-                    >
114
-                  </td>
115
-                  <td>
116
-                    <span v-if="subdrug.single_dose"
117
-                      >{{ subdrug.single_dose }}
118
-                      {{ subdrug.single_dose_unit }}</span
119
-                    >
99
+                    <span v-if="subdrug.single_dose">
100
+                      {{ subdrug.single_dose }}
101
+                      {{ subdrug.single_dose_unit }}
102
+                    </span>
120
                   </td>
103
                   </td>
121
                   <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
104
                   <!--<td v-if="subdrug.single_dose">{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</td>-->
122
                   <td></td>
105
                   <td></td>
171
 import SingleOptionDialog from "./single_option_dialog";
154
 import SingleOptionDialog from "./single_option_dialog";
172
 import OrderFormDialog from "./order_form";
155
 import OrderFormDialog from "./order_form";
173
 import AdviceTemplate from "./select_advice_template_dialog";
156
 import AdviceTemplate from "./select_advice_template_dialog";
174
-import { Toast } from "vant";
157
+import { Toast, Dialog } from "vant";
175
 import { parseTime } from "@/utils";
158
 import { parseTime } from "@/utils";
176
 import { batchCreateAdvices } from "@/api/advice";
159
 import { batchCreateAdvices } from "@/api/advice";
177
 import { setTimeout } from "timers";
160
 import { setTimeout } from "timers";
290
       }
273
       }
291
     },
274
     },
292
     deleteOrderAction: function() {
275
     deleteOrderAction: function() {
293
-      if (this.selecting_advice_index >= 0) {
294
-        if (this.selecting_subdrug_index < 0) {
295
-          this.advices.splice(this.selecting_advice_index, 1);
296
-          this.selecting_advice_index = -1;
276
+      Dialog.confirm({
277
+        title: "删除医嘱",
278
+        message: "确认删除医嘱吗?"
279
+      }).then(() => {
280
+        if (this.selecting_advice_index >= 0) {
281
+          if (this.selecting_subdrug_index < 0) {
282
+            this.advices.splice(this.selecting_advice_index, 1);
283
+            this.selecting_advice_index = -1;
284
+          } else {
285
+            var advice = this.advices[this.selecting_advice_index];
286
+            advice.subdrugs.splice(this.selecting_subdrug_index, 1);
287
+            this.selecting_advice_index = -1;
288
+            this.selecting_subdrug_index = -1;
289
+          }
297
         } else {
290
         } else {
298
-          var advice = this.advices[this.selecting_advice_index];
299
-          advice.subdrugs.splice(this.selecting_subdrug_index, 1);
300
-          this.selecting_advice_index = -1;
301
-          this.selecting_subdrug_index = -1;
291
+          Toast.fail("请先选择医嘱内容");
302
         }
292
         }
303
-      } else {
304
-        Toast.fail("请先选择医嘱内容");
305
-      }
293
+      });
306
     },
294
     },
307
     selectStartTimeAction: function() {
295
     selectStartTimeAction: function() {
308
       this.$refs.start_time_picker.open();
296
       this.$refs.start_time_picker.open();