自备药

src/api/advice.js

@@ -187,9 +187,10 @@ export function CreateAdviceTemplate(data) {
   });
 }
 
-export function UpdateAdviceTemplate(id, data) {
+export function UpdateAdviceTemplate(id, data,drug_id) {
+  
   return request({
-    url: "/api/advicetemplate/update?id=" + id,
+    url: "/api/advicetemplate/update?id=" + id+"&drug_id="+drug_id,
     method: "put",
     data: data
   });
@@ -285,6 +286,7 @@ export function DeleteParentAdviceTemplate(id) {
 }
 
 export function CreateSubAdvice(params) {
+  
   return request({
     url: "/api/subadvice/create",
     method: "post",

src/xt_pages/data/druguseTemplate.vue

@@ -45,6 +45,9 @@
               >{{$t('table.add')}}
               </el-button>
             </div>
+
+
+
             <el-table
               :data="adviceTemplates"
               border
@@ -297,7 +300,7 @@
                 <el-button type="primary" @click="submitTableTemplate('form')">保 存</el-button>
               </div>
             </el-dialog>
-            <el-dialog :title="dialogTitle" :visible.sync="templateFormVisible" width="700px">
+            <el-dialog :title="dialogTitle" :visible.sync="templateFormVisible" width="854px">
               <el-form
                 ref="templateForm"
                 :rules="templateRules"
@@ -305,19 +308,52 @@
                 label-width="90px"
               >
 
-                <el-row>
-                  <el-col :span="12">
-                    <el-form-item label="医嘱内容 :" required prop="advice_name">
-                      <el-input v-model="templateForm.advice_name"></el-input>
+                <el-row >
+                  <el-col :span="24">
+                    <el-form-item label="医嘱内容:" required prop="advice_name">
+                      <!-- <el-input v-model="templateForm.advice_name"></el-input> -->
+
+                      <el-select
+                        v-model="templateForm.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-form-item>
                   </el-col>
 
 
 
-                  <el-col :span="12">
+                  <el-col :span="15">
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="8">
-                        <el-input v-model="templateForm.advice_desc"></el-input>
+                        <!-- <el-input v-model="templateForm.advice_desc"></el-input> -->
+                         <el-select
+                          v-model="templateForm.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-col>
                       <el-col class="line" :span="2">&nbsp;</el-col>
                       <el-col :span="14">
@@ -468,7 +504,7 @@
             <!--TODO-->
 
 
-            <el-dialog :title="editDialogTitle" :visible.sync="templateEditFormVisible" width="700px">
+            <el-dialog :title="editDialogTitle" :visible.sync="templateEditFormVisible" width="854px">
               <el-form
                 ref="templateFormEdit"
                 :rules="templateEditRules"
@@ -476,16 +512,48 @@
                 label-width="90px"
               >
                 <el-row>
-                  <el-col :span="12">
+                  <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-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-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <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-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-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -708,7 +776,7 @@
             </el-dialog>
 
 
-            <el-dialog title="新增医嘱" :visible.sync="templateFormTwoVisible" width="700px">
+            <el-dialog title="新增医嘱" :visible.sync="templateFormTwoVisible" width="854px">
               <el-form
                 ref="templateForm"
                 :rules="templateEditRules"
@@ -716,16 +784,48 @@
                 label-width="90px"
               >
                 <el-row>
-                  <el-col :span="12">
+                  <el-col :span="24">
                     <el-form-item label="医嘱内容 :" required prop="advice_name">
-                      <el-input v-model="templateForm.advice_name"></el-input>
+                      <!-- <el-input v-model="templateForm.advice_name"></el-input> -->
+                    <el-select
+                        v-model="templateForm.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-form-item>
                   </el-col>
-                  <el-col :span="12">
+                  <el-col :span="15">
 
                     <el-form-item label="药品规格 :" prop="advice_desc">
                       <el-col :span="9">
-                        <el-input v-model="templateForm.advice_desc"></el-input>
+                        <!-- <el-input v-model="templateForm.advice_desc"></el-input> -->
+                      <el-select
+                          v-model="templateForm.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-col>
                       <el-col class="line" :span="1">&nbsp;</el-col>
                       <el-col :span="14">
@@ -1202,7 +1302,7 @@
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
 
   import { getDataConfig } from '@/utils/data'
-
+  import { getSelfMedicalList } from "@/api/drug/drug"
   export default {
     name: 'tab',
     components: { BreadCrumb },
@@ -1295,7 +1395,9 @@
           prescribing_number_unit: '',
           delivery_way: '',
           execution_frequency: '',
-          id: 0
+          id: 0,
+          drug_id:"",
+          way:""
         },
         dialogConfigVisible:false,
         templateFormEdit: {
@@ -1354,7 +1456,15 @@
           { lable: 14, name: '外用溶液' },
           { lable: 15, name: '软膏剂' },
           { lable: 16, name: '胶剂' }
-        ]
+        ],
+         medicals:[],
+         drugSpec:[],
+         all_drug:[],
+         current_drug_name:"",
+         current_drug_spec: "",
+         drug_id: 0,
+         src_type:"",
+         way:""
       }
     },
     created() {
@@ -1362,6 +1472,9 @@
       this.unitsOption = getDataConfig('hemodialysis', 'units')
       this.getDoctorAdviceConfig()
       this.getDoctorInitConfig()
+
+       //获取自备药
+      this.getSelfMedicalList()
     },
     methods: {
       initAdvice(){
@@ -1493,7 +1606,8 @@
       },
       onRowClick(row, event, column) {
         this.table_current_index = row.index
-      }, modifyRecordAction: function() {
+      }, 
+      modifyRecordAction: function() {
         if (this.table_current_index == -1) {
           this.$message.error('请选择一条医嘱记录')
           return
@@ -1522,7 +1636,10 @@
           this.templateTableVisible = false
         }).catch(() => {
         })
-      }, submitTableTemplate(formName) {
+      }, 
+
+      //添加医嘱模版
+      submitTableTemplate(formName) {
         if (this.adviceTableData.length <= 0) {
           this.$message.error('至少添加一条医嘱信息')
           return
@@ -1531,9 +1648,12 @@
         const params = {
           'data': this.adviceTableData
         }
-        // this.form.name =  encodeURIComponent(this.form.name)
+      
         let name = encodeURIComponent(this.form.name)
+        console.log("params",params)
+     
         postAdviceTemplate(params, name, this.form.advice_type).then(response => {
+
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
             return false
@@ -1660,6 +1780,18 @@
         })
       },
       submitTemplate(formName) {
+
+        
+        if(this.src_type == ""){
+            this.templateForm.way = 0
+            this.templateForm.drug_id = 0
+        }
+
+        if(this.src_type == 2){ //自备药
+            var arr = this.templateForm.advice_name.split("(自备药)")
+            this.templateForm.advice_name = arr[0]
+        }
+        
         this.$refs[formName].validate(valid => {
           this.templateForm.single_dose = parseFloat(this.templateForm.single_dose)
           this.templateForm.prescribing_number = parseFloat(this.templateForm.prescribing_number)
@@ -1685,6 +1817,8 @@
             templateFormTwo.delivery_way = this.templateForm.delivery_way
             templateFormTwo.execution_frequency = this.templateForm.execution_frequency
             templateFormTwo.parent_id = this.parent_id
+            templateFormTwo.drug_id = this.templateForm.drug_id
+            templateFormTwo.way   = this.templateForm.way
 
             if (this.isAddChild) {
               CreateSubAdvice(templateFormTwo).then(response => {
@@ -1739,6 +1873,8 @@
               templateFormTwo.delivery_way = this.templateForm.delivery_way
               templateFormTwo.execution_frequency = this.templateForm.execution_frequency
               templateFormTwo.parent_id = this.parent_id
+              templateFormTwo.drug_id = this.templateForm.drug_id
+              templateFormTwo.way  = this.templateForm.way
 
               if (this.templateForm.frequency_type == 1) {
                 templateFormTwo.frequency_type = this.templateForm.frequency_type
@@ -1783,6 +1919,9 @@
                     this.adviceTableData[i].frequency_type = templateFormTwo.frequency_type
                     this.adviceTableData[i].day_count = templateFormTwo.day_count
                     this.adviceTableData[i].weekdays = templateFormTwo.weekdays
+                    this.adviceTableData[i].drug_id =  templateFormTwo.drug_id
+                    this.adviceTableData[i].way   = templateFormTwo.way
+                    
                   }
                 }
               } else {
@@ -1981,7 +2120,7 @@
                 object['template_id'] = response.data.data.advice_templates[i].id
                 this.adviceTemplates.push(object)
               }
-
+              
               // 非空模版的处理
               for (let y = 0; y < response.data.data.advice_templates[i].DoctorAdviceTemplate.length; y++) {
                 if (response.data.data.advice_templates[i].id == response.data.data.advice_templates[i].DoctorAdviceTemplate[y].template_id) {
@@ -2011,7 +2150,20 @@
       }, cancelEditHandle() {
         // this.templateTableVisible = true
         this.templateEditFormVisible = false
-      }, submitEditTemplate(formName) {
+      }, 
+      
+      //编辑医嘱
+      submitEditTemplate(formName) {
+         
+         var drug_id = ""
+         for(let i=0;i<this.all_drug.length;i++){
+           if(this.templateFormEdit.advice_name == this.all_drug[i].drug_name){
+              drug_id = this.all_drug[i].id
+           }
+         } 
+        this.templateFormEdit.drug_id = drug_id
+       
+        
         this.$refs[formName].validate(valid => {
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
           this.templateFormEdit.prescribing_number = parseFloat(this.templateFormEdit.prescribing_number)
@@ -2040,8 +2192,8 @@
                 return s && s.trim()
               }).join(',')
             }
-
-            UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit).then(
+           
+            UpdateAdviceTemplate(this.templateFormEdit.id, this.templateFormEdit,this.templateFormEdit.drug_id).then(
               response => {
                 if (response.data.state == 0) {
                   this.$message.error(response.data.msg)
@@ -2064,6 +2216,7 @@
                   this.adviceTemplates[this.currentIndex].day_count = template.day_count
                   this.adviceTemplates[this.currentIndex].week_days = template.week_days
                   this.adviceTemplates[this.currentIndex].frequency_type = template.frequency_type
+                  // this.adviceTemplates[this.currentIndex].drug_id = template.drug_id
                   this.currentIndex = -1
                   return false
                 }
@@ -2156,10 +2309,13 @@
         this.table_current_index_two = row.index
       }, cancelHandleTwo() {
         this.templateFormTwoVisible = false
-      }, submitTemplateTwo(formName) {
+      }, 
+      submitTemplateTwo(formName) {
+       
         this.templateForm['template_id'] = this.current_template_id
         this.templateForm['advice_type'] = this.form.advice_type
-
+       
+      
         if (this.templateForm.frequency_type == 1) {
           this.templateForm.day_count = 0
           this.templateForm.week_days = ''
@@ -2172,6 +2328,8 @@
             return s && s.trim()
           }).join(',')
         }
+
+        // 编辑创建医嘱模版
         CreateSingleAdviceTemplate(this.templateForm).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2202,7 +2360,8 @@
         this.adviceTableDataTwo = []
       }, cancelEditHandleTwo() {
         this.templateEditFormTwoVisible = false
-      }, submitEditTemplateTwo(formName) {
+      }, 
+      submitEditTemplateTwo(formName) {
         this.$refs[formName].validate(valid => {
           this.templateFormEdit.single_dose = parseFloat(this.templateFormEdit.single_dose)
           this.templateFormEdit.prescribing_number = parseFloat(this.templateFormEdit.prescribing_number)
@@ -2290,8 +2449,11 @@
         }
       }, cellMouseLeave: function(row, column, cell, event) {
         this.hoverOrderArr = []
-      }, openEdit(index, row) {
-        console.log(row)
+      },
+
+      // 修改医嘱模版
+       openEdit(index, row) {
+        console.log("row22222",row)
         this.hoverOrderArr = []
         this.currentIndex = index
         this.templateFormEdit.drug_spec_unit = row.drug_spec_unit
@@ -2309,7 +2471,8 @@
         this.templateFormEdit.day_count = row.day_count
         this.templateFormEdit.frequency_type = row.frequency_type
         this.templateFormEdit.weekday = row.week_days.split(',')
-
+        this.templateFormEdit.drug_id = row.drug_id
+        this.templateFormEdit.way  = row.way
         this.templateEditFormVisible = true
         if (row.parent_id > 0) {
           this.editDialogTitle = '编辑子药'
@@ -2318,7 +2481,8 @@
           this.editDialogTitle = '编辑医嘱'
           this.edit_advice_name = '医嘱内容'
         }
-      }, openDelete(index, row) {
+      }, 
+      openDelete(index, row) {
         this.hoverOrderArr = []
 
         this.$confirm('删除记录', '是否删除该医嘱', {
@@ -2481,7 +2645,8 @@
           }
         })
         this.sameRowArr = sameRowArr
-      }, handleUpdateAdviceTemplate(row, index) {
+      },
+       handleUpdateAdviceTemplate(row, index) {
         this.current_template_id = row.template_id
         this.current_template_name = row.name
         this.form.name = row.name
@@ -2493,11 +2658,14 @@
             this.adviceTableDataTwo.push(this.adviceTemplates[i])
           }
         }
-      }, modifyTemplateName() {
+      }, 
+      modifyTemplateName() {
         const params = {
           template_name: this.form.name,
           template_id: this.current_template_id
         }
+        console.log("params---",params)
+        return 
         updateTemplateName(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -2534,6 +2702,153 @@
         })
 
       },
+
+      rand(min, max) {
+        return Math.floor(Math.random() * (max - min)) + min;
+     },
+    //
+    getSelfMedicalList(){
+        const params = {
+          patient_id:this.$route.query.patient_id
+        }
+      getSelfMedicalList(params).then(response=>{
+         if (response.data.state == 1) {
+            this.arr_drug = []
+            var medicalList = response.data.data.private_drug_list
+            var base_drug_list = response.data.data.base_drug_list
+            var base_drug_cofig = response.data.data.base_drug_config
+            var private_drug_cofig = response.data.data.private_drug_config
+
+
+            if(private_drug_cofig != null&&private_drug_cofig.drug_start == 1) {
+
+              for (let i = 0; i < medicalList.length; i++) {
+                if(medicalList[i].drug_specs != null) {
+                  for (let a = 0; a < medicalList[i].drug_specs.length; a++) {
+                    medicalList[i].drug_specs[a]['type'] = 2
+                  }
+                }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                  id:"",
+                }
+
+                medicalList[i].drug_name = medicalList[i].drug_name + "(自备药)"
+                obj.drug_name = medicalList[i].drug_name
+                obj.delivery_way = medicalList[i].delivery_way
+                obj.execution_frequency = medicalList[i].execution_frequency
+                obj.single_dose = medicalList[i].single_dose
+                obj.prescribing_number = medicalList[i].prescribing_number
+                obj.type_id = medicalList[i].id
+                obj.type = 2
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = medicalList[i].drug_specs
+                obj.id = medicalList[i].id
+                this.all_drug.push(obj)
+              }
+            }
+
+
+            for (let i = 0; i < base_drug_list.length; i++) {
+              if(base_drug_list[i].drug_specs != null) {
+                for (let a = 0; a < base_drug_list[i].drug_specs.length; a++) {
+                  base_drug_list[i].drug_specs[a]['type'] = 1
+                }
+              }
+                let obj = {
+                  drug_name: "",
+                  drug_desc: "",
+                  delivery_way: "",
+                  execution_frequency: "",
+                  single_dose: "",
+                  single_dose_unit: "",
+                  prescribing_number: "",
+                  prescribing_number_unit: "",
+                  type_id: "",
+                  type: "",
+                  custom_id: "",
+                  drug_specs: [],
+                  id:""
+                }
+
+                obj.drug_name = base_drug_list[i].drug_name
+                obj.delivery_way = base_drug_list[i].delivery_way
+                obj.execution_frequency = base_drug_list[i].execution_frequency
+                obj.single_dose = base_drug_list[i].single_dose
+                obj.prescribing_number = base_drug_list[i].prescribing_number
+                obj.type_id = base_drug_list[i].id
+                obj.type = 1
+                obj.custom_id = this.rand(10000000, 99999999)
+                obj.drug_specs = base_drug_list[i].drug_specs
+                obj.id = base_drug_list[i].id
+                this.all_drug.push(obj)
+              }
+            }   
+        })
+       
+    },
+    changeDrugName(name){
+       this.current_drug_name = name
+       this.templateForm.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
+          }
+       }
+    },
+    changeDrugDesc(name) {
+        this.current_drug_spec = name
+        for (let i = 0; i < this.drugSpec.length; i++) {
+          if (this.drugSpec[i].drug_spec == name) {
+            this.templateForm.advice_desc = this.drugSpec[i].drug_spec
+            this.templateForm.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            this.templateForm.single_dose = this.drugSpec[i].single_dose.toString()
+            this.templateForm.delivery_way = this.drugSpec[i].delivery_way.toString()
+            this.templateForm.execution_frequency = this.drugSpec[i].execution_frequency.toString()
+            this.drug_id = this.drugSpec[i].id
+            this.src_type = this.drugSpec[i].type
+            this.templateForm.drug_id = this.drugSpec[i].id
+            this.templateForm.way = this.drugSpec[i].type
+          }
+        }
+      },
+
+      changeDrugNameTwo(name){
+        this.current_drug_name = name
+        this.templateFormEdit.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.templateFormEdit.advice_desc = this.drugSpec[i].drug_spec
+            this.templateFormEdit.prescribing_number = this.drugSpec[i].prescribing_number.toString()
+            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()
+          }
+        }
+      },
+
     }
   }
 </script>

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

