自备药

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -202,6 +202,8 @@
       </el-form>
     </el-dialog>
 
+
+   <!-- 编辑选则医嘱模版 -->
     <el-dialog
       title="选择医嘱模板"
       :visible.sync="templateFormVisible"
@@ -331,6 +333,8 @@
         </el-button>
       </div>
     </el-dialog>
+
+
     <el-dialog
       title="选择医嘱模板"
       :visible.sync="oldTemplateFormVisible"
@@ -852,33 +856,6 @@ export default {
           this.nameForm.advice_name = arr[0]
        }
 
-      //  if(typeof(this.nameForm.advice_name) == "string"){
-         
-      //     this.nameForm.advice_name == this.nameForm.advice_name
-      // }
-
-      // if(typeof(this.nameForm.advice_name) == "number"){
-      //     var drug_name = ""
-      //     var name = ""
-      //     var way = 0
-      //     this.nameForm.drug_id = this.nameForm.advice_name
-      //     for(let i=0;i<this.medicals.length;i++){
-      //       if(this.nameForm.advice_name == this.medicals[i].id){
-      //         name = this.medicals[i].drug_name
-      //         way  = this.medicals[i].way
-      //       }
-      //     }
-      //     if(way == 1){
-      //       drug_name = name
-      //     }
-      //     if(way == 2){
-      //       var arr = name.split("(自备药)")
-      //       drug_name = arr[0]
-      //     }
-          
-      //     this.nameForm.advice_name = drug_name
-      //     this.nameForm.way = way
-      // }
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -1718,7 +1695,10 @@ export default {
         }
       }
     },
