Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/api/drug/drug_stock.js

@@ -1,7 +1,6 @@
 import request from '@/utils/request'
 
 export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
-
   return request({
     url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
     method: 'post',
@@ -186,9 +185,9 @@ export function DeleteDrugWarehouseInfoItem(params) {
   })
 }
 
-export function EditDrugWarehouse(params, warehousing_time, id,type,manufacturer_id,dealer_id) {
+export function EditDrugWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugwarehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugwarehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -234,9 +233,9 @@ export function deleteDrugSalesReturnInfo(params) {
   })
 }
 
-export function editDrugSalesReturnInfo(params, return_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugSalesReturnInfo(params, return_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugsalesreturn/edit?return_time=' + return_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugsalesreturn/edit?return_time=' + return_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -274,9 +273,9 @@ export function getDrugWarehouseOutInfo(params) {
   })
 }
 
-export function editDrugWarehouseoutInfo(params, warehouse_out_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugwarehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id="+dealer_id,
+    url: '/api/drugwarehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -290,9 +289,9 @@ export function getDrugCancelStockList(params) {
   })
 }
 
-export function editDrugCancelStockInfo(params, cancel_stock_time, id,type,manufacturer_id,dealer_id) {
+export function editDrugCancelStockInfo(params, cancel_stock_time, id, type, manufacturer_id, dealer_id) {
   return request({
-    url: '/api/drugcancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id+"&type="+type+"&manufacturer_id="+manufacturer_id+"&dealer_id=" + dealer_id,
+    url: '/api/drugcancelstockinfo/edit?cancel_time=' + cancel_stock_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
     method: 'post',
     data: params
   })
@@ -345,8 +344,6 @@ export function getStockDetail(params) {
   })
 }
 