@@ -844,7 +844,7 @@ export default {
         .catch(() => {});
     },
     submitNameForm(formName) {
-      console.log("=====",this.src_type)
+      
        if(this.src_type == ""){
           this.nameForm.way = 0
           this.nameForm.drug_id = 0
@@ -854,33 +854,7 @@ 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
-      // }
+   
       
       var _this = this;
       this.$refs[formName].validate(valid => {

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

@@ -104,7 +104,8 @@ export default {
             drug_spec:"",
             patient_id:"",
             type:1,
-            start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            // start_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
+            start_time: moment(new Date()).subtract(30,'days').format('YYYY-MM-DD'),
             end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             staffList:[]
         }
@@ -200,7 +201,10 @@ export default {
     },
 
     created(){
+    
       this.getCurrentOrgAllStaff() 
+
+
     }
 }
 </script>

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -125,7 +125,7 @@ export default {
             // end_time:moment(new Date()).add('year',0).format("YYYY-MM-DD"),
             start_time:"",
             end_time:"",
-            drug_name:"全部",
+            drug_name:0,
             drug_spec:"",
             drugName:[],
             rulleName:[]
@@ -203,14 +203,19 @@ export default {
         this.getlist()
       },
       changeDrugName(id){
-        var drug_name = ""
-        for(let i=0;i<this.drugName.length;i++){
-          if(id == this.drugName[i].id){
-             drug_name = this.drugName[i].drug_name
+        if(id == 0){
+          this.drug_name = 0
+        }
+        if(id != 0 ){
+          var drug_name = ""
+          for(let i=0;i<this.drugName.length;i++){
+            if(id == this.drugName[i].id){
+              drug_name = this.drugName[i].drug_name
+            }
           }
+          this.drug_name = drug_name
+          this.getRulleName(id)  
         }
-        this.drug_name = drug_name
-        this.getRulleName(id)
         this.getlist()
       },
       changeRullName(id){
@@ -225,8 +230,12 @@ export default {
         this.getlist()
       },
       getlist(){
-          if(this.drug_name == "全部"){
-            this.drug_name = ""
+         var name = ""
+          if(this.drug_name == 0){
+             name = ""
+          }
+          if(this.drug_name != 0){
+             name = this.drug_name
           }
           if(this.drug_spec == "全部"){
             this.drug_spec = ""
@@ -234,11 +243,11 @@ export default {
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
-            drug_name:this.drug_name,
+            drug_name:name,
             drug_spec:this.drug_spec,
             search_input:this.search_input
           }
-         
+         console.log("params9999999",params)
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist