hah阿凡达

src/api/drug/drug_stock.js

@@ -679,4 +679,5 @@ export function ModityDrugCodeWarehouseInfo(data){
     method:"post",
     data:data,
   })
-}
+}
+

src/xt_pages/stock/detail/print.vue

@@ -182,7 +182,8 @@
           type: this.$route.query.type,
           limit:this.$route.query.limit,
           page:this.$route.query.page,
-          good_id:this.good_id,
+          good_id:this.$route.query.good_id,
+          order_way:this.$route.query.order_way
         },
         totalPrice: 0,
         stockDatas: [],

src/xt_pages/stock/detail/stockInDetail.vue

@@ -480,6 +480,7 @@ export default {
         keywords: this.searchKey,
         storehouse_id:this.storehouse_id,
         good_id:this.good_id,
+        order_way:0
       };
       this.cancelStockDate = [];
       const loading = this.$loading({
@@ -770,6 +771,7 @@ export default {
           page:this.page,
           keywords:this.$router.keywords,
           good_id:this.good_id,
+          order_way:0,
         }
       });
       }
@@ -785,7 +787,8 @@ export default {
           page:this.page,
           keywords:this.searchKey,
           storehouse_id:this.storehouse_id,
-          
+          good_id:this.good_id,
+          order_way:0,
         }
        });
       }

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -851,6 +851,8 @@ export default {
             end_time: this.end_time,
             limit:this.limit,
             page:this.page,
+            good_id:this.good_id,
+            order_way:this.order_way
           }
         });
       }
@@ -865,6 +867,8 @@ export default {
             page:this.page,
             storehouse_id:this.storehouse_id,
             keyword:this.searchKey,
+            good_id:this.good_id,
+            order_way:this.order_way
           }
         });
       }

src/xt_pages/stock/drugs/components/drugCancelDetail.vue

@@ -76,6 +76,38 @@
       </div>
     </div>
 
+    <div  style="margin-bottom: 20px;">
+      <label class="title"><span class="name">药品名称</span> :</label>
+      <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="drug_name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="true"
+          placeholder="请输入药品名称"
+          @select="handleSelect"
+          style="width: 300px"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">
+              {{
+                item.drug_name +
+                item.dose +
+                item.dose_unit +
+                "*" +
+                item.min_number +
+                item.min_unit +
+                "/" +
+                item.max_unit +
+                "  " +
+                item.manufacturer
+              }}
+            </div>
+          </template>
+      </el-autocomplete>
+    </div>
+
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       <el-table class="eltable"
         :data="tableData"
@@ -188,6 +220,7 @@ import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers} from "@/api/doctor";
 import {  GetAllConfig} from "@/api/stock";
 import { getDrugCancelDetail } from "@/api/drug/drug_stock";