-
-
 export function getPrintStockGood(params) {
   return request({
     url: '/api/print/stock',
@@ -355,8 +352,6 @@ export function getPrintStockGood(params) {
   })
 }
 
-
-
 export function getDrugWarehouseOutUser(params) {
   return request({
     url: '/api/drugwarehouseout/user',
@@ -365,96 +360,112 @@ export function getDrugWarehouseOutUser(params) {
   })
 }
 
-
 export function createDrugStockAutomaticReduceConfig(is_open) {
   return request({
-    url: '/api/drugstock/automaticreduce/isopen?is_open='+is_open,
-    method: 'post',
+    url: '/api/drugstock/automaticreduce/isopen?is_open=' + is_open,
+    method: 'post'
   })
 }
 
 export function getDrugStockAutomaticReduceConfig() {
   return request({
     url: '/api/drugstockautomaticreduce/get',
-    method: 'get',
+    method: 'get'
   })
 }
 
-
-export function getDrugIndetail(params){
+export function getDrugIndetail(params) {
   return request({
-    url:"/api/drugstock/getdrugindetail",
-    method:"Get",
-    params:params
+    url: '/api/drugstock/getdrugindetail',
+    method: 'Get',
+    params: params
   })
 }
 
-
-export function getDrugCancelOrder(params){
-  
-   return request({
-     url:"/api/drugstock/getdrugcancelorder",
-     method:"get",
-     params:params
-   })
+export function getDrugCancelOrder(params) {
+  return request({
+    url: '/api/drugstock/getdrugcancelorder',
+    method: 'get',
+    params: params
+  })
 }
 
-export function getDrugOutDetail(params){
-  
+export function getDrugOutDetail(params) {
   return request({
-    url:"/api/drugstock/getdrugoutdetail",
-    method:"get",
-    params:params
+    url: '/api/drugstock/getdrugoutdetail',
+    method: 'get',
+    params: params
   })
 }
 
-export function getDrugCancelDetail(params){
-
+export function getDrugCancelDetail(params) {
   return request({
-    url:"/api/drugstock/getdrugcanceldetail",
-    method:"Get",
-    params:params
+    url: '/api/drugstock/getdrugcanceldetail',
+    method: 'Get',
+    params: params
   })
 }
 
-
-export function getDrugAutoMaticList(params){
-  
+export function getDrugAutoMaticList(params) {
   return request({
-    url:"/api/drugstock/getdrugautomaticlist",
-    method:"Get",
-    params:params,
+    url: '/api/drugstock/getdrugautomaticlist',
+    method: 'Get',
+    params: params
   })
 }
 
-
-export function getDrugWarehouseOrderInfo(params){
-   
+export function getDrugWarehouseOrderInfo(params) {
   return request({
-    url:"/api/drugstock/getdrugwarehouseorderinfo",
-    method:"get",
-    params:params
+    url: '/api/drugstock/getdrugwarehouseorderinfo',
+    method: 'get',
+    params: params
   })
 }
 
+export function getDrugStockList(params) {
+  return request({
+    url: '/api/drugstock/drugstocklist',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getDrugStockList(params){
-  
+export function getDrugStockFlow(params) {
   return request({
-    url:"/api/drugstock/drugstocklist",
-    method:"get",
-    params:params
+    url: '/api/drugstock/getdrugstockflow',
+    method: 'Get',
+    params: params
   })
 }
 
+export function getOutDrugStockFlow(params) {
+  return request({
+    url: '/api/drugoutstock/getoutdrugstockflow',
+    method: 'get',
+    params: params
+  })
+}
 
-export function getDrugStockFlow(params){
-  
+export function getBatchOrderDetail(params) {
   return request({
-    url:"/api/drugstock/getdrugstockflow",
-    method:"Get",
-    params:params
+    url: '/api/drug/getbatchorderdetail',
+    method: 'get',
+    params: params
   })
 }
 
+export function getStockInList(params) {
+  return request({
+    url: '/api/stock/getstocklistbyid',
+    method: 'Get',
+    params: params
+  })
+}
 
+export function getStockOutList(params) {
+  return request({
+    url: '/api/stock/getstockoutlist',
+    method: 'get',
+    params: params
+  })
+}

src/api/stock.js

@@ -617,3 +617,11 @@ export function postSearchGoodList(keyword, params) {
     params: params
   })
 }
+
+export function getAllStockList(params) {
+  return request({
+    url: '/api/good/getallstocklist',
+    method: 'get',
+    params: params
+  })
+}

src/router/modules/drugs.js

@@ -157,6 +157,7 @@ export default {
       is_menu: false,
       meta: { title: 'drugStockFlow', noCache: true }
     },
+
     {
       path: '/drugstock/in/drugbatchnumber',
       component: () => import('@/xt_pages/stock/drugs/drugBatchNumber'),
@@ -180,6 +181,24 @@ export default {
       hidden: true,
       is_menu: false,
       meta: { title: 'stockInOrderEdit' }
+    },
+
+    {
+      path: '/stock/in/stockflow',
+      component: () => import('@/xt_pages/stock/stockFlow'),
+      name: 'stockFlow',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockFlow' }
+    },
+
+    {
+      path: '/stock/in/stockbatchnumber',
+      component: () => import('@/xt_pages/stock/stockBatchNumber'),
+      name: 'stockBatchNumber',
+      hidden: true,
+      is_menu: false,
+      meta: { title: 'stockBatchNumber' }
     }
 
   ]

src/xt_pages/data/components/addDrugs.vue

@@ -166,10 +166,10 @@
                             </el-select>
                         </el-form-item>
 
-                        <el-form-item label="单位换算 : ">
+                        <!-- <el-form-item label="单位换算 : ">
                             <el-input v-model="form.unit_matrixing" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>
-                        </el-form-item>
+                        </el-form-item> -->
                         <el-form-item label="拆零零售价(元) : " prop="min_price">
                             <el-input v-model="form.min_price" style="width:160px;" placeholder=""
                                       maxlength="30"></el-input>

src/xt_pages/data/components/consumables.vue

@@ -100,11 +100,11 @@
         </template>
       </el-table-column>
 
-      <el-table-column label="最小单位" width="60" align="center">
+      <!-- <el-table-column label="最小单位" width="60" align="center">
         <template slot-scope="scope">
           {{ getGoodUnit(scope.row.good_unit) }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="零售价" width="60" align="center">
         <template slot-scope="scope">
           {{ scope.row.retail_price }}

src/xt_pages/data/components/drugs.vue

@@ -87,7 +87,7 @@
           <div>{{scope.row.dose}}{{scope.row.dose_unit}}&nbsp;* &nbsp;{{scope.row.min_number}}{{scope.row.min_unit}}/{{scope.row.max_unit}}</div>
         </template>
       </el-table-column>
-      <el-table-column prop="date" label="最大单位" width="60" align="center">
+      <!-- <el-table-column prop="date" label="最大单位" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.max_unit}}</div>
         </template>
@@ -96,7 +96,7 @@
         <template slot-scope="scope">
           <div>{{scope.row.min_unit}}</div>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column prop="date" label="进货价" width="60" align="center">
         <template slot-scope="scope">
           <div>{{scope.row.last_price}}</div>
@@ -491,9 +491,8 @@
         if (val.id > 0) {
           //修改
           val['id'] = this.current_id;
-          console.log("9999999999999999999",val.min_number)
+          
           val.min_number =  parseInt(val.min_number)
-          console.log("min_22222222",val)
          
           editBaseDrugLib(val,untit).then(response => {
             if (response.data.state == 0) {
@@ -507,7 +506,6 @@
           })
         } else if (val.id == 0) {
           //新增
-          console.log("val2222222",val)
          
           createBaseDrugLib(val).then(response => {
             if (response.data.state == 0) {

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -43,39 +43,39 @@
         :data="tableList"
         border
         style="width: 100%">
-        <el-table-column prop="date" label="序号" width="180">
+        <el-table-column prop="date" label="序号" width="180" align="center">
            <template  slot-scope="scope">
-              
+              {{scope.$index + 1}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_type" label="入库单据编码" width="180">
+        <el-table-column prop="drug_type" label="入库单据编码" width="180" align="center">
            <template slot-scope="scope">
-           
+              {{scope.row.warehousing_order}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="操作日期">
+        <el-table-column prop="drug_name" label="操作日期" align="center">
            <template slot-scope="scope">
-            
+              {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="有效期">
+        <el-table-column prop="drug_name" label="有效期" align="center">
            <template slot-scope="scope">
-          
+              {{getTime(scope.row.expiry_date)}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="批号">
+         <el-table-column prop="drug_name" label="批号" align="center">
            <template slot-scope="scope">
-           
+              {{scope.row.number}}
            </template>
         </el-table-column>
-         <el-table-column prop="drug_name" label="入库数量">
+         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            
+              {{scope.row.stock_max_number}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="进货单价">
+        <el-table-column prop="drug_name" label="进货单价" align="center">
            <template slot-scope="scope">
-            
+              {{scope.row.price}}
            </template>
         </el-table-column>
        </el-table>
@@ -104,7 +104,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getAllDrugStockQueryList,getDrugStockList } from '@/api/drug/drug_stock'
+  import { getBatchOrderDetail } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -113,7 +113,7 @@
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-    //   this.getlist()
+       this.getlist()
     },
     components: {
       SettingDialog,
@@ -153,7 +153,48 @@
       }
     },
     methods:{
-
+      getlist(){
+         var params = {
+           drug_id:this.$route.query.drug_id,
+           page:this.page,
+           limit:this.limit,
+         }
+        getBatchOrderDetail(params).then(response=>{
+           if(response.data.state == 1){
+              var detail =  response.data.data.detail
+              console.log("detail2343434",detail)
+              this.tableList = detail
+              var total = response.data.data.total
+              console.log("total",total)
+           }
+        })
+      },
+      getTime(val) {
+       if(val < 0){
+           return ""
+       }
+       if(val == ""){
+          return ""
+        }else {
+          return uParseTime(val, '{y}-{m}-{d}')
+        }
+     },
+   handleSizeChange(val) {
+      this.limit = val;
+      this.getlist();
+    },
+    handleCurrentChange(val) {
+      this.page = val;
+      this.getlist();
+    },
+    startTimeChange(val){
+      this.start_time = val
+      this.getlist()
+    },
+    endTimeChange(val){
+      this.end_time = val
+      this.getlist()
+    }
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -57,52 +57,61 @@
         style="width: 100%">
         <el-table-column prop="date" label="序号" width="180">
            <template  slot-scope="scope">
-              
+              {{scope.$index + 1}}
            </template>
         </el-table-column>
         <el-table-column prop="drug_type" label="出入库方式" width="180">
            <template slot-scope="scope">
-           
+             <span v-if="scope.row.drug_way == 4">入库</span>
+             <span v-if="scope.row.drug_way == 2">出库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码">
            <template slot-scope="scope">
+             <span v-if="scope.row.drug_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.drug_way == 4">{{scope.row.warehousing_order}}</span>
             
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期">
            <template slot-scope="scope">
-          
+             {{getTime(scope.row.ctime)}}
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="出入库数量">
            <template slot-scope="scope">
-           
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.warehousing_order}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="库存剩余量">
            <template slot-scope="scope">
-            
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.stock_max_numbe}}{{scope.row.max_unit}}{{scope.row.stock_min_number}}{{scope.row.min_unit}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.count}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="进/出货单价">
            <template slot-scope="scope">
-            
+             <span v-if="scope.row.drug_way == 4"> {{scope.row.price}}</span>
+             <span v-if="scope.row.drug_way == 2">{{scope.row.price}}</span>
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="有效期">
            <template slot-scope="scope">
-            
+             <span v-if="scope.row.drug_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.drug_way == 2">{{getTime(scope.row.expiry_date)}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="批号">
            <template slot-scope="scope">
-            
+             <span v-if="scope.row.drug_way == 2"> {{scope.row.number}}</span>
+             <span v-if="scope.row.drug_way == 4">{{scope.row.number}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="供应商">
            <template slot-scope="scope">
-            
+             <span v-if="scope.row.drug_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
+             <span v-if="scope.row.drug_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
            </template>
         </el-table-column>
        </el-table>
@@ -131,7 +140,7 @@
 <script>
   import { uParseTime } from '@/utils/tools'
   import BreadCrumb from '@/xt_pages/components/bread-crumb'
-  import { getDrugStockFlow } from '@/api/drug/drug_stock'
+  import { getDrugStockFlow,getOutDrugStockFlow } from '@/api/drug/drug_stock'
   import SettingDialog from './settingDialog/index'
   import { getDictionaryDataConfig } from "@/utils/data";
   export default {
@@ -141,6 +150,7 @@
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
       this.getlist()
+      this.getOutList()
     },
     components: {
       SettingDialog,
@@ -197,24 +207,50 @@
              end_time:this.end_time,
              page:this.page,
              limit:this.limit,
-             stock_type:this.stockType,  
+             stock_type:this.stock_type,  
            }
           console.log("params",params)
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
             console.log("入库数据",list)
-            this.list = list
+            for(let i=0;i<list.length;i++){
+               list[i].drug_way = 4
+               this.tableList.push(list[i])
+            }
+           
             var total = response.data.data.total
             this.total = total
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
-            var outList = response.data.data.outList
-            console.log("出库数据",outList)
-            this.outList = outList
+           
            }
          })  
        },
+       getOutList(){
+          var params = {
+             drug_id:this.$route.query.drug_id,
+             start_time:this.start_time,
+             end_time:this.end_time,
+             page:this.page,
+             limit:this.limit,
+             stock_type:this.stock_type,  
+           }
+          console.log("出库数据",params)
+         getOutDrugStockFlow(params).then(response=>{
+            if(response.data.state == 1){
+               var outList = response.data.data.outList
+               for(let i=0;i<outList.length;i++){
+                  outList[i].drug_way = 2
+                  this.tableList.push(outList[i])
+               }
+              // for(let i=0;i<this.tableList.length;i++){
+              //   this.tableList[i].index = i+1
+              // }
+              console.log("列表数据",this.tableList)
+            }
+         })
+       },
        handleSizeChange(val) {
         this.limit = val
         this.GetAllDrugStockQueryList()
@@ -252,7 +288,17 @@
          }
        }
        return name
-     }
+     },
+    getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -320,7 +320,7 @@
 
         <el-table-column label="规格&单位" align="center">
           <template slot-scope="scope">
-             {{scope.row.drug.dosage}}&nbsp;{{scope.row.drug.max_unit}}*{{scope.row.drug.unval}}{{scope.row.drug.min_unit}}/{{scope.row.drug.packing_unit}}
+             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
           </template>
         </el-table-column>
        

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -9,8 +9,7 @@
         style="float:right;"
         type="primary"
         icon="el-icon-circle-plus-outline"
-        >新增</el-button
-      >
+        >新增</el-button>
     </div>
     <div class="app-container">
       <div class="cell clearfix">
@@ -75,6 +74,7 @@
       </div>
 
       <el-table
+        @current-change="handleSearch"
         :data="warehouseOutDate"
         :class="signAndWeighBoxPatients"
         style="width: 100%"
@@ -135,7 +135,7 @@
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
            
-            <el-tooltip
+            <!-- <el-tooltip
               class="item"
               effect="dark"
               content="详情"
@@ -148,7 +148,7 @@
                 @click="handleSearch(scope.row.id,scope.row.warehouse_out_time,scope.row.warehouse_out_order_number)"
               >
               </el-button>
-            </el-tooltip>
+            </el-tooltip> -->
 
             <el-tooltip
               class="item"
@@ -195,6 +195,101 @@
       </el-pagination>
     </div>
 
+    <div v-show="tableShow" style="margin-bottom:10px">
+      <el-table
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        style="width: 100%"
+        border
+        highlight-current-row
+        ref="multipleTable"
+        @selection-change="select"
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+      >
+        <el-table-column type="selection" width="55" align="center"> </el-table-column>
+
+        <el-table-column label="药品名称" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug.drug_name}}
+          </template>
+        </el-table-column>
+        <el-table-column label="药品类型" align="center">
+          <template slot-scope="scope">
+              {{getDrugType(scope.row.drug.drug_type)}}
+          </template>
+        </el-table-column>
+         <el-table-column label="规格&单位" align="center">
+          <template slot-scope="scope">
+             {{scope.row.drug.dose}}&nbsp;{{scope.row.drug.dose_unit}}*{{scope.row.drug.min_number}}{{scope.row.drug.min_unit}}/{{scope.row.drug.max_unit}}
+          </template>
+        </el-table-column>
+       
+        <el-table-column label="批号" align="center">
+          <template slot-scope="scope">
+           {{scope.row.number}}
+          </template>
+        </el-table-column>
+        
+        <el-table-column label="出库数量" align="center">
+          <template slot-scope="scope">
+             {{scope.row.count}}
+          </template>
+        </el-table-column>
+
+       <el-table-column label="进货价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.price}}
+          </template>
+        </el-table-column>
+
+      
+       <el-table-column label="总价" align="center">
+          <template slot-scope="scope">
+             {{scope.row.total_price}}
+          </template>
+        </el-table-column>
+      
+
+       <el-table-column label="生产厂家" align="center">
+          <template slot-scope="scope">
+             {{getManufacturerName(scope.row.drug.manufacturer)}}
+          </template>
+        </el-table-column>
+
+
+       <el-table-column label="生产日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.product_date)}}
+          </template>
+        </el-table-column>
+       
+
+       <el-table-column label="有效日期" align="center">
+          <template slot-scope="scope">
+             {{getTime(scope.row.expiry_date)}}
+          </template>
+        </el-table-column>
+
+        <el-table-column label="批准文号" align="center">
+          <template slot-scope="scope">
+             {{scope.row.number}}
+          </template>
+        </el-table-column>
+
+
+        <el-table-column label="备注" align="center">
+          <template slot-scope="scope">
+            {{scope.row.remark}}
+          </template>
+        </el-table-column>
+      </el-table>
+
+    </div>
+
 
     <el-dialog
       title="出库详细"
@@ -249,7 +344,6 @@
           </el-table-column>
           <el-table-column label="总价" min-width="20" align="center">
             <template slot-scope="scope">
-              <!-- {{calculate(scope.row.price*scope.row.count)}} -->
               <span v-if="drugConfig.is_open == 0 || drugConfig.is_open == 2">{{(scope.row.count * getRetailPrice(scope.row.drug_id)).toFixed(2)}}</span>
               <span v-if="drugConfig.is_open == 1">{{(getRetailPrice(scope.row.drug_id) * getDrugCount(scope.row.drug_id)).toFixed(2)}}</span>
             </template>
@@ -364,7 +458,7 @@ import {
   getDrugAutoMaticList
 } from "@/api/drug/drug_stock";
 import BreadCrumb from "../../components/bread-crumb";
-
+import { getInitializtion } from '@/api/stock'
 export default {
   name: "salesReturnOrder",
   components: { BreadCrumb },
@@ -389,20 +483,6 @@ export default {
       (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
       "-" +
       (nowDay < 10 ? "0" + nowDay : nowDay);
-    //    var date1 = new Date();
-    // var date2 = new Date(date1);
-
-    // //-30为30天前，+30可以获得30天后的日期
-    // date2.setDate(date1.getDate() - 30);
-
-    // //30天前（月份判断是否小于10，小于10的前面+0）
-    // var agoDay = `${date2.getFullYear()}-${date2.getMonth() + 1<10?`0${date2.getMonth() + 1}`:date2.getMonth() + 1}-${date2.getDate()}`;
-      
-    // //当前日期
-    // var nowDay = `${date1.getFullYear()}-${date1.getMonth() + 1<10?`0${date1.getMonth() + 1}`:date1.getMonth() + 1}-${date1.getDate()}`;
-
-    //  this.start_time = agoDay
-    //  console.log("333333332222",this.start_time)
     this.GetWarehouseOut();
     this.GetConfigInfo();
     this.fetchAllAdminUsers();
@@ -442,7 +522,11 @@ export default {
       userList:[],
       list:[],
       drugConfig:{},
-      drugList:[]
+      drugList:[],
+      tableList:[],
+      drugTypeList:[],
+      tableShow:false,
+      manufacturerList:[],
     };
   },
   methods: {
@@ -588,14 +672,18 @@ export default {
         query: { id: row.id, type: this.type }
       });
     },
-    handleSearch(id,time,warehouse_out_order_number){
-    
-      this.warehousingOutInfo.warehousingOutData = []
-      this.GetOrderDetail(id)
-      this.list = []
-      this.getDrugAutoMaticList(id,time,warehouse_out_order_number)
-      this.dialogVisible = true
-      
+    // handleSearch(id,time,warehouse_out_order_number){
+    //   this.warehousingOutInfo.warehousingOutData = []
+    //   this.GetOrderDetail(id)
+    //   this.list = []
+    //   this.getDrugAutoMaticList(id,time,warehouse_out_order_number)
+    //   this.dialogVisible = true
+    // },
+    handleSearch(val){
+       this.getInitializtion()
+       this.GetOrderDetail(val.id)
+       this.list = []
+       this.getDrugAutoMaticList(val.id,val.time,val.warehouse_out_order_number)
     },
     GetOrderDetail(order_id) {
         const params = {
@@ -607,13 +695,18 @@ export default {
             this.$message.error(response.data.msg)
             return false
           } else {
-          
+            this.tableShow = true
             this.warehousingOutInfo.warehousingOutData=[]
             for (let i = 0; i < response.data.data.list.length; i++) {
-
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
+              this.tableList.push(response.data.data.list[i])
+
             }
+            console.log("详情",this.tableList)
             this.warehousingOutInfo.info = response.data.data.info
+            var manulist = response.data.data.manulist
+            this.manufacturerList = manulist
+            console.log("厂家列表",this.manufacturerList)
             this.handleSpanTempArr()
           }
         })
@@ -828,7 +921,44 @@ export default {
          }
       }
       return price
-    }
+    },
+    getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+    },
+    getInitializtion(){
+      getInitializtion().then(response=>{
+          if(response.data.state ==1){
+            var drugTypeList = response.data.data.drugTypeList
+            console.log("hhhhhhh",drugTypeList)
+            this.drugTypeList = drugTypeList
+          }
+      })
+    },
+   getDrugType(id){
+     var name = ""
+     for(let i=0;i<this.drugTypeList.length;i++){
+       if(id == this.drugTypeList[i].value){
+           name = this.drugTypeList[i].name
+       } 
+     }
+     return name
+   },
+   getManufacturerName(id){
+     var name = ""
+     for(let i=0;i<this.manufacturerList.length;i++){
+       if(id == this.manufacturerList[i].id){
+          name = this.manufacturerList[i].manufacturer_name
+       }
+     }
+     return name
+   }
   }
 };
 </script>

src/xt_pages/stock/drugs/query.vue

@@ -87,11 +87,11 @@
         :data="tableList"
         border
         style="width: 100%">
-        <el-table-column prop="date" label="药品编号" width="180">
+        <!-- <el-table-column prop="date" label="药品编号" width="180">
            <template  slot-scope="scope">
               
            </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column prop="drug_type" label="药品类型" width="180">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
@@ -104,7 +104,7 @@
         </el-table-column>
         <el-table-column prop="drug_name" label="规格&&单位">
            <template slot-scope="scope">
-             {{scope.row.dosage + scope.row.max_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.packing_unit}}
+             {{scope.row.dose + scope.row.dose_unit +"*"+scope.row.min_number+scope.row.min_unit+"/"+scope.row.max_unit}}
            </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="进货单价">
@@ -120,7 +120,7 @@
         <el-table-column prop="drug_name" label="剩余库存量">
            <template slot-scope="scope">
             <span v-if="scope.row.stock_max_number!=''">
-              {{scope.row.stock_max_number}}{{scope.row.packing_unit}}
+              {{scope.row.stock_max_number}}{{scope.row.max_unit}}
               <span v-if="scope.row.stock_min_number!=''">
                 {{scope.row.stock_min_number}}{{scope.row.min_unit}}
               </span>
@@ -137,7 +137,7 @@
             >
               <el-button
                 size="small"
-                type="warning"
+                type="primary"
                 icon="el-icon-edit-outline"
                 @click="handleDetail(scope.row.drug_id)"
               >
@@ -427,7 +427,7 @@
        
         
          const data = this.formatJson(filterVal, this.tableData)
-         console.log("data",data)
+        //  console.log("data",data)
         
          excel.export_json_to_excel({
            header: tHeader,
@@ -470,7 +470,7 @@
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
              var list = response.data.data.list
-           
+             console.log("list",list)
              this.tableList = list
              var total = response.data.data.total
              this.total = total
@@ -504,7 +504,7 @@
         this.$router.push({path:'/drugstock/in/drugstockflow?drug_id='+id})
       },
       handleBatch(id){
-        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id'+id})
+        this.$router.push({path:'/drugstock/in/drugbatchnumber?drug_id='+id})
       }
     }
   }

src/xt_pages/stock/stockBatchNumber.vue

@@ -0,0 +1,317 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+       耗材名称:{{this.$route.query.good_name}}
+       <!-- 库存:
+       厂家: -->
+      </div>
+      <div class="cell clearfix">
+        <span>日期查询:</span>
+        <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;margin-right:10px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+
+        <span>出入库方式:</span>
+        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+            <el-option
+              v-for="(item,index) in stockType"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+        </el-select>
+        
+        
+      </div>
+      
+       <el-table
+        :data="tableList"
+        border
+        style="width: 100%">
+        <el-table-column prop="date" label="序号" width="180" align="center">
+           <template  slot-scope="scope" >
+              {{scope.$index + 1}}
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="入库单据编码" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="操作日期" align="center">
+           <template slot-scope="scope" >
+             {{getTime(scope.row.ctime)}}
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="有效期" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="批号" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="入库数量" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="进货单价" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+           </template>
+        </el-table-column>
+       </el-table>
+       
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100,500,1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  export default {
+    name: 'stockIn',
+    created() {
+      this.getlist()
+    //   this.getOutList()
+    },
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        stock_type:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[],
+        stockType:[
+          {id:0,name:"全部"},
+          {id:1,name:"手动出库"},
+          {id:2,name:"自动出库"},
+          {id:3,name:"入库"},
+        ],
+      
+      }
+    },
+    methods:{
+    
+     
+       handleSizeChange(val) {
+        this.limit = val
+        this.GetAllDrugStockQueryList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.GetAllDrugStockQueryList()
+      },
+        
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+    },
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+     },
+     changeDrug(){},
+     getManufacturer(id){
+       var name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+            name = this.manufacturerList[i].name
+         }
+       }
+       return name
+     },
+    getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
+     //入库详情
+     getlist(){
+        var params= {
+          limit:this.limit,
+          page:this.page,
+          id:this.$route.query.id,
+          start_time:this.start_time,
+          end_time:this.end_time, 
+        } 
+      getStockInList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           console.log("入库数据",list)
+           this.tableList = list
+           var total = response.data.data.total
+           this.total = total
+           console.log("入库数据",this.tableList)
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+         }
+      })
+     },
+    //  getOutList(){
+    //   var params= {
+    //       limit:this.limit,
+    //       page:this.page,
+    //       id:this.$route.query.id,
+    //       start_time:this.start_time,
+    //       end_time:this.end_time, 
+    //     } 
+    //    getStockOutList(params).then(response=>{
+    //       if(response.data.state == 1){
+    //          var outlist = response.data.data.outList
+    //          console.log("出库数据",outlist)
+    //          for(let i=0;i<outlist.length;i++){
+    //            outlist[i].stock_way = 2
+    //            this.tableList.push(outlist[i])
+    //          }
+    //          console.log("hhhhhhhhhhh",this.tableList)
+    //       }
+    //    })  
+    //  }
+    }
+  }
+</script>
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    margin: 0 0 10px 0;
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+  }
+
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/stock/stockFlow.vue

