Merge branch '20200710_pc_vue_new_branch' into 20200916_pc_vue_new_branch

src/api/advice.js

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

src/lang/zh.js

     patient: '患者中心',
     dialysisSolution: '透析处方',
     inspection: '检验检查',
-    home: '首页',
+    home: '透析首页',
     weight: '干体重',
     dialysisRecord: '透析记录',
     scheduling: '排班信息',

src/xt_pages/data/druguseTemplate.vue

                 <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"
                 <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"
                   <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">
           }
         })
       },
-      submitTemplate(formName) {
+      handleSelect1(){
 
-        
+      },
+      handleSelect(){
+
+      },
+      submitTemplate(formName) {
+ 
         if(this.src_type == ""){
             this.templateForm.way = 0
             this.templateForm.drug_id = 0
             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)
           if (isNaN(this.templateForm.prescribing_number)) {
             this.templateForm.prescribing_number = 0
           }
-
+          
           if (valid) {
             const templateFormTwo = {}
             templateFormTwo.template_id = this.current_template_id
          } 
         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)
             )
           }
         })
-      }, drugDesc(row) {
+      }, 
+      drugDesc(row) {
         if (row.isNoSub == 2) {
           if (row.drug_spec.length <= 0) {
             return ''
             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
           }
         }
             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

           <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

         :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">
         <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>
           <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">
 
             <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">
         >
           <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>
         <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>
         >
           <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>
       </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
 
           <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%;"
           </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="选择"
                 >
                   :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>
 
                   :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>
 
           advice_doctor: '',
           remark: '',
           parent_id: 0,
-          drug_name_id:"",
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         },
         nameForm: {
           advice_name: '',
         }
       },
       submitEditAdvice() {
-        console.log("this.form",this.form)
         if (this.form.advice_name.length == 0) {
           this.$message.error('请填写医嘱名称')
           return
       }
       ,
       submitExce() {
+        
         if (this.currentRow == null) {
           this.$message.error('请先选择要执行的医嘱！')
           return false
         }
         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)
           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 => {
           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,
         }
       }
       ,
           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,
         }
       }
       ,
       }
       ,
       execAdvice() {
+        
         if (this.is_has_exce == false) {
           this.$message.error('你没有执行医嘱的权限')
           return false
       }
       ,
       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) {
       }
       ,
       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 {
                 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)
               }
             }
                 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) {
        }
     },
     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) {
             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
         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

         <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"
         </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"
           
           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
              }
           }
           console.log("2222",submitForm)
-         
+        
           CreateGroupAdvice(this.patientID, 0, submitForm, mode).then(
             response => {
               if (response.data.state == 0) {
                   parent_row: parentRow,
                   row_key: thisRowKey
                 };
-                conosle.log("item======",child)
+                
                 item.children.push(child);
                 this.allSelectedTemplate.unshift(child);
               }
       this.templateFormVisible = true;
     },
     selectGroupAdvice(row) {
-      console.log("row-----",row)
       this.groupSelectRow = row;
     },
     groupClassName({ row, rowIndex }) {
                 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) {
        }
     },
     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{
         })
         var results = queryString ? restaurants.filter(this.createFilter(queryString)) : restaurants;
         // 调用 callback 返回建议列表的数据
-        console.log('results',results)
+       
         cb(results);
      },
 
      },
 
      querySearch1(queryString, cb) {
-        console.log('queryString',queryString)
+      
         var restaurants = this.drugSpec;
          console.log(restaurants)
         restaurants.map(item => {
         })
         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

               <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="备注： ">
           catheter_suture_other:'',
           urine_volume:'',
           edema:'',
-
+          special_treatment:'',
         },
 
         InnerDialogProps: {

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

         }
       }, 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++) {
             }
           }
         }
-
-
-
       }
     }
 

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

             <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}}
                     </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>
             currentRow:"",
             tableDatatwo:[],
             patient_id:0,
-            medicineData:[]
+            medicineData:[],
+            standList:[],
+            table_current_index:-1,
         }
     },
     methods:{
              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
                 this.$message.error("药品名称规格已存在")
              }
            })   