+import {  postSearchDrugList } from "@/api/data";
 export default {
   name: "cancelStockDetail",
 
@@ -260,10 +293,57 @@ export default {
       drugTypeList:[],
       dealerList:[],
       manufacturerList:[],
-      patientsList:[]
+      patientsList:[],
+      drug_name:"",
+      drug_id:0
     };
   },
   methods: {
+    querySearchAsync(keyword, cb) {
+      let key = "";
+      if (keyword != undefined) {
+        key = keyword;
+      }
+      let searchArray = [];
+      postSearchDrugList(key, this.storehouse_id).then((response) => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.list;
+
+          var list = response.data.data.list;
+
+          this.drugList = list;
+          var manufacturerList = response.data.data.manufacturerList;
+          this.manufacturerList = manufacturerList;
+          var dealerList = response.data.data.dealerList;
+          this.dealerList = dealerList;
+          for (let i = 0; i < this.drugList.length; i++) {
+            for (let j = 0; j < this.manufacturerList.length; j++) {
+              if (
+                this.drugList[i].manufacturer == this.manufacturerList[j].id
+              ) {
+                this.drugList[i].manufacturer =
+                  this.manufacturerList[j].manufacturer_name;
+              }
+            }
+
+            for (let z = 0; z < dealerList.length; z++) {
+              if (this.drugList[i].dealer == this.dealerList[z].id) {
+                this.drugList[i].dealer = this.dealerList[z].dealer_name;
+              }
+            }
+          }
+
+          cb(this.drugList);
+        } else {
+          cb([]);
+        }
+      });
+    },
+    handleSelect(val) {
+      this.drug_name = val.drug_name
+      this.drug_id = val.id
+      this.getlist()
+    },
     PrintAction() {
         window.sessionStorage.setItem('start_cancel_time',this.start_time)
         window.sessionStorage.setItem('end_cancel_time',this.end_time)
@@ -372,6 +452,7 @@ export default {
         keyword:this.searchKey,
         limit:this.limit,
         page:this.page,
+        drug_id:this.drug_id,
        }
        const loading = this.$loading({
           lock: true,

src/xt_pages/stock/drugs/components/drugInOrder.vue

@@ -86,6 +86,40 @@
       >
     </div>
 
+    <div  style="margin-bottom: 20px;">
+      <label class="title"><span class="name">药品名称</span> :</label>
+      <el-autocomplete
+        class="checkSearch"
+        popper-class="my-autocomplete"
+        v-model="drug_name"
+        :fetch-suggestions="querySearchAsync"
+        :trigger-on-focus="true"
+        placeholder="请输入药品名称"
+        @select="handleSelect"
+        style="width: 300px"
+      >
+        <i class="el-icon-search el-input__icon" slot="suffix"></i>
+        <template slot-scope="{ item }">
+          <div class="name">
+            {{
+              item.drug_name +
+              item.dose +
+              item.dose_unit +
+              "*" +
+              item.min_number +
+              item.min_unit +
+              "/" +
+              item.max_unit +
+              "  " +
+              item.manufacturer
+            }}
+          </div>
+        </template>
+      </el-autocomplete>
+    
+    </div>
+   
+
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       <el-table class="eltable"
         :data="cancelStockDate"
@@ -219,6 +253,7 @@ import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import { GetAllConfig } from "@/api/stock";
 import { getDrugIndetail,getDrugWarehouseInfoPrint,ModityDrugCodeWarehouseInfo} from "@/api/drug/drug_stock"
+import {  postSearchDrugList } from "@/api/data";
 export default {
   name: "stockInDetail",
 
@@ -302,9 +337,60 @@ export default {
       currentIndex:0,
       textarea:"",
       id:0,
+      drug_name:"",
+      drug_id:0,
     };
   },
   methods: {
+    querySearchAsync(keyword, cb) {
+      let key = "";
+      if (keyword != undefined) {
+        key = keyword;
+      }
+      let searchArray = [];
+      postSearchDrugList(key, this.storehouse_id).then((response) => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.list;
+
+          var list = response.data.data.list;
+
+          this.drugList = list;
+          var manufacturerList = response.data.data.manufacturerList;
+          this.manufacturerList = manufacturerList;
+          var dealerList = response.data.data.dealerList;
+          this.dealerList = dealerList;
+          for (let i = 0; i < this.drugList.length; i++) {
+            for (let j = 0; j < this.manufacturerList.length; j++) {
+              if (
+                this.drugList[i].manufacturer == this.manufacturerList[j].id
+              ) {
+                this.drugList[i].manufacturer =
+                  this.manufacturerList[j].manufacturer_name;
+              }
+            }
+
+            for (let z = 0; z < dealerList.length; z++) {
+              if (this.drugList[i].dealer == this.dealerList[z].id) {
+                this.drugList[i].dealer = this.dealerList[z].dealer_name;
+              }
+            }
+          }
+
+          cb(this.drugList);
+        } else {
+          cb([]);
+        }
+      });
+    },
+    changeDrugName(val) {
+      this.currentIndex = val;
+    },
+    handleSelect(val) {
+      this.drug_name = val.drug_name
+      this.drug_id = val.id
+      this.getlist()
+      this.getDrugWarehouseInfoPrint()
+    },
     changeText(event){
       // 检查是否为特定的按键，例如回车键，来确认扫码枪输入完成
       if (event.key === 'Enter') {
@@ -327,7 +413,6 @@ export default {
            id:this.id,
            drug_code:this.textarea,
         }
-        // console.log("params=-==---",params)
        ModityDrugCodeWarehouseInfo(params).then(response=>{
           if(response.data.state == 1){
             var info =  response.data.data.info
@@ -445,6 +530,7 @@ export default {
         limit:this.limit,
         page:this.page,
         storehouse_id:this.storehouse_id,
+        drug_id:this.drug_id,
        }
        const loading = this.$loading({
           lock: true,
@@ -536,6 +622,7 @@ export default {
         end_time:this.end_time,
         order_type:this.order_type,
         storehouse_id:this.storehouse_id,
+        drug_id:this.drug_id,
       }
     
      getDrugWarehouseInfoPrint(params).then(response=>{
@@ -551,7 +638,7 @@ export default {
     PrintAction(){
       window.sessionStorage.setItem('drug_start_in_time',this.start_time)
       window.sessionStorage.setItem('drug_end_in_time',this.end_time)
-      this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page)
+      this.$router.push("/stock/drugprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+this.order_type+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&drug_id="+this.drug_id)
     },
     select(){
 

src/xt_pages/stock/drugs/components/drugOutDetail.vue

@@ -102,6 +102,48 @@
 
     </div>
 
+    <div  style="margin-bottom: 20px;">
+      <label class="title"><span class="name">药品名称</span> :</label>
+        <el-autocomplete
+          class="checkSearch"
+          popper-class="my-autocomplete"
+          v-model="drug_name"
+          :fetch-suggestions="querySearchAsync"
+          :trigger-on-focus="true"
+          placeholder="请输入药品名称"
+          @select="handleSelect"
+          style="width: 300px"
+        >
+          <i class="el-icon-search el-input__icon" slot="suffix"></i>
+          <template slot-scope="{ item }">
+            <div class="name">
+              {{
+                item.drug_name +
+                item.dose +
+                item.dose_unit +
+                "*" +
+                item.min_number +
+                item.min_unit +
+                "/" +
+                item.max_unit +
+                "  " +
+                item.manufacturer
+              }}
+            </div>
+          </template>
+        </el-autocomplete>
+
+        <label class="title"><span class="name">出库方式</span> : </label>
+        <el-select size="small" v-model="order_way" filterable placeholder="请选择仓库" style="width:200px" @change="changeOrderWayList">
+              <el-option
+                v-for="(option, index) in orderWay"
+                :key="index"
+                :label="option.label"
+                :value="option.value">
+              </el-option>
+          </el-select>
+   </div>
+
 
     <!-- <el-row :gutter="12" style="margin-top: 10px"> -->
       <el-table class="eltable"
@@ -228,7 +270,8 @@ import { uParseTime } from "@/utils/tools";
 import { fetchAllAdminUsers } from "@/api/doctor";
 import {GetAllConfig } from "@/api/stock";
 import {getDrugOutDetail,getDrugOutOrderPrint } from "@/api/drug/drug_stock"
- import {getBaseDrugLibList} from '@/api/data'
+import {getBaseDrugLibList} from '@/api/data'
+import {  postSearchDrugList } from "@/api/data";
 export default {
   name: "stockOutDetail",
 
@@ -281,7 +324,11 @@ export default {
       manufacturer_id: "",
       dealer_id: "",
       order_type:"",
-
+      orderWay:[
+        {value:0,label:"全部"},
+        {value:1,label:"手动出库"},
+        {value:2,label:"自动出库"},
+      ],
       searchKey: "",
       type: 2,
       page: 1,
@@ -311,10 +358,63 @@ export default {
       houseList:[],
       dealerList:[],
       manufacturerList:[],
-      patientsList:[]
+      patientsList:[],
+      drug_name:"",
+      drug_id:0,
+      order_way:"",
     };
   },
   methods: {
+    changeOrderWayList(){
+      this.getlist()
+      this.getDrugOutOrderPrint()
+    },
+    querySearchAsync(keyword, cb) {
+      let key = "";
+      if (keyword != undefined) {
+        key = keyword;
+      }
+      let searchArray = [];
+      postSearchDrugList(key, this.storehouse_id).then((response) => {
+        if (response.data.state == 1) {
+          searchArray = response.data.data.list;
+
+          var list = response.data.data.list;
+
+          this.drugList = list;
+          var manufacturerList = response.data.data.manufacturerList;
+          this.manufacturerList = manufacturerList;
+          var dealerList = response.data.data.dealerList;
+          this.dealerList = dealerList;
+          for (let i = 0; i < this.drugList.length; i++) {
+            for (let j = 0; j < this.manufacturerList.length; j++) {
+              if (
+                this.drugList[i].manufacturer == this.manufacturerList[j].id
+              ) {
+                this.drugList[i].manufacturer =
+                  this.manufacturerList[j].manufacturer_name;
+              }
+            }
+
+            for (let z = 0; z < dealerList.length; z++) {
+              if (this.drugList[i].dealer == this.dealerList[z].id) {
+                this.drugList[i].dealer = this.dealerList[z].dealer_name;
+              }
+            }
+          }
+
+          cb(this.drugList);
+        } else {
+          cb([]);
+        }
+      });
+    },
+    handleSelect(val) {
+      this.drug_name = val.drug_name
+      this.drug_id = val.id
+      this.getlist()
+      this.getDrugOutOrderPrint()
+    },
     changeType: function(val) {
       this.order_type = val;
       this.getlist()
@@ -445,7 +545,7 @@ export default {
     PrintAction: function() {
       //  window.sessionStorage.setItem('start_out_time',this.start_time)
       //  window.sessionStorage.setItem('end_out_time',this.end_time)
-       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&storehouse_id="+this.storehouse_id)
+       this.$router.push("/stock/drugoutorderprint?start_time="+this.start_time+"&end_time="+this.end_time+"&order_type="+2+"&manufacturer_id="+this.manufacturer_id+"&keyword="+this.keyword+"&limit="+this.limit+"&page="+this.page+"&storehouse_id="+this.storehouse_id+"&drug_id="+this.drug_id+"&order_way="+this.order_way)
     },
     getlist(){
       var params = {
@@ -457,6 +557,8 @@ export default {
          page:this.page,
          limit:this.limit,
          storehouse_id:this.storehouse_id,
+         drug_id:this.drug_id,
+         order_way:this.order_way,
       }
       const loading = this.$loading({
           lock: true,
@@ -974,6 +1076,8 @@ export default {
          end_time:this.end_time,
          order_type:2,
          storehouse_id:this.storehouse_id,
+         drug_id:this.drug_id,
+         order_way:this.order_way,
       }
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){

src/xt_pages/stock/drugs/drugOutOrderPrint.vue

@@ -140,6 +140,8 @@
         limit:this.$route.query.limit,
         page:this.$route.query.page,
         storehouse_id:this.$route.query.storehouse_id,
+        drug_id:this.$route.query.drug_id,
+        order_way:this.$route.query.order_way,
         cancelStockDate:[],
         drugList:[],
         org_id:0,
@@ -232,6 +234,8 @@
           end_time:this.end_time,
           order_type:parseInt(this.order_type),
           storehouse_id:parseInt(this.storehouse_id),
+          drug_id:this.drug_id,
+          order_way:this.order_way
         }
       
         getDrugOutOrderPrint(params).then(response=>{

src/xt_pages/stock/drugs/drugPrint.vue

@@ -119,6 +119,7 @@
         keyword:this.$route.query.keyword,
         limit:this.$route.query.limit,
         page:this.$route.query.page,
+        drug_id:this.$route.query.drug_id,
         cancelStockDate:[],
         minCount:[],
       }
@@ -233,6 +234,7 @@
           start_time:this.start_time,
           end_time:this.end_time,
           order_type:this.order_type,
+          drug_id:this.drug_id
          }
          console.log("params2222",params)
         getDrugWarehouseInfoPrint(params).then(response=>{