@@ -0,0 +1,341 @@
+<template>
+  <div class="main-contain">
+    <div class="position">
+      <bread-crumb :crumbs="crumbs"></bread-crumb>
+    </div>
+    <div class="app-container ">
+      <div class="cell clearfix">
+       耗材名称:{{this.$route.query.good_name}}
+       <!-- 库存:
+       厂家: -->
+      </div>
+      <div class="cell clearfix">
+        <span>日期查询:</span>
+        <el-date-picker
+            size="small"
+            v-model="start_time"
+            prefix-icon="el-icon-date"
+            :editable="false"
+            style="width: 196px;"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="startTimeChange"
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_time"
+              prefix-icon="el-icon-date"
+              :editable="false"
+              style="width: 196px;margin-right:10px;"
+              type="date"
+              placeholder="选择日期时间"
+              align="right"
+              format="yyyy-MM-dd"
+              value-format="yyyy-MM-dd"
+              @change="endTimeChange"
+          ></el-date-picker>
+
+        <span>出入库方式:</span>
+        <el-select v-model="stock_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+            <el-option
+              v-for="(item,index) in stockType"
+              :key="index"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+        </el-select>
+        
+        
+      </div>
+      
+       <el-table
+        :data="tableList"
+        border
+        style="width: 100%">
+        <el-table-column prop="date" label="序号" width="180"  align="center">
+           <template  slot-scope="scope">
+              {{scope.$index + 1}}
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_type" label="出入库方式" width="180" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4">入库</span>
+             <span v-if="scope.row.stock_way == 2">出库</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.warehouse_out_order_number}}</span>
+             <span v-if="scope.row.stock_way == 4">{{scope.row.warehousing_order}}</span>
+            
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="操作日期" align="center">
+           <template slot-scope="scope">
+             {{getTime(scope.row.ctime)}}
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="出入库数量"  align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4 && scope.row.warehousing_count!=0"> {{scope.row.warehousing_count}}</span>
+             <span v-if="scope.row.stock_way == 2 && scope.row.count!=0">{{scope.row.count}}</span>
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="库存剩余量"  align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4 && scope.row.stock_count!=0">{{scope.row.stock_count}} </span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="进/出货单价"  align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4"> {{scope.row.price}}</span>
+             <span v-if="scope.row.stock_way == 2">{{scope.row.price}}</span>
+           </template>
+        </el-table-column>
+         <el-table-column prop="drug_name" label="有效期" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.stock_way == 4"> {{getTime(scope.row.expiry_date)}}</span>
+             <span v-if="scope.row.stock_way == 2">{{getTime(scope.row.expiry_date)}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="批号" align="center">
+           <template slot-scope="scope" >
+             <span v-if="scope.row.stock_way == 2"> {{scope.row.number}}</span>
+             <span v-if="scope.row.stock_way == 4">{{scope.row.number}}</span>
+           </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="供应商" align="center">
+           <template slot-scope="scope">
+             <span v-if="scope.row.stock_way == 4"> {{getManufacturer(scope.row.manufacturer)}}</span>
+             <span v-if="scope.row.stock_way == 2">{{getManufacturer(scope.row.manufacturer)}}</span>
+           </template>
+        </el-table-column>
+       </el-table>
+       
+      <el-pagination
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :page-sizes="[10, 50, 100,500,1000]"
+        :page-size="10"
+        background
+        align="right"
+        style="margin-top:20px;"
+        layout="total, sizes, prev, pager, next, jumper"
+        :total="total"
+      >
+      </el-pagination>
+    </div>
+  </div>
+</template>
+<script>
+  import { uParseTime } from '@/utils/tools'
+  import BreadCrumb from '@/xt_pages/components/bread-crumb'
+  import {getStockInList,getStockOutList} from "@/api/drug/drug_stock";
+  export default {
+    name: 'stockIn',
+    created() {
+    //   var drugCategory = getDictionaryDataConfig('system','drug_category')
+    //   this.drugCategory.push(...drugCategory)
+    //   this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
+      this.getlist()
+      this.getOutList()
+    },
+    components: {
+      BreadCrumb
+    },
+    data() {
+      return {
+        crumbs: [
+          { path: false, name: '库存管理' },
+          { path: '/stock/drugs/stock/query', name: '药品库存查询' },
+          { path:'/drugstock/in/drugstockflow',name:'库存流水'}
+        ],
+        keywords: '',
+        total: 0,
+        multipleSelection: [],
+        signAndWeighBoxPatients: 'sign-and-weigh-box-patients',
+        start_time: '',
+        end_time: '',
+        page: 1,
+        limit: 10,
+        goodType: [],
+        goodInfo: [],
+        tempArr: [],
+        sameRowArr: [],
+        WarehouseInfo: {
+          loading: false,
+          warehouseInfoDate: []
+        },
+        tableData:[],
+        drug_category:0,
+        stock_type:0,
+        drugCategory:[
+          {id:0,name:"全部"}
+        ],
+        drugTypeList:[],
+        tableList:[],
+        manufacturerList:[],
+        stockType:[
+          {id:0,name:"全部"},
+          {id:1,name:"手动出库"},
+          {id:2,name:"自动出库"},
+          {id:3,name:"入库"},
+        ],
+      
+      }
+    },
+    methods:{
+    
+     
+       handleSizeChange(val) {
+        this.limit = val
+        this.GetAllDrugStockQueryList()
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.GetAllDrugStockQueryList()
+      },
+        
+    startTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.end_time);
+      
+      if (time > 0) {
+        this.$message.error("开始时间不能大于结束时间");
+        this.start_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+    },
+    endTimeChange: function(val) {
+      var time = this.getTimestamp(val) - this.getTimestamp(this.start_time);
+      if (time < 0) {
+        this.$message.error("结束时间不能小于开始时间");
+        this.end_time = "";
+      } else {
+        this.GetAllDrugStockQueryList();
+      }
+     },
+     changeDrug(){},
+     getManufacturer(id){
+       var name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+            name = this.manufacturerList[i].name
+         }
+       }
+       return name
+     },
+    getTime(val) {
+      if(val < 0){
+          return ""
+      }
+      if(val == ""){
+        return ""
+      }else {
+        return uParseTime(val, '{y}-{m}-{d}')
+      }
+     },
+     //入库详情
+     getlist(){
+        var params= {
+          limit:this.limit,
+          page:this.page,
+          id:this.$route.query.id,
+          start_time:this.start_time,
+          end_time:this.end_time, 
+        } 
+      getStockInList(params).then(response=>{
+         if(response.data.state == 1){
+           var list = response.data.data.list
+           for(let i=0;i<list.length;i++){
+             list[i].stock_way = 4
+             this.tableList.push(list[i])
+           }
+           var total = response.data.data.total
+           this.total = total
+           console.log("入库数据",this.tableList)
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+         }
+      })
+     },
+    //  getOutList(){
+    //   var params= {
+    //       limit:this.limit,
+    //       page:this.page,
+    //       id:this.$route.query.id,
+    //       start_time:this.start_time,
+    //       end_time:this.end_time, 
+    //     } 
+    //    getStockOutList(params).then(response=>{
+    //       if(response.data.state == 1){
+    //          var outlist = response.data.data.outList
+    //          console.log("出库数据",outlist)
+    //          for(let i=0;i<outlist.length;i++){
+    //            outlist[i].stock_way = 2
+    //            this.tableList.push(outlist[i])
+    //          }
+    //          console.log("hhhhhhhhhhh",this.tableList)
+    //       }
+    //    })  
+    //  }
+    }
+  }
+</script>
+<style rel="stylesheet/css" lang="scss" scoped>
+  .information {
+    border: 1px #dcdfe6 solid;
+    padding: 30px 20px 30px 20px;
+
+  .border {
+    border-bottom: 1px #dcdfe6 solid;
+    margin: 0px 0 20px 0;
+  }
+
+  }
+
+  .title {
+    background: #409eff;
+    height: 44px;
+    line-height: 44px;
+    padding: 0 0 0 10px;
+    color: #fff;
+    margin: 0 0 10px 0;
+  }
+
+  .edit_separater {
+    border-top: 1px solid rgb(233, 233, 233);
+    margin-top: 15px;
+    margin-bottom: 15px;
+  }
+</style>
+
+<style>
+  .sign-and-weigh-box .sign-and-weigh-box-patients .cell {
+    font-size: 12px;
+  }
+
+  .sign-and-weigh-box .sign-and-weigh-box-patients .current-row > td {
+    background: #6fb5fa;
+  }
+
+  .count {
+    color: #bd2c00;
+  }
+
+  .el-table td,
+  .el-table th.is-leaf,
+  .el-table--border,
+  .el-table--group {
+    border-color: #d0d3da;
+  }
+
+  .el-table--border::after,
+  .el-table--group::after,
+  .el-table::before {
+    background-color: #d0d3da;
+  }
+</style>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -26,7 +26,7 @@
                         value-format="yyyy-MM-dd"></el-date-picker>
       </div>
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">经销商</span> : </label>
        
        <el-select size="small" v-model="form.dealer" filterable placeholder="请选择经销商"  @change="changeDealer">