-        }
+        },
     },
   created(){
        //获取所有药品名称

src/xt_pages/stock/selfPreparedMedicine/index.vue

                 <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/user/components/EditGroupAdvice.vue

         <el-row>
           <el-col :span="10">
             <el-form-item label="医嘱内容 :" required prop="advice_name">
-              <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>
+              
             </el-form-item>
           </el-col>
           <el-col :span="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="请输入内容"
+                  @select="handleSelect1"
+                  @input="changeDrugDesc"
+                ></el-autocomplete>
               </el-col>
               <el-col class="line" :span="2">&nbsp;</el-col>
               <el-col :span="10">
       },
 
       drugOptions: [],
+      deliveryWayOptions: [],
+      executionFrequencyOptions: [],
       adviceTemplates: [],
       submitGroupForm: {
         advice_type: "",
         return [];
       }
     },
-    executionFrequencyOptions: {
-      type: Array,
-      default: function() {
-        return [];
-      }
-    }, deliveryWayOptions: {
-      type: Array,
-      default: function() {
-        return [];
-      }
-    }, unitsOption: {
+
+    unitsOption: {
       type: Array,
       default: function() {
         return [];
         .catch(() => {});
     },
     submitNameForm(formName) {
-
+     
       if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
        }
 
       //  if(typeof(this.nameForm.advice_name) == "string"){
-
+         
       //     this.nameForm.advice_name == this.nameForm.advice_name
       // }
 
       //       var arr = name.split("(自备药)")
       //       drug_name = arr[0]
       //     }
-
+          
       //     this.nameForm.advice_name = drug_name
       //     this.nameForm.way = way
       // }
                 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)
+                
               }
-            }
+            }   
         })
-
+       
     },
     changeDrugName(name){
        this.current_drug_name = name
             this.nameForm.way = this.drugSpec[i].type
           }
         }
-      }
+      },
+      handleSelect1(){
+        
+      },
+
+       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

           <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> -->
 
             <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>
         ref="editGroupForm"
       ></edit-group-advice>
 
+
+    <!-- 新增子药 -->
       <el-dialog
         :title="dialogTitle"
         :visible.sync="dialogFormVisible"
             </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">
         execution_frequency: "",
         advice_doctor: "",
         remark: "",
-        parent_id: 0
+        parent_id: 0,
+        drug_id:0,
+        way:0,
+        drug_name_id:0,
       },
       nameForm: {
         advice_name: "",
               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,
           console.log("33333",this.private_drug_config.drug_start)
           console.log("44444",this.medicals)
 
+
+
           var adviceNames = [];
           for (const index in this.groupForm.adviceNames) {
             this.groupForm.adviceNames[
           } else if (this.groupForm.advice_type == 3) {
             mode = "1-1";
           }
-        console.log("22222222",this.medicals)
-        console.log("3333333",submitForm)
+        console.log("长期医嘱2222",this.medicals)
+        console.log("长期医嘱3333",submitForm)
 
-        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].drug_id == this.medicals[i].drug_name_id){
             //临时
             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 => {
           id: 0,
           children: [],
           parent_row: 0,
-          way:"",
-          drug_id:'',
+          way:0,
+          drug_id:0,
           drug_name_id:0,
         };
         this.nameFormTitle = "新增医嘱内容";
     },
     openConfig() {},
     openEditGroupAdvice(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]);
         remark: groups[0].remark,
         groupno: groupno
       };
-      // console.log(groups[0]);
+      console.log("2222",groups[0]);
 
       var childMap = {};
       for (const index in groups) {
           row_key: this.rowKey,
           table: []
         };
-        console.log("itme-----------",item)
+
         if (item.id in childMap) {
           for (const key in childMap[item.id]) {
             this.rowKey++;
           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) {
               : response.data.data.drugways;
           this.executionFrequencyOptions =
             response.data.data.efs === null ? [] : response.data.data.efs;
-          console.log(this.deliveryWayOptions)
-          console.log(this.executionFrequencyOptions)
-
         }
       });
     },
 
       })
     },
+    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 = ''
             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
             }
           }
         }
     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() {