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

src/api/advice.js

@@ -15,6 +15,7 @@ export function getAllAdviceConfig() {
 }
 
 export function CreateDoctorAdvice(id, advice, mode) {
+  
   return request({
     url: "/api/patients/advice/create?id=" + id + "&mode=" + mode,
     method: "post",
@@ -50,6 +51,7 @@ export function ExecDoctorAdvice(patient, id, time, mode) {
     execution_time: time,
     mode: mode
   };
+  console.log("paras------",params)
   return request({
     url: "/api/patients/advice/exec",
     method: "Post",

src/lang/zh.js

@@ -225,7 +225,6 @@ export default {
     signIndex:'签到排队',
     signIn:'签到窗口',
     lineUp:'排队窗口',
-    otherManagement:'其他管理',
     calling:'排队叫号',
     bedManagement:'床位管理',
     dictionaryManagement:'字典管理',
@@ -235,7 +234,7 @@ export default {
   },
   navbar: {
     logOut: '退出登录',
-    dashboard: '首页',
+    dashboard: '透析首页',
     github: '项目地址',
     screenfull: '全屏',
     theme: '换肤'

src/xt_pages/data/druguseTemplate.vue

@@ -300,6 +300,8 @@
                 <el-button type="primary" @click="submitTableTemplate('form')">保 存</el-button>
               </div>
             </el-dialog>
+
+            <!-- 新增子药 -->
             <el-dialog :title="dialogTitle" :visible.sync="templateFormVisible" width="854px">
               <el-form
                 ref="templateForm"
@@ -514,23 +516,6 @@
                 <el-row>
                   <el-col :span="24">
                     <el-form-item :label="edit_advice_name" required prop="advice_name">
-                      <!-- <el-input v-model="templateFormEdit.advice_name"></el-input> -->
-                       <!-- <el-select
-                            v-model="templateFormEdit.advice_name"
-                            filterable
-                            clearable
-                            allow-create
-                            placeholder="请选择(输入可搜索)"
-                            style="width:200px"
-                            @change="changeDrugNameTwo"
-                          >
-                            <el-option
-                              v-for="(item,index) in all_drug"
-                              :key="index"
-                              :label="item.drug_name"
-                              :value="item.drug_name"
-                            ></el-option>
-                          </el-select> -->
                         <el-autocomplete
                           style="width:100%;"
                           class="inline-input"
@@ -545,34 +530,16 @@
                   <el-col :span="15">
 
                     <el-form-item label="药品规格 :" prop="advice_desc">
-                      <el-col :span="8">
-                        <!-- <el-input v-model="templateFormEdit.advice_desc"></el-input> -->
-                           <!-- <el-select
-                              v-model="templateFormEdit.advice_desc"
-                              filterable
-                              clearable
-                              allow-create
-                              placeholder="请选择(输入可搜索)"
-                              style="width:150px"
-                              @change="changeDrugDescTwo"
-                            >
-                              <el-option
-                                v-for="item in drugSpec"
-                                :key="item.id"
-                                :label="item.drug_spec"
-                                :value="item.drug_spec"
-                              ></el-option>
-                           </el-select> -->
-
-                             <el-autocomplete
-                              style="width:100px;"
-                              class="inline-input"
-                              v-model="templateFormEdit.advice_desc"
-                              :fetch-suggestions="querySearch1"
-                              placeholder="请输入内容"
-                              @select="handleSelect1"
-                              @input="changeDrugDescTwo"
-                            ></el-autocomplete>
+                      <el-col :span="8">                     
+                         <el-autocomplete
+                         style="width:100px;"
+                         class="inline-input"
+                         v-model="templateFormEdit.advice_desc"
+                         :fetch-suggestions="querySearch1"
+                         placeholder="请输入内容"
+                         @select="handleSelect1"
+                         @input="changeDrugDescTwo"
+                       ></el-autocomplete>
                       </el-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -1817,9 +1784,14 @@
           }
         })
       },
-      submitTemplate(formName) {
+      handleSelect1(){
 
-        
+      },
+      handleSelect(){
+
+      },
+      submitTemplate(formName) {
+ 
         if(this.src_type == ""){
             this.templateForm.way = 0
             this.templateForm.drug_id = 0
@@ -1829,7 +1801,8 @@
             var arr = this.templateForm.advice_name.split("(自备药)")
             this.templateForm.advice_name = arr[0]
         }
-        
+        console.log("2222",this.templateForm)
+       
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)
           this.templateForm.prescribing_number = parseFloat(this.templateForm.prescribing_number)
@@ -1840,7 +1813,7 @@
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
-
+          
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
@@ -2201,7 +2174,8 @@
          } 
         this.templateFormEdit.drug_id = drug_id
        
-        console.log("2222",this.templateFormEdit)
+        console.log("编辑子药",this.templateFormEdit)
+       
         this.$refs[formName].validate(valid => {
 
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
@@ -2263,7 +2237,8 @@
             )
           }
         })
-      }, drugDesc(row) {
+      }, 
+      drugDesc(row) {
         if (row.isNoSub == 2) {
           if (row.drug_spec.length <= 0) {
             return ''
@@ -2859,6 +2834,9 @@
             this.drug_id = this.drugSpec[i].id
             this.src_type = this.drugSpec[i].type
             this.templateForm.drug_id = this.drugSpec[i].id
+            this.templateForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.templateForm.prescribing_number_unit = this.drugSpec[i].min_unit
+            this.templateForm.drug_spec_unit = this.drugSpec[i].min_unit
             this.templateForm.way = this.drugSpec[i].type
           }
         }
@@ -2884,6 +2862,9 @@
             this.templateFormEdit.single_dose = this.drugSpec[i].single_dose.toString()
             this.templateFormEdit.delivery_way = this.drugSpec[i].delivery_way.toString()
             this.templateFormEdit.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.templateFormEdit.single_dose_unit = this.drugSpec[i].min_unit
+            this.templateFormEdit.drug_spec_unit = this.drugSpec[i].drug_spec_unit
+            this.templateFormEdit.prescribing_number_unit = this.drugSpec[i].prescribing_number_unit
           }
         }
       },

src/xt_pages/dialysis/details/assessmentBefore.vue

@@ -303,6 +303,11 @@
           <span class="unit"></span>
         </li>
 
+         <li v-if="isShow('特殊处理情况')">
+          <label>特殊处理情况: </label>
+          <span class="content">{{ this.record.special_treatment}}</span>
+          <span class="unit"></span>
+        </li>
       </ul>
     </div>
     <div class="note">

src/xt_pages/dialysis/details/dialog/DoctorAdviceDialog.vue

@@ -239,7 +239,6 @@
         :cell-class-name="adviceNameShow"
         :modal-append-to-body="false"
         highlight-current-row
-        @current-change="handleCurrentChange"
       >
         <el-table-column prop="date" label="开嘱医生" align="center" min-width="26px">
           <template slot-scope="scope">
@@ -249,9 +248,7 @@
         <el-table-column prop="start_time" label="开始时间" align="center" min-width="35px">
           <template slot-scope="scope">
             <span>
-              {{
-              scope.row.start_time | parseTime('{y}-{m}-{d} {h}:{i}')
-              }}
+              {{scope.row.start_time | parseTime('{y}-{m}-{d} {h}:{i}')}}
             </span>
           </template>
         </el-table-column>
@@ -259,8 +256,7 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link">
-                {{ getAdviceContent(scope.row, 1)
-                }}
+                {{ getAdviceContent(scope.row, 1)}}
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -272,8 +268,7 @@
 
             <el-dropdown trigger="click" v-if="scope.row.parent_id > 0">
               <span class="el-dropdown-link">
-                &emsp;{{ getAdviceContent(scope.row, 2)
-                }}
+                &emsp;{{ getAdviceContent(scope.row, 2)}}
                 <i class="el-icon-arrow-down el-icon--right"></i>
               </span>
               <el-dropdown-menu slot="dropdown">
@@ -293,9 +288,7 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.execution_time != 0">
-              {{
-              scope.row.start_time | parseTime('{m}-{d} {h}:{i}')
-              }}
+              {{scope.row.start_time | parseTime('{m}-{d} {h}:{i}')}}
             </span>
             <span v-else></span>
           </template>
@@ -303,9 +296,7 @@
         <el-table-column prop="execution_staff" align="center" min-width="30px" label="执行护士">
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0">
-              {{
-              getXuserName(scope.row.execution_staff)
-              }}
+              {{getXuserName(scope.row.execution_staff)}}
             </span>
             <span v-else></span>
           </template>
@@ -319,9 +310,7 @@
         >
           <template slot-scope="scope">
             <span v-if="scope.row.parent_id == 0">
-              {{
-              getXuserName(scope.row.checker)
-              }}
+              {{getXuserName(scope.row.checker)}}
             </span>
             <span v-else></span>
           </template>
@@ -408,20 +397,11 @@
       </div>-->
       <!-- 新医嘱列表 -->
 
+
+      <!-- 新增医嘱(子药)表单 -->
       <!-- 医嘱表单 -->
       <el-form ref="form" :model="form" label-width="100px" v-show="showAdviceForm">
         <el-row :gutter="20">
