Merge branch '20201014_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201014_pc_vue_new_branch

src/xt_pages/data/components/consumables.vue

       v-loading="goodInfo.loading"
     >
       <el-table-column type="index" label="序号" width="60px" align="center"></el-table-column>
-      <el-table-column label="名称" align="center">
+      <el-table-column label="耗材名称" align="center">
         <template slot-scope="scope">
           {{ scope.row.good_name }}
         </template>

src/xt_pages/data/druguseTemplate.vue

                         clearable
                         allow-create
                         placeholder="请选择(输入可搜索)"
-                        style="width:200px"
+                        style="width:100%"
                         @change="changeDrugName"
                     >
                       <el-option
                         clearable
                         allow-create
                         placeholder="请选择(输入可搜索)"
-                        style="width:200px"
+                        style="width:100%;"
                         @change="changeDrugName"
                     >
                       <el-option
                      </el-select>
                     </el-form-item>
                   </el-col>
-                  <el-col :span="15">
+                  <el-col :span="12">
 
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
                           clearable
                           allow-create
                           placeholder="请选择(输入可搜索)"
-                          style="width:150px"
                           @change="changeDrugDesc"
                         >
                         <el-option

src/xt_pages/dialysis/details/dialog/adviceDialog/AddGroupAdvice.vue

                 allow-create
                 :disabled="isChild"
                 placeholder="请选择(输入可搜索)"
-                style="width:200px"
+                style="width:100%"
                 @change="changeDrugName"
               >
                 <el-option
 
         </el-row>
         <el-row>
-          <el-col :span="13">
+          <el-col :span="12">
             <!--<el-form-item label="规格 :" prop="advice_desc">-->
             <!--<el-input v-model="nameForm.advice_desc"></el-input>-->
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
-              <el-col :span="10">
+              <el-col :span="8">
                 <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
                  <el-select
                   v-model="nameForm.advice_desc"
                   allow-create
                   :disabled="isChild"
                   placeholder="请选择(输入可搜索)"
-                  style="width:150px"
                   @change="changeDrugDesc"
                 >
                   <el-option
 
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
-              <el-col :span="10">
+              <el-col :span="14">
                 <el-select
                   v-model="nameForm.drug_spec_unit"
                   filterable
                   clearable
                   allow-create
                   placeholder="选择"
-                  style="width:120px"
                 >
                   <el-option
                     v-for="item in unitsOption"
               </el-col>
             </el-form-item>
           </el-col>
-          <el-col :span="9">
+          <el-col :span="12">
             <el-form-item label="开药数量 :" prop="prescribing_number">
               <el-col :span="8">
                 <el-input v-model="nameForm.prescribing_number"></el-input>
       current_drug_name:"",
       current_drug_spec: "",
       drug_id: 0,
-      src_type:""
+      src_type:"",
+      private_drug_config:{},
     };
   },
   props: {
   },
   methods: {
     submitgroupAdvice(formName) {
-      
       this.$refs[formName].validate(valid => {
         if (valid) {
-          var submitForm = {
+         var submitForm = {
             advice_type: this.groupForm.advice_type,
             advice_date: this.groupForm.advice_date,
             start_time: this.groupForm.start_time,
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id
           };
-          
-          console.log("888888",this.groupForm.adviceNames)
+         
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           submitForm.adviceNames = adviceNames;
           let mode = "1";
           
-     
           console.log("88888888",submitForm)
-          
+          console.log("99999",this.medicals)
+          if(this.private_drug_config.drug_start == 1){
+           
+             for(let index=0;index<submitForm.adviceNames.length;index++){
+                for(let i=0;i<this.medicals.length;i++){
+                   if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
+                      submitForm.adviceNames[index].way = 2
+                   }
+                }
+             }
+          }
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
       }
     },
     templateTableChange(currentRow, oldCurrentRow) {
+      console.log("params -----",currentRow)
       this.selectedTemp = { id: 0, name: "", org_id: 0, list: [], rows: [] };
       if (currentRow == null) {
         return false;
           .DoctorAdviceTemplate) {
           thisRowKey++;
           var item = {
-            advice_name: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].advice_name,
-            advice_desc: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].advice_desc,
-            single_dose:
-              "" +
-              this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                .single_dose,
-            single_dose_unit: this.adviceTemplateMaps[mapid]
-              .DoctorAdviceTemplate[index].single_dose_unit,
-            drug_spec:
-              "" +
-              this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
+            advice_name: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_name,
+            advice_desc: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].advice_desc,
+            single_dose:"" +this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose,
+            single_dose_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].single_dose_unit,
+            drug_spec:"" +this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec,
             drug_spec_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_spec_unit,
-            prescribing_number:
-              "" +
-              this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index]
-                .prescribing_number,
-            prescribing_number_unit: this.adviceTemplateMaps[mapid]
-              .DoctorAdviceTemplate[index].prescribing_number_unit,
-            delivery_way: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].delivery_way,
-            execution_frequency: this.adviceTemplateMaps[mapid]
-              .DoctorAdviceTemplate[index].execution_frequency,
-            selection: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].selection,
-            advice_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
-              index
-            ].id,
-
+            prescribing_number:"" +this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number,
+            prescribing_number_unit: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].prescribing_number_unit,
+            delivery_way: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].delivery_way,
+            execution_frequency: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].execution_frequency,
+            selection: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].selection,
+            advice_id: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].id,
+            drug_id:this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
+            way:this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
             isEdit: 0,
             id: 0,
             children: [],
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
                 parent_row: parentRow,
