自备药

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

@@ -84,11 +84,11 @@ export default {
         },
         handleCurrentChange(val){
            this.currentRow = val
-           this.getRullListByDrugName(val.drug_name)
+           this.getRullListByDrugName(val.id)
         },
-        getRullListByDrugName(drugname){
+        getRullListByDrugName(id){
             const params = {
-              drug_name:drugname,
+              id:id,
             }
            getRullListByDrugName(params).then(response=>{
               if(response.data.state ==  1){
@@ -102,6 +102,10 @@ export default {
         },
 
         SaveSelfMedicines(){
+          if(this.medicineData.length == 0){
+             this.$message.error("请添加药品规格")
+             return
+          }
           const params = {
              patient_id:this.patient_id,
              medicineData:this.medicineData

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

@@ -97,18 +97,7 @@ export default {
            })  
         },
 
-        //  getAllDrugNameList(){
-        //   getAllDrugNameList().then(response=>{
-        //      if(response.data.state == 1){
-        //        var rullername =  response.data.data.rullerName
-        //        for(let i=0;i<rullername.length;i++){
-        //           rullername[i].outstore_number = ""
-        //           rullername[i].remarks = ""
-        //        }
-        //        this.tableData = rullername
-        //      }
-        //   })
-        // },
+      
        
         saveOutStock(){
            var arr=[]

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

@@ -97,18 +97,7 @@ export default {
              }
           })   
         },
-        // getAllDrugNameList(){
-        //   getAllDrugNameList().then(response=>{
-        //      if(response.data.state == 1){
-        //        var rullername =  response.data.data.rullerName
-        //        for(let i=0;i<rullername.length;i++){
-        //           rullername[i].store_number = ""
-        //           rullername[i].remarks = ""
-        //        }
-        //        this.tableData = rullername
-        //      }
-        //   })
-        // },
+    
         saveStock(){
             var arr=[]
             for(let i=0;i<this.tableData.length;i++){

src/xt_pages/stock/selfPreparedMedicine/index.vue

@@ -268,7 +268,7 @@ export default {
                 drugname:name,
                 patientid:patientid
               }
-            console.log("params ====",params)
+           
             DeleteDrugName(params).then(response => {
               if (response.data.state == 1) {
                   var msg = response.data.data.msg

src/xt_pages/stock/selfPreparedMedicine/info.vue

@@ -285,7 +285,8 @@ export default {
               drug_name_id:"",
               unit:"", 
               price:"",
-              drug_stock_limit:""
+              drug_stock_limit:"",
+              drug_id:"",
             },
             editform:{
               drug_name_id:"",
@@ -333,13 +334,14 @@ export default {
           getAllDrugName().then(response=>{
              if(response.data.state == 1){
                var drugName  = response.data.data.drugName
-               console.log("drugName====",drugName)
+              
                this.drugName = drugName
 
              }
           })  
         },
         handleCurrentChange(val){
+          this.form.drug_id = val.id
           //获取药品规格名称
           this.getRulleName(val.drug_name)
 
@@ -469,17 +471,22 @@ export default {
            const params = {
              drug_spec:drug_spec,
              drug_name_id:this.form.drug_name_id,
+             drug_id:this.form.drug_id,
              unit:this.form.unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
              drug_name:drug_name
            }
+      
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var standName =  response.data.data.RullerName
               this.$message.success("保存成功")
               this.getRulleName(standName.drug_name)
               this.ruleDialogVisible = false
+              this.form.drug_name_id = ""
+              this.form.unit = ""
+              this.form.price = ""            
             }
          })  
        },
@@ -503,13 +510,17 @@ export default {
              unit:this.form.unit,
              price:this.form.price,
              drug_stock_limit:this.form.drug_stock_limit, 
-             drug_name:drug_name
+             drug_name:drug_name,
+             drug_id:this.form.drug_id,
            }
          saveRulleName(params).then(response=>{
             if(response.data.state == 1){
               var RullerName =  response.data.data.RullerName
               this.getRulleName(RullerName.drug_name)
               this.$message.success("保存成功")
+              this.form.drug_name_id = ""
+              this.form.unit = ""
+              this.form.price = ""   
             }
          })    
        },

src/xt_pages/stock/selfPreparedMedicine/query.vue

@@ -46,7 +46,7 @@
                 value-format="yyyy-MM-dd"
                 @change="changeEndtime"
                 ></el-date-picker>
-                <el-select v-model="drug_name" placeholder="请选择" style="margin-right:10px;"
+                <el-select v-model="drug_name" placeholder="药品名称" style="margin-right:10px;"
                  @change="changeDrugName">
                     <el-option
                     v-for="item in drugName"
@@ -55,7 +55,7 @@
                     :value="item.id">
                     </el-option>
                 </el-select>
-                <el-select v-model="drug_spec" placeholder="请选择"
+                <el-select v-model="drug_spec" placeholder="规格名称"
                 @change="changeRullName">
                     <el-option
                     v-for="item in rulleName"
@@ -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:"全部",
             drug_spec:"",
             drugName:[],
             rulleName:[]
@@ -165,9 +165,17 @@ export default {
       getAllDrugName(){
         getAllDrugName().then(response=>{
           if(response.data.state == 1){
-             var drugName =  response.data.data.drugName
-             this.drugName = drugName
-
+             var drugName =  response.data.data.drugName  
+             var obj = {
+               id:0,
+               drug_name:"全部"
+             }
+             var arr = []
+             arr.push(obj)
+             arr.push(...drugName)
+             console.log("arrr",arr)
+             this.drugName = arr
+     
              this.getlist()
           }
         })
@@ -208,6 +216,9 @@ export default {
         this.getlist()
       },
       getlist(){
+          if(this.drug_name == "全部"){
+            this.drug_name = ""
+          }
           const params = {
             start_time:this.start_time,
             end_time:this.end_time,
@@ -218,6 +229,7 @@ export default {
         getAllPatientStockList(params).then(response=>{
             if(response.data.state == 1){
               var stocklist = response.data.data.stocklist
+              console.log("stocklist3333",stocklist)
               for(let i=0;i<stocklist.length;i++){
                  stocklist[i].index = i+1
                  stocklist[i].Count = 0