-          <!--<el-col :span="8">-->
-          <!--<el-form-item label="医嘱类型：">-->
-          <!--<el-input value="临时" disabled></el-input>-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
-          <!--<el-col :span="8">-->
-          <!--<el-form-item label="医嘱时间：">-->
-          <!--<el-input v-model="form.advice_date" readonly></el-input>-->
-          <!--&lt;!&ndash; <el-date-picker type="date" placeholder="选择日期" v-model="form.date1" style="width: 100%;"></el-date-picker> &ndash;&gt;-->
-          <!--</el-form-item>-->
-          <!--</el-col>-->
           <el-col :span="8">
             <el-form-item label="开始时间：">
               <el-date-picker
@@ -438,23 +418,6 @@
 
           <el-col :span="8">
             <el-form-item label="医嘱名称：">
-              <!-- <el-input v-model="form.advice_name"></el-input> -->
-              <!-- <el-select
-                v-model="form.advice_name"
-                filterable
-                clearable
-                allow-create
-                placeholder="请选择(输入可搜索)"
-                style="width:200px"
-                @change="changeDrugName"
-              >
-                <el-option
-                  v-for="(item,index) in all_drug"
-                  :key="index"
-                  :label="item.drug_name"
-                  :value="item.drug_name"
-                ></el-option>
-              </el-select> -->
 
               <el-autocomplete
                 style="width:100%;"
@@ -469,38 +432,19 @@
           </el-col>
 
           <el-col :span="8">
-            <el-form-item label="药品规格：">
-              <!-- <el-input v-model="form.advice_desc" style="width: 40%;"></el-input> -->
-
-               <!-- <el-select
-                  v-model="form.advice_desc"
-                  filterable
-                  clearable
-                  allow-create
-                  placeholder="请选择(输入可搜索)"
-                  style="width:150px"
-                  @change="changeDrugDesc"
-                >
-                  <el-option
-                    v-for="item in drugSpec"
-                    :key="item.id"
-                    :label="item.drug_spec"
-                    :value="item.drug_spec"
-                  ></el-option>
-                 </el-select> -->
+            <el-form-item label="药品规格：">        
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
                   v-model="form.advice_desc"
                   :fetch-suggestions="querySearch1"
                   placeholder="请输入内容"
-                  @select="handleSelect1"
                   @input="changeDrugDesc"
                 ></el-autocomplete>
                  
                 <el-select
                   v-model="form.drug_spec_unit"
-                  style="width: 56%;"
+                  style="width: 100px;"
                   filterable
                   placeholder="选择"
                 >
@@ -532,7 +476,6 @@
                   :value="item.name"
                 ></el-option>
               </el-select>
-              <!-- <el-input v-model="form.prescribing_number_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
           </el-col>
 
@@ -552,8 +495,6 @@
                   :value="item.name"
                 ></el-option>
               </el-select>
-
-              <!-- <el-input v-model="form.single_dose_unit" style="width: 40%;"></el-input> -->
             </el-form-item>
           </el-col>
 
@@ -776,7 +717,9 @@
           advice_doctor: '',
           remark: '',
           parent_id: 0,
-          drug_name_id:"",
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         },
         nameForm: {
           advice_name: '',
@@ -942,7 +885,6 @@
         }
       },
       submitEditAdvice() {
-        console.log("this.form",this.form)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
@@ -1231,6 +1173,7 @@
       }
       ,
       submitExce() {
+        
         if (this.currentRow == null) {
           this.$message.error('请先选择要执行的医嘱！')
           return false
@@ -1247,6 +1190,9 @@
         }
         this.exceLoading = true
         let mode = '6'
+        
+         console.log("222222",this.currentRow.id)
+        
         ExecDoctorAdvice(this.patient.id, this.currentRow.id, this.execTime, mode).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -1311,6 +1257,19 @@
           return false
         }
         let mode = '1'
+        
+       if(this.src_type == ""){
+          this.form.way = 0
+          this.form.drug_id = 0
+          this.form.drug_name_id = 0
+       }
+
+       if(this.src_type == 2){ //自备药
+          var arr = this.form.advice_name.split("(自备药)")
+          this.form.advice_name = arr[0]
+       }
+
+        console.log("新增医嘱子药",this.form)
        
         CreateDoctorAdvice(this.patient.id, this.form, mode)
           .then(response => {
@@ -1407,7 +1366,10 @@
           execution_frequency: this.currentRow.execution_frequency,
           advice_doctor: '',
           remark: '',
-          parent_id: this.currentRow.id
+          parent_id: this.currentRow.id,
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         }
       }
       ,
@@ -1483,9 +1445,9 @@
           advice_doctor: row.advice_doctor,
           remark: row.remark,
           parent_id: row.parent_id,
-          drug_id:"",
-          way:"",
-          drug_name_id:"",
+          drug_id:0,
+          way:0,
+          drug_name_id:0,
         }
       }
       ,