@@ -37,9 +37,9 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
-      <div class="cell clearfix">
+      <!-- <div class="cell clearfix">
         <label class="title"><span class="name">厂商</span> : </label>
 
         <el-select size="small" v-model="form.manufacturer" filterable placeholder="请选择厂商"
@@ -51,7 +51,7 @@
             :value="option.id">
           </el-option>
         </el-select>
-      </div>
+      </div> -->
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table id="oictable" :data="recordInfo.recordData" :class="signAndWeighBoxPatients" border
@@ -430,7 +430,8 @@
             }
           }
         })
-      }, GetAllGoodInfo: function() {
+      }, 
+      GetAllGoodInfo: function() {
         GetAllGoodInfo().then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -648,10 +649,11 @@
               this.$message.success('请添加入库商品')
               return
             }
-
+          
             const params = {
               'stockIn': this.recordInfo.recordData
             }
+           
             postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)

src/xt_pages/stock/stockQuery.vue

@@ -64,7 +64,7 @@
       </div>
       
 
-      <el-table
+      <!-- <el-table
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
@@ -153,6 +153,81 @@
             <span>{{stockInCount(scope.row)  - stockOutCount(scope.row) }}</span>
           </template>
         </el-table-column>
+      </el-table> -->
+       <el-table
+        :row-style="{ color: '#303133' }"
+        :header-cell-style="{
+          backgroundColor: 'rgb(245, 247, 250)',
+          color: '#606266'
+        }"
+        :data="tableList"
+        :class="signAndWeighBoxPatients"
+        border
+        v-loading="WarehouseInfo.loading"
+      >
+        <el-table-column label="耗材类型" align="center">
+          <template slot-scope="scope">
+            <span>{{getGoodType(scope.row.good_type_id)}}</span>
+         </template>
+        </el-table-column>
+        <el-table-column label="耗材名称" align="center">
+          <template slot-scope="scope">
+            {{ scope.row.good_name }}
+          </template>
+        </el-table-column>
+        <el-table-column label="规格&单位" align="center">
+            <template slot-scope="scope">
+              <span>{{ scope.row.specification_name }}*{{scope.row.min_number}}{{scope.row.min_unit}}</span>
+            </template>
+         </el-table-column>
+        <el-table-column label="进货单价" align="center">
+          <template slot-scope="scope">
+            {{scope.row.price}}
+          </template>
+        </el-table-column>
+        <el-table-column label="厂商">
+          <template slot-scope="scope">
+           {{getManufacture(scope.row.manufacturer)}}
+          </template>
+        </el-table-column>
+       <el-table-column label="剩余库存量">
+         <template slot-scope="scope">
+          <span v-if="scope.row.stock_count!=0">{{scope.row.stock_count}}</span>
+         </template>
+       </el-table-column>
+       <el-table-column label="操作" align="center" width="260px">
+          <template slot-scope="scope">
+            <el-tooltip
+              class="item"
+              effect="dark"
+              content="库存流水"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="toClick(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+
+            <el-tooltip
+              class="item"
+              type="primary"
+              content="批次"
+              placement="top"
+            >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-edit-outline"
+                @click="toClickOne(scope.row)"
+              >
+              </el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination
         @size-change="handleSizeChange"