-                row_key: thisRowKey
+                row_key: thisRowKey,
+               
               };
               item.children.push(child);
             }
           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,
+              drug_id: adviceTemplate.DoctorAdviceTemplate[index].drug_id,
+              way:adviceTemplate.DoctorAdviceTemplate[index].way,
               isEdit: 0,
               id: 0,
               children: [],
               parent_row: 0,
               row_key: thisRowKey
             };
+            console.log("items========",item)
             if (
               "children" in adviceTemplate.DoctorAdviceTemplate[index] &&
               adviceTemplate.DoctorAdviceTemplate[index].children.length > 0
                   drug_spec: "" + children[key].drug_spec,
                   drug_spec_unit: children[key].drug_spec_unit,
                   prescribing_number: "" + children[key].prescribing_number,
-                  prescribing_number_unit:
-                    children[key].prescribing_number_unit,
+                  prescribing_number_unit:children[key].prescribing_number_unit,
                   delivery_way: children[key].delivery_way,
                   execution_frequency: children[key].execution_frequency,
+                  drug_id:children[key].drug_id,
+                  way:children[key].way,
                   isEdit: 0,
                   id: 0,
                   children: [],
                   parent_row: parentRow,
                   row_key: thisRowKey
                 };
+                conosle.log("item======",child)
                 item.children.push(child);
                 this.allSelectedTemplate.unshift(child);
               }
           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,
+          drug_id:this.allSelectedTemplate[index].drug_id,
+          way:this.allSelectedTemplate[index].way,
           isEdit: 0,
           id: 0,
           children: [],
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
             var base_drug_list = response.data.data.base_drug_list
             var base_drug_cofig = response.data.data.base_drug_config
             var private_drug_cofig = response.data.data.private_drug_config
-
-
+       
+        
             if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
 
               for (let i = 0; i < medicalList.length; i++) {
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
               }
+              this.private_drug_config = response.data.data.private_drug_config
+              this.medicals = medicalList
             }   
         })
        

src/xt_pages/user/doctorAdvice.vue

       doctorAdvice: [],
       dataAdvice: [],
       medicals:[],
+      private_drug_config:{},
       patient_id:"",
       drugSpec:[],
       all_drug:[],
       });
     },
     submitgroupAdvice(formName) {
+     
       this.addLoading = true;
       this.$refs[formName].validate(valid => {
         if (valid) {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id
           };
-
+       
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
             adviceNames.unshift(this.groupForm.adviceNames[index]);
           }
           submitForm.adviceNames = adviceNames;
+
+
+          console.log("22222",submitForm)
+          if(this.private_drug_config.drug_start == 1){
+              for(let index=0;index<submitForm.adviceNames.length;index++){
+                  for(let i=0;i<this.medicals.length;i++){
+                    if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
+                        submitForm.adviceNames[index].way = 2
+                    }
+                  }
+              }
+            }
+
           let mode = "";
           if (this.groupForm.advice_type == 1) {
             mode = "1-2";
           frequency_type: groups[index].frequency_type,
           day_count: groups[index].day_count,
           week_day: groups[index].week_day,
-
+          drug_id:groups[index].drug_id,
+          wary:groups[index].way,
           isEdit: 0,
           index: 0,
           id: groups[index].id,
                 childMap[item.id][key].prescribing_number_unit,
               delivery_way: childMap[item.id][key].delivery_way,
               execution_frequency: childMap[item.id][key].execution_frequency,
+              drug_id:childMap[item.id][key].drug_id,
+              way:childMap[item.id][key].way,
               isEdit: 0,
               index: 0,
               id: childMap[item.id][key].id,
             frequency_type: this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[
               index
             ].frequency_type,
-
+            drug_id:this.adviceTemplateMaps[mapid].drug_id,
+            way:this.adviceTemplateMaps[mapid].way,
             isEdit: 0,
             id: 0,
             children: [],
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
-
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
                 adviceTemplate.DoctorAdviceTemplate[index].frequency_type,
               week_days: adviceTemplate.DoctorAdviceTemplate[index].week_days,
               template_id: "T" + adviceTemplate.DoctorAdviceTemplate[index].id,
-
+              drug_id: adviceTemplate.DoctorAdviceTemplate[index].drug_id,
+              way:adviceTemplate.DoctorAdviceTemplate[index].way,
               isEdit: 0,
               id: 0,
               children: [],
               parent_row: 0,
               row_key: thisRowKey
             };
+            console.log("item22222222",item)
             if (
               "children" in adviceTemplate.DoctorAdviceTemplate[index] &&
               adviceTemplate.DoctorAdviceTemplate[index].children.length > 0
                     children[key].prescribing_number_unit,
                   delivery_way: children[key].delivery_way,
                   execution_frequency: children[key].execution_frequency,
+                  drug_id:children[key].drug_id,
+                  way:children[key].way,
                   isEdit: 0,
                   id: 0,
                   children: [],
                   parent_row: parentRow,
                   row_key: thisRowKey
                 };
+                console.log("child",child)
                 item.children.push(child);
                 this.allSelectedTemplate.unshift(child);
               }
           day_count: this.allSelectedTemplate[index].day_count,
           frequency_type: this.allSelectedTemplate[index].frequency_type,
           week_days: this.allSelectedTemplate[index].week_days,
-
+          drug_id:this.allSelectedTemplate[index].drug_id,
+          way:this.allSelectedTemplate[index].way,
           isEdit: 0,
           id: 0,
           children: [],
                 prescribing_number_unit: children[key].prescribing_number_unit,
                 delivery_way: children[key].delivery_way,
                 execution_frequency: children[key].execution_frequency,
+                drug_id:children[key].drug_id,
+                way:children[key].way,
                 isEdit: 0,
                 id: 0,
                 children: [],
                 parent_row: parentRow,
                 row_key: this.rowKey
               };
+              console.log("child",child)
               item.children.push(child);
             }
             this.$set(item, "children", item.children);
                       children[key].prescribing_number_unit,
                     delivery_way: children[key].delivery_way,
                     execution_frequency: children[key].execution_frequency,
+                    drug_id:children[key].drug_id,
+                    way:children[key].way,
                     isEdit: 0,
                     id: 0,
                     children: [],
       });
     },
     submitNameForm(formName) {
-
+       
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-      // 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) {
                       _this.groupForm.adviceNames[index].children[j].delivery_way = _this.nameForm.delivery_way;
                       _this.groupForm.adviceNames[index].children[j].execution_frequency =_this.nameForm.execution_frequency;
                       _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id;
-                      _this.groupForm.adviceNames[index].children[j].way = this.nameForm.way;
+                      _this.groupForm.adviceNames[index].children[j].way = _this.nameForm.way;
                       _this.$set(
                         _this.groupForm.adviceNames[index].children,
                         j,
                   _this.groupSelectRow.row_key ==
                   _this.groupForm.adviceNames[index].row_key
                 ) {
-                  _this.groupForm.adviceNames[index].advice_name =
-                    _this.nameForm.advice_name;
+                  _this.groupForm.adviceNames[index].advice_name =_this.nameForm.advice_name;
                   _this.groupForm.adviceNames[index].advice_desc =
                     _this.nameForm.advice_desc;
 
                   } else if (_this.nameForm.frequency_type == 3) {
                     _this.groupForm.adviceNames[index].frequency_type =
                       _this.nameForm.frequency_type;
+                   _this.groupForm.adviceNames[index].drug_id = _this.nameForm.drug_id
+                   _this.groupForm.adviceNames[index].way = _this.nameForm.way
                     _this.groupForm.adviceNames[index].day_count = "0";
                     _this.groupForm.adviceNames[index].week_days = this.weeks
                       .filter(function(s) {
                 _this.nameForm.week_days = "";
               } else if (this.nameForm.frequency_type == 3) {
                 _this.nameForm.frequency_type = _this.nameForm.frequency_type;
+
                 _this.nameForm.day_count = "0";
                 _this.nameForm.week_days = this.weeks
                   .filter(function(s) {
                 this.all_drug.push(obj)
               }
             }
-            console.log("999999999",this.all_drug)
-            console.log("medicalist",this.medicalList)
-            console.log("base_drug_list",base_drug_list)
-            console.log("private_drug_config",private_drug_cofig)
-            console.log("base",base_drug_cofig)
+
+            this.private_drug_config = response.data.data.private_drug_config
+            this.medicals = medicalList
+          
       })
     },
    changeDrugName(name){