@@ -1616,6 +1578,7 @@
       }
       ,
       execAdvice() {
+        
         if (this.is_has_exce == false) {
           this.$message.error('你没有执行医嘱的权限')
           return false
@@ -2071,13 +2034,14 @@
       }
       ,
       cellMouseEnter: function(row, column, event) {
+        console.log("数据是",row)
         this.currentRow = row
-        this.groupSelectRow = row
-        this.sameRowArr.forEach((arr, i) => {
-          if (arr.indexOf(row.index) != -1) {
-            this.hoverOrderArr = arr
-          }
-        })
+        // this.groupSelectRow = row
+        // this.sameRowArr.forEach((arr, i) => {
+        //   if (arr.indexOf(row.index) != -1) {
+        //     this.hoverOrderArr = arr
+        //   }
+        // })
       }
       ,
       cellMouseLeave: function(row, column, cell, event) {
@@ -2196,17 +2160,17 @@
       }
       ,
       handleCurrentChange(row) {
-        // this.currentRow = row;
+
+        this.currentRow = row;
         // this.groupSelectRow = row;
         // this.sameRowArr.forEach((arr, i) => {
         //   if (arr.indexOf(row.index) != -1) {
         //     this.hoverOrderArr = arr;
         //   }
         // });
-      }
-      ,
+      },
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-        // console.log('columnIndex', columnIndex)
+     
         if (columnIndex === 0) {
           if (rowIndex % 2 === 0) {
             return {
@@ -2358,6 +2322,7 @@
                 obj.type = 2
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = medicalList[i].drug_specs
+                console.log("222",this.all_drug)
                 this.all_drug.push(obj)
               }
             }
@@ -2394,13 +2359,15 @@
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
+                console.log("2222",this.all_drug)
               }
             }
         })
      },
     changeDrugName(name){
       this.current_drug_name = name
-      this.form.advice_desc = ''
+      this.form.advice_desc = ""
+      this.$forceUpdate()
       this.drugSpec = []
       for (let i = 0; i < this.all_drug.length; i++) {
         if (this.all_drug[i].drug_name == name) {
@@ -2409,6 +2376,7 @@
        }
     },
     changeDrugDesc(name) {
+      this.$forceUpdate()
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
@@ -2421,8 +2389,11 @@
             this.src_type = this.drugSpec[i].type
             this.form.drug_id = this.drugSpec[i].id
             this.form.way = this.drugSpec[i].type
+
+            this.form.drug_spec_unit = this.drugSpec[i].min_unit
+            this.form.prescribing_number_unit = this.drugSpec[i].min_unit
+            this.form.single_dose_unit = this.drugSpec[i].min_unit
             if(this.drugSpec[i].drug_name_id){
-              console.log("22222",this.drugSpec[i].drug_name_id)
                this.form.drug_name_id = this.drugSpec[i].drug_name_id
             }else{
               this.form.drug_name_id = 0
@@ -2465,6 +2436,9 @@
         console.log('results',results)
         cb(results);
       },
+     handleSelect(){
+
+     }
     },
     created() {
       var date = this.$route.query && this.$route.query.date

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

@@ -370,24 +370,6 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-               <!-- <el-select
-                v-model="nameForm.advice_name"
-                filterable
-                clearable
-                allow-create
-                :disabled="isChild"
-                placeholder="请选择(输入可搜索)"
-                style="width:100%"
-                @change="changeDrugName"
-              >
-                <el-option
-                  v-for="(item,index) in all_drug"
-                  :key="index"
-                  :label="item.drug_name"
-                  :value="item.drug_name"
-                ></el-option>
-              </el-select> -->
-
              <el-autocomplete
                 style="width:100%;"
                 class="inline-input"
@@ -407,30 +389,10 @@
         </el-row>
         <el-row>
           <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="8">
-                <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
-                 <!-- <el-select
-                  v-model="nameForm.advice_desc"
-                  filterable
-                  clearable
-                  allow-create
-                  :disabled="isChild"
-                  placeholder="请选择(输入可搜索)"
-                  @change="changeDrugDesc"
-                >
-                  <el-option
-                    v-for="item in drugSpec"
-                    :key="item.id"
-                    :label="item.drug_spec"
-                    :value="item.drug_spec"
-                  ></el-option>
-                 </el-select> -->
-
-
+               
                 <el-autocomplete
                   style="width:100px;"
                   class="inline-input"
@@ -743,11 +705,18 @@ export default {
           
           console.log("88888888",submitForm)
           console.log("99999",this.medicals)
-          
-          if(this.private_drug_config.drug_start == 1){
-           
+          if(this.private_drug_config != null&& 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].children.length >0){
+                      for(let y=0;y<submitForm.adviceNames[index].children.length;y++){
+                          if(submitForm.adviceNames[index].children[y].drug_id == this.medicals[i].drug_name_id){
+                             submitForm.adviceNames[index].children[y].drug_name_id = this.medicals[i].drug_name_id
+                             submitForm.adviceNames[index].children[y].way = 2  
+                          }
+                      }
+                   }
                    if(submitForm.adviceNames[index].drug_id == this.medicals[i].drug_name_id){
                       submitForm.adviceNames[index].way = 2
                       submitForm.adviceNames[index].drug_name_id = this.medicals[i].drug_name_id
@@ -756,7 +725,7 @@ export default {
              }
           }
           console.log("2222",submitForm)
-         
+        
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -1312,7 +1281,7 @@ export default {
                   parent_row: parentRow,
                   row_key: thisRowKey
                 };
-                conosle.log("item======",child)
+                
                 item.children.push(child);
                 this.allSelectedTemplate.unshift(child);
               }
@@ -1475,7 +1444,6 @@ export default {
       this.templateFormVisible = true;
     },
     selectGroupAdvice(row) {
-      console.log("row-----",row)
       this.groupSelectRow = row;
     },
     groupClassName({ row, rowIndex }) {
@@ -1620,16 +1588,17 @@ export default {
                 this.all_drug.push(obj)
 
               }
+
               this.private_drug_config = response.data.data.private_drug_config
               this.medicals = medicalList
             }   
-            console.log("-======",this.all_drug)
+           
         })
        
     },
     changeDrugName(name){
-       this.current_drug_name = name
-       this.nameForm.advice_desc = ''
+      this.current_drug_name = name
+      this.nameForm.advice_desc = ''
       this.drugSpec = []
       for (let i = 0; i < this.all_drug.length; i++) {
         if (this.all_drug[i].drug_name == name) {
@@ -1638,20 +1607,22 @@ export default {
        }
     },
     changeDrugDesc(name) {
-      console.log("-----",this.drugSpec)
         this.current_drug_spec = name
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
             this.nameForm.advice_desc = this.drugSpec[i].drug_spec
             this.nameForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
             this.nameForm.single_dose = this.drugSpec[i].single_dose.toString()
+
             this.nameForm.delivery_way = this.drugSpec[i].delivery_way.toString()
             this.nameForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
             this.drug_id = this.drugSpec[i].id
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
-            this.drug_name_id = this.drugSpec[i].drug_name_id
+            this.nameForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.nameForm.drug_spec_unit = this.drugSpec[i].min_unit
+            this.nameForm.prescribing_number_unit = this.drugSpec[i].min_unit
             if(this.drugSpec[i].drug_name_id){
                this.nameForm.drug_name_id = this.drugSpec[i].drug_name_id
             }else{
@@ -1670,7 +1641,7 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-        console.log('results',results)
+       
         cb(results);
      },
 
@@ -1681,7 +1652,7 @@ export default {
      },
 
      querySearch1(queryString, cb) {
-        console.log('queryString',queryString)
+      
         var restaurants = this.drugSpec;
          console.log(restaurants)
         restaurants.map(item => {
@@ -1689,9 +1660,16 @@ export default {
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-        console.log('results',results)
+       
         cb(results);
       },
+
+      handleSelect(){
+
+      },
+      handleSelect1(){
+
+      }
   },
   watch: {
     "selectedTemp.list": function() {

src/xt_pages/dialysis/details/dialog/assessmentBeforeDislysisDialog.vue

@@ -358,6 +358,13 @@
               <el-input v-model="assessmentBeforeDislysis.emergency_treatment_other"></el-input>
             </el-form-item>
           </el-col>
+            
+          <el-col :span="8" v-if="isShow('特殊处理情况')">
+            <el-form-item label="特殊处理情况:">
+              <el-input v-model="assessmentBeforeDislysis.special_treatment"></el-input>
+            </el-form-item>
+          </el-col>
+          
 
           <el-col :span="24">
             <el-form-item label="备注： ">
@@ -689,7 +696,7 @@
           catheter_suture_other:'',
           urine_volume:'',
           edema:'',
-
+          special_treatment:'',
         },
 
         InnerDialogProps: {

src/xt_pages/dialysis/details/dialog/dialysisPrescriptionDialog.vue

@@ -19,7 +19,7 @@
         ref="dialysisPrescription"
         :model="dialysisPrescription"
         label-width="148px"
-      > 
+      >
         <el-row :gutter="24">
           <el-col :span="8" v-if="isShows('透析模式')">
             <el-form-item label="透析模式">
@@ -219,9 +219,9 @@
             </el-form-item>
           </el-col>
 
-          
 
-       
+
+
 
           <el-col :span="8" v-if="isShows('置换量') && (this.$store.getters.xt_user.template_info.template_id == 20)"
                   v-show="zhiShow">
@@ -519,265 +519,265 @@
           <!--          </el-col>-->
 
           <!--透析耗材-->
-          <el-col
-            :span="8"
-            v-if="isShows('血液透析干粉') && config.is_open == 1"
-          >
-            <el-form-item label="血液透析干粉：">
-              <el-select
-                v-model="dialysisPrescription.niprocart"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-                <el-option
-                  v-for="(option, index) in niprocart_info"
-                  :key="index + 'p'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用动静脉穿刺针：">
-              <el-select
-                v-model="dialysisPrescription.jms"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in jms_info"
-                  :key="index + 'a'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_info"
-                  :key="index + 's'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"
-          >
-            <el-form-item label="内瘘管翼状针16G：">
-              <el-select
-                v-model="dialysisPrescription.fistula_needle_set_16"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in fistula_needle_set_16_info"
-                  :key="index + 'd'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-
-          <el-col
-            :span="8"
-            v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"
-          >
-            <el-form-item label="一次性使用血液灌流器：">
-              <el-select
-                v-model="dialysisPrescription.hemoperfusion"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
-
-                <el-option
-                  v-for="(option, index) in hemoperfusion_info"
-                  :key="index + 'f'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液透析干粉') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液透析干粉：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.niprocart"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
+                <!--<el-option-->
+                  <!--v-for="(option, index) in niprocart_info"-->
+                  <!--:key="index + 'p'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用动静脉穿刺针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用动静脉穿刺针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.jms"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('空心纤维血液透析器') && config.is_open == 1"
-          >
-            <el-form-item label="空心纤维血液透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyser_sterilised"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in jms_info"-->
+                  <!--:key="index + 'a'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyser_sterilised_info"
-                  :key="index + 'g'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_info"-->
+                  <!--:key="index + 's'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('内瘘管翼状针16G') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="内瘘管翼状针16G：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.fistula_needle_set_16"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('中空纤维透析器') && config.is_open == 1"
-          >
-            <el-form-item label="中空纤维透析器：">
-              <el-select
-                v-model="dialysisPrescription.filtryzer"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in fistula_needle_set_16_info"-->
+                  <!--:key="index + 'd'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('一次性使用血液灌流器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="一次性使用血液灌流器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.hemoperfusion"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in filtryzer_info"
-                  :key="index + 'h'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in hemoperfusion_info"-->
+                  <!--:key="index + 'f'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('空心纤维血液透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="空心纤维血液透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyser_sterilised"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">
-            <el-form-item label="透析器：">
-              <el-select
-                v-model="dialysisPrescription.dialyzers"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyser_sterilised_info"-->
+                  <!--:key="index + 'g'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('中空纤维透析器') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="中空纤维透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.filtryzer"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in dialyzers_info"
-                  :key="index + 1"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in filtryzer_info"-->
+                  <!--:key="index + 'h'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">
-            <el-form-item label="注射器：">
-              <el-select
-                v-model="dialysisPrescription.injector"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('透析器') && config.is_open == 1">-->
+            <!--<el-form-item label="透析器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.dialyzers"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in injector_info"
-                  :key="index + 'j'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in dialyzers_info"-->
+                  <!--:key="index + 1"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('体外循环血路管') && config.is_open == 1"
-          >
-            <el-form-item label="体外循环血路管：">
-              <el-select
-                v-model="dialysisPrescription.bloodlines"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('注射器') && config.is_open == 1">-->
+            <!--<el-form-item label="注射器：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.injector"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in bloodlines_info"
-                  :key="index + 'k'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in injector_info"-->
+                  <!--:key="index + 'j'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('体外循环血路管') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="体外循环血路管：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.bloodlines"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-          <el-col
-            :span="8"
-            v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"
-          >
-            <el-form-item label="血液净化补液管路(置换管)：">
-              <el-select
-                v-model="dialysisPrescription.tubing_hemodialysis"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in bloodlines_info"-->
+                  <!--:key="index + 'k'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
+
+          <!--<el-col-->
+            <!--:span="8"-->
+            <!--v-if="isShows('血液净化补液管路(置换管)') && config.is_open == 1"-->
+          <!--&gt;-->
+            <!--<el-form-item label="血液净化补液管路(置换管)：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.tubing_hemodialysis"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in tubingHemodialysis_info"
-                  :key="index + 'x'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in tubingHemodialysis_info"-->
+                  <!--:key="index + 'x'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">
-            <el-form-item label="护理包：">
-              <el-select
-                v-model="dialysisPrescription.package"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('护理包') && config.is_open == 1">-->
+            <!--<el-form-item label="护理包：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.package"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in safe_package_info"
-                  :key="index + 'z'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in safe_package_info"-->
+                  <!--:key="index + 'z'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
-          <el-col :span="8" v-if="isShows('A液') && config.is_open == 1">
-            <el-form-item label="A液：">
-              <el-select
-                v-model="dialysisPrescription.a_liquid"
-                placeholder="请选择"
-              >
-                <el-option :key="0" label="请选择" :value="0"></el-option>
+          <!--<el-col :span="8" v-if="isShows('A液') && config.is_open == 1">-->
+            <!--<el-form-item label="A液：">-->
+              <!--<el-select-->
+                <!--v-model="dialysisPrescription.a_liquid"-->
+                <!--placeholder="请选择"-->
+              <!--&gt;-->
+                <!--<el-option :key="0" label="请选择" :value="0"></el-option>-->
 
-                <el-option
-                  v-for="(option, index) in aliquid_info"
-                  :key="index + 'c'"
-                  :label="option.GoodInfo.specification_name"
-                  :value="option.GoodInfo.id"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+                <!--<el-option-->
+                  <!--v-for="(option, index) in aliquid_info"-->
+                  <!--:key="index + 'c'"-->
+                  <!--:label="option.GoodInfo.specification_name"-->
+                  <!--:value="option.GoodInfo.id"-->
+                <!--&gt;</el-option>-->
+              <!--</el-select>-->
+            <!--</el-form-item>-->
+          <!--</el-col>-->
 
 
 
@@ -1369,8 +1369,8 @@
         }
       },
       setLastRecord: function(schedual,lastAssessmentAfterDislysis,lastPredialysisEvaluation,lastDialysisPrescribe,lastDryWeightDislysis,system_prescribe) {
-        
-       
+
+
         this.treatment_mode = this.$store.getters.treatment_mode
         console.log("99999",this.treatment_mode)
         this.perfusion_apparatus = getDataConfig(
@@ -1462,7 +1462,7 @@
             }
           }
         } else {
-           
+
           if (schedual.mode_id == 2 ||schedual.mode_id == 5 ||schedual.mode_id == 12) {
             this.zhiShow = true
             this.huShow = true
@@ -3025,7 +3025,7 @@
                       response.data.data.system_prescription[key]
                   }
                 }
-                
+
               } else {
                 for (const key in this.dialysisPrescription) {
                   // 临时处方为空
@@ -3641,7 +3641,7 @@
           }
         }
       },
-    
+
     }
   }
 </script>

src/xt_pages/index/verify_token.vue

@@ -14,8 +14,15 @@ export default {
           // alert('token 验证成功')
           // console.log(this.$store.getters.xt_permission.addRouters)
           this.$router.addRoutes(this.$store.getters.xt_permission.addRouters) // 动态添加可访问路由表
-  //        next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
-          this.$router.replace({ path: '/dialysis/dialysisrecord' })
+  //          next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record
+          if(this.$store.getters.current_role_urls.includes('/dialysis/dialysisrecord')){
+            this.$router.replace({ path: '/dialysis/dialysisrecord' })
+
+          }else{
+            this.$router.replace({ path: '/home' })
+
+
+          }
 
         })
       })

src/xt_pages/role/components/AdminRoleInfoForm.vue

@@ -10,19 +10,16 @@
         <el-input v-model="form.name" placeholder="用户姓名"></el-input>
       </el-form-item>
 
-      <el-form-item label="角色 : " prop="role" label-width="60px">
+      <!--<el-form-item label="角色 : " prop="role_ids" label-width="60px">-->
 
-           <el-checkbox-group v-model="form.role">
-            <el-checkbox label="子管理员" name="type"></el-checkbox>
-            <el-checkbox label="医生" name="type"></el-checkbox>
-            <el-checkbox label="护士" name="type"></el-checkbox>
-            <el-checkbox label="技师" name="type"></el-checkbox>
-            <el-checkbox label="运营" name="type"></el-checkbox>
-            <el-checkbox label="库存" name="type"></el-checkbox>
-            <el-checkbox label="院长" name="type"></el-checkbox>
+        <el-form-item label="角色 : " prop="role_ids">
+          <el-checkbox-group v-model="form.role_ids">
+            <el-checkbox v-for="( item,index) in roles" :key="index" :label="item.id" :value="item.id">{{item.name}}
+            </el-checkbox>
           </el-checkbox-group>
         </el-form-item>
 
+
       <el-form-item label="职称 : ">
         <el-select v-model="form.user_type" placeholder="用户类型">
           <el-option

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -369,6 +369,8 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       }
+      this.propForm.goods = []
+
       GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -384,7 +386,7 @@ export default {
             }
             this.$refs.dialog.show()
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              this.propForm.goodType.push(response.data.data.goodInfo[i].type)
             }
             const obj = {}
             this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -400,7 +402,7 @@ export default {
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a]
               respObj['isSelected'] = false
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj)
               }
             }

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -326,6 +326,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -341,7 +343,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -357,7 +359,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/drugs/drugsStockDialog/index.vue

@@ -210,7 +210,8 @@
         }
       }, changeGoodInfoTableData: function(val) {
         console.log(val)
-      }, changeAllGoodInfoTableData: function(selection) {
+      },
+       changeAllGoodInfoTableData: function(selection) {
         var goodInfos = this.propForm.goods[this.table_current_index].drug_specs
         if (selection.length > 0) {
           for (let y = 0; y < goodInfos.length; y++) {
@@ -245,9 +246,6 @@
             }
           }
         }
-
-
-
       }
     }
 

src/xt_pages/stock/salesReturnEdit.vue

@@ -324,6 +324,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         };
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -336,7 +338,7 @@
             this.$refs.dialog.show();
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
               this.propForm.goodType.push(
-                response.data.data.goodInfo[i].GoodsType
+                response.data.data.goodInfo[i].type
               );
             }
             const obj = {};
@@ -356,7 +358,7 @@
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a];
               respObj["isSelected"] = false;
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj);
               }
             }

src/xt_pages/stock/salesReturnOrderAdd.vue

@@ -306,6 +306,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -321,7 +323,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -337,7 +339,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/selfPreparedMedicine/components/addMedicine.vue

@@ -9,7 +9,7 @@
             <div style="width:200px;">
               <el-table :data="tableData" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" 
                  :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
-                 ref="monthlyPlanTable" @current-change="handleCurrentChange" >
+                 ref="monthlyPlanTable" @current-change="handleCurrentChange">
                     <el-table-column align="center" prop="name" label="药品名称">
                         <template slot-scope="scope">
                            {{scope.row.drug_name}}
@@ -17,11 +17,18 @@
                     </el-table-column>
                 </el-table>
             </div>
+
+
             <div style="flex:1;padding-left:10px;">
-                <el-table :data="tableDatatwo" border style="width: 100%;" height="300" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
-                 highlight-current-row  @selection-change="handleSelectionChange">
-                    <el-table-column type="selection" align="center" width="55"></el-table-column>
-                    <el-table-column align="center" prop="name" label="规格名称">
+                <el-table :data="tableDatatwo" border style="width: 100%;" height="300"
+                 ref="multipleTable"
+                 :row-style="{ color: '#303133' }"
+                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" 
+                  highlight-current-row
+                  @select="selectGoodInfo"
+                  @select-all="changeAllGoodInfoTableData">
+                 <el-table-column type="selection" align="center" width="55"></el-table-column>
+                 <el-table-column align="center" prop="name" label="规格名称">
                         <template slot-scope="scope">{{scope.row.drug_spec}}</template>
                     </el-table-column>
                 </el-table>