+
+
     newAddTempForm() {
+      console.log("9999888")
       this.allSelectedTemplate = [];
       var thisRowKey = 0;
       for (const indexs in this.adviceTemplateMaps) {
@@ -1727,36 +1707,25 @@ export default {
           if (adviceTemplate.DoctorAdviceTemplate[index].selection) {
             thisRowKey++;
             var item = {
-              advice_name:
-                adviceTemplate.DoctorAdviceTemplate[index].advice_name,
-              advice_desc:
-                adviceTemplate.DoctorAdviceTemplate[index].advice_desc,
-              single_dose:
-                "" + adviceTemplate.DoctorAdviceTemplate[index].single_dose,
-              single_dose_unit:
-                adviceTemplate.DoctorAdviceTemplate[index].single_dose_unit,
-              drug_spec:
-                "" + adviceTemplate.DoctorAdviceTemplate[index].drug_spec,
-              drug_spec_unit:
-                adviceTemplate.DoctorAdviceTemplate[index].drug_spec_unit,
-              prescribing_number:
-                "" +
-                adviceTemplate.DoctorAdviceTemplate[index].prescribing_number,
-              prescribing_number_unit:
-                adviceTemplate.DoctorAdviceTemplate[index]
-                  .prescribing_number_unit,
-              delivery_way:
-                adviceTemplate.DoctorAdviceTemplate[index].delivery_way,
-              execution_frequency:
-                adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
+              advice_name:adviceTemplate.DoctorAdviceTemplate[index].advice_name,
+              advice_desc:adviceTemplate.DoctorAdviceTemplate[index].advice_desc,
+              single_dose:"" + adviceTemplate.DoctorAdviceTemplate[index].single_dose,
+              single_dose_unit:adviceTemplate.DoctorAdviceTemplate[index].single_dose_unit,
+              drug_spec:"" + adviceTemplate.DoctorAdviceTemplate[index].drug_spec,
+              drug_spec_unit:adviceTemplate.DoctorAdviceTemplate[index].drug_spec_unit,
+              prescribing_number:"" +adviceTemplate.DoctorAdviceTemplate[index].prescribing_number,
+              prescribing_number_unit:adviceTemplate.DoctorAdviceTemplate[index].prescribing_number_unit,
+              delivery_way:adviceTemplate.DoctorAdviceTemplate[index].delivery_way,
+              execution_frequency:adviceTemplate.DoctorAdviceTemplate[index].execution_frequency,
               advice_id: adviceTemplate.DoctorAdviceTemplate[index].id,
               selection: adviceTemplate.DoctorAdviceTemplate[index].selection,
               day_count: adviceTemplate.DoctorAdviceTemplate[index].day_count,
-              frequency_type:
-                adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
+              frequency_type:adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
               week_days: adviceTemplate.DoctorAdviceTemplate[index].week_days,
               template_id: "T" + adviceTemplate.DoctorAdviceTemplate[index].id,
-
+              way:adviceTemplate.DoctorAdviceTemplate[index].way,
+              drug_id:adviceTemplate.DoctorAdviceTemplate[index].drug_id,
+              drug_name_id:adviceTemplate.DoctorAdviceTemplate[index].drug_name_id,
               isEdit: 0,
               id: 0,
               children: [],
@@ -1785,6 +1754,9 @@ export default {
                     children[key].prescribing_number_unit,
                   delivery_way: children[key].delivery_way,
                   execution_frequency: children[key].execution_frequency,
+                  way:children[key].way,
+                  drug_id:children[key].drug_id,
+                  drug_name_id:children[key].drug_name_id,
                   isEdit: 0,
                   id: 0,
                   children: [],
@@ -1836,19 +1808,17 @@ export default {
           single_dose_unit: this.allSelectedTemplate[index].single_dose_unit,
           drug_spec: "" + this.allSelectedTemplate[index].drug_spec,
           drug_spec_unit: this.allSelectedTemplate[index].drug_spec_unit,
-          prescribing_number:
-            "" + this.allSelectedTemplate[index].prescribing_number,
-          prescribing_number_unit: this.allSelectedTemplate[index]
-            .prescribing_number_unit,
+          prescribing_number:"" + this.allSelectedTemplate[index].prescribing_number,
+          prescribing_number_unit: this.allSelectedTemplate[index].prescribing_number_unit,
           delivery_way: this.allSelectedTemplate[index].delivery_way,
-          execution_frequency: this.allSelectedTemplate[index]
-            .execution_frequency,
-
+          execution_frequency: this.allSelectedTemplate[index].execution_frequency,
           day_count: this.allSelectedTemplate[index].day_count.toString(),
           frequency_type: this.allSelectedTemplate[index].frequency_type,
           week_days: this.allSelectedTemplate[index].week_days,
           template_id: this.allSelectedTemplate[index].template_id,
-
+          way:this.allSelectedTemplate[index].way,
+          drug_id:this.allSelectedTemplate[index].drug_id,
+          drug_name_id:this.allSelectedTemplate[index].drug_name_id,
           isEdit: 0,
           id: 0,
           children: [],
@@ -1872,6 +1842,9 @@ export default {
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                way:children[key].way,
+                drug_id:children[key].drug_id,
+                drug_name_id:children[key].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -1972,7 +1945,9 @@ export default {
               frequency_type: groups[index].frequency_type,
               week_day: groups[index].week_day,
               template_id: groups[index].template_id,
-
+              way:groups[index].way,
+              drug_id:groups[index].drug_id,
+              drug_name_id:groups[index].drug_name_id,
               isEdit: 0,
               index: 0,
               id: groups[index].id,
@@ -2000,6 +1975,9 @@ export default {
                   isEdit: 0,
                   index: 0,
                   id: childMap[item.id][key].id,
+                  drug_id:childMap[item.id][key].drug_id,
+                  way:childMap[item.id][key].way,
+                  drug_name_id:childMap[item.id][key].drug_name_id,
                   children: [],
                   parent_row: item.row_key,
                   row_key: this.editRowKey
@@ -2508,6 +2486,9 @@ export default {
       },
       handleSelect1(){
         
+      },
+      handleSelect(){
+
       },
 
        querySearch(queryString, cb) {

src/xt_pages/user/doctorAdvice.vue

@@ -2997,7 +2997,7 @@ export default {
         remark: groups[0].remark,
         groupno: groupno
       };
-      console.log("2222",groups[0]);
+      console.log("触发了吗----------",groups[0]);
 
       var childMap = {};
       for (const index in groups) {