手机端

src/pages/advice/DialysisAdviceTable.vue

@@ -193,9 +193,9 @@
 </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',
@@ -294,10 +294,10 @@ export default {
                   advices: []
                 }
               )
-            };
+            }
             var initGroupBlock = function (group, advice) {
               group.group_no = advice.groupno
-            };
+            }
 
             var advice_groups = []
             var group = newGroupObject()
@@ -325,7 +325,7 @@ export default {
                   group.advices.push(advice)
                   advice_groups.push(group)
                   group = newGroupObject()
-                  continue;
+                  continue
                 }
               } else {
                 if (group.group_no > 0 && group.group_no != advice.groupno) {
@@ -392,11 +392,11 @@ export default {
     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 '临嘱'
         }
       }
     },
@@ -425,7 +425,7 @@ export default {
     parseTime: function (time, layout) {
       // console.log(time);
       if (time == 0) {
-        return '';
+        return ''
       }
       return parseTime(time, layout)
     },

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 {