@@ -47,7 +54,9 @@ export default {
             currentRow:"",
             tableDatatwo:[],
             patient_id:0,
-            medicineData:[]
+            medicineData:[],
+            standList:[],
+            table_current_index:-1,
         }
     },
     methods:{
@@ -79,40 +88,98 @@ export default {
              if(response.data.state == 1){
                var rullername =  response.data.data.rullerName
                console.log("rullerName",rullername)
-               this.tableData = rullername
+               var list =   response.data.data.list
+               console.log("list999999",list)
+               this.standList = list
+               this.tableData = list
              }
            }) 
         },
         handleCurrentChange(val){
-           this.currentRow = val
-           this.getRullListByDrugName(val.id)
-        },
-        getRullListByDrugName(id){
-            const params = {
-              id:id,
+          for(let i=0;i<this.tableData.length;i++){
+             if(val.id == this.tableData[i].id){
+                this.tableDatatwo = this.tableData[i].XtStandName
+             }
+          }
+
+         for (let i = 0; i < this.tableDatatwo.length; i++) {
+             console.log("222",this.tableDatatwo[i].isSelected)
+            if (this.tableDatatwo[i].isSelected) {
+                this.$nextTick(function() {
+                this.$refs.multipleTable.toggleRowSelection(this.tableDatatwo[i])
+                })
             }
-           getRullListByDrugName(params).then(response=>{
-              if(response.data.state ==  1){
-                var drugName =  response.data.data.drugName
-                this.tableDatatwo = drugName
+         }
+        //  this.currentRow = val
+           
+        //    this.getRullListByDrugName(val.id)
+        },
+        // getRullListByDrugName(id){
+        //     const params = {
+        //       id:id,
+        //     }
+        //    getRullListByDrugName(params).then(response=>{
+        //       if(response.data.state ==  1){
+        //         var drugName =  response.data.data.drugName
+        //         this.tableDatatwo = drugName
+        //       }
+        //    })
+        // },
+        // handleSelectionChange(val){
+        //    console.log("val22222",val)
+        //    this.medicineData = val
+        // },
+        changeAllGoodInfoTableData(selection){  
+        let selected = selection.length && selection.indexOf(selection) !== -1
+
+        if (selection.length > 0) {
+          for (let y = 0; y < this.tableDatatwo.length; y++) {
+                for (let i = 0; i < selection.length; i++) {
+                if (this.tableDatatwo[y].id == selection[i].id) {
+                    this.tableDatatwo[y].isSelected = true
+                }
+               }
+             }
+           }else{
+             for (let y = 0; y < this.tableDatatwo.length; y++) {
+                    this.tableDatatwo[y].isSelected = false 
               }
-           })
+           }
         },
-        handleSelectionChange(val){
-           this.medicineData = val
+        selectGoodInfo(rows, row){
+          let selected = rows.length && rows.indexOf(row) !== -1
+           if(selected == true){
+            for (let y = 0; y < this.tableDatatwo.length; y++) {
+                for (let i = 0; i < rows.length; i++) {
+                if (this.tableDatatwo[y].id == rows[i].id) {
+                    this.tableDatatwo[y].isSelected = true
+                 }
+                }
+            }
+           }
+           if(selected == 0){
+            for (let y = 0; y < this.tableDatatwo.length; y++) {
+                this.tableDatatwo[y].isSelected = false 
+            }
+           }
         },
-
-        SaveSelfMedicines(){
-          if(this.medicineData.length == 0){
+      SaveSelfMedicines(){
+        this.multipleSelection = []
+          for (let i = 0; i < this.tableData.length; i++) {
+            for (let a = 0; a < this.tableData[i].XtStandName.length; a++) {
+                if (this.tableData[i].XtStandName[a].isSelected) {
+                    this.multipleSelection.push(this.tableData[i].XtStandName[a])
+                }
+            }
+         }
+          if(this.multipleSelection.length == 0){
              this.$message.error("请添加药品规格")
              return
           }
           const params = {
              patient_id:this.patient_id,
-             medicineData:this.medicineData
+             medicineData:this.multipleSelection
           }
-         console.log("params----",params)
-       
          SaveSelfMedicines(params).then(response=>{
              if(response.data.state == 1){
                 var msg = response.data.data.msg
@@ -123,7 +190,7 @@ export default {
                 this.$message.error("药品名称规格已存在")
              }
            })   
-        }
+        },
     },
   created(){
        //获取所有药品名称

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -46,7 +46,8 @@
                 <div style="width:160px;">
                     <div class="tablesTitle">患者列表</div>
                     <el-table :data="tablePatient" border style="width: 100%;" height="500" :row-style="{ color: '#303133' }" :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row
-                    @current-change="handleCurrentChange"  ref="monthlyPlanTable">
+                    @current-change="handleCurrentChange"  ref="monthlyPlanTable"
+                    >
                         <el-table-column align="center" prop="dialysis_no" label="透析号" width="70">
                             <template slot-scope="scope">{{scope.row.dialysis_no}}</template>
                         </el-table-column>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -496,6 +496,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg)
@@ -511,7 +513,7 @@
               }
               this.$refs.dialog.show()
               for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-                this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+                this.propForm.goodType.push(response.data.data.goodInfo[i].type)
               }
               const obj = {}
               this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -527,7 +529,7 @@
               for (let a = 0; a < response.data.data.goodInfo.length; a++) {
                 var respObj = response.data.data.goodInfo[a]
                 respObj['isSelected'] = false
-                if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+                if (respObj.type.id == this.propForm.goodType[i].id) {
                   goodInfo.push(respObj)
                 }
               }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -505,6 +505,8 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       };
+      this.propForm.goods = []
+
       GetAllGoodInfoByID(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
@@ -517,7 +519,7 @@ export default {
           this.$refs.dialog.show();
           for (let i = 0; i < response.data.data.goodInfo.length; i++) {
             this.propForm.goodType.push(
-              response.data.data.goodInfo[i].GoodsType
+              response.data.data.goodInfo[i].type
             );
           }
           const obj = {};
@@ -537,7 +539,7 @@ export default {
           for (let a = 0; a < response.data.data.goodInfo.length; a++) {
             var respObj = response.data.data.goodInfo[a];
             respObj["isSelected"] = false;
-            if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+            if (respObj.type.id == this.propForm.goodType[i].id) {
               goodInfo.push(respObj);
             }
           }

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -485,6 +485,7 @@ export default {
         manufacturer_id: this.form.manufacturer,
         dealer_id: this.form.dealer
       }
+      this.propForm.goods = []
       GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -500,7 +501,7 @@ export default {
             }
             this.$refs.dialog.show()
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
-              this.propForm.goodType.push(response.data.data.goodInfo[i].GoodsType)
+              this.propForm.goodType.push(response.data.data.goodInfo[i].type)
             }
             const obj = {}
             this.propForm.goodType = this.propForm.goodType.reduce((cur, next) => {
@@ -516,7 +517,7 @@ export default {
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a]
               respObj['isSelected'] = false
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj)
               }
             }

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -369,6 +369,8 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         };
+        this.propForm.goods = []
+
         GetAllGoodInfoByID(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg);
@@ -381,7 +383,7 @@
             this.$refs.dialog.show();
             for (let i = 0; i < response.data.data.goodInfo.length; i++) {
               this.propForm.goodType.push(
-                response.data.data.goodInfo[i].GoodsType
+                response.data.data.goodInfo[i].type
               );
             }
             const obj = {};
@@ -401,7 +403,7 @@
             for (let a = 0; a < response.data.data.goodInfo.length; a++) {
               var respObj = response.data.data.goodInfo[a];
               respObj["isSelected"] = false;
-              if (respObj.GoodsType.id == this.propForm.goodType[i].id) {
+              if (respObj.type.id == this.propForm.goodType[i].id) {
                 goodInfo.push(respObj);
               }
             }

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"
@@ -382,23 +386,16 @@
         <el-row>
           <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <el-select
+
+               <el-autocomplete
+                style="width:100%;"
+                class="inline-input"
                 v-model="nameForm.advice_name"
-                filterable
-                clearable
-                allow-create
-                :disabled="isChild"
-                placeholder="请选择(输入可搜索)"
-                style="width:200px"
-                @change="changeDrugName"
-              >
-                <el-option
-                  v-for="(item,index) in all_drug"
-                  :key="index"
-                  :label="item.drug_name"
-                  :value="item.drug_name"
-                ></el-option>
-              </el-select>
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                @input="changeDrugName"
+              ></el-autocomplete>
               
             </el-form-item>
           </el-col>
@@ -408,23 +405,14 @@
             <!--</el-form-item>-->
             <el-form-item label="药品规格 :" prop="advice_desc">
               <el-col :span="10">
-                 <el-select
+                <el-autocomplete
+                  style="width:100px;"
+                  class="inline-input"
                   v-model="nameForm.advice_desc"
-                  filterable
-                  clearable
-                  allow-create
-                  :disabled="isChild"
-                  placeholder="请选择(输入可搜索)"
-                  style="width:150px"
-                  @change="changeDrugDesc"
-                >
-                  <el-option
-                    v-for="item in drugSpec"
-                    :key="item.id"
-                    :label="item.drug_spec"
-                    :value="item.drug_spec"
-                  ></el-option>
-                 </el-select>
+                  :fetch-suggestions="querySearch1"
+                  placeholder="请输入内容"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="10">
@@ -641,9 +629,10 @@ export default {
         index: 0,
         id: 0,
         children: [],
-        way:"",
-        drug_id:"",
-        src_type:""
+        way:0,
+        drug_id:0,
+        src_type:"",
+        drug_name_id:0
       },
 
       drugOptions: [],
@@ -856,7 +845,7 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-     
+       console.log("888888",this.nameForm)
       if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -866,40 +855,14 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           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
-      // }
+      console.log("新增医嘱内容")
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
           if (_this.nameForm.isEdit) {
             var submitForm = null;
             if (!this.isChild) {
+              console.log("进来了吗")
               submitForm = {
                 advice_type: _this.groupForm.advice_type,
                 advice_date: _this.groupForm.advice_date,
@@ -914,6 +877,9 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_name_id:_this.nameForm.drug_name_id,
+                drug_id:_this.nameForm.drug_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
@@ -943,6 +909,9 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_name_id:_this.nameForm.drug_name_id,
+                drug_id:_this.nameForm.drug_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
@@ -951,13 +920,14 @@ export default {
                 groupno: _this.groupForm.groupno,
                 frequency_type: 0,
                 day_count: "0",
-                week_days: ""
+                week_days: "",
+              
               };
             }
             let mode = "";
 
             if (_this.groupForm.advice_type == 1) {
-              // if(_this.nameForm.)
+            
               mode = "1-3";
               if (
                 _this.groupForm.doctor != _this.$store.getters.xt_user.user.id
@@ -972,7 +942,7 @@ export default {
                 mode = "3-1";
               }
             }
-
+            console.log("编辑",submitForm)
             EditNewDoctorAdvice(
               this.patientID,
               this.groupSelectRow.id,
@@ -998,31 +968,22 @@ export default {
                   ) {
                     var advice = response.data.data.advice;
                     _this.adviceTableData[index].drug_spec = advice.drug_spec;
-                    _this.adviceTableData[index].drug_spec_unit =
-                      advice.drug_spec_unit;
+                    _this.adviceTableData[index].drug_spec_unit = advice.drug_spec_unit;
                     _this.adviceTableData[index].start_time = advice.start_time;
-                    _this.adviceTableData[index].advice_name =
-                      advice.advice_name;
-                    _this.adviceTableData[index].advice_desc =
-                      advice.advice_desc;
-                    _this.adviceTableData[index].single_dose =
-                      advice.single_dose;
-                    _this.adviceTableData[index].single_dose_unit =
-                      advice.single_dose_unit;
-                    _this.adviceTableData[index].delivery_way =
-                      advice.delivery_way;
-                    _this.adviceTableData[index].execution_frequency =
-                      advice.execution_frequency;
-                    _this.adviceTableData[index].prescribing_number =
-                      advice.prescribing_number;
-                    _this.adviceTableData[index].prescribing_number_unit =
-                      advice.prescribing_number_unit;
-
-                    _this.adviceTableData[index].frequency_type =
-                      advice.frequency_type;
+                    _this.adviceTableData[index].advice_name =advice.advice_name;
+                    _this.adviceTableData[index].advice_desc = advice.advice_desc;
+                    _this.adviceTableData[index].single_dose = advice.single_dose;
+                    _this.adviceTableData[index].single_dose_unit = advice.single_dose_unit;
+                    _this.adviceTableData[index].delivery_way = advice.delivery_way;
+                    _this.adviceTableData[index].execution_frequency = advice.execution_frequency;
+                    _this.adviceTableData[index].prescribing_number = advice.prescribing_number;
+                    _this.adviceTableData[index].prescribing_number_unit = advice.prescribing_number_unit;
+                    _this.adviceTableData[index].frequency_type = advice.frequency_type;
                     _this.adviceTableData[index].day_count = advice.day_count;
                     _this.adviceTableData[index].week_day = advice.week_day;
-
+                    _this.adviceTableData[index].way = advice.way,
+                    _this.adviceTableData[index].drug_id = advice.drug_id,
+                    _this.adviceTableData[index].drug_name_id = advice.drug_name_id
                     break;
                   }
                 }
@@ -1038,42 +999,21 @@ export default {
                       var children =
                         _this.groupForm.adviceNames[index].children;
                       for (let j = 0; j < ale; j++) {
-                        if (
-                          _this.groupSelectRow.row_key == children[j].row_key
-                        ) {
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].advice_name = _this.nameForm.advice_name;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].advice_desc = _this.nameForm.advice_desc;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].single_dose = "" + _this.nameForm.single_dose;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].single_dose_unit = _this.nameForm.single_dose_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].drug_spec = "" + _this.nameForm.drug_spec;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].drug_spec_unit = _this.nameForm.drug_spec_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].prescribing_number =
-                            "" + _this.nameForm.prescribing_number;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].prescribing_number_unit =
-                            _this.nameForm.prescribing_number_unit;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].delivery_way = _this.nameForm.delivery_way;
-                          _this.groupForm.adviceNames[index].children[
-                            j
-                          ].execution_frequency =
-                            _this.nameForm.execution_frequency;
+                        if (_this.groupSelectRow.row_key == children[j].row_key) {
+                          _this.groupForm.adviceNames[index].children[j].advice_name = _this.nameForm.advice_name;
+                          _this.groupForm.adviceNames[index].children[j].advice_desc = _this.nameForm.advice_desc;
+                          _this.groupForm.adviceNames[index].children[j].single_dose = "" + _this.nameForm.single_dose;
+                          _this.groupForm.adviceNames[index].children[j].single_dose_unit = _this.nameForm.single_dose_unit;
+                          _this.groupForm.adviceNames[index].children[j].drug_spec = "" + _this.nameForm.drug_spec;
+                          _this.groupForm.adviceNames[index].children[j].drug_spec_unit = _this.nameForm.drug_spec_unit;
+                          _this.groupForm.adviceNames[index].children[j].prescribing_number ="" + _this.nameForm.prescribing_number;
+                          _this.groupForm.adviceNames[index].children[j].prescribing_number_unit =
+                          _this.nameForm.prescribing_number_unit;
+                          _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].way = _this.nameForm.way
+                          _this.groupForm.adviceNames[index].children[j].drug_id = _this.nameForm.drug_id
+                          _this.groupForm.adviceNames[index].children[j].drug_name_id = _this.nameForm.drug_name_id
                           _this.$set(
                             _this.groupForm.adviceNames[index].children,
                             j,
@@ -1086,40 +1026,23 @@ export default {
                   }
                 } else {
                   for (let index = 0; index < ale; index++) {
-                    if (
-                      _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_desc =
-                        "" + _this.nameForm.advice_desc;
-                      _this.groupForm.adviceNames[index].single_dose =
-                        "" + _this.nameForm.single_dose;
-                      _this.groupForm.adviceNames[index].single_dose_unit =
-                        _this.nameForm.single_dose_unit;
-                      _this.groupForm.adviceNames[index].drug_spec =
-                        "" + _this.nameForm.drug_spec;
-                      _this.groupForm.adviceNames[index].drug_spec_unit =
-                        _this.nameForm.drug_spec_unit;
-                      _this.groupForm.adviceNames[index].prescribing_number =
-                        "" + _this.nameForm.prescribing_number;
-                      _this.groupForm.adviceNames[
-                        index
-                      ].prescribing_number_unit =
-                        _this.nameForm.prescribing_number_unit;
-                      _this.groupForm.adviceNames[index].delivery_way =
-                        _this.nameForm.delivery_way;
-                      _this.groupForm.adviceNames[index].execution_frequency =
-                        _this.nameForm.execution_frequency;
-
-                      _this.groupForm.adviceNames[index].frequency_type =
-                        _this.nameForm.frequency_type;
-                      _this.groupForm.adviceNames[index].day_count =
-                        _this.nameForm.day_count;
-                      _this.groupForm.adviceNames[
-                        index
-                      ].week_day = _this.weeks.join(",");
+                    if ( _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_desc = "" + _this.nameForm.advice_desc;
+                      _this.groupForm.adviceNames[index].single_dose ="" + _this.nameForm.single_dose;
+                      _this.groupForm.adviceNames[index].single_dose_unit =_this.nameForm.single_dose_unit;
+                      _this.groupForm.adviceNames[index].drug_spec ="" + _this.nameForm.drug_spec;
+                      _this.groupForm.adviceNames[index].drug_spec_unit =_this.nameForm.drug_spec_unit;
+                      _this.groupForm.adviceNames[index].prescribing_number ="" + _this.nameForm.prescribing_number;
+                      _this.groupForm.adviceNames[index].prescribing_number_unit =_this.nameForm.prescribing_number_unit;
+                      _this.groupForm.adviceNames[index].delivery_way =_this.nameForm.delivery_way;
+                      _this.groupForm.adviceNames[index].execution_frequency =_this.nameForm.execution_frequency;
+                      _this.groupForm.adviceNames[index].frequency_type =_this.nameForm.frequency_type;
+                      _this.groupForm.adviceNames[index].drug_name_id = _this.nameForm.drug_name_id
+                      _this.groupForm.adviceNames[index].drug_id = _this.nameForm.drug_id
+                      _this.groupForm.adviceNames[index].way = _this.nameForm.way
+                      _this.groupForm.adviceNames[index].day_count = _this.nameForm.day_count;
+                      _this.groupForm.adviceNames[index].week_day = _this.weeks.join(",");
                       console.log(_this.weeks);
                       _this.$set(
                         _this.groupForm.adviceNames,
@@ -1149,12 +1072,16 @@ export default {
                 prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                 delivery_way: _this.nameForm.delivery_way,
                 execution_frequency: _this.nameForm.execution_frequency,
+                way:_this.nameForm.way,
+                drug_id:_this.nameForm.drug_id,
+                drug_name_id:_this.nameForm.drug_name_id,
                 isEdit: 0,
                 id: 0,
                 advice_doctor: "",
                 remark: _this.groupForm.remark,
                 parent_id: _this.groupSelectRow.id,
-                groupno: _this.groupForm.groupno
+                groupno: _this.groupForm.groupno,
+               
               };
 
               let mode = "";
@@ -1163,7 +1090,7 @@ export default {
               } else {
                 mode = "1-1";
               }
-
+              console.log("submitFort",submitForm)
               CreateNewDoctorAdvice(this.patientID, submitForm, mode).then(
                 response => {
                   if (response.data.state == 0) {
@@ -1257,17 +1184,16 @@ export default {
                     drug_spec: "" + _this.nameForm.drug_spec,
                     drug_spec_unit: _this.nameForm.drug_spec_unit,
                     prescribing_number: "" + _this.nameForm.prescribing_number,
-                    prescribing_number_unit:
-                      _this.nameForm.prescribing_number_unit,
+                    prescribing_number_unit: _this.nameForm.prescribing_number_unit,
                     delivery_way: _this.nameForm.delivery_way,
                     execution_frequency: _this.nameForm.execution_frequency,
-                    template_id:
-                      "D" + new Date().getTime() + this.getRandValue(),
-
+                    template_id:"D" + new Date().getTime() + this.getRandValue(),
                     frequency_type: _this.nameForm.frequency_type,
                     day_count: _this.nameForm.day_count.toString(),
                     week_days: _this.nameForm.week_days,
-
+                    drug_id:_this.nameForm.drug_id,
+                    way:_this.nameForm.way,
+                    drug_name_id:_this.nameForm.drug_name_id,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -1286,13 +1212,9 @@ export default {
               } else {
                 mode = "1-1";
               }
+              console.log("触发了吗",_this.patientID,_this.submitGroupForm)
+              CreateNewGroupAdvice(_this.patientID, _this.groupForm.groupno,_this.submitGroupForm, mode).then(response => {
 
-              CreateNewGroupAdvice(
-                _this.patientID,
-                _this.groupForm.groupno,
-                _this.submitGroupForm,
-                mode
-              ).then(response => {
                 if (response.data.state == 0) {
                   _this.$message.error(response.data.msg);
                   return false;
@@ -1377,7 +1299,9 @@ export default {
                         frequency_type: groups[index].frequency_type,
                         day_count: groups[index].day_count,
                         week_day: groups[index].week_day,
-
+                        drug_name_id:0,
+                        way:0,
+                        drug_id:0,
                         isEdit: 0,
                         index: 0,
                         id: groups[index].id,
@@ -1507,7 +1431,10 @@ export default {
 
           day_count: this.groupSelectRow.day_count,
           week_days: this.groupSelectRow.week_day,
-          frequency_type: this.groupSelectRow.frequency_type
+          frequency_type: this.groupSelectRow.frequency_type,
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         };
 
         if (!this.isChild) {
@@ -1528,6 +1455,9 @@ export default {
           delivery_way: "",
           execution_frequency: "",
           template_id: "",
+          way:0,
+          drug_id:0,
+          drug_name_id:0,
           isEdit: 0,
           index: 0,
           id: 0,
@@ -1733,7 +1663,10 @@ export default {
         }
       }
     },
+
+
     newAddTempForm() {
+      console.log("9999888")
       this.allSelectedTemplate = [];
       var thisRowKey = 0;
       for (const indexs in this.adviceTemplateMaps) {
@@ -1742,36 +1675,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: [],
@@ -1800,6 +1722,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: [],
@@ -1851,19 +1776,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: [],
@@ -1887,6 +1810,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: [],
@@ -1987,7 +1913,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,
@@ -2015,6 +1943,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
@@ -2051,39 +1982,19 @@ export default {
               .DoctorAdviceTemplate) {
               _this.editRowKey++;
               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,
-                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,
+                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,
+                way:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].way,
+                drug_id:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_id,
+                drug_name_id:_this.adviceTemplateMaps[mapid].DoctorAdviceTemplate[index].drug_name_id,
                 isEdit: 0,
                 id: 0,
                 children: [],
@@ -2110,10 +2021,12 @@ export default {
                     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,
+                    way:children[key].way,
+                    drug_id:children[key].drug_id,
+                    drug_name_id:children[key].drug_name_id,
                     isEdit: 0,
                     id: 0,
                     children: [],
@@ -2338,18 +2251,13 @@ export default {
       }
     },
     getAdviceConfig(type) {
+       console.log("type",type)
       getAdviceConfig(type).then(response => {
         if (response.data.state == 1) {
-          this.deliveryWayOptions =
-            response.data.data.drugways === null
-              ? []
-              : response.data.data.drugways;
-          this.executionFrequencyOptions =
-            response.data.data.efs === null ? [] : response.data.data.efs;
-          this.adviceTemplates =
-            response.data.data.advice_templates === null
-              ? []
-              : response.data.data.advice_templates;
+          this.deliveryWayOptions =response.data.data.drugways === null? []: response.data.data.drugways;
+          console.log("给药途径",this.deliveryWayOptions)
+          this.executionFrequencyOptions = response.data.data.efs === null ? [] : response.data.data.efs;
+          this.adviceTemplates = response.data.data.advice_templates === null? []: response.data.data.advice_templates;
 
           var templateLen = this.adviceTemplates.length;
           for (let index = 0; index < templateLen; index++) {
@@ -2357,8 +2265,7 @@ export default {
               continue;
             }
 
-            var DoctorAdviceTemplate = this.adviceTemplates[index]
-              .DoctorAdviceTemplate;
+            var DoctorAdviceTemplate = this.adviceTemplates[index].DoctorAdviceTemplate;
             for (let i = 0; i < DoctorAdviceTemplate.length; i++) {
               DoctorAdviceTemplate[i].selection = false;
             }
@@ -2489,7 +2396,7 @@ export default {
                 obj.custom_id = this.rand(10000000, 99999999)
                 obj.drug_specs = base_drug_list[i].drug_specs
                 this.all_drug.push(obj)
-                console.log("中2222222222222222222",this.all_drug)
+                
               }
             }   
         })
@@ -2518,9 +2425,55 @@ export default {
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
+            this.nameForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.nameForm.prescribing_number_unit = this.drugSpec[i].min_unit
+            this.nameForm.drug_spec_unit = this.drugSpec[i].min_unit
+
+            if(this.drugSpec[i].drug_name_id){
+               this.nameForm.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.nameForm.drug_name_id = 0
+            }
           }
         }
-      }
+      },
+      handleSelect1(){
+        
+      },
+      handleSelect(){
+
+      },
+
+       querySearch(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+       
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+      
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+       
+        cb(results);
+      },
   },
   watch: {
     rowKey: function() {

src/xt_pages/user/doctorAdvice.vue

@@ -945,25 +945,15 @@
           <el-row>
             <el-col :span="10">
               <el-form-item label="医嘱内容:" required prop="advice_name">
-                <!-- <el-input v-model="nameForm.advice_name"></el-input> -->
-
-                <el-select
-                  v-model="nameForm.advice_name"
-                  filterable
-                  clearable
-                  allow-create
-                  :disabled="isChild"
-                  placeholder="请选择(输入可搜索)"
-                  style="width:200px"
-                  @change="changeDrugName"
-                >
-                  <el-option
-                    v-for="(item,index) in all_drug"
-                    :key="index"
-                    :label="item.drug_name"
-                    :value="item.drug_name"
-                  ></el-option>
-                </el-select>
+               <el-autocomplete
+                style="width:100%;"
+                class="inline-input"
+                v-model="nameForm.advice_name"
+                :fetch-suggestions="querySearch"
+                placeholder="请输入内容"
+                @select="handleSelect"
+                @input="changeDrugName"
+              ></el-autocomplete>
               <!-- <div style="color:red;font-size:12px;">
                 库存不足50
               </div> -->
@@ -972,25 +962,17 @@
 
             <el-col :span="14">
               <el-form-item label="药品规格 :" prop="advice_desc">
-                <el-col :span="12">
-                  <!-- <el-input v-model="nameForm.advice_desc"></el-input> -->
-                    <el-select
-                    v-model="nameForm.advice_desc"
-                    filterable
-                    clearable
-                    allow-create
-                    :disabled="isChild"
-                    placeholder="请选择(输入可搜索)"
-                    style="width:150px"
-                    @change="changeDrugDesc"
-                >
-                  <el-option
-                    v-for="item in drugSpec"
-                    :key="item.id"
-                    :label="item.drug_spec"
-                    :value="item.drug_spec"
-                  ></el-option>
-                 </el-select>
+                <el-col :span="6">
+               
+                <el-autocomplete
+                  style="width:100px;"
+                  class="inline-input"
+                  v-model="nameForm.advice_desc"
+                  :fetch-suggestions="querySearch1"
+                  placeholder="请输入内容"
+                  @select="handleSelect1"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
 
                 </el-col>
                 <el-col class="line" :span="2">&nbsp;</el-col>
@@ -1176,6 +1158,8 @@
         ref="editGroupForm"
       ></edit-group-advice>
 
+
+    <!-- 新增子药 -->
       <el-dialog
         :title="dialogTitle"
         :visible.sync="dialogFormVisible"
@@ -1236,25 +1220,32 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="医嘱内容 :" required prop="advice_name">
-                <el-input v-model="adviceForm.advice_name"></el-input>
-                <!--<el-select v-model="adviceForm.advice_name" @change="changeAdviceName" filterable clearable allow-create placeholder="请选择(输入可搜索)" style="width:50%" >-->
-                <!--<el-option-->
-                <!--v-for="item in adviceTemplates"-->
-                <!--:key="item.id"-->
-                <!--:label="item.advice_name"-->
-                <!--:value="item.id"-->
-                <!--&gt;-->
-                <!--<span >{{ item.advice_name }}</span>-->
-                <!--<span >{{ item.advice_spec }}</span>-->
-                <!--</el-option>-->
-                <!--</el-select>-->
+                <el-autocomplete
+                  style="width:100%;"
+                  class="inline-input"
+                  v-model="adviceForm.advice_name"
+                  :fetch-suggestions="querySearch"
+                  placeholder="请输入内容"
+                  @select="handleSelect"
+                  @input="changeDrugNameTwo"
+                ></el-autocomplete>
               </el-form-item>
             </el-col>
 
             <el-col :span="12">
               <el-form-item label="药品规格 :" prop="advice_desc">
                 <el-col :span="9">
-                  <el-input v-model="adviceForm.advice_desc"></el-input>
+                  <!-- <el-input v-model="adviceForm.advice_desc"></el-input> -->
+                  <el-autocomplete
+                    style="width:100px;"
+                    class="inline-input"
+                    v-model="adviceForm.advice_desc"
+                    :fetch-suggestions="querySearch1"
+                    placeholder="请输入内容"
+                    @select="handleSelect1"
+                    @input="changeDrugDescTwo"
+                  ></el-autocomplete>
+
                 </el-col>
                 <el-col class="line" :span="1">&nbsp;</el-col>
                 <el-col :span="14">
@@ -2090,7 +2081,10 @@ export default {
         execution_frequency: "",
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        drug_id:0,
+        way:0,
+        drug_name_id:0,
       },
       nameForm: {
         advice_name: "",
@@ -2234,7 +2228,18 @@ export default {
               mode = "3-1";
             }
           }
+          if(this.src_type == ""){
+              this.adviceForm.way = 0
+              this.adviceForm.drug_id = 0
+              this.adviceForm.drug_name_id = 0
+          }
 
+          if(this.src_type == 2){ //自备药
+              var arr = this.adviceForm.advice_name.split("(自备药)")
+              this.adviceForm.advice_name = arr[0]
+          }
+
+       
           EditNewDoctorAdvice(
             this.patientID,
             this.adviceForm.id,
@@ -2301,9 +2306,7 @@ export default {
             remark: this.groupForm.remark,
             parent_id: this.groupForm.parent_id,
           };
-          console.log("22222",submitForm)
-          console.log("33333",this.private_drug_config.drug_start)
-          console.log("44444",this.medicals)
+        
          
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
@@ -2316,19 +2319,16 @@ export default {
           }
           submitForm.adviceNames = adviceNames;
 
-
-         
-
           let mode = "";
           if (this.groupForm.advice_type == 1) {
             mode = "1-2";
           } else if (this.groupForm.advice_type == 3) {
             mode = "1-1";
           }
-        console.log("22222222",this.medicals)
-        console.log("3333333",submitForm)
-      
-        if(this.private_drug_config.drug_start == 1){
+        console.log("长期医嘱2222",this.medicals)
+        console.log("长期医嘱3333",submitForm)
+       
+        if(this.private_drug_config != null&&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){
@@ -2421,7 +2421,18 @@ export default {
             //临时
             mode = "1-1";
           }
+          if(this.src_type == ""){
+              this.adviceForm.way = 0
+              this.adviceForm.drug_id = 0
+              this.adviceForm.drug_name_id = 0
+          }
 
+          if(this.src_type == 2){ //自备药
+              var arr = this.adviceForm.advice_name.split("(自备药)")
+              this.adviceForm.advice_name = arr[0]
+          }
+          console.log("222222",this.adviceForm)
+         
           CreateNewDoctorAdvice(this.patientID, this.adviceForm, mode).then(
             response => {
               if (response.data.state == 0) {
@@ -2688,8 +2699,8 @@ export default {
           id: 0,
           children: [],
           parent_row: 0,
-          way:"",
-          drug_id:'',
+          way:0,
+          drug_id:0,
           drug_name_id:0,
         };
         this.nameFormTitle = "新增医嘱内容";
@@ -2958,8 +2969,15 @@ export default {
     },
     openConfig() {},
     openEditGroupAdvice(groupno) {
+      console.log("groupno",groupno)
       var groups = [];
       this.rowKey = 0;
+      for(let i=0;i<this.adviceTableData.length;i++){
+        if(this.adviceTableData[i].advice_type == 2){
+           this.adviceTableData[i].advice_type = "临时"
+        }
+      }
+
       for (const index in this.adviceTableData) {
         if (groupno == this.adviceTableData[index].groupno) {
           groups.push(this.adviceTableData[index]);
@@ -2979,7 +2997,7 @@ export default {
         remark: groups[0].remark,
         groupno: groupno
       };
-      // console.log(groups[0]);
+      console.log("到了",groups[0]);
 
       var childMap = {};
       for (const index in groups) {
@@ -3023,7 +3041,7 @@ export default {
           row_key: this.rowKey,
           table: []
         };
-        console.log("itme-----------",item)
+      
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;
@@ -3063,6 +3081,7 @@ export default {
     },
 
     openEdit(index, row) {
+      
       this.currentIndex = index;
       (this.dialogTitle = "修改医嘱"), (this.isEdit = true);
 
@@ -4040,7 +4059,7 @@ export default {
           var arr = this.nameForm.advice_name.split("(自备药)")
           this.nameForm.advice_name = arr[0]
        }
-      
+      console.log("医嘱2222",this.nameForm)
       var _this = this;
       this.$refs[formName].validate(valid => {
         if (valid) {
@@ -4492,6 +4511,40 @@ export default {
           
       })
     },
+    changeDrugNameTwo(name){
+       this.current_drug_name = name
+       this.adviceForm.advice_desc = ''
+      this.drugSpec = []
+      for (let i = 0; i < this.all_drug.length; i++) {
+        if (this.all_drug[i].drug_name == name) {
+            this.drugSpec = this.all_drug[i].drug_specs
+          }
+       }   
+    },
+   changeDrugDescTwo(name){
+      this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.adviceForm.advice_desc = this.drugSpec[i].drug_spec
+            this.adviceForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.adviceForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.adviceForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.adviceForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.adviceForm.drug_id = this.drugSpec[i].id
+            this.adviceForm.way = this.drugSpec[i].type
+            this.adviceForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.adviceForm.drug_spec_unit = this.drugSpec[i].min_unit
+            this.adviceForm.prescribing_number_unit = this.drugSpec[i].min_unit
+            if(this.drugSpec[i].drug_name_id){
+               this.adviceForm.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.adviceForm.drug_name_id = 0
+            }
+          }
+        }
+   },
    changeDrugName(name){
        this.current_drug_name = name
        this.nameForm.advice_desc = ''
@@ -4515,8 +4568,13 @@ export default {
             this.src_type = this.drugSpec[i].type
             this.nameForm.drug_id = this.drugSpec[i].id
             this.nameForm.way = this.drugSpec[i].type
+            this.nameForm.single_dose_unit = this.drugSpec[i].min_unit
+            this.nameForm.drug_spec_unit = this.drugSpec[i].min_unit
+            this.nameForm.prescribing_number_unit = this.drugSpec[i].min_unit
             if(this.drugSpec[i].drug_name_id){
-               this.nameForm.drug_name_id = 0
+               this.nameForm.drug_name_id = this.drugSpec[i].drug_name_id
+            }else{
+              this.nameForm.drug_name_id = 0
             }
           }
         }
@@ -4524,6 +4582,44 @@ export default {
     rand(min, max) {
         return Math.floor(Math.random() * (max - min)) + min;
     },
+
+     querySearch(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.all_drug;
+        restaurants.map(item => {
+          item.value = item.drug_name
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+     },
+
+     createFilter(queryString) {
+        return (restaurant) => {
+          return (restaurant.drug_name.toLowerCase().indexOf(queryString.toLowerCase()) === 0);
+        };
+     },
+
+     querySearch1(queryString, cb) {
+        console.log('queryString',queryString)
+        var restaurants = this.drugSpec;
+         console.log(restaurants)
+        restaurants.map(item => {
+          item.value = item.drug_spec
+        })
+        var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
+        // 调用 callback 返回建议列表的数据
+        console.log('results',results)
+        cb(results);
+      },
+
+      handleSelect1(){
+
+      },
+      handleSelect(){
+
+      }
   },
   watch: {
     adviceTableData: function() {