自备药

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

@@ -439,13 +439,12 @@
                   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="选择"
                 >
@@ -718,7 +717,9 @@
           advice_doctor: '',
           remark: '',
           parent_id: 0,
-          drug_name_id:"",
+          drug_id:0,
+          drug_name_id:0,
+          way:0,
         },
         nameForm: {
           advice_name: '',
@@ -2168,11 +2169,6 @@
         //   }
         // });
       },
-
-      handleSelect1(){
-
-      }
-      ,
       objectSpanMethod({ row, column, rowIndex, columnIndex }) {
      
         if (columnIndex === 0) {
@@ -2367,7 +2363,8 @@
      },
     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) {
@@ -2376,8 +2373,8 @@
        }
     },
     changeDrugDesc(name) {
+      this.$forceUpdate()
         this.current_drug_spec = name
-         console.log("999",this.drugSpec)
         for (let i = 0; i < this.drugSpec.length; i++) {
           if (this.drugSpec[i].drug_spec == name) {
             this.form.advice_desc = this.drugSpec[i].drug_spec

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

@@ -1597,8 +1597,8 @@ export default {
        
     },
     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) {

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

@@ -382,23 +382,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 +401,15 @@
             <!--</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">
@@ -2489,7 +2474,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)
+                
               }
             }   
         })
@@ -2523,7 +2508,38 @@ export default {
       },
       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() {