@@ -176,15 +251,17 @@ import BreadCrumb from "@/xt_pages/components/bread-crumb";
 import {
   GetAllGoodInfo,
   GetAllGoodType,
-  getAllStockQueryList
+  getAllStockQueryList,
+  getAllStockList
 } from "@/api/stock";
 
 export default {
   name: "stockIn",
   created() {
-    this.GetAllStockQuery();
+    // this.GetAllStockQuery();
     this.GetAllGoodInfo();
     this.GetAllGoodType();
+    this.getlist()
   },
   components: {
     BreadCrumb
@@ -213,6 +290,8 @@ export default {
       value:"",
       type_name:"",
       types:[],
+      tableList:[],
+      manufacturerList:[]
     };
   },
   methods: {
@@ -290,6 +369,7 @@ export default {
             this.goodType.push(response.data.data.goodType[i]);
             this.types.push(response.data.data.goodType[i])
           }
+          
           console.log("商品类型",this.types)
         }
       });
@@ -311,11 +391,13 @@ export default {
     },
     handleSizeChange(val) {
       this.limit = val;
-      this.GetAllStockQuery();
+      // this.GetAllStockQuery();
+      this.getlist()
     },
     handleCurrentChange(val) {
       this.page = val;
-      this.GetAllStockQuery();
+      // this.GetAllStockQuery();
+       this.getlist()
     },
     calculate: function(val) {
       return Math.round(parseFloat(val) * 100) / 100;
@@ -328,7 +410,8 @@ export default {
         this.start_time = "";
       } else {
         this.start_time = val
-        this.GetAllStockQuery();
+        // this.GetAllStockQuery();
+         this.getlist()
       }
     },
     endTimeChange: function(val) {
@@ -338,7 +421,8 @@ export default {
         this.end_time = "";
       } else {
         this.end_time = val
-        this.GetAllStockQuery();
+        // this.GetAllStockQuery();
+         this.getlist()
       }
      
     },
