Merge branch 'wzf' of http://git.shengws.com/zhangbj/xt_pad into wzf

src/pages/advice/DialysisAdviceTable.vue

@@ -163,7 +163,9 @@
       </div>-->
       <el-table :data="date" border style="width: 100%">
         <el-table-column fixed prop="date" label="姓名" width="100" align="center">
-          <template slot-scope="scope"></template>
+            <template slot-scope="scope">
+               {{ scope.row.advice_name }}
+            </template>
         </el-table-column>
         <el-table-column prop="name" label="透析号" width="100" align="center"></el-table-column>
         <el-table-column prop="province" label="期效" width="100" align="center"></el-table-column>
@@ -191,16 +193,16 @@
 </template>
 
 <script>
-import SideBar from "@/pages/layout/SideBar";
-import { parseTime } from "@/utils";
-import { getSchedualDoctors } from "@/api/advice";
+import SideBar from '@/pages/layout/SideBar'
+import { parseTime } from '@/utils'
+import { getSchedualDoctors } from '@/api/advice'
 
 export default {
-  name: "DialysisAdviceTable",
+  name: 'DialysisAdviceTable',
   components: {
     SideBar
   },
-  data() {
+  data () {
     return {
       selected_date: new Date(),
       admin_user: [],
@@ -208,153 +210,153 @@ export default {
       show_sch_type_selector: false,
       schedule_type_selected: 0,
       schedule_types: [
-        { value: 0, text: "全部班次" },
-        { value: 1, text: "上午" },
-        { value: 2, text: "下午" },
-        { value: 3, text: "晚上" }
+        { value: 0, text: '全部班次' },
+        { value: 1, text: '上午' },
+        { value: 2, text: '下午' },
+        { value: 3, text: '晚上' }
       ],
 
       show_zone_selector: false,
       zone_selected: 0,
       show_patient_type_selector: false,
-      zones: [{ value: 0, text: "全部分区", select: true }],
+      zones: [{ value: 0, text: '全部分区', select: true }],
 
       show_advice_type_selector: false,
       advice_type_selected: 0,
       advice_types: [
-        { value: 0, text: "全部医嘱" },
-        { value: 1, text: "长期医嘱" },
-        { value: 3, text: "临时医嘱" }
+        { value: 0, text: '全部医嘱' },
+        { value: 1, text: '长期医嘱' },
+        { value: 3, text: '临时医嘱' }
       ],
 
       patient_types: [
-        { value: 0, text: "全部病人" },
-        { value: 1, text: "我的病人" },
-        { value: 2, text: "未执行病人" }
+        { value: 0, text: '全部病人' },
+        { value: 1, text: '我的病人' },
+        { value: 2, text: '未执行病人' }
       ],
       patient_selected: 0,
 
       scheduleMap: {},
       tableData: []
-    };
+    }
   },
   computed: {
-    selected_date_str: function() {
-      return parseTime(this.selected_date, "{y}-{m}-{d}");
+    selected_date_str: function () {
+      return parseTime(this.selected_date, '{y}-{m}-{d}')
     },
-    filtedScheduals: function() {
-      var scheduleMap = new Object();
+    filtedScheduals: function () {
+      var scheduleMap = new Object()
       if (this.zone_selected == 0) {
         for (const key in this.scheduleMap) {
-          scheduleMap[key] = this.scheduleMap[key];
+          scheduleMap[key] = this.scheduleMap[key]
         }
       } else {
-        var zone_name = this.zones[this.zone_selected].text;
-        scheduleMap[zone_name] = this.scheduleMap[zone_name];
+        var zone_name = this.zones[this.zone_selected].text
+        scheduleMap[zone_name] = this.scheduleMap[zone_name]
       }
 
       if (this.schedule_type_selected != 0) {
-        var _scheduleMap = {};
+        var _scheduleMap = {}
         for (const key in scheduleMap) {
-          var origin_schedules = scheduleMap[key];
-          var schedules = [];
+          var origin_schedules = scheduleMap[key]
+          var schedules = []
           for (let index = 0; index < origin_schedules.length; index++) {
-            const schedule = origin_schedules[index];
+            const schedule = origin_schedules[index]
             if (schedule.schedule_type == this.schedule_type_selected) {
-              schedules.push(schedule);
+              schedules.push(schedule)
             }
           }
           if (schedules.length > 0) {
-            _scheduleMap[key] = schedules;
+            _scheduleMap[key] = schedules
           }
         }
 
-        scheduleMap = _scheduleMap;
+        scheduleMap = _scheduleMap
       }
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key];
+        let mapArr = scheduleMap[key]
         for (let i = 0; i < mapArr.length; i++) {
-          mapArr[i]["new_advice"] = [];
+          mapArr[i]['new_advice'] = []
         }
       }
 
       for (var key in scheduleMap) {
-        let mapArr = scheduleMap[key];
+        let mapArr = scheduleMap[key]
         for (let i = 0; i < mapArr.length; i++) {
-          var maps = mapArr[i];
-          var resp_advices = maps.doctor_advice;
+          var maps = mapArr[i]
+          var resp_advices = maps.doctor_advice
           if (resp_advices.length > 0) {
-            var newGroupObject = function() {
+            var newGroupObject = function () {
               return Object.assign(
                 {},
                 {
                   group_no: 0,
                   advices: []
                 }
-              );
-            };
-            var initGroupBlock = function(group, advice) {
-              group.group_no = advice.groupno;
-            };
+              )
+            }
+            var initGroupBlock = function (group, advice) {
+              group.group_no = advice.groupno
+            }
 
-            var advice_groups = [];
-            var group = newGroupObject();
+            var advice_groups = []
+            var group = newGroupObject()
             for (let index = 0; index < resp_advices.length; index++) {
-              const advice = resp_advices[index];
+              const advice = resp_advices[index]
               if (advice.groupno == 0) {
                 // 老版本的医嘱
                 if (advice.parent_id > 0) {
                   if (advice_groups.length > 0) {
-                    var parent_group = advice_groups[advice_groups.length - 1];
+                    var parent_group = advice_groups[advice_groups.length - 1]
                     if (parent_group.advices.length > 0) {
                       if (parent_group.advices[0].id == advice.parent_id) {
-                        parent_group.advices.push(advice);
+                        parent_group.advices.push(advice)
                       }
                     }
                   }
-                  continue;
+                  continue
                 } else {
                   if (group.group_no > 0) {
-                    advice_groups.push(group);
-                    group = newGroupObject();
+                    advice_groups.push(group)
+                    group = newGroupObject()
                   }
 
-                  initGroupBlock(group, advice);
-                  group.advices.push(advice);
-                  advice_groups.push(group);
-                  group = newGroupObject();
-                  continue;
+                  initGroupBlock(group, advice)
+                  group.advices.push(advice)
+                  advice_groups.push(group)
+                  group = newGroupObject()
+                  continue
                 }
               } else {
                 if (group.group_no > 0 && group.group_no != advice.groupno) {
-                  advice_groups.push(group);
-                  group = newGroupObject();
+                  advice_groups.push(group)
+                  group = newGroupObject()
                 }
                 if (group.group_no == 0) {
-                  initGroupBlock(group, advice);
+                  initGroupBlock(group, advice)
                 }
                 if (group.group_no == advice.groupno) {
-                  group.advices.push(advice);
+                  group.advices.push(advice)
                 }
               }
             }
             if (group.group_no > 0) {
               // 上述的算法会导致最后一组没有加到advice_groups，这里要手动加上
-              advice_groups.push(group);
+              advice_groups.push(group)
             }
-            advice_groups = advice_groups;
+            advice_groups = advice_groups
           } else {
-            advice_groups = [];
+            advice_groups = []
           }
-          maps.new_advice = advice_groups;
+          maps.new_advice = advice_groups
         }
       }
 
-      return scheduleMap;
+      return scheduleMap
     }
   },
-  created() {
-    this.requestSchedualDoctors();
+  created () {
+    this.requestSchedualDoctors()
   },
   methods: {
     // getNumber: function (advice,schedule) {
@@ -368,115 +370,115 @@ export default {
     //   }
     //
     // },
-    clickfunction: function(val) {
+    clickfunction: function (val) {
       // console.log(val);
       this.$router.push({
-        path: "/details",
+        path: '/details',
         query: {
           patient_id: val.patient.id,
           date: this.selected_date.getTime() / 1000,
           patient_name: val.patient.name
         }
-      });
+      })
     },
-    handlePaitentType: function(index) {
-      this.patient_selected = index;
-      this.show_patient_type_selector = false;
-      this.requestSchedualDoctors();
+    handlePaitentType: function (index) {
+      this.patient_selected = index
+      this.show_patient_type_selector = false
+      this.requestSchedualDoctors()
     },
-    openPicker() {
-      this.$refs.picker.open();
+    openPicker () {
+      this.$refs.picker.open()
     },
-    getAdaviceType(type, parent_id) {
+    getAdaviceType (type, parent_id) {
       if (parent_id == 0) {
         if (type == 1) {
-          return "长嘱";
+          return '长嘱'
         } else if (type == 2) {
-          return "临嘱";
+          return '临嘱'
         } else if (type == 3) {
-          return "临嘱";
+          return '临嘱'
         }
       }
     },
-    getName(val) {
-      console.log(this.admin_user);
+    getName (val) {
+      console.log(this.admin_user)
 
       for (let i = 0; i < this.admin_user.length; i++) {
         if (this.admin_user[i].id == val) {
-          return this.admin_user[i].name;
+          return this.admin_user[i].name
         }
       }
     },
-    handletimeType: function(index) {
-      this.schedule_type_selected = index;
-      this.show_sch_type_selector = false;
+    handletimeType: function (index) {
+      this.schedule_type_selected = index
+      this.show_sch_type_selector = false
     },
-    handleAdviceType: function(index) {
-      this.advice_type_selected = index;
-      this.show_advice_type_selector = false;
-      this.requestSchedualDoctors();
+    handleAdviceType: function (index) {
+      this.advice_type_selected = index
+      this.show_advice_type_selector = false
+      this.requestSchedualDoctors()
     },
-    handleZoneChange: function(index) {
-      this.zone_selected = index;
-      this.show_zone_selector = false;
+    handleZoneChange: function (index) {
+      this.zone_selected = index
+      this.show_zone_selector = false
     },
-    parseTime: function(time, layout) {
+    parseTime: function (time, layout) {
       // console.log(time);
       if (time == 0) {
-        return "";
+        return ''
       }
-      return parseTime(time, layout);
+      return parseTime(time, layout)
     },
-    requestSchedualDoctors() {
+    requestSchedualDoctors () {
       getSchedualDoctors({
         date: this.selected_date_str,
         patient_type: this.patient_selected,
         advice_type: 2
       }).then(rs => {
-        var resp = rs.data;
+        var resp = rs.data
         if (resp.state == 1) {
-          this.admin_user = resp.data.adminUser;
-          var schedules = resp.data.scheduals;
-          console.log("schedules", schedules);
-          var zoneMap = {};
-          var scheduleMap = {};
+          this.admin_user = resp.data.adminUser
+          var schedules = resp.data.scheduals
+          console.log('schedules', schedules)
+          var zoneMap = {}
+          var scheduleMap = {}
           for (let index = 0; index < schedules.length; index++) {
-            const schedule = schedules[index];
+            const schedule = schedules[index]
             if (schedule.doctor_advice.length == 0) {
-              continue;
+              continue
             }
             if (scheduleMap[schedule.device_number.zone.name] == null) {
-              scheduleMap[schedule.device_number.zone.name] = [];
+              scheduleMap[schedule.device_number.zone.name] = []
             }
-            scheduleMap[schedule.device_number.zone.name].push(schedule);
+            scheduleMap[schedule.device_number.zone.name].push(schedule)
             if (zoneMap[schedule.device_number.zone.name] == null) {
               zoneMap[schedule.device_number.zone.name] =
-                schedule.device_number.zone;
+                schedule.device_number.zone
             }
           }
 
-          var zones = [];
-          zones.push({ value: 0, text: "全部分区" });
+          var zones = []
+          zones.push({ value: 0, text: '全部分区' })
           for (var zoneName in zoneMap) {
-            zones.push({ value: zoneMap[zoneName].id, text: zoneName });
+            zones.push({ value: zoneMap[zoneName].id, text: zoneName })
           }
 
-          zones = zones.sort(function(a, b) {
-            return a.value > b.value;
-          });
-          this.zones = zones;
+          zones = zones.sort(function (a, b) {
+            return a.value > b.value
+          })
+          this.zones = zones
 
-          this.scheduleMap = scheduleMap;
+          this.scheduleMap = scheduleMap
         } else {
           this.$toast({
             message: resp.msg
-          });
+          })
         }
-      });
+      })
     },
-    adviceDesc(advice) {}
+    adviceDesc (advice) {}
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/pages/main/dialog/new_order/AddNewOrders.vue

@@ -52,14 +52,18 @@
                 <td
                   style="text-align: left; padding-left: 5px; padding-right: 5px;"
                 >{{ advice.title }}</td>
+
                 <td v-if="advice.advice_desc">{{ advice.advice_desc }}{{advice.drug_spec_unit}}</td>
+
                 <td
                   v-if="advice.prescribing_number"
                 >{{ advice.prescribing_number }}{{ advice.prescribing_number_unit }}</td>
                 <td v-else></td>
                 <td v-if="advice.single_dose">{{ advice.single_dose }} {{ advice.single_dose_unit }}</td>
                 <td v-else></td>
+
                 <td>{{ advice.delivery_way }}</td>
+
                 <td>{{ advice.execution_frequency }}</td>
               </tr>
               <tr
@@ -82,19 +86,43 @@
                     v-if="subdrug.single_dose"
                   >{{ subdrug.single_dose }} {{ subdrug.single_dose_unit }}</span>
                 </td>
-                
+
                 <td></td>
                 <td></td>
               </tr>
             </template>
           </table>-->
-          <el-table :data="tableData" border style="width: 100%" @row-click="click">
-            <el-table-column fixed prop="date" label="医嘱内容" width="150"></el-table-column>
-            <el-table-column prop="name" label="药品规格" width="120"></el-table-column>
-            <el-table-column prop="province" label="开药数量" width="120"></el-table-column>
-            <el-table-column prop="city" label="单次用量" width="120"></el-table-column>
-            <el-table-column prop="address" label="给药途径" width="300"></el-table-column>
-            <el-table-column prop="zip" label="执行频率" width="120"></el-table-column>
+          <el-table :data="advices" border style="width: 100%" :row-class-name="tableRowClassName" @row-click="clickAdviceAction">
+            <el-table-column fixed prop="date" label="医嘱内容" width="150">
+              <template slot-scope="scope">
+                   {{ scope.row.title }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="name" label="药品规格" width="120">
+              <template slot-scope="scope">
+              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="province" label="开药数量" width="120">
+              <template slot-scope="scope">
+              {{ scope.row.prescribing_number }}{{ scope.row.prescribing_number_unit }}
+              </template>
+            </el-table-column>
+            <el-table-column prop="city" label="单次用量" width="120">
+              <template slot-scope="scope">
+
+              </template>
+            </el-table-column>
+            <el-table-column prop="address" label="给药途径" width="300">
+               <template slot-scope="scope">
+                   {{ scope.row.delivery_way }}
+               </template>
+            </el-table-column>
+            <el-table-column prop="zip" label="执行频率" width="120">
+              <template slot-scope="scope">
+                  {{ scope.row.execution_frequency }}
+              </template>
+            </el-table-column>
           </el-table>
         </div>
       </div>
@@ -139,16 +167,16 @@
 </template>
 
 <script>
-import SingleOptionDialog from "./single_option_dialog";
-import OrderFormDialog from "./order_form";
-import AdviceTemplate from "./select_advice_template_dialog";
-import { Toast } from "vant";
-import { parseTime } from "@/utils";
-import { batchCreateAdvices } from "@/api/advice";
-import { setTimeout } from "timers";
+import SingleOptionDialog from './single_option_dialog'
+import OrderFormDialog from './order_form'
+import AdviceTemplate from './select_advice_template_dialog'
+import { Toast } from 'vant'
+import { parseTime } from '@/utils'
+import { batchCreateAdvices } from '@/api/advice'
+import { setTimeout } from 'timers'
 
 export default {
-  name: "AddNewOrdersDialogContent",
+  name: 'AddNewOrdersDialogContent',
   components: {
     SingleOptionDialog,
     OrderFormDialog,
@@ -166,170 +194,147 @@ export default {
     },
     advice_templates: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     },
     drug_spec_unit_options: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     },
     delivery_way_options: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     },
     execution_frequency_options: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     },
     single_dose_unit_options: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     },
     prescribing_number_unit_options: {
       type: Array,
-      default: function() {
-        return [];
+      default: function () {
+        return []
       }
     }
   },
-  data() {
+  data () {
     return {
       show_dialog_key: 0,
       loading: false,
 
-      record_date_str: "",
+      record_date_str: '',
       start_time: new Date(),
-      start_time_str: "",
+      start_time_str: '',
 
       selecting_advice_index: -1,
       selecting_subdrug_index: -1,
       advices: [],
-      tableData: [
-        {
-          date: "2016-05-02",
-          name: "123",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1518 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-04",
-          name: "456",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1517 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-01",
-          name: "789",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1519 弄",
-          zip: 200333
-        },
-        {
-          date: "2016-05-03",
-          name: "565345",
-          province: "上海",
-          city: "普陀区",
-          address: "上海市普陀区金沙江路 1516 弄",
-          zip: 200333
-        }
-      ]
-    };
+      tableData: []
+    }
   },
-  mounted() {
-    this.record_date_str = parseTime(new Date(), "{y}-{m}-{d}");
+  mounted () {
+    this.record_date_str = parseTime(new Date(), '{y}-{m}-{d}')
     this.start_time_str =
-      parseTime(this.start_time, "{y}-{m}-{d} {h}:{i}") + ":00";
+      parseTime(this.start_time, '{y}-{m}-{d} {h}:{i}') + ':00'
   },
   methods: {
-    click(row, column, event) {
-      console.log(row);
-      console.log(column);
-      console.log(event);
+    click (row, column, event) {
+      alert('aaa')
+      // console.log(row)
+      // console.log(column)
+      // console.log(event)
     },
-    backAction: function() {
-      this.$emit("back-action");
+    backAction: function () {
+      this.$emit('back-action')
     },
-    addOrderByTemplateAction: function() {
-      this.show_dialog_key = 1;
-      this.selecting_advice_index = -1;
+    addOrderByTemplateAction: function () {
+      this.show_dialog_key = 1
+      this.selecting_advice_index = -1
     },
-    addNewOrderAction: function() {
-      this.show_dialog_key = 2;
-      this.$refs.order_form.showWithNew();
-      this.selecting_advice_index = -1;
+    addNewOrderAction: function () {
+      this.show_dialog_key = 2
+      this.$refs.order_form.showWithNew()
+      this.selecting_advice_index = -1
     },
-    clickAdviceAction: function(advice_index) {
-      this.selecting_advice_index = advice_index;
-      this.selecting_subdrug_index = -1;
+    // clickAdviceAction: function (advice_index) {
+    //   this.selecting_advice_index = advice_index
+    //   this.selecting_subdrug_index = -1
+    // },
+
+    tableRowClassName (row, rowIndex) {
+      row.index = rowIndex
     },
-    clickSubdrugAction: function(advice_index, subdrug_index) {
-      this.selecting_advice_index = advice_index;
-      this.selecting_subdrug_index = subdrug_index;
+    clickAdviceAction (row, event, column) {
+      console.log(row.index)
+      this.selecting_advice_index = row.index
+      this.selecting_subdrug_index = -1
     },
-    modifyOrderAction: function() {
+    clickSubdrugAction: function (advice_index, subdrug_index) {
+      this.selecting_advice_index = advice_index
+      this.selecting_subdrug_index = subdrug_index
+    },
+    modifyOrderAction: function () {
       if (this.selecting_advice_index >= 0) {
         if (this.selecting_subdrug_index < 0) {
-          this.show_dialog_key = 2;
+          this.show_dialog_key = 2
           this.$refs.order_form.showWithEdit(
             this.advices[this.selecting_advice_index]
-          );
+          )
         } else {
-          this.show_dialog_key = 2;
+          this.show_dialog_key = 2
           this.$refs.order_form.showWithEdit(
             this.advices[this.selecting_advice_index].subdrugs[
               this.selecting_subdrug_index
             ]
-          );
+          )
         }
       } else {
-        Toast.fail("请先选择医嘱内容");
+        Toast.fail('请先选择医嘱内容')
       }
     },
-    deleteOrderAction: function() {
+    deleteOrderAction: function () {
       if (this.selecting_advice_index >= 0) {
         if (this.selecting_subdrug_index < 0) {
-          this.advices.splice(this.selecting_advice_index, 1);
-          this.selecting_advice_index = -1;
+          this.advices.splice(this.selecting_advice_index, 1)
+          this.selecting_advice_index = -1
         } else {
-          var advice = this.advices[this.selecting_advice_index];
-          advice.subdrugs.splice(this.selecting_subdrug_index, 1);
-          this.selecting_advice_index = -1;
-          this.selecting_subdrug_index = -1;
+          var advice = this.advices[this.selecting_advice_index]
+          advice.subdrugs.splice(this.selecting_subdrug_index, 1)
+          this.selecting_advice_index = -1
+          this.selecting_subdrug_index = -1
         }
       } else {
-        Toast.fail("请先选择医嘱内容");
+        Toast.fail('请先选择医嘱内容')
       }
     },
-    selectStartTimeAction: function() {
-      this.$refs.start_time_picker.open();
+    selectStartTimeAction: function () {
+      this.$refs.start_time_picker.open()
     },
-    comfirmAction: function() {
+    comfirmAction: function () {
       if (this.advices.length == 0) {
-        Toast.fail("请创建医嘱");
-        return;
+        Toast.fail('请创建医嘱')
+        return
       }
 
-      var data = {};
-      data.advice_type = 2;
-      data.advice_date = this.record_date_str;
-      data.start_time = this.start_time_str;
-      var adviceJSONs = [];
+      var data = {}
+      data.advice_type = 2
+      data.advice_date = this.record_date_str
+      data.start_time = this.start_time_str
+      var adviceJSONs = []
       for (let index = 0; index < this.advices.length; index++) {
-        const advice = this.advices[index];
+        const advice = this.advices[index]
         var json = {
           advice_name: advice.title,
           advice_desc: advice.advice_desc,
@@ -343,9 +348,9 @@ export default {
           execution_frequency: advice.execution_frequency,
           remark: advice.remark,
           subdrugs: []
-        };
+        }
         for (let s_i = 0; s_i < advice.subdrugs.length; s_i++) {
-          const subdrug = advice.subdrugs[s_i];
+          const subdrug = advice.subdrugs[s_i]
           json.subdrugs.push({
             advice_name: subdrug.title,
             advice_desc: subdrug.advice_desc,
@@ -355,47 +360,49 @@ export default {
             single_dose_unit: subdrug.single_dose_unit,
             prescribing_number: String(subdrug.prescribing_number),
             prescribing_number_unit: subdrug.prescribing_number_unit
-          });
+          })
         }
-        adviceJSONs.push(json);
+        adviceJSONs.push(json)
       }
 
-      data.adviceNames = adviceJSONs;
+      data.adviceNames = adviceJSONs
       // console.log(adviceJSONs)
 
-      this.loading = true;
+      this.loading = true
       batchCreateAdvices(this.patient_id, this.group_no, data)
         .then(rs => {
-          this.loading = false;
-          var resp = rs.data;
+          this.loading = false
+          var resp = rs.data
+
           if (resp.state == 1) {
             // 返回数组，清空数据，隐藏弹框
-            this.$emit("did-create-advices", resp.data.advices);
-            var t = this;
-            setTimeout(function() {
-              t.advices.splice(0, t.advices.length);
-              t.show_dialog_key = 0;
-              t.selecting_advice_index = -1;
-            }, 500);
+            this.$emit('did-create-advices', resp.data.advices)
+            console.log('resp.data.advices', resp.data.advices)
+            var t = this
+            setTimeout(function () {
+              t.advices.splice(0, t.advices.length)
+              t.show_dialog_key = 0
+              t.selecting_advice_index = -1
+            }, 500)
           } else {
-            Toast.fail(resp.msg);
+            Toast.fail(resp.msg)
           }
         })
         .catch(err => {
-          this.loading = false;
-          Toast.fail(err);
-        });
+          this.loading = false
+          Toast.fail(err)
+        })
       // batchCreateAdvices()
     },
 
-    didSelectStartTime: function(time) {
-      this.start_time_str = parseTime(time, "{y}-{m}-{d} {h}:{i}") + ":00";
+    didSelectStartTime: function (time) {
+      this.start_time_str = parseTime(time, '{y}-{m}-{d} {h}:{i}') + ':00'
     },
-    didSelectTemplateAdvice: function(resp_advices) {
-      this.show_dialog_key = 0;
-      var advices = [];
+    didSelectTemplateAdvice: function (resp_advices) {
+      this.show_dialog_key = 0
+      var advices = []
       for (let index = 0; index < resp_advices.length; index++) {
-        const adv = resp_advices[index];
+        const adv = resp_advices[index]
         if (adv.parent_id == 0) {
           advices.push({
             id: adv.id,
@@ -410,14 +417,14 @@ export default {
             prescribing_number: adv.prescribing_number,
             prescribing_number_unit: adv.prescribing_number_unit,
             subdrugs: []
-          });
+          })
         }
       }
       for (let r_a_i = 0; r_a_i < resp_advices.length; r_a_i++) {
-        const resp_adv = resp_advices[r_a_i];
+        const resp_adv = resp_advices[r_a_i]
         if (resp_adv.parent_id > 0) {
           for (let p_i = 0; p_i < advices.length; p_i++) {
-            const p_adv = advices[p_i];
+            const p_adv = advices[p_i]
             if (p_adv.id == resp_adv.parent_id) {
               var subdrug = {
                 id: resp_adv.id,
@@ -431,14 +438,14 @@ export default {
                 single_dose_unit: resp_adv.single_dose_unit,
                 prescribing_number: resp_adv.prescribing_number,
                 prescribing_number_unit: resp_adv.prescribing_number_unit
-              };
-              p_adv.subdrugs.push(subdrug);
-              break;
+              }
+              p_adv.subdrugs.push(subdrug)
+              break
             }
           }
         }
       }
-      this.advices.push(...advices);
+      this.advices.push(...advices)
     },
     // didSelectOrderTemplate: function(index) {
     //   this.show_dialog_key = 0;
@@ -499,45 +506,45 @@ export default {
     //   }
     //   this.advices.push(...advices);
     // },
-    didAddNewOrder: function(order) {
-      this.$refs.order_form.dismiss();
-      this.show_dialog_key = 0;
-      order.id = 0;
-      order.subdrugs = [];
-      this.advices.push(order);
+    didAddNewOrder: function (order) {
+      this.$refs.order_form.dismiss()
+      this.show_dialog_key = 0
+      order.id = 0
+      order.subdrugs = []
+      this.advices.push(order)
     },
-    didModifyOrder: function(order) {
-      this.$refs.order_form.dismiss();
-      this.show_dialog_key = 0;
+    didModifyOrder: function (order) {
+      this.$refs.order_form.dismiss()
+      this.show_dialog_key = 0
       if (this.selecting_advice_index >= 0) {
-        var advice = this.advices[this.selecting_advice_index];
+        var advice = this.advices[this.selecting_advice_index]
         if (this.selecting_subdrug_index < 0) {
-          advice.title = order.title;
-          advice.advice_desc = order.advice_desc;
+          advice.title = order.title
+          advice.advice_desc = order.advice_desc
           // advice.drug_spec = order.drug_spec;
-          advice.drug_spec_unit = order.drug_spec_unit;
-          advice.delivery_way = order.delivery_way;
-          advice.execution_frequency = order.execution_frequency;
-          advice.single_dose = order.single_dose;
-          advice.single_dose_unit = order.single_dose_unit;
-          advice.prescribing_number = order.prescribing_number;
-          advice.prescribing_number_unit = order.prescribing_number_unit;
-          advice.remark = order.remark;
+          advice.drug_spec_unit = order.drug_spec_unit
+          advice.delivery_way = order.delivery_way
+          advice.execution_frequency = order.execution_frequency
+          advice.single_dose = order.single_dose
+          advice.single_dose_unit = order.single_dose_unit
+          advice.prescribing_number = order.prescribing_number
+          advice.prescribing_number_unit = order.prescribing_number_unit
+          advice.remark = order.remark
         } else {
-          var subdrug = advice.subdrugs[this.selecting_subdrug_index];
-          subdrug.title = order.title;
-          subdrug.advice_desc = order.advice_desc;
+          var subdrug = advice.subdrugs[this.selecting_subdrug_index]
+          subdrug.title = order.title
+          subdrug.advice_desc = order.advice_desc
           // subdrug.drug_spec = order.drug_spec;
-          subdrug.drug_spec_unit = order.drug_spec_unit;
-          subdrug.single_dose = order.single_dose;
-          subdrug.single_dose_unit = order.single_dose_unit;
-          subdrug.prescribing_number = order.prescribing_number;
-          subdrug.prescribing_number_unit = order.prescribing_number_unit;
+          subdrug.drug_spec_unit = order.drug_spec_unit
+          subdrug.single_dose = order.single_dose
+          subdrug.single_dose_unit = order.single_dose_unit
+          subdrug.prescribing_number = order.prescribing_number
+          subdrug.prescribing_number_unit = order.prescribing_number_unit
         }
       }
     }
   }
-};
+}
 </script>
 
 <style style="stylesheet/scss" lang="scss" scoped>

src/styles/style.scss

@@ -217,7 +217,7 @@ body {
     @include text-align;
     margin: 0.25rem 0;
     color: #34495e;
-    font-size: 0.36rem;
+    font-size: 0.32rem;
     padding: 0 0.3rem;
   }
   .forbid {