Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/xt_pages/data/specialDictionary.vue

@@ -1,4 +1,4 @@
-<template>
+ <template>
   <div class="main-contain">
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>

src/xt_pages/user/components/EditGroupAdvice.vue

@@ -396,7 +396,7 @@
                 @select="handleSelect"
                 @input="changeDrugName"
               ></el-autocomplete>
-              
+
             </el-form-item>
           </el-col>
           <el-col :span="14">
@@ -696,6 +696,16 @@ export default {
       default: function() {
         return [];
       }
+    },executionFrequencyOptions:{
+      type: Array,
+      default: function() {
+        return [];
+      }
+    },deliveryWayOptions:{
+      type: Array,
+      default: function() {
+        return [];
+      }
     },
 
     unitsOption: {
@@ -921,13 +931,13 @@ export default {
                 frequency_type: 0,
                 day_count: "0",
                 week_days: "",
-              
+
               };
             }
             let mode = "";
 
             if (_this.groupForm.advice_type == 1) {
-            
+
               mode = "1-3";
               if (
                 _this.groupForm.doctor != _this.$store.getters.xt_user.user.id
@@ -1081,7 +1091,7 @@ export default {
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
                 groupno: _this.groupForm.groupno,
-               
+
               };
 
               let mode = "";
@@ -2396,11 +2406,11 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
-                
+
               }
-            }   
+            }
         })
-       
+
     },
     changeDrugName(name){
        this.current_drug_name = name
@@ -2438,7 +2448,7 @@ export default {
         }
       },
       handleSelect1(){
-        
+
       },
       handleSelect(){
 
@@ -2452,7 +2462,7 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
      },
 
@@ -2463,7 +2473,7 @@ export default {
      },
 
      querySearch1(queryString, cb) {
-      
+
         var restaurants = this.drugSpec;
          console.log(restaurants)
         restaurants.map(item => {
@@ -2471,7 +2481,7 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-       
+
         cb(results);
       },
   },