@@ -376,7 +460,8 @@ export default {
     showStockOutDetailDialog: function() {},
     showCancelStockDetailDialog: function() {},
     search: function() {
-      this.GetAllStockQuery();
+      // this.GetAllStockQuery();
+      this.getlist()
     },
 
     exportList(){
@@ -421,6 +506,51 @@ export default {
       // 把时间日期转成时间戳
       return new Date(time).getTime() / 1000;
     },
+    getGoodType(id){
+      var name = ""
+      for(let i=0;i<this.goodType.length;i++){
+        if(id == this.goodType[i].id){
+           name = this.goodType[i].type_name
+        }
+      }
+      return name
+    },
+    getlist(){
+      const params = {
+        page: this.page,
+        limit: this.limit,
+        keyword: this.keywords,
+        start_time:this.start_time,
+        end_time:this.end_time,
+        type_name:this.type_name,
+      };
+
+      getAllStockList(params).then(response=>{
+         if(response.data.state == 1){
+          var list = response.data.data.list
+          console.log("list22222",list)
+          this.tableList = list
+          var total = response.data.data.total
+           var manufacturerList = response.data.data.manufacturerList
+           this.manufacturerList = manufacturerList
+         }
+      })
+    },
+    getManufacture(id){
+       var name = ""
+       for(let i=0;i<this.manufacturerList.length;i++){
+         if(id == this.manufacturerList[i].id){
+           name = this.manufacturerList[i].manufacturer_name
+         }
+       }
+       return name
+    },
+    toClick(val){
+      this.$router.push({path:"/stock/in/stockflow?id="+val.good_id+"&good_name="+val.good_name})
+    },
+    toClickOne(val){
+      this.$router.push({path:"/stock/in/stockbatchnumber?id="+val.good_id+"&good_name="+val.good_name})
+    }
   }
 };
 </script>