518合并代码

src/api/drug/drug_stock.js

@@ -1,8 +1,8 @@
 import request from '@/utils/request'
 
-export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
+export function postDrugWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type, storehouse_id) {
   return request({
-    url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    url: '/api/drugwarehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -72,9 +72,9 @@ export function getDrugWarehouseOutInfoList(params) {
   })
 }
 
-export function postDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type) {
+export function postDrugWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id) {
   return request({
-    url: '/api/drugwarehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    url: '/api/drugwarehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -185,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, storehouse_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 + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -273,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, storehouse_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 + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -289,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, storehouse_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 + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -321,9 +321,9 @@ export function deleteDrugCancelStockInfo(params) {
   })
 }
 
-export function postDrugCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type) {
+export function postDrugCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id) {
   return request({
-    url: '/api/drugcancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    url: '/api/drugcancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })

src/api/stock.js

@@ -201,9 +201,9 @@ export function GetAllGoodInfo(params) {
   })
 }
 
-export function postWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type) {
+export function postWarehouse(params, warehousing_time, manufacturer_id, dealer_id, type, storehouse_id) {
   return request({
-    url: '/api/warehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    url: '/api/warehouse/create?warehousing_time=' + warehousing_time + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -273,9 +273,9 @@ export function getWarehouseOutInfoList(params) {
   })
 }
 
-export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type) {
+export function postWarehouseOut(params, warehousing_time, dealer_id, manufacturer_id, type, storehouse_id) {
   return request({
-    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type,
+    url: '/api/warehouseout/create?warehousing_out_time=' + warehousing_time + '&dealer_id=' + dealer_id + '&manufacturer_id=' + manufacturer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -386,9 +386,9 @@ export function DeleteWarehouseInfoItem(params) {
   })
 }
 
-export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id) {
+export function EditWarehouse(params, warehousing_time, id, type, manufacturer_id, dealer_id, storehouse_id) {
   return request({
-    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
+    url: '/api/warehouse/edit?warehousing_time=' + warehousing_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -474,9 +474,9 @@ export function getWarehouseOutInfo(params) {
   })
 }
 
-export function editWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id) {
+export function editWarehouseoutInfo(params, warehouse_out_time, id, type, manufacturer_id, dealer_id, storehouse_id) {
   return request({
-    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id,
+    url: '/api/warehouseout/edit?warehouse_out_time=' + warehouse_out_time + '&id=' + id + '&type=' + type + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -522,9 +522,9 @@ export function deleteCancelStockInfo(params) {
   })
 }
 
-export function postCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type) {
+export function postCancelStock(params, cancelStockTime, manufacturer_id, dealer_id, type, storehouse_id) {
   return request({
-    url: '/api/cancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type,
+    url: '/api/cancelstock/create?time=' + cancelStockTime + '&manufacturer_id=' + manufacturer_id + '&dealer_id=' + dealer_id + '&type=' + type + '&storehouse_id=' + storehouse_id,
     method: 'post',
     data: params
   })
@@ -779,7 +779,6 @@ export function saveReportStock(data) {
 }
 
 export function getReportStockList(params) {
-  console.log('params', params)
   return request({
     url: '/api/stock/getreportstocklist',
     method: 'get',
@@ -978,3 +977,19 @@ export function getInventoryExportList(params) {
     params: params
   })
 }
+
+export function getDrugDetailSummary(params) {
+  return request({
+    url: '/api/stock/getdrugdetailsummary',
+    method: 'get',
+    params: params
+  })
+}
+
+export function getGoodDetailSummary(params) {
+  return request({
+    url: '/api/stock/getgooddetialsummary',
+    method: 'Get',
+    params: params
+  })
+}

src/api/warehouse.js

@@ -1,6 +1,6 @@
 import request from '@/utils/request'
 
-//分页（已渲染）
+// 分页（已渲染）
 export function storehouselist(params) {
   return request({
     url: '/api/secondary/storehouselist',
@@ -9,7 +9,7 @@ export function storehouselist(params) {
   })
 }
 
-//获取当前机构的所有可用仓库名称接口(已渲染)
+// 获取当前机构的所有可用仓库名称接口(已渲染)
 export function getallstorehousename(params) {
   return request({
     url: '/api/secondary/getallstorehousename',
@@ -18,7 +18,7 @@ export function getallstorehousename(params) {
   })
 }
 
-//获取一条仓库数据接口(好像用不到了)
+// 获取一条仓库数据接口(好像用不到了)
 export function getonestorehouse(params) {
   return request({
     url: '/api/secondary/getonestorehouse',
@@ -27,7 +27,7 @@ export function getonestorehouse(params) {
   })
 }
 
-//修改仓库接口(已渲染)
+// 修改仓库接口(已渲染)
 export function updatestorehouse(data) {
   return request({
     url: '/api/secondary/updatestorehouse',
@@ -36,7 +36,7 @@ export function updatestorehouse(data) {
   })
 }
 
-//添加仓库接口(已渲染)
+// 添加仓库接口(已渲染)
 export function addstorehouse(data) {
   return request({
     url: '/api/secondary/addstorehouse',
@@ -45,7 +45,7 @@ export function addstorehouse(data) {
   })
 }
 
-//仓库地址查重接口(合并到新增)
+// 仓库地址查重接口(合并到新增)
 export function isstorehouseaddress(params) {
   return request({
     url: '/api/secondary/isstorehouseaddress',
@@ -54,7 +54,7 @@ export function isstorehouseaddress(params) {
   })
 }
 
-//仓库名称查重接口(合并到新增)
+// 仓库名称查重接口(合并到新增)
 export function isstorehousename(params) {
   return request({
     url: '/api/secondary/isstorehousename',
@@ -63,7 +63,7 @@ export function isstorehousename(params) {
   })
 }
 
-//删除仓库接口(已渲染)
+// 删除仓库接口(已渲染)
 export function deletestorehouse(params) {
   return request({
     url: '/api/secondary/deletestorehouse',
@@ -72,7 +72,7 @@ export function deletestorehouse(params) {
   })
 }
 
-//修改仓库状态接口(已渲染)
+// 修改仓库状态接口(已渲染)
 export function updatestatus(params) {
   return request({
     url: '/api/secondary/updatestatus',
@@ -81,7 +81,7 @@ export function updatestatus(params) {
   })
 }
 
-//获取仓库编号接口(已渲染)
+// 获取仓库编号接口(已渲染)
 export function getcode(params) {
   return request({
     url: '/api/secondary/getcode',
@@ -90,7 +90,7 @@ export function getcode(params) {
   })
 }
 
-//查询该机构的仓库配置(已渲染)
+// 查询该机构的仓库配置(已渲染)
 export function findstorehouseconfig(params) {
   return request({
     url: '/api/secondary/findstorehouseconfig',
@@ -99,7 +99,7 @@ export function findstorehouseconfig(params) {
   })
 }
 
-//更改耗材自动入库仓库(已渲染)
+// 更改耗材自动入库仓库(已渲染)
 export function updateinfo(params) {
   return request({
     url: '/api/secondary/updateinfo',
@@ -107,7 +107,7 @@ export function updateinfo(params) {
     params: params
   })
 }
-//更改耗材自动出库仓库(已渲染)
+// 更改耗材自动出库仓库(已渲染)
 export function updateoutinfo(params) {
   return request({
     url: '/api/secondary/updateoutinfo',
@@ -115,7 +115,7 @@ export function updateoutinfo(params) {
     params: params
   })
 }
-//更改药品自动入库仓库(已渲染)
+// 更改药品自动入库仓库(已渲染)
 export function updatedruginfo(params) {
   return request({
     url: '/api/secondary/updatedruginfo',
@@ -123,7 +123,7 @@ export function updatedruginfo(params) {
     params: params
   })
 }
-//更改药品自动出库仓库(已渲染)
+// 更改药品自动出库仓库(已渲染)
 export function updatedrugout(params) {
   return request({
     url: '/api/secondary/updatedrugout',
@@ -131,6 +131,22 @@ export function updatedrugout(params) {
     params: params
   })
 }
+// 获取管理员列表(已渲染)
+export function getusername(params) {
+  return request({
+    url: '/api/secondary/getusername',
+    method: 'get',
+    params: params
+  })
+}
+// 获取当前登录人的id(已渲染)
+export function getcreaterid(params) {
+  return request({
+    url: '/api/secondary/getcreaterid',
+    method: 'get',
+    params: params
+  })
+}
 //获取管理员列表(已渲染)
 export function getusername(params) {
   return request({

src/lang/zh.js

@@ -174,8 +174,10 @@ export default {
     selfPreparedMedicineQuery: '自备药查询',
     selfPreparedMedicineIndex: '自备药管理',
     selfPreparedMedicine: '自备药管理',
+    wareHouseManage: '仓库管理',
+    inventoryTransfer: '库存调拨',
     wareHouseManage:'仓库管理',
-    
+
     inventoryTransfer:'库存调拨',
 
     consumablesManagement: '耗材管理',
@@ -278,7 +280,8 @@ export default {
     labelPrint: '标签打印',
     faPiao: '发票设置',
     chargeDetailManagement: '收费明细',
-    yidiClear: '异地清分'
+    yidiClear: '异地清分',
+    zeroSummary: '零用明细汇总'
   },
   navbar: {
     logOut: '退出登录',

src/router/modules/hisTool.js

@@ -34,7 +34,7 @@ export default {
       component: () => import('@/xt_pages/outpatientRecord/outpatientRecord'),
       name: 'outpatientSickRecord',
       meta: { title: 'outpatientSickRecord', noCache: true }
-    },{
+    }, {
       path: '/hisTool/summary',
       component: () => import('@/xt_pages/outpatientTool/summary'),
       name: 'outpatientSickRecord',
@@ -63,6 +63,11 @@ export default {
       name: 'statistics',
       meta: { title: 'statistics', noCache: true }
     },
-
+    {
+      path: '/hisTool/zeroSummary',
+      component: () => import('@/xt_pages/outpatientTool/zeroSummary'),
+      name: 'zeroSummary',
+      meta: { title: 'zeroSummary', noCache: true }
+    }
   ]
 }

src/router/modules/stock.js

@@ -372,6 +372,18 @@ export default {
         title: '调拨详情',
         noCache: true
       }
+    },
+
+    {
+      path: '/stock/inventoryTransfer/transedit',
+      component: () => import('@/xt_pages/stock/inventoryTransfer/transEdit'),
+      hidden: true,
+      is_menu: false,
+      name: 'transEdit',
+      meta: {
+        title: '编辑调拨',
+        noCache: true
+      }
     }
   ]
 }

src/xt_pages/stock/cancelStockOrder.vue

@@ -15,12 +15,21 @@
 
     <div class="app-container">
       <div class="cell clearfix">
+        <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           class="filter-item"
           v-model.trim="searchKey"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人"
         />
         <el-button
           size="small"
@@ -105,6 +114,12 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{getHouseName(scope.row.storehouse_id) }}
+            </template>
+          </el-table-column>
+
           <el-table-column label="制单人" align="center">
             <template slot-scope="scope">
               {{ getXuserName(scope.row.creater) }}
@@ -192,6 +207,12 @@
             </template>
           </el-table-column>
 
+         <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{getHouseName(scope.row.storehouse_id)}}
+            </template>
+          </el-table-column>
+
           <el-table-column label="退库数量" align="center">
             <template slot-scope="scope">
               {{ scope.row.count}}{{scope.row.GoodInfo.packing_unit}}
@@ -321,7 +342,9 @@ export default {
       tableList:[],
       showTable:false,
       order_id:"",
-      exportList:[]
+      exportList:[],
+      houseList:[],
+      storehouse_id:0,
     };
   },
   methods: {
@@ -332,7 +355,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getCancelStockList(Params).then(response => {
@@ -344,6 +368,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
           }
+          this.houseList = response.data.data.houseList
         }
       });
     },
@@ -359,7 +384,8 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getCancelStockList(Params).then(response => {
@@ -371,6 +397,13 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
           }
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+          }
+        
         }
       });
     },
@@ -399,7 +432,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+     
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -474,7 +507,7 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      console.log("row22222",row.id)
+    
       this.$router.push({"path":"/stock/cancel/cancelstockorderedit?id="+row.id})
     },
     handleDelete: function(index, row) {
@@ -485,8 +518,7 @@ export default {
       const params = {
         ids: idStr
       };
-      console.log("params233223232323232323",params)
-     
+
       this.$confirm("确认删除退库单记录?", "删除退库单记录", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -583,18 +615,15 @@ export default {
       getSingCancelOrder(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list0000000000",list)
           this.tableList = list
           this.showTable = true
         }
       }) 
     },
     toPrint(){
-      console.log("22222",this.order_id)
       if(this.order_id == ""){
         this.$message.error("请勾选退库单")
       }else{
-        console.log("232332332")
         this.$router.push({path:'/stock/drugs/cancelstockorderprint?order_id='+this.order_id+"&start_time="+this.start_time+"&end_time="+this.end_time})
       }
     },
@@ -614,11 +643,10 @@ export default {
         end_time: this.end_time,
         order_id:this.order_id,
       };
-      console.log("params2323232",Params)
+
      getCancelExportList(Params).then(response=>{
         if(response.data.state == 1){
           var list =  response.data.data.list
-          console.log("list2323232",list)
           this.exportList = list
         }
      })
@@ -630,7 +658,6 @@ export default {
         return
       }
      import('@/vendor/Export2Excel').then(excel => {
-      console.log("23232323",this.exportList)
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].total_price = this.exportList[i].count * this.exportList[i].price
         this.exportList[i].good_name = this.exportList[i].GoodInfo.good_name
@@ -647,7 +674,7 @@ export default {
       }
       const tHeader = ['耗材名称',  '规格&单位','退库数量','退库单价','批次','品名/注册证号(备案凭证号)','生产厂家','生产日期','有效期','退库原因']
       const filterVal = ['good_name', 'unit','count','price','number','register_account','manufacturer','product_date','expiry_date','remark']
-      console.log("table",this.exportList)
+
      
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
@@ -661,6 +688,18 @@ export default {
     formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      return storehouse_name
+    },
+    changeStoreHouse(){
+      this.GetCancelStock()
+    }
   }
 };
 </script>

src/xt_pages/stock/cancelStockOrderAdd.vue

@@ -35,8 +35,16 @@
       ></stock-in-dialog>
       <div class="filter-container">
         <div class="cell clearfix">
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+         </el-select>
           <label class="title"><span class="name">退库时间</span> : </label>
-
           <el-date-picker
             size="small"
             v-model="return_time"
@@ -63,6 +71,7 @@
         >
        
          <el-table-column align="center" width="320" fixed="left">
+       
              <template slot="header" slot-scope="scope">
               <span>耗材名称</span>
             </template>
@@ -346,7 +355,9 @@ export default {
       goodInfo:[],
       numberList:[],
       dealerList:[],
-      manufacturerList:[]
+      manufacturerList:[],
+      list:[],
+      storehouse_id:"",
     };
   },
   methods: {
@@ -402,6 +413,8 @@ export default {
           this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
           this.form.manufacturer = 0
           this.form.dealer = 0
+          this.list = response.data.data.list
+          this.storehouse_id = response.data.data.configlist.storehouse_out_info
         }
         loading.close()
       })
@@ -569,15 +582,14 @@ export default {
           const params = {
             cancelStock: this.recordInfo.recordData
           };
-        
-          console.log("parasm23233222332323",params)
-          
+         
           postCancelStock(
             params,
             this.return_time,
             this.form.manufacturer,
             this.form.dealer,
-            this.type
+            this.type,
+            this.storehouse_id,
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -585,18 +597,22 @@ export default {
               return false;
             } else {
              var msg =  response.data.data.msg
+             var good_name = response.data.data.good_name
+             var specification_name = response.data.data.specification_name
+             var storehose_name = response.data.data.storehouse_name
+            var str = storehose_name + " " + good_name +"*" + specification_name +"该批次退库数量大于出库数量"
              if (msg == 1){
                 this.$message.error("无出库记录")
                 return
              }
              if(msg == 2){
-               this.$message.error("该批次退库数量大于出库数量")
+               this.$message.error(str)
              }
               if(msg == 4){
-               this.$message.error("该批次退库数量大于入库数量")
+               this.$message.error(str)
              }
              if(msg == 5){
-              this.$message.error("该批次退库数量大于入库数量")
+              this.$message.error(str)
              }
              if(msg == 3){
                this.$notify({
@@ -662,7 +678,7 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-      console.log("列表23323232332",this.recordInfo.recordData)
+     
       for(let i=0;i<this.recordInfo.recordData.length;i++){
         if(this.currentIndex == i){
           this.recordInfo.recordData[i].good_name = val.good_name
@@ -697,8 +713,6 @@ export default {
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list2243444",list)
-
           this.numberList = []
           this.numberList = list
         }

src/xt_pages/stock/cancelStockOrderEdit.vue

@@ -16,7 +16,16 @@
         v-on:dialog-cancle="cancle"
       ></stock-in-dialog>
       <div class="cell clearfix">
-
+      
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+         </el-select>
         <label class="title"><span class="name">退库时间</span> : </label>
         <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -315,7 +324,9 @@
         manufacturerList:[],
         dealerList:[],
         numberList:[],
-        numberShow:true
+        numberShow:true,
+        storehouse_id:"",
+        list:[],
       }
     },
     methods: {
@@ -365,6 +376,8 @@
             this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
             this.form.manufacturer = 0
             this.form.dealer = 0
+            this.list = response.data.data.list
+          
           }
           loading.close()
         })
@@ -598,6 +611,7 @@
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
+            this.storehouse_id = response.data.data.info.storehouse_id
             this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer

src/xt_pages/stock/detail/cancelStockDetail.vue

@@ -23,9 +23,18 @@
       >汇总导出
     </el-button>
     <div class="cell clearfix">
+     <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>  
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width:200px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/规格名称/耗材名称"
@@ -38,7 +47,7 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
+     
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -67,49 +76,10 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
-    </div>
-
     
+    </div>
 
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">单据类型</span> : </label>
-      <el-select
-        size="small"
-        v-model="order_type"
-        clearable
-        placeholder="单据类型"
-        @change="changeType"
-      >
-        <el-option
-          v-for="item in orderTypeArr"
-          :key="item.value"
-          :label="item.label"
-          :value="item.value"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
-    <!-- <div class="cell clearfix">
-      <label class="title"><span class="name">其它</span> : </label>
-      <el-select
-        size="small"
-        v-model="manufacturer_id"
-        clearable
-        placeholder="厂商"
-        @change="changeManufacturer"
-      >
-        <el-option
-          v-for="item in manufacturer"
-          :key="item.id"
-          :label="item.manufacturer_name"
-          :value="item.id"
-        >
-        </el-option>
-      </el-select>
-    </div> -->
-
+  
     <el-row :gutter="12" style="margin-top: 10px">
       <el-table
         :data="cancelStockDate"
@@ -166,6 +136,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{ getStorehouseName(scope.row.storehouse_id) }}
+          </template>
+        </el-table-column>
+
         <el-table-column label="数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.count }}
@@ -280,6 +256,8 @@ export default {
       goodUnit:[],
       tableDataList:[],
       table:[],
+      houseList:[],
+      storehouse_id:0
     };
   },
   methods: {
@@ -390,9 +368,10 @@ export default {
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
         dealer: this.dealer_id,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
-      // console.log("Params23232233223232332",Params)
+    
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
         if (response.data.state == 0) {
@@ -400,7 +379,12 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
-          // console.log("数据源头",response.data.data.list)
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+           this.houseList.push(response.data.data.houseList[i])
+          }
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             
@@ -728,7 +712,24 @@ export default {
         }
       }
       return total
-    }
+    },
+   getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.GetCancelStock()
+     }
   }
 };
 </script>

src/xt_pages/stock/detail/stockInDetail.vue

@@ -26,9 +26,18 @@
     </el-button>
 
     <div class="cell clearfix">
+      <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>  
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width: 180px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/规格名称/耗材名称"
@@ -41,7 +50,7 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
+    
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -70,7 +79,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
+      
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -102,12 +111,14 @@
         <el-table-column label="耗材名称" align="center">
           <template slot-scope="scope">
             {{ typeNameOne(scope.row.good_id) }}
+          
           </template>
         </el-table-column>
 
         <el-table-column label="规格型号" align="center">
           <template slot-scope="scope">
             {{ specificationName(scope.row.good_id) }}
+           
           </template>
         </el-table-column>
 
@@ -122,6 +133,11 @@
             {{ getXuserName(scope.row.Warehousing.creater) }}
           </template>
         </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getStorehouseName(scope.row.storehouse_id) }}
+          </template>
+        </el-table-column>
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{ scope.row.price }}
@@ -247,6 +263,8 @@ export default {
       org_id:0,
       tableInfo:[],
       tableDataList:[],
+      houseList:[],
+      storehouse_id:0,
     };
   },
   methods: {
@@ -308,7 +326,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       this.tableList = []
@@ -361,7 +380,8 @@ export default {
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
         dealer: this.dealer_id,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
@@ -370,6 +390,12 @@ export default {
           return false;
         } else {
           this.total = response.data.data.total;
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+           this.houseList.push(response.data.data.houseList[i])
+          }
           var total_price = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             total_price += parseInt(response.data.data.list[i].warehousing_count) * response.data.data.list[i].price
@@ -379,6 +405,8 @@ export default {
             this.cancelStockDate.push(obj);
           }
           this.tableDataList = response.data.data.list
+          console.log("表格发3223332322332332323232332233",this.cancelStockDate)
+         
           this.cancelStockDate.push({
             warehousing_order: "合计",
             is_total: 1,
@@ -430,12 +458,10 @@ export default {
       this.multipleSelection = val;
     },
     handleSizeChange(val) {
-      console.log("val2332323223",val)
       this.limit = val;
       this.GetCancelStock();
     },
     handleCurrentChange(val) {
-      console.log("888888",val)
       this.page = val;
       this.GetCancelStock();
     },
@@ -795,10 +821,26 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          // console.log("入库详情单",list)
           this.tableInfo = list
         }
       })
+     },
+     getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.GetCancelStock()
      }
   }
 };

src/xt_pages/stock/detail/stockOutDetail.vue

@@ -23,9 +23,18 @@
       >汇总导出
     </el-button>
     <div class="cell clearfix">
+      <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width:180px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/规格名称/耗材名称"
@@ -38,7 +47,7 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
+
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -67,7 +76,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
+
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -123,13 +132,18 @@
           <template slot-scope="scope">
             {{ getXuserName(scope.row.WarehouseOut.creater) }}
           </template>
+        </el-table-column>
+         <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{ getStorehouseName(scope.row.storehouse_id) }}
+          </template>
         </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.is_total == 0 && (orgId == 9919)">{{scope.row.GoodInfo.buy_price}}</span>
-            <span v-else> 
-              <span v-if="scope.row.price > 0"> {{ scope.row.price }} </span> 
-               <span v-if="scope.row.price == 0"> {{ scope.row.GoodInfo.packing_price }} </span> 
+            <span v-else>
+              <span v-if="scope.row.price > 0"> {{ scope.row.price }} </span>
+               <span v-if="scope.row.price == 0"> {{ scope.row.GoodInfo.packing_price }} </span>
             </span>
           </template>
         </el-table-column>
@@ -170,7 +184,7 @@ import { deleteCancelStock, GetAllConfig, getStockDetail,getPrintStockGood,getGo
 
 export default {
   name: "stockOutDetail",
-  
+
   created() {
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
@@ -201,7 +215,7 @@ export default {
       this.end_time = end_time
     }
     window.sessionStorage.removeItem('start')
-    window.sessionStorage.removeItem('end')  
+    window.sessionStorage.removeItem('end')
     this.getGoodDetailPrintList()
     this.GetCancelStock();
     this.GetConfigInfo();
@@ -209,8 +223,8 @@ export default {
     this.goodUnit = this.$store.getters.good_unit
     var org_id = this.$store.getters.xt_user.org.id
     this.orgId = org_id
-    
-    
+
+
   },
   data() {
     return {
@@ -249,6 +263,8 @@ export default {
       tableData:[],
       tableOut:[],
       tableDataList:[],
+      storehouse_id:0,
+      houseList:[],
     };
   },
   methods: {
@@ -256,7 +272,7 @@ export default {
       this.order_type = val;
       this.GetCancelStock();
       this.getGoodDetailPrintList()
-      
+
     },
     changeManufacturer: function(val) {
       this.manufacturer_id = val;
@@ -323,12 +339,12 @@ export default {
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
-            
+
             var obj = response.data.data.list[i];
             total += response.data.data.list[i].price * response.data.data.list[i].count
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
-       
+
           }
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
@@ -338,6 +354,7 @@ export default {
               warehouse_out_time: 0
             }
           });
+
         }
       });
     },
@@ -357,7 +374,8 @@ export default {
         manufacturer: this.manufacturer_id,
         order_type: this.order_type,
         dealer: this.dealer_id,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getStockDetail(Params).then(response => {
@@ -367,7 +385,12 @@ export default {
         } else {
 
           this.total = response.data.data.total;
-         
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+           this.houseList.push(response.data.data.houseList[i])
+          }
           var total = 0
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.tableData.push(response.data.data.list[i])
@@ -378,13 +401,13 @@ export default {
             if(response.data.data.list[i].price == 0){
                total += response.data.data.list[i].GoodInfo.packing_price * response.data.data.list[i].count
             }
-           
+
             obj["is_total"] = 0;
             this.cancelStockDate.push(obj);
           }
-          
+
           this.tableDataList = response.data.data.list
-          
+
           this.cancelStockDate.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -393,7 +416,7 @@ export default {
               warehouse_out_time: 0
             }
           });
-          
+
         }
       });
     },
@@ -456,7 +479,7 @@ export default {
         this.cancelStockDate = []
         this.GetCancelStock();
         this.getGoodDetailPrintList()
-       
+
       }
     },
     endTimeChange(val) {
@@ -649,7 +672,7 @@ export default {
     //   getPrintStockGood(params).then(response=>{
     //       if(response.data.state == 1){
     //         var stockTotal =  response.data.data.stockTotal
-          
+
     //         this.stockTotal = stockTotal
     //         var list =  response.data.data.list
     //         this.tableList = []
@@ -727,7 +750,7 @@ export default {
           is_mark:"",
           manufacturer:"",
         }
-       
+
         getGoodInfoList(params).then(response => {
           if (response.data.state == 0) {
             this.$message.error(response.data.msg)
@@ -737,7 +760,7 @@ export default {
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.goodInfoData.push(response.data.data.list[i])
             }
-           
+
           }
         })
       },
@@ -758,9 +781,9 @@ export default {
         }else{
           this.tableOut[i].total_price = (this.getStockCount(this.tableOut[i].good_id) * this.tableOut[i].retail_price).toFixed(2)
         }
-       
+
         if(this.orgId  == 10265 || this.orgId ==10215 ){
-        
+
          this.tableOut[i].out_count = this.getMySelfCount(this.tableOut[i].good_id)
         }
         if(this.orgId!=10265 && this.orgId !=10215){
@@ -773,8 +796,8 @@ export default {
        const filterVal = ['index','good_name', 'specification_name', 'packing_unit','out_count','packing_price','total_price','remark']
 
        const data = this.formatJson(filterVal, this.tableOut)
-       console.log("date2332323232",data)
-      
+
+
         excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -802,19 +825,19 @@ export default {
             this.tableDataList[i].total_price = (this.tableDataList[i].count * this.tableDataList[i].price).toFixed(2)
             total += this.tableDataList[i].count * this.tableDataList[i].price
           }
-         
-         
+
+
         }
         obj.total_price = total.toFixed(2)
-      
+
         this.tableDataList.push(obj)
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','单据编号', '耗材类型', '耗材名称','规格型号','操作时间','制单人','出货价','数量','总价']
        const filterVal = ['index','warehouse_out_order_number', 'good_type_name', 'good_name','specification_name','time','user_name','price','out_count','total_price']
 
        const data = this.formatJson(filterVal, this.tableDataList)
- 
-      
+
+
         excel.export_json_to_excel({
            header: tHeader,
            data,
@@ -842,7 +865,7 @@ export default {
        }
        return total_price
      },
-   
+
      getGoodDetailPrintList(){
         const params = {
           start_time:this.start_time,
@@ -853,16 +876,16 @@ export default {
       getGoodDetailPrintList(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("lisrt23323223233232232323232323",list)
+
           this.tableOut = list
           var stockTotal = response.data.data.stockTotal
-          console.log("list88888888888888888888",stockTotal)
+
           this.stockTotal = stockTotal
         }
       })
      },
      getStockCount(id){
-     
+
         var count = ""
         for(let i=0;i<this.stockTotal.length;i++){
             if(id == this.stockTotal[i].good_id){
@@ -870,7 +893,7 @@ export default {
             }
         }
         return count
-    }, 
+    },
     getMySelfCount(good_id){
        var total = 0
        for(let i=0;i<this.tableOut.length;i++){
@@ -887,6 +910,23 @@ export default {
        }
        return total
      },
+    getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.GetCancelStock()
+     }
   }
 };
 </script>

src/xt_pages/stock/drugs/cancelDrugStockOrder.vue

@@ -14,13 +14,23 @@
     </div>
 
     <div class="app-container">
+      
       <div class="cell clearfix">
+        <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           class="filter-item"
           v-model.trim="searchKey"
-          placeholder="单据编码/制单人/厂商"
+          placeholder="单据编码/制单人"
         />
         <el-button
           size="small"
@@ -104,6 +114,13 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
+
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
             {{ getXuserName(scope.row.creater) }}
@@ -187,6 +204,14 @@
                 {{ scope.row.BaseDrugLib.medical_insurance_number}}
               </template>
             </el-table-column>
+
+
+            <el-table-column label="仓库名称" align="center">
+              <template slot-scope="scope">
+                {{getHouseName(scope.row.storehouse_id)}}
+              </template>
+            </el-table-column>
+
             <el-table-column label="退库数量" align="center">
               <template slot-scope="scope">
                 {{ scope.row.count}}
@@ -326,7 +351,9 @@ export default {
       tableList:[],
       showTable:false,
       order_id:"",
-      exportList:[]
+      exportList:[],
+      houseList:[],
+      storehouse_id:0,
     };
   },
   methods: {
@@ -337,7 +364,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getDrugCancelStockList(Params).then(response => {
@@ -364,7 +392,8 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        storehouse_id:this.storehouse_id,
       };
       this.cancelStockDate = [];
       getDrugCancelStockList(Params).then(response => {
@@ -372,12 +401,18 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          console.log("列表23232323232323",response.data.data.list)
+         
           
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.cancelStockDate.push(response.data.data.list[i]);
           }
+          var obj= {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+          }
         }
       });
     },
@@ -555,8 +590,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      })
-        .then(() => {
+      }).then(() => {
           deleteDrugCancelStock(params).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -582,23 +616,22 @@ export default {
         .catch(() => {});
     },
     handleCurrentChangeOne(val) {
+     if(val!=null){
       this.getCancelStockDetail(val.id)
+     }
     },
     getCancelStockDetail(id){
-      console.log("id232233223",id)
         var params = {
           id:id
         }
       getCancelStockDetail(params).then(response=>{
        if(response.data.state == 1){
          var list =  response.data.data.list
-         console.log("hhhh23233323223",list)
          for(let i=0;i<list.length;i++){
            list[i].product_date = this.getTime(list[i].product_date,"{y}-{h}-{d}")
            list[i].expiry_date = this.getTime(list[i].expiry_date,"{y}-{h}-{d}")
          }
          this.tableList = list
-        //  console.log("list23232",list)
          this.showTable = true
        }
       })
@@ -669,6 +702,18 @@ export default {
     formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+   getHouseName(id){
+    var storehouse_name = ""
+    for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+    }
+    return storehouse_name
+  },
+  changeStoreHouse(){
+    this.GetCancelStock()
+  }
   }
 };
 </script>

src/xt_pages/stock/drugs/cancelDrugStockOrderAdd.vue

@@ -38,8 +38,16 @@
 
       <div class="filter-container">
         <div class="cell clearfix">
+          <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+          <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+            </el-select>
           <label class="title"><span class="name">退库时间</span> : </label>
-
           <el-date-picker
             size="small"
             v-model="return_time"
@@ -365,7 +373,9 @@ export default {
       dealerList:[],
       manufacturerList:[],
       numberList:[],
-      unitList:[]
+      unitList:[],
+      list:[],
+      storehouse_id:"",
     };
   },
   methods: {
@@ -425,6 +435,8 @@ export default {
 
           this.form.manufacturer = 0
           this.form.dealer = 0
+          this.list = response.data.data.list
+          this.storehouse_id = response.data.data.configlist.drug_storehouse_out
         }
         loading.close()
       })
@@ -546,6 +558,10 @@ export default {
       this.$router.go(-1);
     },
     submit() {
+      if(this.storehouse_id == ""){
+        this.$message.error("仓库不能为空!")
+        return
+      }
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
@@ -584,7 +600,8 @@ export default {
             this.return_time,
             this.form.manufacturer,
             this.form.dealer,
-            this.type
+            this.type,
+            this.storehouse_id,
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);

src/xt_pages/stock/drugs/cancelDrugStockOrderEdit.vue

@@ -18,7 +18,15 @@
       >
       </drugs-stock-dialog>
       <div class="cell clearfix">
-
+        <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+          <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
         <label class="title"><span class="name">退库时间</span> : </label>
         <el-date-picker size="small" v-model="return_time" prefix-icon="el-icon-date" :editable="false" style="width: 196px;"
                         type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -342,7 +350,9 @@
         dealerList:[],
         numberList:[],
         unitList:[],
-        canCelShow:true
+        canCelShow:true,
+        storehouse_id:"",
+        houseList:[],
       }
     },
     methods: {
@@ -420,7 +430,7 @@
         }
         return name;
       },  specificationName: function(drug_id) {
-        console.log(this.goodInfo)
+
         let name = "";
         for (let i = 0; i < this.goodInfo.length; i++) {
           if (this.goodInfo[i].id == drug_id) {
@@ -555,9 +565,9 @@
             const params = {
               'cancelStock': this.recordInfo.recordData
             }
-            console.log("232323223",this.recordInfo.recordData)
+           
             
-            editDrugCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer).then(response => {
+            editDrugCancelStockInfo(params, this.return_time, this.$route.query.id, this.$route.query.type,this.form.manufacturer,this.form.dealer,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 return false
@@ -590,7 +600,7 @@
             this.$message.error(response.data.msg)
             return false
           } else {
-            console.log("list232323",response.data.data.list)
+           
             for (let i = 0; i < response.data.data.list.length; i++) {
               response.data.data.list[i].count = response.data.data.list[i].count.toString()
               response.data.data.list[i].price = response.data.data.list[i].price.toString()
@@ -603,10 +613,12 @@
               this.recordInfo.recordData.push(response.data.data.list[i])
             }
             this.cancelStock = response.data.data.info
-            console.log("hhhh23hh2hh23h223",this.cancelStock)
+           
+            this.storehouse_id = response.data.data.info.storehouse_id
             this.return_time = this.getTime(this.cancelStock.return_time, '{y}-{m}-{d}')
             this.form.manufacturer = this.cancelStock.manufacturer
             this.form.dealer = this.cancelStock.dealer
+            this.houseList = response.data.data.houselist
           }
           if (this.recordInfo.recordData.length == 0) {
             const tempObj = {}
@@ -634,7 +646,7 @@
             searchArray = response.data.data.list;
             
              var list = response.data.data.list
-             console.log("猎豹22222222222",list)
+      
 
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
@@ -672,13 +684,13 @@
             arr.push(this.recordInfo.recordData[i].drug_id)
          }
          var str = arr.join(",")
-         console.log("str",str)
+       
          if(str.indexOf(val.id)!=-1){
             this.$message.error("该药品已存在列表中")
             return
          }
          this.getDrugBatchNumber(val.id)
-         console.log("val2323232323223",val)
+
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id  = val.id
@@ -699,7 +711,7 @@
             
            }
         }
-        console.log("333333",this.recordInfo.recordData)
+       
       },
       getDrugBatchNumber(id){
           var params = {
@@ -708,7 +720,7 @@
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list2222",list)
+       
              for(let i=0;i<list.length;i++){
                this.numberList.push(list[i])
              }

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

@@ -23,9 +23,18 @@
       >汇总导出
     </el-button>
     <div class="cell clearfix">
+     <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>  
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width: 200px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -38,7 +47,7 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
+    
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -67,7 +76,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
+     
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -128,6 +137,11 @@
           {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
+       <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+          {{getStorehouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
         <el-table-column label="退货价" align="center">
           <template slot-scope="scope">
           {{scope.row.price}}
@@ -235,6 +249,8 @@ export default {
       tableList:[],
       tableDataList:[],
       drugTypeList:[],
+      storehouse_id:0,
+      houseList:[],
     };
   },
   methods: {
@@ -272,7 +288,7 @@ export default {
    
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+     
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -343,12 +359,18 @@ export default {
         keyword:this.searchKey,
         limit:this.limit,
         page:this.page,
+        storehouse_id:this.storehouse_id,
        }
       getDrugCancelDetail(params).then(response=>{
          if(response.data.state == 1){
            var order =  response.data.data.order
            var list = response.data.data.orderPrint
-           //this.drugTypeList = response.data.data.drugTypeList
+           var obj = {id:0,storehouse_name:"全部"}
+            this.houseList = []
+            this.houseList.push(obj)
+            for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+            }
            for(let i=0;i<list.length;i++){
              list[i].child = []
             for(let j=0;j<order.length;j++){
@@ -489,7 +511,24 @@ export default {
         }
       }
       return name
-    } 
+    },
+    getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.getlist()
+     }  
   }
 };
 </script>

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

@@ -23,11 +23,20 @@
       type="primary"
       >汇总导出
     </el-button>
-
+   
     <div class="cell clearfix">
+      <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>  
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width: 200px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -40,7 +49,6 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -70,7 +78,6 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
     </div>
 
     <el-row :gutter="12" style="margin-top: 10px">
@@ -124,6 +131,11 @@
            {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+           {{getStorehouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
         <el-table-column label="进货价" align="center">
           <template slot-scope="scope">
             {{scope.row.price}}
@@ -134,6 +146,11 @@
             {{scope.row.warehousing_count}}
           </template>
         </el-table-column>
+        <el-table-column label="单位" align="center">
+          <template slot-scope="scope">
+            {{scope.row.count_unit}}
+          </template>
+        </el-table-column>
         <el-table-column label="总价" align="center">
           <template slot-scope="scope">
             {{scope.row.total_price}}
@@ -190,7 +207,6 @@ export default {
     
     var end_time =  window.sessionStorage.getItem('drug_end_in_time')
     if(start_time !=null){
-      console.log("hh232323232红红火火")
       this.start_time = start_time
     }
     if(end_time!=null){
@@ -238,6 +254,8 @@ export default {
       tableList:[],
       tabelePrintList:[],
       drugTypeList:[],
+      storehouse_id:0,
+      houseList:[],
     };
   },
   methods: {
@@ -342,16 +360,24 @@ export default {
         keyword:this.searchKey,
         limit:this.limit,
         page:this.page,
+        storehouse_id:this.storehouse_id,
        }
       getDrugIndetail(params).then(response=>{
         if(response.data.state == 1){
           var drugInOrder = response.data.data.detail
           var drugTypeParent = response.data.data.drugTypeParent
-          console.log("药品类型",drugTypeParent)
-        //  this.drugTypeList = drugTypeParent
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+           this.houseList.push(response.data.data.houseList[i])
+          }
           var total_price = 0
           for(let i=0;i<drugInOrder.length;i++){
              drugInOrder[i].specification_name  = drugInOrder[i].dose + drugInOrder[i].dose_unit + "*" + drugInOrder[i].min_number +  drugInOrder[i].min_unit + "/" + drugInOrder[i].max_unit
+             if(drugInOrder[i].storehouse_id > 0){
+               drugInOrder[i].total_price = (drugInOrder[i].warehousing_count * drugInOrder[i].price).toFixed(2)
+             }
              drugInOrder[i].is_total = 0
              total_price += drugInOrder[i].warehousing_count * drugInOrder[i].price
           }
@@ -362,6 +388,7 @@ export default {
             ctime:"",
             total_price:total_price.toFixed(2),
           });
+          console.log("drugInOrder232332322323233232322332322332",drugInOrder)
           this.cancelStockDate = drugInOrder
            let objInfo = {}
           drugInOrder.forEach((item,index)=>{
@@ -416,7 +443,7 @@ export default {
         end_time:this.end_time,
         order_type:this.order_type,
       }
-     console.log("药品入库232323223",params)
+    
      getDrugWarehouseInfoPrint(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
@@ -443,7 +470,7 @@ export default {
       return name
     },
      exportList(){
-        console.log("hhh233223232323",this.tabelePrintList)
+       
         for(let i=0;i<this.tabelePrintList.length;i++){
           this.tabelePrintList[i].index = i+1
           this.tabelePrintList[i].drug_name = this.tabelePrintList[i].XtBaseDrug.drug_name
@@ -517,7 +544,24 @@ export default {
         }
       }
       return name
-    }
+    },
+   getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.getlist()
+     }
   }
 };
 </script>

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

@@ -24,9 +24,18 @@
     </el-button>
    
     <div class="cell clearfix">
+       <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>  
       <el-input
         size="small"
-        style="width: 400px;"
+        style="width: 200px;"
         class="filter-item"
         v-model.trim="searchKey"
         placeholder="单据编码/制单人/药品名称"
@@ -39,7 +48,6 @@
         @click="search"
         >搜索</el-button
       >
-      <div style="margin-left:10px;">
         <label class="title"><span class="name">日期查询</span> : </label>
         <el-date-picker
           size="small"
@@ -68,7 +76,7 @@
           value-format="yyyy-MM-dd"
           @change="endTimeChange"
         ></el-date-picker>
-      </div>
+     
     </div>
 
   
@@ -125,6 +133,11 @@
            {{getAdminUser(scope.row.creater)}}
           </template>
         </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+           {{getStorehouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
         <el-table-column label="出货价" align="center">
           <template slot-scope="scope">
            <span v-if="org_id == 9919">{{scope.row.last_price}} </span> 
@@ -265,6 +278,8 @@ export default {
       tablePrint:[],
       org_id:0,
       drugTypeList:[],
+      storehouse_id:0,
+      houseList:[],
     };
   },
   methods: {
@@ -317,7 +332,7 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+       
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
         }
@@ -396,13 +411,19 @@ export default {
          keyword:this.searchKey,
          page:this.page,
          limit:this.limit,
+         storehouse_id:this.storehouse_id,
       }  
       getDrugOutDetail(params).then(response=>{
         this.tableData = []
         this.tableList = []
         if(response.data.state == 1){
           var order = response.data.data.order
-          console.log("出库数据",order)
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+           this.houseList.push(response.data.data.houseList[i])
+          }
           var total_price = 0
           for(let i=0;i<order.length;i++){
              order[i].specification_name  = order[i].dose + order[i].dose_unit + "*" + order[i].min_number +  order[i].min_unit + "/" + order[i].max_unit
@@ -424,7 +445,7 @@ export default {
              }
             
           }
-          console.log("total_price23322332232332323232",order)
+         
            order.push({
             warehouse_out_order_number: "合计",
             is_total: 1,
@@ -437,7 +458,7 @@ export default {
             order[i].total_price = order[i].total_price.toFixed(2)
           }
        
-          console.log("order232233232232323232332",order)
+         
           this.tableData = order
            let objInfo = {}
           order.forEach((item,index)=>{
@@ -526,7 +547,7 @@ export default {
     },
 
      exportList(){
-        console.log("hh23233223",this.tablePrint)
+    
         for(let i=0;i<this.tablePrint.length;i++){
           this.tablePrint[i].index = i+1
         }
@@ -544,7 +565,7 @@ export default {
               this.tablePrint[i].total = this.getTotalPriceOne(this.tablePrint[i].child,this.tablePrint[i].max_unit,this.tablePrint[i].min_number,this.tablePrint[i].min_price) 
            }
         }
-       console.log("列表数据333333333",this.tablePrint)
+  
        
        import('@/vendor/Export2Excel').then(excel => {
        const tHeader = ['序号','药品名称', '规格型号', '单位','数量','单价','总价','备注']
@@ -556,7 +577,7 @@ export default {
        obj.total_price = obj.total_price.toFixed(2)
        this.tablePrint.push(obj)
        const data = this.formatJson(filterVal, this.tablePrint)
-       console.log("data",data)
+  
        
        excel.export_json_to_excel({
            header: tHeader,
@@ -610,7 +631,7 @@ export default {
          }
        }
        const data = this.formatJson(filterVal, this.tableData)
-       console.log("data",data)
+  
      
        excel.export_json_to_excel({
            header: tHeader,
@@ -641,7 +662,7 @@ export default {
             for (let i = 0; i < response.data.data.list.length; i++) {
               this.drugList.push(response.data.data.list[i])
             }
-            console.log("药品列表",this.drugList)
+ 
           }
         })
       },
@@ -651,11 +672,11 @@ export default {
          end_time:this.end_time,
          order_type:2,
       }  
-      console.log("poara232323223233223",params)
+     
      getDrugOutOrderPrint(params).then(response=>{
         if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("药品出库详情",list)
+          
             let objInfo = {}
             if(this.org_id == 9671 || this.org_id == 9919){
               list.forEach((item,index)=>{
@@ -712,7 +733,7 @@ export default {
               }
             }
            this.tablePrint = newArr
-           console.log(" this.tablePrint",this.tablePrint)  
+          
         }
      })
     },
@@ -755,7 +776,7 @@ export default {
         for(let j=0;j<arr.length;j++){
           total +=arr[j].count
         }
-        console.log("total23232",total)
+        
         return (total*min_price).toFixed(2)
       },
 
@@ -771,7 +792,7 @@ export default {
         for(let j=0;j<arr.length;j++){
           total +=arr[j].count
         }
-        console.log("total23232",total)
+     
         return total*min_price
       },
       getCountSix(drug_id,val){
@@ -813,7 +834,24 @@ export default {
           }
         }
         return price
-      } 
+      },
+      getStorehouseName(id){
+       var storehouse_name = ""
+       for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+       }
+       if(storehouse_name == "全部"){
+          return ""
+       }else{
+         return storehouse_name
+       }
+     },
+     changeHouseList(){
+       this.houseList = []
+       this.getlist()
+     } 
   }
 };
 </script>

src/xt_pages/stock/drugs/drugBatchNumber.vue

@@ -44,7 +44,7 @@
         :data="tableList"
         border
         style="width: 100%">
-        <el-table-column prop="date" label="序号" width="180" align="center">
+        <el-table-column prop="date" label="序号" width="100" align="center">
            <template  slot-scope="scope">
               {{scope.$index + 1}}
            </template>
@@ -73,6 +73,11 @@
            <template slot-scope="scope">
               {{scope.row.batch_number}}
            </template>
+        </el-table-column>
+        <el-table-column prop="drug_name" label="仓库名称" width="200" align="center">
+           <template slot-scope="scope">
+              <span>{{getHouseName(scope.row.storehouse_id)}}</span>
+           </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="数量" align="center">
            <template slot-scope="scope">
@@ -187,6 +192,7 @@
         minCount:[],
         drugOutList:[],
         drug:{},
+        houseList:[],
       }
     },
     methods:{
@@ -199,13 +205,14 @@
         getBatchOrderDetail(params).then(response=>{
            if(response.data.state == 1){
               var detail =  response.data.data.detail
-              console.log("detail2343434",detail)
+             
               this.tableList = detail
               this.manufacturerList = response.data.data.manufacturerList
               var total = response.data.data.total
-              console.log("total",total)
+              
               this.total = total
               this.drug =  response.data.data.drug
+              this.houseList = response.data.data.houseList
            }
         })
       },
@@ -244,16 +251,16 @@
       getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
-            console.log("入库数据",countlist)
+          
             this.countList = countlist
             var outcountlist = response.data.data.outCountList
-            console.log("出库数据",outcountlist)
+           
             this.outCountList = outcountlist
             var aucountlist = response.data.data.auCountList
-            console.log("自动数据",aucountlist)
+           
             this.autoCountList = aucountlist
              var minCount = response.data.data.minCount
-            console.log("minCount",minCount)
+            
             this.minCount = minCount
             var info = response.data.data.info
             for(let i=0;i<info.length;i++){
@@ -261,7 +268,7 @@
                  info[i].count = info[i].count * info[i].min_number
               }
             }
-            console.log("info2222222",info)
+          
             this.drugOutList = info
           }
         })
@@ -362,7 +369,16 @@
            name = this.drug.drug_name
         }
         return name
-     }
+     },
+     getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      return storehouse_name
+     },
     }
   }
 </script>

src/xt_pages/stock/drugs/drugDamaged.vue

@@ -1,6 +1,14 @@
 <template>
   <div>
     <div  style="margin-bottom:10px;">
+    <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changehouseList">
+        <el-option
+          v-for="(option, index) in houseList"
+          :key="index"
+          :label="option.storehouse_name"
+          :value="option.id">
+        </el-option>
+      </el-select>   
       <el-input
       size="small"
       style="width: 200px;"
@@ -60,6 +68,11 @@
               {{getTotalPrice(scope.row.drug_id,scope.row.min_price)}}
             </template>
         </el-table-column>
+        <el-table-column prop="name" label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{getHouseName(scope.row.storehouse_id)}}
+            </template>
+        </el-table-column>
         <el-table-column prop="name" label="操作人" align="center">
             <template slot-scope="scope">
               {{getDoctorName(scope.row.creater)}}
@@ -219,6 +232,7 @@ export default {
                 product_date:"",
                 stock_max_number:"",
                 stock_min_number:"",
+                storehouse_id:"",
             },
             drugList:[],
             manufacturerList:[],
@@ -258,6 +272,7 @@ export default {
             min_unit:"",
             min_price:0,
             drug_id:0,
+            storehouse_id:0,
         }
     },
     methods:{
@@ -295,6 +310,7 @@ export default {
           start_time:this.start_time,
           end_time:this.end_time,
           keyword:this.searchKey,
+          storehouse_id:this.storehouse_id,
         }
 
         getDrugDamageList(params).then(response=>{
@@ -304,6 +320,12 @@ export default {
              this.doctorList = response.data.data.doctorList
              var datamagelist = response.data.data.damagelist
              this.datamageList = datamagelist
+             var obj = {id:0,storehouse_name:"全部"}
+             this.houseList = []
+             this.houseList.push(obj)
+             for(let i=0;i<response.data.data.houseList.length;i++){
+              this.houseList.push(response.data.data.houseList[i])
+             }
            }
         })
       },
@@ -432,6 +454,23 @@ export default {
        all_count =  total_count * this.min_number
 
        return (count / all_count).toFixed(2)*100
+     },
+     changehouseList(){
+       this.houseList = []
+       this.getlist()
+     },
+     getHouseName(id){
+      var storehouse_name  = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      if(storehouse_name == "全部"){
+        return ""
+      }else{
+        return storehouse_name
+      }
      }
     },
     created(){

src/xt_pages/stock/drugs/drugStockFlow.vue

@@ -71,16 +71,18 @@
              <span v-if="scope.row.consumable_type == 7">自动退库</span>
              <span v-if="scope.row.consumable_type == 5">报损数量</span>
              <span v-if="scope.row.consumable_type == 10">盘盈</span>
-            <span v-if="scope.row.consumable_type == 11">盘亏</span>
+             <span v-if="scope.row.consumable_type == 11">盘亏</span>
+             <span v-if="scope.row.consumable_type == 12">调拨出库</span>
+             <span v-if="scope.row.consumable_type == 13">调拨入库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
            <template slot-scope="scope">
              <span v-if="scope.row.consumable_type == 1">{{scope.row.warehousing_order}}</span>
-              <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3">{{scope.row.warehouse_out_order_number}}</span>
+              <span v-if="scope.row.consumable_type == 2 || scope.row.consumable_type == 3 || scope.row.consumable_type == 12">{{scope.row.warehouse_out_order_number}}</span>
               <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>
               <span v-if="scope.row.consumable_type == 5">{{scope.row.warehouse_out_order_number}}</span>
-              <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11">{{scope.row.warehousing_order}}</span>
+              <span v-if="scope.row.consumable_type == 10 || scope.row.consumable_type == 11 || scope.row.consumable_type == 13">{{scope.row.warehousing_order}}</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="操作日期" align="center">
@@ -88,6 +90,11 @@
              {{getTime(scope.row.ctime,"{y}-{h}-{d}")}}
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="仓库名称" align="center">
+           <template slot-scope="scope">
+              <span>{{getHouseName(scope.row.storehouse_id)}}</span>
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="数量" align="center">
            <template slot-scope="scope">
               {{scope.row.count}}
@@ -184,10 +191,7 @@
       var drugCategory = getDictionaryDataConfig('system','drug_category')
       this.drugCategory.push(...drugCategory)
       this.drugTypeList = getDictionaryDataConfig('system','drug_type') 
-      // this.getlist()
-      // this.getOutList()
-      // this.getDrugCountList()
-
+  
       this.getDrugFlow()
     },
     components: {
@@ -234,7 +238,9 @@
           {id:3,name:"自动出库"},
           {id:4,name:"手动退库"},
           {id:10,name:"盘盈"},
-          {id:11,name:"盘亏"}
+          {id:11,name:"盘亏"},
+          {id:12,name:"调拨出库"},
+          {id:13,name:"调拨入库"}
         ],
         outList:[],
         countList:[],
@@ -243,11 +249,11 @@
         drugOutList:[],
         total:0,
         drug:{},
+        houseList:[],
       }
     },
     methods:{
        getlist(){
-         console.log("2332233232",this.$route.query.drug_id)
            var params = {
              drug_id:this.$route.query.drug_id,
              start_time:this.start_time,
@@ -256,11 +262,10 @@
              limit:this.limit,
              stock_type:this.stock_type,  
            }
-          console.log("params23322323232332",params)
          getDrugStockFlow(params).then(response=>{
            if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("库存数量",list)
+          
             for(let i=0;i<list.length;i++){
                list[i].drug_way = 4
                this.tableList.push(list[i])
@@ -286,7 +291,7 @@
          getOutDrugStockFlow(params).then(response=>{
             if(response.data.state == 1){
                var outList = response.data.data.outList
-               console.log("outlist",outList)
+              
 
               for(let i=0;i<outList.length;i++){
                
@@ -294,13 +299,13 @@
                   outList[i].drug_way = 2
                 }
                 if(outList[i].is_sys == 0){
-                  console.log("进来22222")
+                 
                   outList[i].drug_way = 1
                 }
                 this.tableList.push(outList[i])
               }
               this.total = response.data.data.total
-              console.log("出库列表数据",this.tableList)
+            
             }
          })
        },
@@ -360,16 +365,16 @@
       getDrugCountList(params).then(response=>{
           if(response.data.state == 1){
             var countlist =  response.data.data.countList
-            // console.log("入库数据",countlist)
+           
             this.countList = countlist
             var outcountlist = response.data.data.outCountList
-            // console.log("出库数据",outcountlist)
+         
             this.outCountList = outcountlist
             var aucountlist = response.data.data.auCountList
-            // console.log("自动数据",aucountlist)
+            
             this.autoCountList = aucountlist
              var minCount = response.data.data.minCount
-            // console.log("minCount",minCount)
+           
             this.minCount = minCount
             var info = response.data.data.info
             for(let i=0;i<info.length;i++){
@@ -377,7 +382,7 @@
                  info[i].count = info[i].count * info[i].min_number
               }
             }
-            // console.log("info2222222",info)
+           
             this.drugOutList = info
           }
         })
@@ -469,8 +474,6 @@
        if((count%min_number)!=0){
          str_min = count%min_number + min_unit
        }
-       console.log("str2323222",str)
-       console.log("str22333333",str_min)
        return str+str_min
      },
 
@@ -486,16 +489,18 @@
        getDrugFlow(params).then(response=>{
           if(response.data.state ==1){
             var list = response.data.data.list
-            console.log("list232323232",list)
+           
             this.tableList = list
             var total = response.data.data.total
-            console.log("total23232",total)
+           
             this.total =total
             this.manufacturerList = response.data.data.manufacturerList
             this.dealerList = response.data.data.dealerList
             var drug = response.data.data.drug
-            console.log("drug233223232323223",drug)
+           
             this.drug = drug
+
+            this.houseList = response.data.data.houseList
           }
        })
      },
@@ -527,7 +532,16 @@
          min_price = this.drug.min_price
        }
        return min_price
-     }
+     },
+     getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      return storehouse_name
+     },
     }
   }
 </script>

src/xt_pages/stock/drugs/drugStockInOrder.vue

@@ -15,9 +15,18 @@
 
     <div class="app-container">
       <div class="cell clearfix">
+       <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           v-model.trim="searchKey"
           class="filter-item"
           placeholder="单据编码/制单人/药品名称"
@@ -31,6 +40,7 @@
           >搜索</el-button
         >
         <div style="margin-left:10px;">
+
           <label class="title"><span class="name">入库时间</span> : </label>
           <el-date-picker
             size="small"
@@ -107,12 +117,25 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
             {{ getXuserName(scope.row.creater) }}
           </template>
         </el-table-column>
 
+       <el-table-column label="入库方式" align="center">
+          <template slot-scope="scope">
+           <span v-if="scope.row.is_sys == 13">调拨入库</span>
+           <span v-else>手动入库</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
 
@@ -200,6 +223,11 @@
             {{scope.row.batch_number}}
           </template>
         </el-table-column>
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             {{scope.row.warehousing_count}}{{scope.row.max_unit}}
@@ -437,6 +465,8 @@ export default {
       order_id:"",
       dealerList:[],
       exportList:[],
+      houseList:[],
+      storehouse_id:0,
     };
   },
   methods: {
@@ -447,9 +477,9 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
-      console.log("parasm2222222",Params)
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
@@ -462,7 +492,6 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
-          
         }
       });
     },
@@ -474,6 +503,7 @@ export default {
         end_time: this.end_time,
         type: this.type,
         keywords:this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.Warehouse.warehouseDate = [];
       getDrugWarehouseList(Params).then(response => {
@@ -487,7 +517,12 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
-          // console.log("列表999988888",this.warehouse.warehouseDate)
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+             this.houseList.push(response.data.data.houseList[i])
+          }
         }
       });
     },
@@ -549,10 +584,10 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
+       
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
-          console.log("制单人2222222",this.adminUserOptions)
+         
           var alen = this.adminUserOptions.length;
           for (let index = 0; index < alen; index++) {
             if (this.adminUserOptions[index].user_type == 2) {
@@ -563,7 +598,6 @@ export default {
       });
     },
     clicks: function() {
-      console.log(this.WarehouseInfo.warehouseInfoDate);
     },
     handleWarehouse: function() {
       this.$router.push({ path: "/drugstock/in/add", query: { type: this.type } });
@@ -619,7 +653,7 @@ export default {
     handleEdit:function(index,row){
        this.$router.push({
          name:"drugStockInOrderEdit",
-         query:{id:row.id,type:this.type,supply_warehouse_id:row.supply_warehouse_id}
+         query:{id:row.id,type:this.type,supply_warehouse_id:row.supply_warehouse_id,is_sys:row.is_sys}
        })
     },
     handleSearch(id){
@@ -631,18 +665,18 @@ export default {
       const params = {
         id: order_id
       };
-      console.log("parasm222222222",params)
+
       this.WarehouseInfo.warehouseInfoDate = []
       getDrugWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          console.log("hhhhhhhhhh",response.data.data.info)
+         
           for (let i = 0; i < response.data.data.info.length; i++) {
             this.showOne = true
             this.WarehouseInfo.warehouseInfoDate.push(response.data.data.info[i]);
-            console.log("列表详情",this.WarehouseInfo.warehouseInfoDate)
+           
           }
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
           this.getAllDrugList()
@@ -650,7 +684,10 @@ export default {
       });
     },
     handleDelete: function(index, row) {
-      console.log("rowe23323223",row)
+      if(row.is_sys ==13){
+        this.$message.error("调拨入库数据不能删除!")
+        return false
+      }
       if(row.supply_warehouse_id >0 ){
         this.$message.error("自动入库数据不能删除!")
         return false
@@ -717,10 +754,14 @@ export default {
       const ids = [];
       const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys== 13){
+          this.$message.error("调拨入库数据不能删除!")
+          return false
+        }
         ids.push(this.selectedTableData[i].id);
         idOne.push(this.selectedTableData[i].supply_warehouse_id)
       }
-      console.log("idson233223233223",idOne)
+     
       for(let i=0;i<idOne.length;i++){
         if(idOne[i] >0 ){
            this.$message.error("自动入库数据不能删除!")
@@ -830,7 +871,7 @@ export default {
       exportDrugList(params).then(response=>{
          if(response.data.state == 1){
           var list =  response.data.data.list
-          console.log("list23232323",list)
+          
           for(let i=0;i<list.length;i++){
             list[i].product_date = this.getTime(list[i].product_date)
             list[i].expiry_date = this.getTime(list[i].expiry_date)
@@ -839,7 +880,7 @@ export default {
           var manufacturerList = response.data.data.manufacturerList
           this.manufacturerList = manufacturerList
           var dealerList = response.data.data.dealerList
-          console.log("经销是,",dealerList)
+        
           this.dealerList = dealerList
          }
       })
@@ -849,7 +890,6 @@ export default {
       if(this.order_id == ""){
         this.$message.error("请勾选入库单")
       }
-      console.log("hhhh2323",this.exportList)
       for(let i=0;i<this.exportList.length;i++){
         this.exportList[i].index = i+1
         this.exportList[i].unit = this.exportList[i].dose + this.exportList[i].dose_unit + "*" + this.exportList[i].min_number + this.exportList[i].min_unit + "/"+this.exportList[i].max_unit
@@ -875,8 +915,6 @@ export default {
       }
       
       import('@/vendor/Export2Excel').then(excel => {
-        console.log("232323",this.drugTypeList)
-        console.log("hhh23",this.exportList)
          for(let i=0;i<this.exportList.length;i++){
            for(let j=0;j<this.drugTypeList.length;j++){
              if(this.exportList[i].drug_type == this.drugTypeList[j].id){
@@ -889,7 +927,7 @@ export default {
         const filterVal = ['index','drug_name', 'drug_type','unit','batch_number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','number','remark']
          
      
-        console.log("table",this.exportList)
+
         
         const data = this.formatJson(filterVal, this.exportList)
         excel.export_json_to_excel({
@@ -903,6 +941,18 @@ export default {
    formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+  getHouseName(id){
+    var storehouse_name = ""
+    for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+    }
+    return storehouse_name
+  },
+  changeStoreHouse(){
+    this.GetWarehouse()
+  }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockInOrderAdd.vue

@@ -23,6 +23,15 @@
 
 
       <div class="cell clearfix">
+        <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+            <el-option
+              v-for="(option, index) in list"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
         <label class="title"><span class="name">入库时间</span> : </label>
         <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -452,6 +461,8 @@
         totalPrice:0,
         unitList:[],
         loading:false,
+        list:[],
+        storehouse_id:"",
       }
     },
     methods: {
@@ -527,7 +538,7 @@
           } else {
             this.manufacturer = response.data.data.manufacturer;
             this.dealer = response.data.data.dealer;
-            console.log("2222333333",response.data.data.drugs)
+            
             for(let i = 0; i<  response.data.data.drugs.length;i++){
               this.goodType.push(response.data.data.drugs[i])
               if(response.data.data.drugs[i].drug_specs != null) {
@@ -541,6 +552,8 @@
 
             this.form.manufacturer = 0
             this.form.dealer = 0
+            this.list = response.data.data.list
+            this.storehouse_id = response.data.data.configlist.drug_storehouse_info
           }
           loading.close()
 
@@ -631,7 +644,7 @@
           manufacturer_id: this.form.manufacturer,
           dealer_id: this.form.dealer
         }
-        console.log("2222",this.form.dealer)
+      
         GetAllDrugInfoByID(params).then(response => {
           
             if (response.data.state == 0) {
@@ -708,7 +721,10 @@
           if (valid) {
             this.loading = true
             const array = this.recordInfo.recordData
-          
+            if(this.storehouse_id == 0){
+             this.$message.error("仓库不能为空!")
+             return false
+            }
             for (let i = 0; i < array.length; i++) {
 
               if (array[i].drug_id == 0) {
@@ -745,9 +761,8 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            console.log("params2222222",params)
            
-            postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
+            postDrugWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false
                 this.$message.error(response.data.msg)
@@ -814,7 +829,7 @@
             searchArray = response.data.data.list;
             
              var list = response.data.data.list
-             console.log("猎豹22222222222",list)
+            
 
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
@@ -872,7 +887,7 @@
             
            }
         }
-        console.log("333333",this.recordInfo.recordData)
+       
       }
      
     }

src/xt_pages/stock/drugs/drugStockInOrderEdit.vue

@@ -36,6 +36,15 @@
       </drugs-stock-dialog>
 
       <div class="cell clearfix">
+        <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+            <el-option
+              v-for="(option, index) in list"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select>
         <label class="title"><span class="name">入库时间</span> : </label>
         <el-date-picker
           size="small"
@@ -452,6 +461,8 @@ export default {
       drug_show:false,
       loading:false,
       disabled:false,
+      storehouse_id:"",
+      list:[],
     };
   },
   methods: {
@@ -491,9 +502,6 @@ export default {
           }
         }
       }
-
-      // console.log( this.recordInfo.recordData)
-
       this.currentIndex = -1;
     },
     cancle: function() {
@@ -551,7 +559,10 @@ export default {
       return name;
     },
     handleEdit: function(index, row) {
-      console.log("row23323223",row)
+      if(parseInt(this.$route.query.is_sys)==13){
+        this.$message.error("调拨入库数据不能新增!")
+        return false
+      }
       if(row.supply_warehouse_id > 0){
         this.$message.error("自动入库数据不能新增!")
         return false
@@ -573,6 +584,10 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      if(parseInt(this.$route.query.is_sys)==13){
+        this.$message.error("调拨入库数据不能删除!")
+        return false
+      }
       if(row.supply_warehouse_id > 0){
         this.$message.error("自动入库数据不能删除!")
         return false
@@ -587,8 +602,7 @@ export default {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
-        })
-          .then(() => {
+        }).then(() => {
             DeleteDrugWarehouseInfoItem(params).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg);
@@ -673,7 +687,10 @@ export default {
         if (valid) {
           this.loading = true
           const array = this.recordInfo.recordData;
-        
+          if(this.storehouse_id == 0){
+            this.$message.error("仓库不能为空!")
+            return false
+          }
           for (let i = 0; i < array.length; i++) {
             if (array[i].drug_id == 0) {
               this.$message.error("药品名称或者药品规格名称不能为空");
@@ -710,15 +727,14 @@ export default {
           const params = {
             stockIn: this.recordInfo.recordData
           };
-          console.log("params22222222222",params)
-        
           EditDrugWarehouse(
             params,
             this.warehousing_time,
             this.$route.query.id,
             this.$route.query.type,
             this.form.manufacturer,
-            this.form.dealer
+            this.form.dealer,
+            this.storehouse_id,
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error(response.data.msg);
@@ -753,7 +769,7 @@ export default {
           var dealerList  = response.data.data.dealerList
         
           this.dealerList = dealerList
-          console.log("详情32332323232323232232323323232323232",response.data.data.info)
+         
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
               response.data.data.info[i].product_date,
@@ -805,13 +821,9 @@ export default {
                }
             }
           }
-          console.log("列表详情",this.recordInfo.recordData)
-
-
           this.warehouse = response.data.data.warehousing;
-          // this.form.manufacturer = this.warehouse.manufacturer;
-          // this.form.dealer = this.warehouse.dealer;
-
+          this.storehouse_id = response.data.data.warehousing.storehouse_id
+          this.list = response.data.data.list
           this.warehousing_time = this.getTime(
             this.warehouse.warehousing_time,
             "{y}-{m}-{d}"
@@ -867,7 +879,6 @@ export default {
         this.currentIndex = val
       },
       handleSelect(val){
-        console.log("val2222",val)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(i == this.currentIndex){
              this.recordInfo.recordData[i].drug_id = val.id
@@ -912,6 +923,10 @@ export default {
     if( parseInt(this.$route.query.supply_warehouse_id)>0){
       this.disabled = true
     }
+    if(parseInt(this.$route.query.is_sys) == 13){
+      this.disabled = true
+    }
+
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrder.vue

@@ -13,9 +13,18 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
+        <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select>
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           class="filter-item"
           v-model.trim="searchKey"
           placeholder="单据编码/制单人/厂商"
@@ -103,6 +112,12 @@
           </template>
         </el-table-column>
 
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
             {{ getXuserName(scope.row.creater) }}
@@ -115,23 +130,11 @@
           </template>
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 1">{{"自动出库"}}</span>
-            <span v-if="scope.row.is_sys != 1">{{"手动出库"}}</span>
-
-          </template>
-        </el-table-column>
-
-        <!-- <el-table-column label="厂家" align="center">
-          <template slot-scope="scope">
-            {{scope.row.manufacturers ? scope.row.manufacturers.manufacturer_name:''}}
+            <span v-if="scope.row.is_sys == 0">{{"手动出库"}}</span>
+            <span v-if="scope.row.is_sys == 12">{{"调拨出库"}}</span>
           </template>
         </el-table-column>
 
-        <el-table-column label="经销商" align="center">
-          <template slot-scope="scope">
-            {{scope.row.dealers ? scope.row.dealers.dealer_name:''}}
-          </template>
-        </el-table-column> -->
-
 
         <el-table-column label="操作" align="center" width="240">
           <template slot-scope="scope">
@@ -216,12 +219,24 @@
               {{scope.row.medical_insurance_number}}
             </template>
           </el-table-column>
+          <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
               <!-- <span v-if="scope.row.is_sys ==  0">{{getTotalCount(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span> -->
               <span> {{getTotalCountOne(scope.row.drug_id,scope.row.min_number,scope.row.max_unit,scope.row.min_unit)}}</span>
             </template>
           </el-table-column>
+          <el-table-column label="出库对象" align="center" v-if="is_sys == 0">
+            <template slot-scope="scope">
+              <span>{{getXuserName(scope.row.admin_user_id)}} </span>
+            </template>
+          </el-table-column>
+          <el-table-column label="出货单价" align="center">
           <el-table-column label="出库单价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price > 0"> {{scope.row.price}}</span>
@@ -488,6 +503,9 @@ export default {
       exportList:[],
       batchNumberList:[],
       drugFlowList:[],
+      houseList:[],
+      storehouse_id:0,
+      is_sys:0,
     };
   },
   methods: {
@@ -498,7 +516,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
@@ -510,6 +529,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
+          this.houseList = response.data.data.houseList
         }
       });
     },
@@ -526,7 +546,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.warehouseOutDate = [];
       getDrugWarehouseOutList(Params).then(response => {
@@ -538,7 +559,12 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
-
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houseList = []
+          this.houseList.push(obj)
+          for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+          }
         }
       });
     },
@@ -631,7 +657,7 @@ export default {
       this.$router.push({path:"/drug/out/drugstockoutorderedit?id="+row.id+"&type="+this.type+"&is_sys="+row.is_sys+"&supply_cancel_out_id="+row.supply_cancel_out_id})
     },
     handleSearch(val){
-
+       this.is_sys = val.is_sys
        this.getInitializtion()
        this.getSinleOrderDetail(val.id,val.warehouse_out_time,val.is_sys)
        this.list = []
@@ -639,6 +665,10 @@ export default {
     },
 
     handleDelete: function(index, row) {
+      if(row.is_sys == 12){
+       this.$message.error("调拨出库数据不能删除!")
+       return
+      }
       if(row.supply_cancel_out_id >0){
         this.$message.error("采购出库数据不能删除!")
         return
@@ -711,6 +741,10 @@ export default {
           this.$message.error("自动出库数据不能删除!")
           return false
         }
+        if(this.selectedTableData[i].is_sys == 12){
+          this.$message.error("调拨出库数据不能删除!")
+          return false
+        }
         if(this.selectedTableData[i].is_sys == 0){
           ids.push(this.selectedTableData[i].id);
           idsOne.push(this.selectedTableData[i].supply_cancel_out_id)
@@ -924,7 +958,6 @@ export default {
          id:id,
          start_time:start_time,
        }
-      console.log("is_sys22222",is_sys)
      getSinleOrderDetail(params).then(response=>{
         if(response.data.state == 1){
           this.tableShow = true
@@ -934,6 +967,7 @@ export default {
          this.manufacturerList = response.data.data.manufacturerList
          this.dealerList = response.data.data.dealerList
          var drugFlowList = response.data.data.drugFlowList
+
          if (is_sys == 1){
            if(drugFlowList.length >0){
             for(let i=0;i<drugFlowList.length;i++){
@@ -946,10 +980,10 @@ export default {
 
             }
            }
-        
+
             this.drugFlowList = drugFlowList
          }
-         if(is_sys == 0){
+         if(is_sys == 0 || is_sys == 12){
             var flowlist = response.data.data.flowlist
             this.drugFlowList = []
             for(let i=0;i<flowlist.length;i++){
@@ -972,7 +1006,7 @@ export default {
               list[i].number = ""
            }
          }
-         console.log("list233223323233223",list)
+
          this.tableList = list
         }
      })
@@ -995,7 +1029,7 @@ export default {
 
           this.drugDialogVisible = true
         }
-        if(val.is_sys == 0){
+        if(val.is_sys == 0 || val.is_sys == 12){
 
           this.drugDialogVisibleTwo = true
         }
@@ -1094,7 +1128,6 @@ export default {
          return str + min_str
       },
       getTotalCountOne(id,min_number,max_unit,min_unit){
-        console.log("hhhahdhhff",this.drugFlowList)
         var arr = []
         for(let i=0;i<this.drugFlowList.length;i++){
           if(id == this.drugFlowList[i].drug_id){
@@ -1237,6 +1270,18 @@ export default {
 
         return  all_price
       },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+      }
+      return storehouse_name
+    },
+    changeStoreHouse(){
+      this.GetWarehouseOut()
+    }
   }
 };
 </script>

src/xt_pages/stock/drugs/drugStockOutOrderAdd.vue

@@ -27,6 +27,15 @@
     <div class="app-container">
   
       <div class="cell clearfix">
+        <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+            <el-option
+              v-for="(option, index) in list"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker
           size="small"
@@ -141,6 +150,20 @@
             </template>
 
           </el-table-column>
+
+          <el-table-column label="出库对象" width="140" align="center">
+            <template slot-scope="scope">
+               <el-select v-model="scope.row.admin_user_id" filterable placeholder="请选择厂商">
+                <el-option
+                  v-for="(option, index) in doctorList"
+                  :key="index"
+                  :label="option.user_name"
+                  :value="option.admin_user_id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货价<span style="color: red">*</span></span>
@@ -346,6 +369,9 @@ export default {
       unitList:[],
       numberList:[],
       listLoading: false,
+      storehouse_id:"",
+      list:[],
+      doctorList:[],
     };
   },
   methods: {
@@ -382,6 +408,9 @@ export default {
 
           this.form.manufacturer = 0
           this.form.dealer = 0
+          this.storehouse_id = response.data.data.configlist.drug_storehouse_out
+          this.list = response.data.data.list
+          this.doctorList = response.data.data.doctorList
         }
         loading.close()
 
@@ -424,6 +453,7 @@ export default {
       tempObj["warehouse_info_id"] = 0
       tempObj["dealer"] = ""
       tempObj['manufacturer'] = ''
+      tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -521,6 +551,10 @@ export default {
             }
             total = total + array[i].price * array[i].return_count;
           }
+          if(this.storehouse_id == 0){
+            this.$message.error("仓库不能为空!")
+            return false
+          }
           if (this.recordInfo.recordData.length <= 0) {
             this.$message.success("请添加出库商品");
             return;
@@ -548,13 +582,19 @@ export default {
                 this.recordInfo.recordData[i].batch_number = this.numberList[y].batch_number
                 this.recordInfo.recordData[i].warehouse_info_id = this.numberList[y].id
               }
-           
             }
+           for(let s=0;s<this.doctorList.length;s++){
+            if(this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name){
+              this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id
+            }
+
+            }
+
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
-          console.log("param23323232",params)
+       
          
           const loading = this.$loading({
             lock: true,
@@ -567,7 +607,8 @@ export default {
             this.warehouse_out_time,
             this.form.dealer,
             this.form.manufacturer,
-            this.type
+            this.type,
+            this.storehouse_id
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足");
@@ -623,13 +664,13 @@ export default {
           if (response.data.state == 1) {
             searchArray = response.data.data.list;
              var list = response.data.data.list
-             console.log("list99999999",list)
+     
              this.drugList = list
              var manufacturerList = response.data.data.manufacturerList
              this.manufacturerList = manufacturerList
              var dealerList = response.data.data.dealerList
              this.dealerList = dealerList
-             console.log("经销商",this.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){
@@ -659,7 +700,7 @@ export default {
             arr.push(this.recordInfo.recordData[i].drug_id)
          }
          var str = arr.join(",")
-         console.log("str",str)
+       
          if(str.indexOf(val.id)!=-1){
             this.$message.error("该药品已存在列表中")
             return
@@ -706,14 +747,14 @@ export default {
         getDrugBatchNumber(params).then(response=>{
            if(response.data.state == 1){
              var list = response.data.data.list
-             console.log("list2222",list)
+            
              this.numberList = []
              this.numberList = list
            }
         })
       },
       changeUnit(val){
-        console.log("val2323232322323",val,this.recordInfo.recordData)
+       
         this.getDrugBatchNumber(val.drug_id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
           if(this.recordInfo.recordData[i].drug_id == val.drug_id){
@@ -732,7 +773,7 @@ export default {
         }
       },
       changeBatchNumber(val){
-        console.log("val",val)
+       
         this.getDrugBatchNumber(val.drug_id)
         for(let i=0;i<this.recordInfo.recordData.length;i++){
             if(this.currentIndex == i){
@@ -775,6 +816,7 @@ export default {
     tempObj["number"] = ""
     tempObj["warehouse_info_id"] = 0
     tempObj["count"] = ""
+    tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
     this.propForm.goodUnit = this.$store.getters.good_unit;

src/xt_pages/stock/drugs/drugStockOutOrderDetail.vue

@@ -144,7 +144,8 @@
           loading: false,
           warehousingOutData: [],
           info: {}
-        }
+        },
+        doctorList:[],
       }
     },
     methods: {
@@ -168,6 +169,7 @@
               this.warehousingOutInfo.warehousingOutData.push(response.data.data.list[i])
             }
             this.warehousingOutInfo.info = response.data.data.info
+            this.doctorList = response.data.data.doctorList
             this.handleSpanTempArr()
           }
         })

src/xt_pages/stock/drugs/drugStockOutOrderEdit.vue

@@ -21,7 +21,32 @@
         v-on:dialog-cancle="cancle"
       >
       </drugs-stock-dialog>
-
+        
+      <div class="cell clearfix">
+        <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+            <el-option
+              v-for="(option, index) in houstList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+          </el-select>
+        <label class="title"><span class="name">出库时间</span> : </label>
+        <el-date-picker
+          :disabled="drug_show"
+          size="small"
+          v-model="warehouse_out_time"
+          prefix-icon="el-icon-date"
+          :editable="false"
+          style="width: 200px;"
+          type="date"
+          placeholder="选择日期时间"
+          align="right"
+          format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd"
+        ></el-date-picker>
+      </div>
 
       <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
         <el-table :data="recordInfo.recordData" :class="signAndWeighBoxPatients" style="width: 100%" border
@@ -133,6 +158,18 @@
 
             </template>
           </el-table-column>
+          <el-table-column label="出库对象" width="140" align="center">
+            <template slot-scope="scope">
+               <el-select v-model="scope.row.admin_user_id" filterable placeholder="请选择厂商"  :disabled="drug_show">
+                <el-option
+                  v-for="(option, index) in doctorList"
+                  :key="index"
+                  :label="option.user_name"
+                  :value="option.admin_user_id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
          <el-table-column width="120" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货价<span style="color: red">*</span></span>
@@ -334,7 +371,9 @@
         drug_show:false,
         unitList:[],
         unitShow:true,
-        numberList:[]
+        numberList:[],
+        houstList:[],
+        storehouse_id:"",
       }
     },
     methods: {
@@ -429,6 +468,10 @@
         return name;
       },
        handleEdit: function(index, row) {
+        if(parseInt(this.$route.query.is_sys) == 12){
+          this.$message.error("调拨出库数据不能新增!")
+          return
+        }
         if(row.supply_cancel_out_id >0){
          this.$message.error("采购出库数据不能新增!")
          return
@@ -451,9 +494,13 @@
         tempObj['dealer'] = ""
         tempObj['manufacturer'] = ""
         tempObj['warehouse_info_id'] = 0
+        tempObj["admin_user_id"] =  this.$store.getters.xt_user.user.user_name
         this.recordInfo.recordData.push(tempObj)
       }, handleDelete: function(index, row) {
-        console.log("row323232232",row)
+        if(parseInt(this.$route.query.is_sys) == 12){
+          this.$message.error("调拨出库数据不能删除!")
+          return
+        }
         if(row.supply_cancel_out_id >0){
          this.$message.error("采购出库数据不能删除!")
          return
@@ -591,7 +638,13 @@
                      this.recordInfo.recordData[i].warehouse_info_id =  this.numberList[y].id
                   }
                }
+              
+               for(let s=0;s<this.doctorList.length;s++){
+                  if(this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name){
+                    this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id
+                  }
 
+               }
             }
             const loading = this.$loading({
               lock: true,
@@ -602,9 +655,8 @@
             const params = {
               'stockOut': this.recordInfo.recordData
             }
-            console.log("param23322323233222323",params)
-
-            editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
+         
+            editDrugWarehouseoutInfo(params, this.warehouse_out_time, this.$route.query.id, this.$route.query.type, this.form.manufacturer, this.form.dealer,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 loading.close()
@@ -692,9 +744,10 @@
               }
 
             this.warehouseOut = response.data.data.info
+            this.storehouse_id = response.data.data.info.storehouse_id
             this.warehouse_out_time = this.getTime(this.warehouseOut.warehouse_out_time, '{y}-{m}-{d}')
-
-
+            this.houstList = response.data.data.houstList
+            this.doctorList = response.data.data.doctorList
           }
 
           if (this.recordInfo.recordData.length == 0) {
@@ -818,6 +871,9 @@
       if(sys == 1){
         this.drug_show = true
       }
+      if(sys == 12){
+        this.drug_show = true
+      }
       if(parseInt(this.$route.query.supply_cancel_out_id)>0){
         this.drug_show = true
       }

src/xt_pages/stock/drugs/inventory.vue

@@ -1,6 +1,15 @@
 <template>
   <div>
     <div v-show="showSearch">
+    <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>   
      <el-autocomplete
         class="checkSearch"
         popper-class="my-autocomplete"
@@ -62,6 +71,11 @@
                     {{scope.row.manufacturer_name}}
                   </template> 
               </el-table-column>
+             <el-table-column prop="name" label="仓库名称" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getHouseName(scope.row.storehouse_id)}}
+                  </template> 
+              </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="180"  align="center">
                 <template slot-scope="scope">
                     <span><el-input style="width:50px" v-model="scope.row.stock_max_number" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
@@ -96,6 +110,15 @@
               </el-table-column>
           </el-table>
       </el-collapse-item>
+     <label class="title"><span class="name">仓库</span> :</label>
+      <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+      </el-select>   
       <el-autocomplete
           class="checkSearch"
           popper-class="my-autocomplete"
@@ -166,6 +189,7 @@ export default {
                 proof_count:"",
                 min_count:"",
                 min_unit:"",
+                storehouse_id:"",
             },
             total: 0,
             editdialogVisible:false,
@@ -201,6 +225,8 @@ export default {
             showTableOne:false,
             panShow:true,
             panOneShow:true,
+            houseList:[],
+            storehouse_id:"",
         }
     },
     methods:{
@@ -234,6 +260,7 @@ export default {
             }
              var params = {
                 keyword:key,
+                storehouse_id:this.storehouse_id,
              }
             
             postSearchDrugWarehouseList(params).then(response => {
@@ -279,7 +306,8 @@ export default {
             return
           }
            var params = {
-              id:val.drug_id
+              id:val.drug_id,
+              storehouse_id:this.storehouse_id,
             }
            getDrugWarehouseInfoList(params).then(response=>{
              if(response.data.state == 1){
@@ -566,7 +594,9 @@ export default {
               
               this.doctorList =  response.data.data.doctorList
               
+              this.houseList = response.data.data.houseList
 
+              this.storehouse_id = response.data.data.houseConfig.drug_storehouse_out
             }
           })
         },
@@ -860,7 +890,7 @@ export default {
        var params = {
          tableData:arr
        }
-      console.log("paramse32323232",params)
+     
       saveInentoryList(params).then(response=>{
         if(response.data.state == 1){
            var inventory = response.data.data.inventory
@@ -870,11 +900,19 @@ export default {
           
         }
       })
+    },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      return storehouse_name
     }
     },
     created(){
       this.unitList =  this.getDataConfig('hemodialysis','units')
-      console.log("单位",this.unitList)
       this.getlist()
     },
     mounted() {

src/xt_pages/stock/drugs/inventoryDetails.vue

@@ -2,6 +2,14 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
+              <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changehouseList">
+                <el-option
+                  v-for="(option, index) in houseList"
+                  :key="index"
+                  :label="option.storehouse_name"
+                  :value="option.id">
+                </el-option>
+              </el-select>   
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
@@ -61,6 +69,12 @@
                    {{getTime(scope.row.expiry_date)}}
                 </template>  
             </el-table-column>
+
+           <el-table-column prop="name" label="仓库名称" width="200"  align="center">
+                <template slot-scope="scope">
+                   {{getHouseName(scope.row.storehouse_id)}}
+                </template>  
+            </el-table-column>
            
            <el-table-column prop="name" label="盘点前数量" width="100"  align="center">
                 <template slot-scope="scope">
@@ -117,7 +131,7 @@ export default {
             total: 0,
             limit:10,
             page:1,
-            
+            storehouse_id:0,
         }
     },
     methods:{
@@ -140,14 +154,22 @@ export default {
               limit:this.limit,
               page:this.page,
               keyword:this.searchKey,
+              storehouse_id:this.storehouse_id,
             }
         
           getInventoryDetailList(params).then(response=>{
              if(response.data.state == 1){
               this.total =  response.data.data.total
               this.tableData = response.data.data.list
-              console.log("比阿哥",this.tableData)
+           
               this.doctorList = response.data.data.doctorList
+              var obj = {id:0,storehouse_name:"全部"}
+              this.houseList= []
+              this.houseList.push(obj)
+              for(let i=0;i<response.data.data.houseList.length;i++){
+                this.houseList.push(response.data.data.houseList[i])
+              }
+
              }
           })   
         },
@@ -165,7 +187,23 @@ export default {
             return uParseTime(val, '{y}-{m}-{d}')
          }
         },
-
+       changehouseList(){
+         this.houseList = []
+         this.getlist()
+       },
+       getHouseName(id){
+         var storehouse_name = ""
+         for(let i=0;i<this.houseList.length;i++){
+           if(id == this.houseList[i].id){
+              storehouse_name = this.houseList[i].storehouse_name
+           }
+         }
+         if(storehouse_name == "全部"){
+           return ""
+         }else{
+           return storehouse_name
+         }
+       }
     },
     created(){
       this.getlist()

src/xt_pages/stock/drugs/query.vue

@@ -30,15 +30,39 @@
     </div>
     <div class="app-container ">
       <div class="cell clearfix">
-         <el-select v-model="drug_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
+        <div>
+          <span>仓库名称:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in storeList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <span>药品名称:</span>
+          <el-select v-model="drug_id" style="width:200px;margin-right:10px;" placeholder="请选择" 
+          filterable
+           @change="changeDrugName">
+            <el-option
+              v-for="item in medicalList"
+              :key="item.id"
+              :label="item.drug_name"
+              :value="item.id">
+            </el-option>
+          </el-select> 
+        </div>
+         <!-- <el-select v-model="drug_type" style="width:160px;margin-right:10px;" placeholder="请选择" @change="changeDrug">
             <el-option
               v-for="(item,index) in drugTypeList"
               :key="index"
               :label="item.name"
               :value="item.id">
             </el-option>
-        </el-select>
-         <el-date-picker
+        </el-select> -->
+         <!-- <el-date-picker
             v-model="start_time"
             prefix-icon="el-icon-date"
             :editable="false"
@@ -61,8 +85,8 @@
               format="yyyy-MM-dd"
               value-format="yyyy-MM-dd"
               @change="endTimeChange"
-          ></el-date-picker>
-          <el-input
+          ></el-date-picker> -->
+          <!-- <el-input
             style="width: 200px;"
             class="filter-item"
             v-model.trim="keywords"
@@ -75,12 +99,12 @@
             icon="el-icon-search"
             @click="search"
           >搜索
-          </el-button>
+          </el-button> -->
       </div>
 
-       <el-table :data="tableList" border style="width: 100%">
-
-        <el-table-column prop="drug_type" label="药品类型" width="180" align="center">
+       <el-table :data="tableList" border style="width: 100%"   :cell-class-name="cellStyle">
+ 
+        <el-table-column prop="drug_type" label="药品类型" width="100" align="center">
            <template slot-scope="scope">
              {{getDrugType(scope.row.drug_type)}}
            </template>
@@ -110,43 +134,51 @@
              {{getManufacturerList(scope.row.manufacturer)}}
            </template>
         </el-table-column>
+       <el-table-column prop="drug_name" label="仓库名称" align="center">
+           <template slot-scope="scope">
+            <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+                {{getHouseName(item.storehouse_id)}}
+              </td>
+            </tr>
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
-            <span v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
-              {{getWarehoseInfoOne(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)}}
-            </span>
+             <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+               {{getWarehoseInfoSeven(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id)}}
+              </td>
+            </tr>
            </template>
         </el-table-column>
-        <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showOne">
+        <el-table-column prop="drug_name" label="出库数量" align="center">
            <template slot-scope="scope">
-              <span>
-                 {{getOutFlush(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info)}}
-              </span>
+            <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+              {{getOutFlushNight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,scope.row.drug_cancel_stock_info,item.storehouse_id)}}
+              </td>
+            </tr>
            </template>
         </el-table-column>
 
-        <el-table-column prop="drug_name" label="出库数量" align="center" v-if="showTwo">
+        <el-table-column prop="drug_name" label="剩余库存量" align="center">
            <template slot-scope="scope">
-           
-             <span>{{getOutCount(scope.row.id)+getAutoCount(scope.row.id)}}{{scope.row.max_unit}}</span>
-             
+              <tr style="background: none" v-for="(item,index) in scope.row.drug_warehouse" :key="index">
+                <td style="border-right: none; border-inline-end: none;text-align: center">
+                {{getOverFlushInfoEight(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number,item.storehouse_id,scope.row.storehouse_id)}}
+                </td>
+            </tr>
            </template>
         </el-table-column>
-        
-        <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showThree">
+
+       <el-table-column prop="drug_name" label="总库存量" align="center" v-if="showThree">
            <template slot-scope="scope">
             <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info)>0">
                 {{ getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number)?getOverFlushInfo(scope.row.drug_warehouse_info,scope.row.max_unit,scope.row.min_unit,scope.row.min_number):0}}
             </div>
            </template>
-        </el-table-column>
-        <el-table-column prop="drug_name" label="剩余库存量" align="center" v-if="showFour">
-           <template slot-scope="scope">
-            <div v-if="getWarehoseInfo(scope.row.drug_warehouse_info) >0">
-               <span>{{getWarehoseInfo(scope.row.drug_warehouse_info) - getOutCount(scope.row.id) - getAutoCount(scope.row.id)}}{{scope.row.max_unit}} </span>         
-            </div>
-           </template>
-        </el-table-column>
+        </el-table-column> 
         <el-table-column prop="drug_name" label="操作" align="center" width="200px">
           <template slot-scope="scope">
             <el-button
@@ -213,10 +245,6 @@ import { min } from 'moment'
       var drugTypeList = getDictionaryDataConfig('system','drug_type')
       this.drugTypeList.push(...drugTypeList)
       this.org_id =  this.$store.getters.xt_user.org.id
-      console.log("机构ID",this.org_id)
-      // this.getDrugCountList()
-
-
     },
     components: {
       SettingDialog,
@@ -269,6 +297,11 @@ import { min } from 'moment'
         showTwo:false,
         showThree:true,
         showFour:false,
+        houseList:[],
+        medicalList:[],
+        storehouse_id:0,
+        drug_id:0,
+        storeList:[],
       }
     },
     methods: {
@@ -281,6 +314,8 @@ import { min } from 'moment'
           drug_type:this.drug_type,
           start_time:this.start_time,
           end_time:this.end_time,
+          drug_id:this.drug_id,
+          storehouse_id:this.storehouse_id,
         }
         getDrugStockList(params).then(response=>{
           if(response.data.state == 1){
@@ -305,12 +340,36 @@ import { min } from 'moment'
                  }
                }
              }
-             console.log("列表list232323323232323223",list)
              this.tableList = list
              var total = response.data.data.total
              this.total = total
              this.manufacturerList = response.data.data.manufacturerList
+             this.houseList = []
+             this.storeList = []
+             var obj = {
+               id:0,storehouse_name:"全部"
+             }
+             var objOne = {
+               id:0,drug_name:"全部"
+             }
 
+             this.storeList.push(obj)
+             for(let i=0;i<response.data.data.houseList.length;i++){
+               this.houseList.push(response.data.data.houseList[i])
+               this.storeList.push(response.data.data.houseList[i])
+             }
+             this.medicalList = []
+             this.medicalList.push(objOne)
+             for(let i=0;i<response.data.data.medicalList.length;i++){
+               for(let j=0;j<response.data.data.manufacturerList.length;j++){
+                if(response.data.data.medicalList[i].manufacturer == response.data.data.manufacturerList[j].id){
+                   response.data.data.medicalList[i].manufacturer = response.data.data.manufacturerList[j].manufacturer_name
+                }
+              }
+              response.data.data.medicalList[i].drug_name = response.data.data.medicalList[i].drug_name +response.data.data.medicalList[i].dose + response.data.data.medicalList[i].dose_unit + "*" + response.data.data.medicalList[i].min_number +  response.data.data.medicalList[i].min_unit+ "/"+ response.data.data.medicalList[i].max_unit +  " " +response.data.data.medicalList[i].manufacturer
+               this.medicalList.push(response.data.data.medicalList[i])
+             }
+             
            }
         })
       },
@@ -892,7 +951,126 @@ import { min } from 'moment'
            str_min =  over_count%min_number + min_unit
          }
        return str+str_min
+      },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
       }
+      return storehouse_name
+     },
+     getWarehoseInfoSeven(arr,max_unit,min_unit,min_number,storehouse_id){
+        var total = 0
+        var max_str=  ""
+         var min_str = ""
+        if (arr.length > 0) {
+          for(let i=0;i<arr.length;i++){
+            if(arr[i].storehouse_id == storehouse_id){
+              total += parseInt(arr[i].warehousing_count)
+            } 
+          }
+        }
+        if (total < min_number){
+          min_str = total + min_unit
+        }
+        if (total == 0) {
+          min_str = ""
+          max_str = ""
+        }
+        if (total >=min_number) {
+           if(parseInt(total/min_number)!=0){
+              max_str = parseInt(total/min_number) + max_unit
+           }
+           if(total%min_number!=0){
+              min_str = total%min_number + min_unit
+           }
+
+        }
+        return max_str + min_str
+      },
+           
+      getOverFlushInfoEight(arr,max_unit,min_unit,min_number,storehouse_id){
+
+         var max_str=  ""
+         var min_str = ""
+         var total = 0
+         var newarr = arr
+         if(newarr.length > 0 ){
+           for(let i=0;i<newarr.length;i++){
+            if(newarr[i].storehouse_id == storehouse_id){
+              total += (newarr[i].stock_max_number+newarr[i].stock_min_number)
+            }
+           }
+         }
+         if (total < min_number){
+           min_str = total + min_unit
+         }
+         if (total == 0) {
+            min_str = ""
+            max_str = ""
+         }
+         if (total >=min_number) {
+           if(parseInt(total/min_number)!=0){
+              max_str = parseInt(total/min_number) + max_unit
+           }
+           if(total%min_number!=0){
+              min_str = total%min_number + min_unit
+           }
+
+         }
+        return max_str + min_str
+      },
+      getOutFlushNight(info,max_unit,min_unit,min_number,cancel_info,storehouse_id){
+
+        var str = ""
+        var str_min = ""
+        //总库存
+        var total = 0
+        var out_count = 0
+        var over_count = 0
+        var cancel_count = 0
+        for(let i=0;i<info.length;i++){
+          if(info[i].storehouse_id == storehouse_id){
+            total += info[i].warehousing_count
+          }
+          
+        }
+        
+        for(let j=0;j<info.length;j++){
+          if(info[j].storehouse_id == storehouse_id){
+            out_count += (info[j].stock_max_number + info[j].stock_min_number)
+          }
+          
+        }
+       
+        // for(let z=0;z<cancel_info.length;z++){
+        //    cancel_count += cancel_info[z].count
+        // }
+       // over_count = total - out_count + cancel_count
+         over_count = total - out_count 
+        if(parseInt(over_count/min_number)!=0){
+            str = parseInt(over_count/min_number)+ max_unit
+         }
+         if(over_count%min_number !=0){
+           str_min =  over_count%min_number + min_unit
+         }
+       return str+str_min
+      },
+      changeStorehouseName(){
+        this.getlist()
+     },
+      changeDrugName(){
+        this.getlist()
+      },
+     // 合并单元格样式
+     cellStyle({ row, column, rowIndex, columnIndex }) {
+      let arr = [6, 7, 8, 9];
+      if (arr.indexOf(columnIndex) > -1) {
+        return "spanClass";
+      }
+    },
     }
   }
 </script>
@@ -950,4 +1128,25 @@ import { min } from 'moment'
   .el-table::before {
     background-color: #d0d3da;
   }
+
+
+/* 合并表格线样式 */
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+}
+.spanClass .cell tr:last-of-type td{
+  border-bottom: none;
+}
 </style>

src/xt_pages/stock/inventory.vue

@@ -1,6 +1,15 @@
 <template>
   <div>
     <div v-show="showSearch">
+      <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+       </el-select>  
      <el-autocomplete
         class="checkSearch"
         popper-class="my-autocomplete"
@@ -62,6 +71,12 @@
                     {{scope.row.manufacturer_name}}
                   </template> 
               </el-table-column>
+
+             <el-table-column prop="name" label="仓库名称" width="100"  align="center">
+                  <template slot-scope="scope">
+                    {{getStorehouseName(scope.row.storehouse_id)}}
+                  </template> 
+              </el-table-column>
               <el-table-column prop="name" label="盘点前数量" width="120"  align="center">
                 <template slot-scope="scope">
                     <span><el-input style="width:80px" v-model="scope.row.stock_count" :disabled="true"></el-input>{{scope.row.max_unit}}</span> 
@@ -94,6 +109,15 @@
               </el-table-column>
           </el-table>
       </el-collapse-item>
+        <label class="title"><span class="name">仓库</span>:</label>
+          <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+                <el-option
+                  v-for="(option, index) in houseList"
+                  :key="index"
+                  :label="option.storehouse_name"
+                  :value="option.id">
+                </el-option>
+          </el-select>
       <el-autocomplete
           class="checkSearch"
           popper-class="my-autocomplete"
@@ -160,6 +184,7 @@ export default {
                 product_date:"",
                 number:"",
                 proof_count:"",
+                storehouse_id:"",
             },
          manufacturerList:[],
          dealerList:[],
@@ -194,6 +219,8 @@ export default {
          inventory_total:0,
          WarehouseList:[],
          showTableOne:false,
+         houseList:[],
+         storehouse_id:"",
         }
     },
     methods:{
@@ -203,13 +230,14 @@ export default {
                 key = keyword
             }
             var params = {
-              keyword:key
+              keyword:key,
+              storehouse_id:this.storehouse_id,
             }
             postSearchGoodWarehouseList(params).then(response => {
             if (response.data.state == 1) {
             
                 var list = response.data.data.list
-                console.log("列表数据",list)
+              
                 this.goodList = list
                 var manufacturerList = response.data.data.manufacturerList
                 this.manufacturerList = manufacturerList
@@ -272,72 +300,76 @@ export default {
           this.page = val
           this.getlist()
         },
-    getlist(){
-      var params = {
-            keyword:this.searchKey,
-            start_time:this.start_time,
-            end_time:this.end_time,
-            inventory_status:this.inventory_status, 
-            page:this.page,
-            limit:this.limit,
-          }
-          console.log("我爱你中国parasm",params)
-        getInventoryList(params).then(response=>{
-            if(response.data.state ==1 ){
-            var list =  response.data.data.list
-            console.log("列表23232323232",list)
-            this.tableList = list
-            var total = response.data.data.total
-            this.total = total
-            this.doctorList =  response.data.data.doctorlist
+      changeHouseList(){
+        this.querySearchAsync()
+      },
+      getlist(){
+        var params = {
+              keyword:this.searchKey,
+              start_time:this.start_time,
+              end_time:this.end_time,
+              inventory_status:this.inventory_status, 
+              page:this.page,
+              limit:this.limit,
             }
-        })
+          getInventoryList(params).then(response=>{
+              if(response.data.state ==1 ){
+              var list =  response.data.data.list
+              this.tableList = list
+              var total = response.data.data.total
+              this.total = total
+              this.doctorList =  response.data.data.doctorlist
+              this.houseList = response.data.data.houseList
+              var houseConfig = response.data.data.houseConfig
+              this.storehouse_id = houseConfig.storehouse_out_info
+              }
+          })
+        },
+      getChecker(id){
+        var name = ""
+        for(let i=0;i<this.doctorList.length;i++){
+            if(id == this.doctorList[i].admin_user_id){
+              name = this.doctorList[i].user_name
+            }
+        }
+        return name
       },
-     getChecker(id){
-       var name = ""
-       for(let i=0;i<this.doctorList.length;i++){
-          if(id == this.doctorList[i].admin_user_id){
-             name = this.doctorList[i].user_name
-          }
-       }
-       return name
-     },
-    toCheck(){
-      if(this.ids.length <=0){
-         this.$message.error("请勾选核对数据")
-         return
-       }else{
-         this.checkDialogVisible = true
-       }
-     },
-    changePrice(val){  
-       var arr = []
+      toCheck(){
+        if(this.ids.length <=0){
+          this.$message.error("请勾选核对数据")
+          return
+        }else{
+          this.checkDialogVisible = true
+        }
+      },
+      changePrice(val){  
+        var arr = []
+        
+        for(let i=0;i<val.length;i++){
+          arr.push(val[i].id)
+        }
+        var str = arr.join(",")
       
-       for(let i=0;i<val.length;i++){
-         arr.push(val[i].id)
-       }
-      var str = arr.join(",")
-    
-      console.log("str",str)
-      this.ids = str
      
-     },
-     SaveCheckedInventory(){
-         var params = {
-            ids:this.ids,
-            check_time:this.getTime(this.check_time),
-            checker:this.checker,
-         }
-       console.log("params",params)
-       SaveCheckedInventory(params).then(response=>{
-         if(response.data.state == 1){
-           this.$message.success("保存成功")
-           var inventory = response.data.data.inventory
-           this.checkDialogVisible = false
-           this.getlist()
-         }
-       })
-     },
+        this.ids = str
+      
+      },
+      SaveCheckedInventory(){
+          var params = {
+              ids:this.ids,
+              check_time:this.getTime(this.check_time),
+              checker:this.checker,
+
+          }
+        SaveCheckedInventory(params).then(response=>{
+          if(response.data.state == 1){
+            this.$message.success("保存成功")
+            var inventory = response.data.data.inventory
+            this.checkDialogVisible = false
+            this.getlist()
+          }
+        })
+      },
       toDelete(index){
        this.tableData.splice(index,1)
      },
@@ -345,7 +377,7 @@ export default {
        getInventoryDetail(id).then(response=>{
           if(response.data.state == 1){
             var detail =  response.data.data.detail
-            console.log("detial",detail)
+         
             this.form.good_name = detail.good_name
             this.form.specification_name = detail.specification_name
             this.form.count = detail.count
@@ -415,6 +447,7 @@ export default {
     getGoodInventoryWarehouseList(id){
        var params = {
          id:id,
+         storehouse_id:this.storehouse_id,
        }
       getGoodInventoryWarehouseList(params).then(response=>{
          if(response.data.state == 1){
@@ -458,7 +491,7 @@ export default {
                 }
               }
             }
-          console.log("newList2333232323232",newList)
+        
           
           this.tableData = newList
           this.showSearch = false
@@ -497,7 +530,6 @@ export default {
       })
     },
     toMove(item,index){
-      console.log("index",item)
        this.$confirm('此操作将移除耗材整个批次, 是否继续?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
@@ -542,10 +574,9 @@ export default {
         
       }
        var params = {
-         tableData:arr
+         tableData:arr,
+         storehouse_id:this.storehouse_id,
        }
-      console.log("params2323323",params)
-     
       saveStockInentoryList(params).then(response=>{
         if(response.data.state == 1){
            var inventory = response.data.data.inventory
@@ -554,6 +585,15 @@ export default {
            this.tableData = []
         }
       })
+    },
+    getStorehouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+        if(id == this.houseList[i].id){
+          storehouse_name = this.houseList[i].storehouse_name
+        }
+      }
+      return storehouse_name
     }
    },
     created(){

src/xt_pages/stock/inventoryDetails.vue

@@ -2,6 +2,15 @@
     <div>
         <div style="display: flex;align-items: center;justify-content: space-between;margin-bottom:10px;">
             <div>
+             <label class="title"><span class="name">仓库</span> :</label>
+              <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+                  <el-option
+                    v-for="(option, index) in houseList"
+                    :key="index"
+                    :label="option.storehouse_name"
+                    :value="option.id">
+                  </el-option>
+               </el-select>  
                 <el-input
                 size="small"
                 style="width: 200px;margin-left:10px;"
@@ -42,6 +51,12 @@
                  {{getTime(scope.row.product_date)}}
                </template>
             </el-table-column>
+
+           <el-table-column  prop="name" label="仓库名称" width="200" align="center">
+               <template slot-scope="scope">
+                 {{getStorehouseName(scope.row.storehouse_id)}}
+               </template>
+            </el-table-column>
            
             <el-table-column prop="name" label="盘点前数量" width="100" align="center">
               <template slot-scope="scope">
@@ -108,6 +123,8 @@ export default {
             page:1,
             ids:"",
             damageList:[],
+            storehouse_id:0,
+            houseList:[],
          }
     },
     methods:{
@@ -134,6 +151,7 @@ export default {
             keyword:this.searchKey,
             limit:this.limit,
             page:this.page,
+            storehouse_id:this.storehouse_id,
           }
           this.tableData = []
           getInventoryDetailList(params).then(response=>{
@@ -143,6 +161,13 @@ export default {
              
                this.tableData = list
                this.total = response.data.data.total
+               var obj = {id:0,storehouse_name:"全部"}
+               this.houseList = []
+               this.houseList.push(obj)
+               for(let i=0;i<response.data.data.houseList.length;i++){
+                 this.houseList.push(response.data.data.houseList[i])
+               }
+              
              }
           })
         },
@@ -188,6 +213,23 @@ export default {
        },
       inventoryExportList(){
         this.$router.push({path:'/stock/inventoryPrint'})
+      },
+      getStorehouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        if(storehouse_name == "全部"){
+          return ""
+        }else{
+          return storehouse_name
+        }
+      },
+      changeHouseList(){
+        this.houseList = []
+        this.getlist()
       }
     },
     created(){

src/xt_pages/stock/inventoryTransfer/Addtrans.vue

@@ -3,11 +3,11 @@
     <div class="position">
       <bread-crumb :crumbs="crumbs"></bread-crumb>
       <div>
-        <el-button type="primary" @click="save">保存</el-button>
-        <el-button type="warning" @click="examine">审核</el-button>
+        <el-button type="primary" @click="submit" v-show="showButton">保存</el-button>
+        <el-button type="warning" @click="examine" v-show="showCheck">审核</el-button>
       </div>
     </div>
-    <div class="app-container">
+    <div class="app-container" v-loading="loading">
       <div
         style="
           justify-content: flex-start;
@@ -18,89 +18,153 @@
       >
         <el-form
           :inline="true"
-          :rules="rules"
           :model="formInline"
           class="demo-form-inline"
         >
           <el-form-item label="单据日期：">
             <el-date-picker
-              v-model="value1"
+              v-model="warehousing_time"
+              format="yyyy-MM-dd"
+               value-format="yyyy-MM-dd"
               type="date"
               placeholder="选择日期"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="调出仓库：" prop="region">
-            <el-select v-model="formInline.region" placeholder="活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
+          <span><span style="color:red">*</span>调出仓库：</span>
+          <el-form-item  prop="storehouse_out_id">
+              <el-select size="small" v-model="storehouse_out_id" filterable placeholder="请选择调出仓库" @change="changeHouseList">
+                <el-option
+                  v-for="(option, index) in houseList"
+                  :key="index"
+                  :label="option.storehouse_name"
+                  :value="option.id">
+                </el-option>
+              </el-select>
           </el-form-item>
-          <el-form-item label="调入仓库：" prop="region">
-            <el-select v-model="formInline.region" placeholder="活动区域">
-              <el-option label="区域一" value="shanghai"></el-option>
-              <el-option label="区域二" value="beijing"></el-option>
-            </el-select>
+          <span><span style="color:red">*</span>调入仓库：</span>
+          <el-form-item prop="storehouse_in_id">
+            <el-select size="small" v-model="storehouse_in_id" filterable placeholder="请选择调入仓库">
+            <el-option
+              v-for="(option, index) in houseList"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+           </el-select>
           </el-form-item>
         </el-form>
       </div>
+     <el-form :rules="tableRules" :model="recordInfo" ref="tableForm">
       <el-table
         :row-style="changColor"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        :data="tableData"
-        :class="signAndWeighBoxPatients"
+        :data="recordInfo.recordData"
         border
+       
       >
-        >
-        <el-table-column label="单据编号" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column align="center">
-          <template slot="header" slot-scope="scope">
+      >
+    
+        <el-table-column align="center"  width="230">
+          <template slot="header" slot-scope="scope" >
             商品名称<span style="color:red;">*</span>
           </template>
           <template slot-scope="scope">
-        <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品类型" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="规格&&单位" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+           <el-form-item
+                :prop="'recordData.' + scope.$index + '.name'"
+                :rules="tableRules.name"
+              >
+                <el-select
+                  @blur="selectGoodName"
+                  v-model="scope.row.name"
+                  style="width:200"
+                  filterable
+                  placeholder="请选择商品"
+                  @change="changeName"
+                  @input="changeGoodName(scope.$index)"
+                  :disabled="disabled"
+                >
+                  <el-option
+                    v-for="(item, index) in tabList"
+                    :key="index"
+                    :label="item.project_name"
+                    :value="item"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
           </template>
         </el-table-column>
-        <el-table-column label="调拨数量" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
-          </template>
+        <el-table-column align="center"  width="200">
+          <template slot="header" slot-scope="scope">
+              <span>商品类型<span style="color: red">*</span></span>
+            </template>
+     
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px;">
+                <el-input v-model="scope.row.project_type" :disabled="true" style="width:180px"></el-input>
+              </el-form-item>
+            </template>
         </el-table-column>
-        <el-table-column label="库存总数" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
-          </template>
+        <el-table-column  align="center" width="250">
+         <template slot="header" slot-scope="scope" >
+              <span>规格<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+
+              <el-form-item style="padding-top: 20px">
+                 <el-input v-model="scope.row.second_specification_name" style="width:200px" :disabled="true"></el-input>
+              </el-form-item>
+
+            </template>
         </el-table-column>
-        <el-table-column label="制单人" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
-          </template>
+        <el-table-column  align="center" width="250">
+             <template slot="header" slot-scope="scope">
+              <span>调拨数量<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item style="padding-top: 20px" :prop="'recordData.' + scope.$index + '.count'"
+                            :rules='tableRules.count' >
+                <el-input v-model="scope.row.count" style="width:100px"  @input="selectCount(scope.row.project_id,scope.row.sencond_unit,scope.row.is_source,scope.row.count,scope.$index)"></el-input>
+                <el-select
+                  v-model="scope.row.sencond_unit"
+                  style="width: 100px"
+                  filterable
+                  placeholder="请选择"
+                  :disabled="disabled"
+                 
+                >
+                  <el-option
+                    v-for="(item, index) in scope.row.unitList"
+                    :key="index"
+                    :label="item.name"
+                    :value="item.name"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </template>
         </el-table-column>
-        <el-table-column label="备注" align="center">
+        <el-table-column label="库存总数" align="center" width="200">
+           <template slot="header" slot-scope="scope">
+              <span>库存总数<span style="color: red">*</span></span>
+            </template>
+            <template slot-scope="scope">
+              <el-form-item  style="padding-top: 20px">
+                <el-input v-model="scope.row.second_total" style="width:150px" :disabled="true"></el-input>
+              </el-form-item>
+            </template>
+         </el-table-column>
+      
+        <el-table-column label="备注" align="center" width="200">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            <el-input v-model="scope.row.remake" style="width:160px"></el-input>
           </template>
         </el-table-column>
 
-
-
-        <el-table-column label="操作" align="center" width="260px">
+        <el-table-column label="操作" align="center" width="190px">
           <template slot-scope="scope">
             <el-tooltip class="item" content="新增" placement="top-start">
               <el-button
@@ -117,31 +181,22 @@
                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toDelete(scope.row, scope.row.$index)"
+                @click="toDelete(scope.row, scope.$index)"
               >
               </el-button>
             </el-tooltip>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100, 200, 500, 1000]"
-        :page-size="10"
-        background
-        align="right"
-        style="margin-top: 20px"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-      >
-      </el-pagination>
+    </el-form>
     </div>
   </div>
 </template>
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import { uParseTime } from '@/utils/tools'
+import {getSencondeGoodList,saveSencondOrder,checkSecondOrder,getStoreHouseGoodList,getSumSecondeCount} from '@/api/seconde'
 export default {
   components: {
     BreadCrumb,
@@ -161,11 +216,36 @@ export default {
         user: "",
         region: "",
       },
-      rules: {
-        region: [
-          { required: true, message: "请选择活动区域", trigger: "change" },
-        ],
-      },
+      currentIndex: 0,
+      tableRules: {
+          name: [
+            { required: true, message: '商品名称不能为空', trigger: 'blur' }
+          ],
+          count: [
+            { required: true, message: '调拨数量不能为空', trigger: 'blur' }
+          ],
+        },
+        goodType: [],
+        manufacturerList:[],
+        goodList:[],
+        loading:false,
+        list:[],
+        configlist:{},
+        recordInfo: {
+          recordData: [],
+        },
+        drugList:[],
+        goodTypeList:[],
+        drugTypeList:[],
+        houseList:[],
+        tabList:[],
+        disabled:false,
+        storehouse_out_id:"",
+        storehouse_in_id:"",
+        loading:false,
+        warehousing_time:"",
+        showButton:true,
+        showCheck:false,
     };
   },
 
@@ -177,16 +257,69 @@ export default {
     approval() {},
 
     // 审核
-    examine() {},
+    examine() {
+      this.loading = true
+      var array = []
+      array.push(this.id)
+      var ids = array.join(",")
+    
+      checkSecondOrder(ids).then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+          this.loading = false
+          if(msg == 1){
+            this.$message.success("审核成功!")
+            this.$router.push({path:"/stock/inventoryTransfer"})
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var storehose_name = response.data.data.storehose_name
 
-    // 保存
-    save() {},
+            this.$message.error(storehose_name + " "+good_name+"*"+specification_name+"库存不足,无法调拨,请修改调拨数量!")
+          }
+          if(msg == 3){
+            var drug_name =  response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit =  response.data.data.max_unit
+            var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+            var storehose_name = response.data.data.storehose_name
+            this.$message.error(storehose_name +" "+str +"库存不足,无法调拨,请修改调拨数量!")
 
+          }
+
+        }
+      })
+    },
     // 表单添加
-    toAdd() {},
+    toAdd() {
+      const tempObj = {}
+      tempObj["name"] = "";
+      tempObj['project_name'] = ""
+      tempObj['project_type'] = ""
+      tempObj['second_specification_name'] = ''
+      tempObj['sencond_unit'] = ''
+      tempObj['count'] = ''
+      tempObj['second_total'] = ''
+      tempObj["is_source"] = 0
+      tempObj["remake"] = ''
+      tempObj["project_id"] = 0
+      tempObj["min_price"] = 0
+      this.recordInfo.recordData.push(tempObj)
+    },
 
     // 删除
-    toDelete() {},
+    toDelete(row,index) {
+      if (this.recordInfo.recordData.length <= 1) {
+        this.$message.error('只有一条记录的时候无法删除')
+        return
+      } else {
+        this.recordInfo.recordData.splice(index, 1)
+      }
+    },
 
     // 详情查看
     toDetails() {},
@@ -218,7 +351,290 @@ export default {
         };
       }
     },
+    //获取基本数据信息
+    getlist(){
+      getSencondeGoodList().then(response=>{
+        if(response.data.state == 1){
+
+          var houseList =  response.data.data.houseList
+          this.houseList = houseList
+        }
+      })
+    },
+    getTime(val, temp) {
+      if (val != 0) {
+        return uParseTime(val, temp)
+      } else {
+        return ''
+      }
+    },
+    submit() { 
+      this.loading = true
+      const loading = this.$loading({
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.7)'
+      })
+      if(this.storehouse_out_id <=0){
+        this.$message.error("调出仓库不能为空!")
+        this.loading = false
+        loading.close()
+        return
+      }
+      if(this.storehouse_in_id <=0){
+        this.$message.error("调入仓库不能为空!")
+        this.loading = false
+        loading.close()
+        return
+      }
+      this.$refs['tableForm'].validate((valid) => {
+        if(valid) {
+          const array = this.recordInfo.recordData
+        
+          for (let i = 0; i < array.length; i++) {
+            array[i].count = parseInt(array[i].count)
+            array[i].second_total = array[i].second_total.toString()
+          }
+          const params = {
+            'stockIn': this.recordInfo.recordData
+          }
+          var storehouse_in_id = parseInt(this.storehouse_in_id)
+          var storehouse_out_id = parseInt(this.storehouse_out_id)
+         
+          var warehouse_time = this.warehousing_time
+          
+          console.log("@3232332323232",warehouse_time)
+         
+          saveSencondOrder(params,warehouse_time,storehouse_in_id,storehouse_out_id).then(response => {
+            if (response.data.state == 1) {
+              this.showCheck = true
+              this.showButton = false
+              var warehousingInfo = response.data.data.warehousingInfo   
+              this.$message.success('保存成功')
+              this.loading = false 
+              loading.close()
+              this.id = response.data.data.id
+            } else {
+              this.$message.error("保存失败")
+              loading.close()
+            }
+          })
+        } else {
+          return false
+        }
+      })
+    },
+    changeGoodName(val) {
+      this.currentIndex = val;
+    },
+    selectGoodName(val){
+      if(this.storehouse_out_id == ""){
+        this.$message.error("请先选择调出仓库!")
+        return
+      }
+    },
+    changeName(val) {
+      for (let i = 0; i < this.recordInfo.recordData.length; i++) {
+        if (this.currentIndex == i) {
+          this.recordInfo.recordData[i].project_id = val.id;
+          this.recordInfo.recordData[i].is_source = val.is_source;
+          this.recordInfo.recordData[i].name = val.name;
+          this.recordInfo.recordData[i].project_name = val.project_name;
+          this.recordInfo.recordData[i].project_type = val.project_type;
+          this.recordInfo.recordData[i].second_specification_name = val.second_specification_name;
+          this.recordInfo.recordData[i].second_total = val.second_total;
+          this.recordInfo.recordData[i].sencond_unit = val.sencond_unit
+          this.recordInfo.recordData[i].min_price = val.min_price
+          if (val.count == NaN) {
+            this.recordInfo.recordData[i].count = "";
+          } else {
+            this.recordInfo.recordData[i].count = val.count? val.count : "";
+          }
+          this.recordInfo.recordData[i].unitList = val.unitList;
+        }
+      }
+    },
+    getWarehoseInfo(arr, max_unit, min_unit, min_number) {
+        var total = 0;
+        var max_str = "";
+        var min_str = "";
+        if (arr.length > 0) {
+            for (let i = 0; i < arr.length; i++) {
+            total += parseInt(arr[i].stock_max_number + arr[i].stock_min_number);
+            }
+        }
+        if (total < min_number) {
+            min_str = total + min_unit;
+        }
+        if (total == 0) {
+            min_str = "";
+            max_str = "";
+        }
+        if (total >= min_number) {
+            if (parseInt(total / min_number) != 0) {
+            max_str = parseInt(total / min_number) + max_unit;
+            }
+            if (total % min_number != 0) {
+            min_str = (total % min_number) + min_unit;
+            }
+        }
+        return max_str + min_str;
+      },
+      getTotalStockCount(arr) {
+        var total_count = 0;
+        for (let i = 0; i < arr.length; i++) {
+            total_count += arr[i].stock_count;
+        }
+        return total_count;
+      },
+      changeHouseList(){
+         var params = {
+           storehouse_out_id:this.storehouse_out_id,
+         }
+         this.tabList = []
+        getStoreHouseGoodList(params).then(response=>{
+          var drugList = response.data.data.drugList
+          this.drugList= drugList
+          var goodList = response.data.data.goodList
+          this.goodList = goodList
+          var manufactuerList = response.data.data.manufacturerList
+        
+          var goodTypeList = response.data.data.goodTypeList
+          this.goodTypeList = goodTypeList
+          var drugTypeList = response.data.data.drugTypeList
+          this.drugTypeList = drugTypeList
+         
+          for(let i=0;i<drugList.length;i++){
+            for (let j = 0; j < manufactuerList.length; j++) {
+              if (drugList[i].manufacturer == manufactuerList[j].id) {
+                drugList[i].manufacturer = manufactuerList[j].manufacturer_name;
+              }
+            }
+            for (let z = 0; z < drugList[i].drug_warehouse_info.length; z++) {
+              if (drugList[i].max_unit ==drugList[i].drug_warehouse_info[z].max_unit) {
+                  drugList[i].drug_warehouse_info[z].stock_max_number = drugList[i].drug_warehouse_info[z].stock_max_number *drugList[i].min_number;
+              }
+              }
+              for (let y = 0; y < this.drugTypeList.length; y++) {
+                if (drugList[i].drug_type == this.drugTypeList[y].value) {
+                    drugList[i].drug_type = this.drugTypeList[y].name;
+                  }
+              }
+              drugList[i].name = drugList[i].drug_name
+              drugList[i].project_name =drugList[i].drug_name + " " +drugList[i].dose + drugList[i].dose_unit + "*" +drugList[i].min_number +drugList[i].min_unit + "/" + drugList[i].max_unit + " " +drugList[i].manufacturer;
+              drugList[i].project_type = drugList[i].drug_type;
+              drugList[i].second_specification_name = drugList[i].dose + drugList[i].dose_unit +"*" + drugList[i].min_number +drugList[i].min_unit +"/" + drugList[i].max_unit;
+              drugList[i].second_total = this.getWarehoseInfo(drugList[i].drug_warehouse_info,drugList[i].max_unit,drugList[i].min_unit,drugList[i].min_number);
+              drugList[i].is_source = 1
+              drugList[i].count = ""
+              drugList[i].remake = ""
+              drugList[i].min_price = drugList[i].min_price
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList = [
+                  { id: 1, name: "" },
+                  { id: 2, name: "" },
+              ];
+            }
+          if (drugList[i].max_unit == drugList[i].min_unit) {
+              drugList[i].unitList = [{ id: 1, name: "" }];
+          }
+
+          drugList[i].sencond_unit = drugList[i].max_unit;
+          for (let j = 0; j < drugList[i].unitList.length; j++) {
+            if (drugList[i].max_unit != drugList[i].min_unit) {
+              drugList[i].unitList[0].name = drugList[i].max_unit;
+              drugList[i].unitList[1].name = drugList[i].min_unit;
+            }
+            if (drugList[i].max_unit == drugList[i].min_unit) {
+              drugList[i].unitList[0].name = drugList[i].max_unit;
+            }
+          }
+          this.tabList.push(drugList[i]);
+          }
+
+        for (let i = 0; i < goodList.length; i++) {
+          for (let j = 0; j < manufactuerList.length; j++) {
+            if (goodList[i].manufacturer == manufactuerList[j].id) {
+                goodList[i].manufacturer = manufactuerList[j].manufacturer_name;
+            }
+          }
+          for (let y = 0; y < this.goodTypeList.length; y++) {
+            if (goodList[i].good_type_id == this.goodTypeList[y].id) {
+              goodList[i].good_type_id = this.goodTypeList[y].type_name;
+            }
+          }
+          goodList[i].name = goodList[i].good_name
+          goodList[i].project_name = goodList[i].good_name + " " + goodList[i].specification_name + " " + goodList[i].manufacturer;
+          goodList[i].project_type = goodList[i].good_type_id;
+          goodList[i].second_specification_name = goodList[i].specification_name;
+          goodList[i].second_total = this.getTotalStockCount(
+            goodList[i].good_warehouse_info
+          );
+          goodList[i].count = ""
+          goodList[i].is_source = 2;
+          goodList[i].name = goodList[i].good_name;
+          goodList[i].unitList = [{ id: 1, name: "" }];
+          goodList[i].sencond_unit = goodList[i].packing_unit;
+          goodList[i].remake = ""
+          goodList[i].min_price = goodList[i].retail_price
+          for (let j = 0; j < goodList[i].unitList.length; j++) {
+            goodList[i].unitList[0].name = goodList[i].packing_unit;
+          }
+          this.tabList.push(goodList[i]);
+        }
+       })
+      },
+     selectCount(project_id,sencond_unit,is_source,count,index){
+      var params = {
+        project_id:project_id,
+        sencond_unit:sencond_unit,
+        is_source:parseInt(is_source),
+        count:parseInt(count),
+        storehouse_out_id:this.storehouse_out_id
+      }
+      getSumSecondeCount(params).then(response=>{
+         if(response.data.state == 1){
+           var msg = response.data.data.msg
+           if(msg == 2){
+             this.$message.error("调拨数量不能大于库存总量!")
+             for(let i=0;i<this.recordInfo.recordData.length;i++){
+               if(index == i){
+                 this.recordInfo.recordData[i].count = ""
+               }
+             }
+           }
+         }
+      })
+
+    }
   },
+  created(){
+    var nowDate = new Date()
+    var nowYear = nowDate.getFullYear()
+    var nowMonth = nowDate.getMonth() + 1
+    var nowDay = nowDate.getDate()
+    this.warehousing_time =
+      nowYear +
+      '-' +
+      (nowMonth < 10 ? '0' + nowMonth : nowMonth) +
+      '-' +
+      (nowDay < 10 ? '0' + nowDay : nowDay)
+    const tempObj = {}
+    tempObj["name"] = "";
+    tempObj['project_name'] = ""
+    tempObj['project_type'] = ""
+    tempObj['second_specification_name'] = ''
+    tempObj['sencond_unit'] = ''
+    tempObj['count'] = ''
+    tempObj['second_total'] = ''
+    tempObj["remake"] = ''
+    tempObj["is_source"] = 0
+    tempObj["project_id"] = 0
+    tempObj["min_price"] = 0
+    this.recordInfo.recordData.push(tempObj)
+    this.getlist()  
+  }
 };
 </script>
 

src/xt_pages/stock/inventoryTransfer/index.vue

@@ -18,25 +18,51 @@
         "
       >
         <div>
-          <el-input
-            size="small"
-            style="width: 200px; margin-left: 10px"
-            class="filter-item"
-            v-model.trim="keywords"
-          />
-          <el-button
+          <!-- <el-button
             size="small"
             class="filter-item"
             type="primary"
             icon="el-icon-search"
             @click="search"
             >查看</el-button
-          >
+          > -->
         </div>
         <div>
           单据日期：
-          <el-date-picker v-model="value1" type="date" placeholder="选择日期">
-          </el-date-picker>
+          <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"
+            type="date"
+            placeholder="选择日期时间"
+            align="right"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            @change="endTimeChange"
+          ></el-date-picker>
+          <el-input
+            size="small"
+            style="width: 200px; margin-left: 10px"
+            class="filter-item"
+            placeholder="请输入单据编号,仓库名称"
+            v-model.trim="keywords"
+          />
           <el-button
             size="small"
             class="filter-item"
@@ -60,42 +86,38 @@
         <el-table-column type="selection" width="55"> </el-table-column>
         <el-table-column label="单据编号" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.drug_name ? scope.row.drug_name : "" }}</span>
+            <span>{{scope.row.second_order_number}}</span>
           </template>
         </el-table-column>
         <el-table-column label="单据日期" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.drug_spec ? scope.row.drug_spec : "" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="商品名称" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+             {{getTime(scope.row.record_date)}}
           </template>
         </el-table-column>
+      
         <el-table-column label="调出仓库" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+             {{getHouseName(scope.row.storehouse_out_id)}}
           </template>
         </el-table-column>
         <el-table-column label="调入仓库" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{getHouseName(scope.row.storehouse_in_id)}}
           </template>
         </el-table-column>
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{getDocName(scope.row.creater)}}
           </template>
         </el-table-column>
         <el-table-column label="审核人" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+           {{getDocName(scope.row.checker)}}
           </template>
         </el-table-column>
         <el-table-column label="审核时间" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{getTime(scope.row.check_time)}}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="260px">
@@ -114,7 +136,7 @@
                 icon="el-icon-delete"
                 size="small"
                 type="danger"
-                @click="toDelete(scope.row, scope.row.$index)"
+                @click="toDelete(scope.row, scope.$index)"
               >
               </el-button>
             </el-tooltip>
@@ -150,6 +172,8 @@
 
 <script>
 import BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getAllSecondOrderList,checkSecondOrder,deleteStoreHouseList,returnCheckSecondOrder} from "@/api/seconde";
+import { uParseTime } from "@/utils/tools";
 export default {
   components: {
     BreadCrumb,
@@ -164,44 +188,200 @@ export default {
       total: 0,
       page: 1,
       limit: 10,
-      tableData: [{}, {}],
+      tableData: [],
+      keywords:"",
+      start_time:"",
+      end_time:"",
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
+      houseList:[],
+      check_id:0,
+      ids:"",
+      array:[],
+      checkArray:[],
+      returnArray:[],
     };
   },
 
   methods: {
-    // 初始化数据
-    init() {},
-
+   
     // 反审核
-    approval() {},
+    approval() {
+      if(this.array.length<=0){
+       this.$message.error("请勾选需要反审核的订单!")
+       return
+      }
+      if(this.returnArray.length >0){
+        this.$message.error("不能勾选未审核的单据!")
+        return
+      }
+      var ids = this.array.join(",")
+      returnCheckSecondOrder(ids).then(response=>{
+         if(response.data.state == 1){
+          var msg = response.data.data.msg
+          if(msg == 0){
+            this.$message.success("反审核失败!")
+            this.getlist()
+          }
+          if(msg == 1){
+            this.$message.success("反审核成功!")
+            this.getlist()
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var storehose_name = response.data.data.storehose_name
+
+            this.$message.error(storehose_name + " "+good_name+"*"+specification_name+"已有出库数据不能反审核")
+          }
+          if(msg == 3){
+            var drug_name =  response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit =  response.data.data.max_unit
+            var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+            var storehose_name = response.data.data.storehose_name
+            this.$message.error(storehose_name +" "+str +"已有出库数据不能反审核!")
+
+          }
+         }
+      })
+
+    },
 
     // 审核
-    examine() {},
+    examine() {
+      if(this.checkArray.length >0){
+       this.$message.error("不能勾选已审核的单据!")
+       return
+      }
+
+      if(this.array.length <=0){
+       this.$message.error("请勾选需要审核的订单!")
+       return
+      }
+      var ids = this.array.join(",")
+      checkSecondOrder(ids).then(response=>{
+        if(response.data.state == 1){
+          var msg = response.data.data.msg
+         
+          if(msg == 1){
+            this.$message.success("审核成功!")
+            this.getlist()
+          }
+          if(msg == 2){
+            var good_name = response.data.data.good_name
+            var specification_name = response.data.data.specification_name
+            var storehose_name = response.data.data.storehose_name
+
+            this.$message.error("审核失败" + " "+storehose_name + " "+good_name+"*"+specification_name+"库存不足,无法调拨,请修改调拨数量!")
+          }
+          if(msg == 3){
+            var drug_name =  response.data.data.drug_name
+            var dose = response.data.data.dose
+            var dose_unit = response.data.data.dose_unit
+            var min_number = response.data.data.min_number
+            var min_unit =  response.data.data.min_unit
+            var max_unit =  response.data.data.max_unit
+            var str = drug_name + " " + dose + dose_unit + "*" + min_number + min_unit+"/"+max_unit
+            var storehose_name = response.data.data.storehose_name
+            this.$message.error("审核失败" + " " + storehose_name +" "+str +"库存不足,无法调拨,请修改调拨数量!")
+
+          }
+
+        }
+      })
+    },
 
     // 添加
     Add() {
-        this.$router.push({path:"/stock/inventoryTransfer/Addtrans"})
+      this.$router.push({path:"/stock/inventoryTransfer/Addtrans"})
     },
 
     // 删除
-    toDelete() {},
+    toDelete(row,index) {
+      if(row.is_check == 1){
+        this.$message.error("已审核数据不能删除!")
+        return 
+      }
+      this.$confirm("确认删除库存调拨单记录?", "删除库存调拨单记录", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消", 
+        type: "warning"
+      }).then(() => {
+          deleteStoreHouseList(row.id).then(response => {
+            if (response.data.state == 0) {
+              this.$message.error(response.data.msg);
+              return false;
+            } else {
+              this.$notify({
+                title: "成功",
+                message: "删除成功",
+                type: "success",
+                duration: 2000
+              });
+              this.tableData.splice(index,1)
+            }
+          });
+        }).catch(() => {});
+    },
 
     // 详情查看
-    toDetails() {
-        this.$router.push({path:"/stock/inventoryTransfer/transDetails"})
+    toDetails(row) {
+        this.$router.push({path:"/stock/inventoryTransfer/transDetails?id="+row.id})
+    },
+    changeTypeName() {
+      this.getlist();
+    },
+    startTimeChange() {
+      
+      this.getlist();
+    },
+    endTimeChange() {
+     
+      this.getlist();
+    },
+    search() {
+      this.getlist();
+    },
+    getTimes(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
     },
-
     // 表单全选
-    handleSelectionChange() {},
-
+    handleSelectionChange(val) {
+      this.array = []
+      this.checkArray = []
+      this.returnArray = []
+     for(let i=0;i<val.length;i++){
+      this.array.push(val[i].id)
+      if(val[i].is_check == 1){
+        this.checkArray.push(val[i].is_check)
+      }
+      if(val[i].is_check == 2){
+        this.returnArray.push(val[i].is_check)
+      }
+     }
+    },
     // 页表操作
     handleSizeChange(val) {
+      this.array= []
+      this.checkArray = []
+      this.returnArray = []
       this.limit = val;
-      this.init();
+      this.getlist();
     },
     handleCurrentChange(val) {
+      this.array= []
+      this.checkArray = []
+      this.returnArray = []
       this.page = val;
-      this.init();
+      this.getlist();
     },
 
     // 表格样式
@@ -218,7 +398,89 @@ export default {
         };
       }
     },
+    getlist() {
+      var params = {
+        check_id: this.check_id,
+        start_time: this.start_time,
+        end_time: this.end_time,
+        keyword: this.keywords,
+        page: this.page,
+        limit: this.limit,
+      };
+      getAllSecondOrderList(params).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableData = list;
+          var total = response.data.data.total;
+          this.total = total;
+          this.houseList = response.data.data.houseList
+          this.doctorList = response.data.data.doctorList
+        }
+      });
+    },
+    getName(id) {
+      var name = "";
+      for (let i = 0; i < this.supplyList.length; i++) {
+        if (id == this.supplyList[i].id) {
+          name = this.supplyList[i].supplier_name;
+        }
+      }
+      return name;
+    },
+    getDocName(id) {
+      var user_name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          user_name = this.doctorList[i].user_name;
+        }
+      }
+      return user_name;
+    },
+    getTime(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+      }
+      return storehouse_name
+    },
+    toEdit(row){
+      this.$router.push("/stock/inventoryTransfer/transedit?id="+row.id)
+    }
   },
+  created(){
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
+    this.end_time = this.getTimes(new Date());
+
+    // this.org_id = this.$store.getters.xt_user.org_id;
+    // var start_time =  window.sessionStorage.getItem('purchase_start_time')
+    
+    // var end_time =  window.sessionStorage.getItem('purchase_end_time')
+   
+    // if(start_time !=null){
+    //   this.start_time = ""
+    //   this.start_time = start_time
+    // }
+    // if(end_time!=null){
+    //   this.end_time = ""
+    //   this.end_time = end_time
+    // }
+    // window.sessionStorage.removeItem('purchase_start_time')
+    // window.sessionStorage.removeItem('purchase_end_time')
+    this.getlist();
+  }
 };
 </script>
 

src/xt_pages/stock/inventoryTransfer/transDetails.vue

@@ -10,8 +10,7 @@
           backgroundColor: 'rgb(245, 247, 250)',
           color: '#606266',
         }"
-        :data="tableData"
-        :class="signAndWeighBoxPatients"
+        :data="tableList"
         border
       >
         >
@@ -20,78 +19,69 @@
             商品名称<span style="color: red">*</span>
           </template>
           <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+           {{scope.row.project_name}}
           </template>
         </el-table-column>
         <el-table-column label="商品类型" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.Count ? scope.row.Count : "" }}</span>
+           {{scope.row.project_type}}
           </template>
         </el-table-column>
-        <el-table-column label="规格&&单位" align="center">
+        <el-table-column label="规格" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+             {{scope.row.second_specification_name}}
           </template>
         </el-table-column>
         <el-table-column label="调拨数量" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{scope.row.count}}{{scope.row.sencond_unit}}
           </template>
         </el-table-column>
         <el-table-column label="调出仓库" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+           {{getHouseName(scope.row.storehouse_out_id)}}
           </template>
         </el-table-column>
         <el-table-column label="调入仓库" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+           {{getHouseName(scope.row.storehouse_in_id)}}
           </template>
         </el-table-column>
         <el-table-column label="库存总数" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{scope.row.second_total}}
           </template>
         </el-table-column>
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{getDocName(warehouse.creater)}}
           </template>
         </el-table-column>
         <el-table-column label="审核人" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            {{getDocName(warehouse.checker)}}
           </template>
         </el-table-column>
         <el-table-column label="审核时间" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+           <span v-if="warehouse.check_time >0">{{getTimes(warehouse.check_time)}}</span>  
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.outCount ? scope.row.outCount : "" }}</span>
+            <span>{{ scope.row.remake ? scope.row.remake : "" }}</span>
           </template>
         </el-table-column>
       </el-table>
-      <el-pagination
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :page-sizes="[10, 50, 100, 200, 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 BreadCrumb from "@/xt_pages/components/bread-crumb";
+import {getSecondOrderDetailList} from "@/api/seconde";
+import { uParseTime } from "@/utils/tools";
 export default {
   components: {
     BreadCrumb,
@@ -116,6 +106,12 @@ export default {
           { required: true, message: "请选择活动区域", trigger: "change" },
         ],
       },
+      supplyList: [],
+      check_id: 0,
+      doctorList: [],
+      houseList:[],
+      warehouse:{},
+      tableList:[],
     };
   },
 
@@ -168,7 +164,71 @@ export default {
         };
       }
     },
+       getTimes(time) {
+      if (time === "") {
+        return "";
+      }
+      return uParseTime(time, "{y}-{m}-{d}");
+    },
+    getlist() {
+       var id = parseInt(this.$route.query.id)
+      getSecondOrderDetailList(id).then((response) => {
+        if (response.data.state == 1) {
+          var list = response.data.data.list;
+          this.tableList = list;
+          this.houseList = response.data.data.houseList
+          this.doctorList = response.data.data.doctorList
+          var warehouse = response.data.data.warehouse
+          this.warehouse = warehouse
+        }
+      });
+    },
+    getHouseName(id){
+      var storehouse_name = ""
+      for(let i=0;i<this.houseList.length;i++){
+         if(id == this.houseList[i].id){
+           storehouse_name = this.houseList[i].storehouse_name
+         }
+      }
+      return storehouse_name
+    },
+    getDocName(id) {
+      var user_name = "";
+      for (let i = 0; i < this.doctorList.length; i++) {
+        if (id == this.doctorList[i].admin_user_id) {
+          user_name = this.doctorList[i].user_name;
+        }
+      }
+      return user_name;
+    }
   },
+  created(){
+    var now = new Date(); //当前日期
+    var nowMonth = now.getMonth(); //当前月
+    var nowYear = now.getFullYear(); //当前年
+    //本月的开始时间
+    var monthStartDate = new Date(nowYear, nowMonth, 1);
+    this.start_time = this.getTimes(monthStartDate);
+    this.end_time = this.getTimes(new Date());
+
+    this.org_id = this.$store.getters.xt_user.org_id;
+    // var start_time =  window.sessionStorage.getItem('purchase_start_time')
+    
+    // var end_time =  window.sessionStorage.getItem('purchase_end_time')
+  
+    // if(start_time !=null){
+    //   this.start_time = ""
+    //   this.start_time = start_time
+    // }
+    // if(end_time!=null){
+    //   this.end_time = ""
+    //   this.end_time = end_time
+    // }
+    // window.sessionStorage.removeItem('purchase_start_time')
+    // window.sessionStorage.removeItem('purchase_end_time')
+  
+    this.getlist();
+  }
 };
 </script>
 

src/xt_pages/stock/stockBatchNumber.vue

@@ -71,6 +71,11 @@
              <span>{{scope.row.number}} </span>
            </template>
         </el-table-column>
+        <el-table-column prop="drug_name" label="仓库名称" align="center">
+           <template slot-scope="scope">
+              <span>{{getHouseName(scope.row.storehouse_id)}}</span>
+           </template>
+        </el-table-column>
         <el-table-column prop="drug_name" label="入库数量" align="center">
            <template slot-scope="scope">
              <span> {{scope.row.warehousing_count}}{{packing_unit}}</span>
@@ -183,6 +188,7 @@
         keywords:"",
         packing_unit:"",
         cancelCountList:[],
+        houseList:[],
       }
     },
     methods:{
@@ -246,16 +252,13 @@
       getStockInList(params).then(response=>{
          if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("入库数据",list)
-          //  for(let i=0;i<list.length;i++){
-          //    list[i].stock_way = 4
-          //  }
+        
            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
+           this.houseList = response.data.data.houseList
          }
       })
      },
@@ -269,7 +272,6 @@
         return count
      },
      getOutCount(id){
-        console.log("id222",id)
         var count = ""
         for(let i=0;i<this.outCountList.length;i++){
           if(id == this.outCountList[i].good_id){
@@ -309,18 +311,19 @@
         getStockDrugCount(params).then(response=>{
           if(response.data.state == 1){
             var count = response.data.data.count
-            console.log("详情入库统计",count)
+           
             this.countList = count
             var outlist = response.data.data.outList
-            console.log("详情出库数量",outlist)
-            
+           
             this.outCountList = outlist
             var autoCount = response.data.data.autoCount
-            console.log("详情自动出库",autoCount)
+           
             this.autoCountList = autoCount
             var totalCount = response.data.data.totalCount
-            console.log("totalcount",totalCount)
+  
             this.cancelCountList = totalCount
+
+           
           }
         })
       },
@@ -332,7 +335,16 @@
           }
         }
        return stock_count
-      }
+      },
+      getHouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        return storehouse_name
+     },
       
 
     }

src/xt_pages/stock/stockDamaged.vue

@@ -1,6 +1,15 @@
 <template>
   <div>
     <div  style="margin-bottom:10px;">
+       <label class="title"><span class="name">仓库</span> :</label>
+       <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeHouseList">
+          <el-option
+            v-for="(option, index) in houseList"
+            :key="index"
+            :label="option.storehouse_name"
+            :value="option.id">
+          </el-option>
+        </el-select>  
         <el-input
         size="small"
         style="width: 200px;"
@@ -60,6 +69,11 @@
             {{getAllDamageCount(scope.row.good_id,scope.row.buy_price)}}
             </template>    
         </el-table-column>
+        <el-table-column prop="date" label="仓库名称"  align="center">
+          <template  slot-scope="scope">
+            {{getStorehouseName(scope.row.storehouse_id)}}
+            </template>    
+        </el-table-column>
         <el-table-column prop="name" label="操作"  align="center">
           <template  slot-scope="scope">
             <el-button type="primary" @click="toDamagedDetail(scope.row.good_id)">查看详情</el-button>
@@ -444,6 +458,8 @@ export default {
             good_name:"",
             price:0,
             good_id:0,
+            storehouse_id:0,
+            houseList:[],
         }
     },
     methods:{
@@ -641,18 +657,23 @@ export default {
           keyword:this.searchKey,
           limit:this.limit,
           page:this.page,
+          storehouse_id:this.storehouse_id,
          }
        getReportStockList(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-            console.log("报损金额22222",list)
             this.total = response.data.data.total
             this.tableList = list
            var doctorlist = response.data.data.doctorlist
            this.doctorList = doctorlist
            var damageList =  response.data.data.damageList
-          
-          this.damageList = damageList
+           this.damageList = damageList
+           var obj = {id:0,storehouse_name:"全部"}
+           this.houseList = []
+           this.houseList.push(obj)
+           for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+           }
           }
        })   
       },
@@ -793,30 +814,28 @@ export default {
       },
       toQuery(){
         this.toDamagedDetail(this.good_id)
+      },
+      getStorehouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        if(storehouse_name == "全部"){
+          return ""
+        }else{
+          return storehouse_name
+        }
+      },
+      changeHouseList(){
+        this.houseList = []
+        this.getlist()
       }
     },
     created(){
-        // var nowDate = new Date();
-        // var nowYear = nowDate.getFullYear();
-        // var nowMonth = nowDate.getMonth() + 1;
-        // var nowDay = nowDate.getDate();
-        // this.end_time =
-        // nowYear +
-        // "-" +
-        // (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        // "-" +
-        // (nowDay < 10 ? "0" + nowDay : nowDay);
-        // nowDate.setMonth(nowDate.getMonth() - 1);
-        // nowYear = nowDate.getFullYear();
-        // nowMonth = nowDate.getMonth() + 1;
-        // nowDay = nowDate.getDate();
-        // this.start_time =
-        // nowYear +
-        // "-" +
-        // (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        // "-" +
-        // (nowDay < 10 ? "0" + nowDay : nowDay);
-         this.getlist()
+  
+       this.getlist()
     },
   
     mounted() {

src/xt_pages/stock/stockFlow.vue

@@ -68,6 +68,8 @@
              <span v-if="scope.row.consumable_type == 7">自动退库</span>
              <span v-if="scope.row.consumable_type == 10">盘盈</span>
              <span v-if="scope.row.consumable_type == 11">盘亏</span>
+             <span v-if="scope.row.consumable_type == 12">调拨出库</span>
+             <span v-if="scope.row.consumable_type == 13">调拨入库</span>
            </template>
         </el-table-column>
         <el-table-column prop="drug_name" label="出/入库单据编码" align="center">
@@ -78,25 +80,26 @@
             <span v-if="scope.row.consumable_type == 4 || scope.row.consumable_type == 7">{{scope.row.cancel_order_number}}</span>  
             <span v-if="scope.row.consumable_type == 10">{{scope.row.warehouse_out_order_number}}</span>
             <span v-if="scope.row.consumable_type == 11">{{scope.row.warehouse_out_order_number}}</span>
+            <span v-if="scope.row.consumable_type == 12">{{scope.row.warehouse_out_order_number}}</span>
+            <span v-if="scope.row.consumable_type == 13">{{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>{{getHouseName(scope.row.storehouse_id)}}</span>
+           </template>
         </el-table-column>
          <el-table-column prop="drug_name" label="数量"  align="center">
            <template slot-scope="scope">
              <span>{{scope.row.count}}{{packing_unit}}</span>
            </template>
         </el-table-column>
-     
-       <!-- <el-table-column label="是否退库" align="center">
-         <template slot-scope="scope">
-           <span v-if="scope.row.is_edit == 2">是</span>
-           <span v-if="scope.row.is_edit ==1">否</span>   
-         </template>
-       </el-table-column> -->
+   
 
        <!-- <el-table-column label="批次" align="center">
          <template slot-scope="scope">
@@ -170,10 +173,7 @@
         (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
         "-" +
         (nowDay < 10 ? "0" + nowDay : nowDay);
-      // this.getlist()
-      // this.getStockOutList()
-      // this.getStockDrugCount()
-    
+      
       this.getStockFlow()
       this.packing_unit = this.$route.query.packing_unit
     },
@@ -220,6 +220,8 @@
           {id:4,name:"手动退库"},
           {id:10,name:"盘盈"},
           {id:11,name:"盘亏"},
+          {id:12,name:"调拨出库"},
+          {id:13,name:"调拨入库"},
         ],
         countList:[],
         outCountList:[],
@@ -228,7 +230,8 @@
         obj:{},
         packing_unit:"",
         cancelCountList:[],
-        good:{}
+        good:{},
+        houseList:[],
       }
     },
     methods:{
@@ -345,17 +348,17 @@
       getStockDrugCount(params).then(response=>{
          if(response.data.state == 1){
            var count = response.data.data.count
-          //  console.log("详情入库统计",count)
+         
            this.countList = count
            var outlist = response.data.data.outList
-          //  console.log("详情出库数量",outlist)
+        
           
            this.outCountList = outlist
            var autoCount = response.data.data.autoCount
-          //  console.log("详情自动出库",autoCount)
+         
            this.autoCountList = autoCount
            var totalCount = response.data.data.totalCount
-          //  console.log("totalcount",totalCount)
+         
            this.cancelCountList = totalCount
          }
       })
@@ -370,7 +373,7 @@
         return count
         },
       getOutCount(id){
-        console.log("id222",id)
+       
         var count = ""
         for(let i=0;i<this.outCountList.length;i++){
           if(id == this.outCountList[i].good_id){
@@ -429,17 +432,25 @@
        getStockFlow(params).then(response=>{
           if(response.data.state == 1){
             var list =  response.data.data.list
-            console.log("list2323",list)
             var total = response.data.data.total
-            console.log("total",total)
             this.tableList = list
             this.total = total
             this.good = response.data.data.good
            var manufacturerList = response.data.data.manufacturerList
            this.manufacturerList = manufacturerList
+           this.houseList = response.data.data.houseList
           }
        })
-     }
+     },
+     getHouseName(id){
+        var storehouse_name = ""
+        for(let i=0;i<this.houseList.length;i++){
+          if(id == this.houseList[i].id){
+            storehouse_name = this.houseList[i].storehouse_name
+          }
+        }
+        return storehouse_name
+     },
     }
   }
 </script>

src/xt_pages/stock/stockInOrder.vue

@@ -15,10 +15,20 @@
     </div>
 
     <div class="app-container">
+      
       <div class="cell clearfix">
+        <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in list"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select>
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           v-model.trim="searchKey"
           class="filter-item"
           placeholder="单据编码/制单人/耗材名称"
@@ -110,12 +120,25 @@
           </template>
         </el-table-column>
 
+       <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
             {{ getXuserName(scope.row.creater) }}
           </template>
         </el-table-column>
 
+        <el-table-column label="入库方式" align="center">
+          <template slot-scope="scope">
+            <span v-if="scope.row.is_sys == 12">调拨入库</span>
+            <span v-if="scope.row.is_sys == 0">手动入库</span>
+          </template>
+        </el-table-column>
+
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
             <el-tooltip
@@ -203,6 +226,12 @@
             {{ scope.row.number}}
           </template>
         </el-table-column>
+         <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
+
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
             {{ scope.row.warehousing_count}}{{scope.row.GoodInfo.packing_unit}}
@@ -775,6 +804,8 @@ export default {
       order_id:0,
       exportList:[],
       checkAllStatus:false,
+      list:[],
+      storehouse_id:0,
     };
     
   
@@ -793,7 +824,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.Warehouse.warehouseDate = [];
       getWarehouseList(Params).then(response => {
@@ -807,6 +839,7 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
+        
         }
       });
     },
@@ -816,9 +849,10 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        storehouse_id:this.storehouse_id,
       };
-      console.log("parasm22222",Params)
+
       this.Warehouse.warehouseDate = [];
       getWarehouseList(Params).then(response => {
         if (response.data.state == 0) {
@@ -831,6 +865,13 @@ export default {
           for (let i = 0; i < response.data.data.list.length; i++) {
             this.Warehouse.warehouseDate.push(response.data.data.list[i]);
           }
+          this.list = []
+          var obj = {id:0,storehouse_name:"全部"}
+          this.list.push(obj)
+          for(let i=0;i<response.data.data.houselist.length;i++){
+            this.list.push(response.data.data.houselist[i])
+          }
+          
         }
       });
     },
@@ -890,7 +931,6 @@ export default {
     },
     fetchAllAdminUsers() {
       fetchAllAdminUsers().then(response => {
-        console.log(response);
         if (response.data.state == 1) {
           this.adminUserOptions = response.data.data.users;
           var alen = this.adminUserOptions.length;
@@ -922,8 +962,6 @@ export default {
       return name;
     },
     getTypeNameOne:function(id){
-      console.log("999999",this.goodInfo)
-     
       let name = "";
       for (let i = 0; i < this.goodInfo.length; i++) {
         if (this.goodInfo[i].id == id) {
@@ -960,7 +998,7 @@ export default {
       });
     },
     clicks: function() {
-      console.log(this.WarehouseInfo.warehouseInfoDate);
+
     },
     handleWarehouse: function() {
       this.$router.push({ path: "/stock/in/add", query: { type: this.type } });
@@ -1038,8 +1076,7 @@ export default {
         } else {
           this.manufacturer = response.data.data.manufacturer;
           this.dealer = response.data.data.dealer;
-          // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
-          // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
+          // this.list = response.data.data.list
           this.getlist()
         }
       });
@@ -1059,11 +1096,13 @@ export default {
       }
     },
     handleEdit: function(index, row) {
-      console.log("rowe232323232332",row)
-      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id})
+      this.$router.push({path:"/stock/in/order/edit?id="+row.id+"&supply_warehouse_id="+row.supply_warehouse_id+"&is_sys="+row.is_sys})
     },
     handleDelete: function(index, row) {
-     
+      if(row.is_sys== 12){
+        this.$message.error("调拨入库数据不能删除!")
+        return false
+      }
       if(row.supply_warehouse_id > 0){
         this.$message.error("采购入库单不能删除!")
         return false
@@ -1107,7 +1146,6 @@ export default {
     },
    
     select(selection) {
-      console.log("selection",selection)
       var ids= []
       for(let i=0;i<selection.length;i++){
         ids.push(selection[i].id)
@@ -1126,10 +1164,13 @@ export default {
       const ids = [];
       const idOne = []
       for (let i = 0; i < this.selectedTableData.length; i++) {
+        if(this.selectedTableData[i].is_sys ==12){
+          this.$message.error("调拨入库数据不能删除!")
+          return false
+        }
         ids.push(this.selectedTableData[i].id);
         idOne.push(this.selectedTableData[i].supply_warehouse_id)
       }
-      console.log("idson23322323",idOne)
       for(let i=0;i<idOne.length;i++){
         if(idOne[i] >0){
           this.$message.error("采购入库数据不能删除!")
@@ -1203,11 +1244,10 @@ export default {
 
             this.recordInfo.recordData.push(response.data.data.info[i]);
             this.tableList.push(response.data.data.info[i])
-            console.log("详情",this.tableList)
           }
            this.warehouse = response.data.data.warehousing;
            this.warehousing_time = this.getTime(this.warehouse.warehousing_time,"{y}-{m}-{d}");
-           console.log("单据日期",this.warehousing_time)
+
           this.WarehouseInfo.warehouse = response.data.data.warehousing;
          
         }
@@ -1336,7 +1376,7 @@ export default {
       this.$refs["tableForm"].validate(valid => {
         if (valid) {
           const array = this.recordInfo.recordData;
-          console.log('array',array)
+
           for (let i = 0; i < array.length; i++) {
             if (array[i].good_type_id == 0) {
               this.$message.error("商品类型不能为空");
@@ -1483,12 +1523,13 @@ export default {
         id:this.order_id,
         start_time:this.start_time,
         end_time:this.end_time,
+        storehouse_id:this.storehouse_id,
       }
-      console.log("params",params)
+     
       getExportStockList(params).then(response=>{
         if(response.data.state == 1){
            var list = response.data.data.list
-           console.log("数据导出222222",list)
+          
            for(let i=0;i<this.goodType.length;i++){
              for(let j=0;j<list.length;j++){
                if(this.goodType[i].id == list[j].good_type_id){
@@ -1506,15 +1547,12 @@ export default {
                   list[i].manufacturer = this.manufacturer[j].manufacturer_name
                }
             }
-           console.log("经销⬆商",this.dealer)
            for(let z=0;z<this.dealer.length;z++){
                if(list[i].dealer == this.dealer[z].id){
                  list[i].dealer = this.dealer[z].dealer_name
                }
             }
           }
-          console.log("表格2222222",this.exportList)
-          
           this.exportList = list
         }
       })
@@ -1545,7 +1583,7 @@ export default {
       const tHeader = ['耗材名称','耗材类型', '规格&单位','批号','入库数量','进货价','总价','生产厂家','生产日期','有效期','经销商','批准文号','备注']
       const filterVal = ['good_name', 'good_type_id', 'unit','number','warehousing_count','price','total_price','manufacturer','product_date','expiry_date','dealer','license_number','remark']
 
-      console.log("table",this.exportList)
+
      
       const data = this.formatJson(filterVal, this.exportList)
       excel.export_json_to_excel({
@@ -1559,6 +1597,19 @@ export default {
     formatJson(filterVal, jsonData) {
     return jsonData.map(v => filterVal.map(j => v[j]));
    },
+   getHouseName(id){
+    var storehouse_name = ""
+    for(let i=0;i<this.list.length;i++){
+        if(id == this.list[i].id){
+          storehouse_name = this.list[i].storehouse_name
+        }
+    }
+    return storehouse_name
+    },
+    changeStoreHouse(){
+      this.GetWarehouse();
+      this.getlist()
+    }
   }
 };
 </script>

src/xt_pages/stock/stockInOrderAdd.vue

@@ -20,6 +20,15 @@
 
 
       <div class="cell clearfix">
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+           </el-select>
         <label class="title"><span class="name">入库时间</span> : </label>
         <el-date-picker size="small" v-model="warehousing_time" prefix-icon="el-icon-date" :editable="false"
                         style="width: 196px;" type="date" placeholder="选择日期时间" align="right" format="yyyy-MM-dd"
@@ -378,6 +387,8 @@
         manufacturerList:[],
         goodList:[],
         loading:false,
+        list:[],
+        storehouse_id:"",
       }
     },
     methods: {
@@ -467,7 +478,8 @@
             }
           }
         })
-      }, GetConfigInfo: function() {
+      },
+      GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
           text: 'Loading',
@@ -490,6 +502,8 @@
             this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
             this.form.manufacturer = 0
             this.form.dealer = 0
+            this.list = response.data.data.list
+            this.storehouse_id = response.data.data.configlist.storehouse_info
           }
           loading.close()
 
@@ -660,12 +674,14 @@
       }
       ,
       submit() {
-        console.log("res23322332",this.$refs)
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             this.loading = true
             const array = this.recordInfo.recordData
-            console.log("array9999999",array)
+            if(this.storehouse_id == 0){
+              this.$message.error("仓库不能为空!")
+              return
+            }
             for (let i = 0; i < array.length; i++) {
               if (array[i].good_type_id == 0) {
                 this.$message.error('商品类型不能为空')
@@ -679,6 +695,7 @@
               this.$message.success('请添加入库商品')
               return
             }
+
             for(let i=0;i<this.recordInfo.recordData.length;i++){
              if(this.recordInfo.recordData[i].dealer == ""){
                 this.recordInfo.recordData[i].dealer = 0
@@ -707,9 +724,8 @@
             const params = {
               'stockIn': this.recordInfo.recordData
             }
-            console.log("stockIn",this.recordInfo.recordData)
-            
-            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type).then(response => {
+           
+            postWarehouse(params, this.warehousing_time, this.form.manufacturer, this.form.dealer, this.type,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.loading = false
                 this.$message.error(response.data.msg)
@@ -778,7 +794,6 @@
         this.currentIndex = val
       },
       handleSelect(val){
-         console.log("val3232232323",val)
          for(let i=0;i<this.recordInfo.recordData.length;i++){
            if(this.currentIndex == i){
               this.recordInfo.recordData[i].good_type_id = val.id
@@ -812,7 +827,8 @@
              
            }
          }
-      }
+      },
+   
     }
     ,
     created() {
@@ -846,8 +862,6 @@
       this.recordInfo.recordData.push(tempObj)
       this.GetConfigInfo()
       this.propForm.goodUnit = this.$store.getters.good_unit
-
-      console.log("单位",this.getDataConfig('hemodialysis','units'))
     }
 
   }

src/xt_pages/stock/stockInOrderEdit.vue

@@ -34,6 +34,15 @@
       ></stock-in-dialog>
 
       <div class="cell clearfix">
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+          </el-select>
         <label class="title"><span class="name">入库时间</span> : </label>
         <el-date-picker
           size="small"
@@ -402,6 +411,8 @@ export default {
       numberList:[],
       loading:false,
       disabled:false,
+      storehouse_id:0,
+      list:[],
     };
   },
   methods: {
@@ -468,6 +479,7 @@ export default {
           this.dealer = response.data.data.dealer;
           this.goodType = response.data.data.goodType;
           this.goodInfo = response.data.data.goodInfo;
+          this.list = response.data.data.list
           // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
           // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
         }
@@ -497,6 +509,11 @@ export default {
         this.$message.error("采购入库数据不能新增!")
         return false
       }
+      
+      if(parseInt(this.$route.query.is_sys) >0){
+        this.$message.error("调拨入库数据不能新增!")
+        return false
+      }
       const tempObj = {};
       tempObj["id"] = 0;
       tempObj["good_type_id"] = 0;
@@ -514,6 +531,10 @@ export default {
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
+      if(parseInt(this.$route.query.is_sys) >0){
+        this.$message.error("调拨入库数据不能删除!")
+        return false
+      }
       if(row.supply_warehouse_id >0){
         this.$message.error("采购入库数据不能删除!")
         return false
@@ -629,6 +650,10 @@ export default {
         if (valid) {
           this.loading = true
           const array = this.recordInfo.recordData;
+          if(this.storehouse_id == 0){
+            this.$message.error("仓库不能为空!")
+            return
+          }    
           for (let i = 0; i < array.length; i++) {
             if (array[i].good_type_id == 0) {
               this.$message.error("商品类型不能为空");
@@ -661,7 +686,7 @@ export default {
           const params = {
             stockIn: this.recordInfo.recordData
           };
-          console.log("params2222",params)
+          
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -674,7 +699,8 @@ export default {
             this.$route.query.id,
             this.$route.query.type,
             this.form.manufacturer,
-            this.form.dealer
+            this.form.dealer,
+            this.storehouse_id,
           ).then(response => {
             if (response.data.state == 0) {
               this.loading =false
@@ -697,13 +723,13 @@ export default {
       const params = {
         id: order_id
       };
-      console.log("parm2222222222",params)
+
       getWarehouseInfoList(params).then(response => {
         if (response.data.state == 0) {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          console.log("列表2222222",response.data.data.info)
+        
          
           for (let i = 0; i < response.data.data.info.length; i++) {
             response.data.data.info[i].product_date = this.getTime(
@@ -729,12 +755,12 @@ export default {
            
             this.recordInfo.recordData.push(response.data.data.info[i]);
            
-            console.log("列表",this.recordInfo.recordData)
+           
           }
 
           this.warehouse = response.data.data.warehousing;
-          console.log("jhhahfhh",this.warehouse)
- 
+          this.storehouse_id = response.data.data.warehousing[0].storehouse_id
+       
           this.warehousing_time = this.getTime(
             this.warehouse[0].warehousing_time,
             "{y}-{m}-{d}"
@@ -835,9 +861,13 @@ export default {
     this.propForm.goodUnit = this.$store.getters.good_unit;
     const order_id = this.$route.query.id;
     var supply_warehouse_id =  parseInt(this.$route.query.supply_warehouse_id)  
+    var is_sys = parseInt(this.$route.query.is_sys)
     if(supply_warehouse_id > 0){
       this.disabled = true
     }
+    if(is_sys == 12){
+      this.disabled = true
+    }
     this.GetOrderDetail(order_id);
 
   }

src/xt_pages/stock/stockOutOrder.vue

@@ -14,9 +14,18 @@
     </div>
     <div class="app-container">
       <div class="cell clearfix">
+        <label class="title"><span class="name">仓库</span> :</label>
+        <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" @change="changeStoreHouse">
+            <el-option
+              v-for="(option, index) in houselist"
+              :key="index"
+              :label="option.storehouse_name"
+              :value="option.id">
+            </el-option>
+        </el-select> 
         <el-input
           size="small"
-          style="width: 400px;"
+          style="width: 200px;"
           class="filter-item"
           v-model.trim="searchKey"
           placeholder="单据编码/制单人/耗材名称"
@@ -103,6 +112,12 @@
             {{ scope.row.warehouse_out_order_number }}
           </template>
         </el-table-column>
+       
+        <el-table-column label="仓库名称" align="center">
+          <template slot-scope="scope">
+            {{getHouseName(scope.row.storehouse_id)}}
+          </template>
+        </el-table-column>
 
         <el-table-column label="制单人" align="center">
           <template slot-scope="scope">
@@ -114,6 +129,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.is_sys == 1">自动出库</span>
             <span v-if="scope.row.is_sys == 0">手动出库</span>
+            <span v-if="scope.row.is_sys == 12">调拨出库</span>
           </template>
         </el-table-column>
        
@@ -197,6 +213,12 @@
               {{ scope.row.social_security_directory_code}}
             </template>
           </el-table-column>
+
+          <el-table-column label="仓库名称" align="center">
+            <template slot-scope="scope">
+              {{getHouseName(scope.row.storehouse_id)}}
+            </template>
+          </el-table-column>
          
           <el-table-column label="出库数量" align="center">
             <template slot-scope="scope">
@@ -204,6 +226,11 @@
               <span v-if="scope.row.is_sys == 1">{{getOutStockCount(scope.row.good_id)}}{{scope.row.packing_unit}}</span> 
             </template>
           </el-table-column>
+          <el-table-column label="出库对象" align="center" v-if="is_sys== 0">
+            <template slot-scope="scope">
+             {{getXuserName(scope.row.admin_user_id)}}
+            </template>
+          </el-table-column>
           <el-table-column label="出货价" align="center">
             <template slot-scope="scope">
               <span v-if="scope.row.price >0">{{ scope.row.price}}</span> 
@@ -788,7 +815,11 @@ export default {
       exportList:[],
       is_sys:0,
       infoList:[],
-      stockFlowList:[]
+      stockFlowList:[],
+      list:[],
+      houselist:[],
+      storehouse_id:0,
+      is_sys:0,
     };
   },
   methods: {
@@ -799,7 +830,8 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type,
-        keywords: this.searchKey
+        keywords: this.searchKey,
+        storehouse_id:this.storehouse_id,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then(response => {
@@ -826,7 +858,8 @@ export default {
         limit: this.limit,
         start_time: this.start_time,
         end_time: this.end_time,
-        type: this.type
+        type: this.type,
+        storehouse_id:this.storehouse_id,
       };
       this.warehouseOutDate = [];
       getWarehouseOutList(Params).then(response => {
@@ -834,14 +867,18 @@ export default {
           this.$message.error(response.data.msg);
           return false;
         } else {
-          console.log("parsm",response.data.data)
-          
+         
           this.total = response.data.data.total;
           for (let i = 0; i < response.data.data.list.length; i++) {
             
             this.warehouseOutDate.push(response.data.data.list[i]);
           }
-          console.log("2222222",this.warehouseOutDate)
+          var obj = {id:0,storehouse_name:"全部"}
+          this.houselist = []
+          this.houselist.push(obj)
+          for(let i=0;i<response.data.data.houselist.length;i++){
+            this.houselist.push(response.data.data.houselist[i])
+          }
         }
       });
     },
@@ -933,6 +970,7 @@ export default {
           this.dealer = response.data.data.dealer;
           this.goodInfo = response.data.data.goodInfo
           this.goodType = response.data.data.goodType
+          this.list = response.data.data.list
           // this.manufacturer.splice(0, 0, { id: 0, manufacturer_name: "全部" });
           // this.dealer.splice(0, 0, { id: 0, dealer_name: "全部" });
           this.getlist()
@@ -958,7 +996,10 @@ export default {
        
     },
     handleDelete: function(index, row) {
-     
+      if(row.is_sys == 12){
+        this.$message.error("调拨出库数据不能删除!")
+        return false
+      }
       if(row.supply_cancel_out_id >0){
         this.$message.error("采购出库数据不能删除!")
         return false
@@ -1034,6 +1075,10 @@ export default {
         if(this.selectedTableData[i].is_sys == 1){
           this.$message.error("自动出库数据不能删除!")
           return false
+        }
+        if(this.selectedTableData[i].is_sys ==12){
+          this.$message.error("调拨出库数据不能删除!")
+          return false
         }
          if(this.selectedTableData[i].is_sys == 0){
            ids.push(this.selectedTableData[i].id);
@@ -1075,15 +1120,16 @@ export default {
               }
             }
           });
-        })
-        .catch(() => {});
+        }).catch(() => {});
     },
 
 
     handleSearch(val){
+      this.is_sys = val.is_sys
       this.tableList = []
       this.editdialogVisibleThree = false
       this.GetOrderDetailOne(val.id)
+
       this.GetTotalCount(val.warehouse_out_time)
     },
   
@@ -1678,6 +1724,23 @@ export default {
      }
      arr = this.unique(arr)
      return arr.join(',')
+   },
+   getHouseName(id){
+    var storehouse_name = ""
+    for(let i=0;i<this.houselist.length;i++){
+        if(id == this.houselist[i].id){
+          storehouse_name = this.houselist[i].storehouse_name
+        }
+    }
+    if(storehouse_name == "全部"){
+      return ""
+    }else{
+       return storehouse_name
+    }
+   
+   },
+   changeStoreHouse(){
+     this.GetWarehouseOut()
    }
   }
 };

src/xt_pages/stock/stockOutOrderAdd.vue

@@ -37,6 +37,15 @@
 
 
       <div class="cell clearfix">
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px">
+              <el-option
+                v-for="(option, index) in list"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+         </el-select>
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker
           size="small"
@@ -140,6 +149,19 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="出库对象"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.admin_user_id" filterable placeholder="请选择出库对象">
+                <el-option
+                  v-for="(option, index) in doctorList"
+                  :key="index"
+                  :label="option.user_name"
+                  :value="option.admin_user_id">
+                </el-option>
+               </el-select>
+            </template>   
+          </el-table-column>
+
           <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>出货单价<span style="color: red">*</span></span>
@@ -339,6 +361,9 @@ export default {
       goodList:[],
       manufacturerList:[],
       numberList:[],
+      storehouse_id:"",
+      list:[],
+      doctorList:[],
     };
   },
   methods: {
@@ -347,7 +372,7 @@ export default {
       this.propForm.goods = []
 
       this.$refs.dialog.hide()
-      console.log(val)
+    
       if (val.selectedGoodInfo.length > 0) {
         for (let i = val.selectedGoodInfo.length - 1; i >= 0; i--) {
           if (i == 0) {
@@ -401,7 +426,9 @@ export default {
           this.dealer.splice(0, 0, { id: 0, dealer_name: '全部' })
           this.manufacturer.splice(0, 0, { id: -1, manufacturer_name: '其他' })
           this.dealer.splice(0, 0, { id: -1, dealer_name: '其他' })
-
+          this.list = response.data.data.list
+          this.storehouse_id = response.data.data.configlist.storehouse_out_info
+          this.doctorList =  response.data.data.doctorList
         }
       });
     },
@@ -446,6 +473,7 @@ export default {
       tempObj["product_date"] = ""
       tempObj["license_number"] = ""
       tempObj["warehouse_info_id"] = 0
+      tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
       this.recordInfo.recordData.push(tempObj);
     },
     handleDelete: function(index, row) {
@@ -530,7 +558,7 @@ export default {
             this.propForm.goods.push(goodObj)
 
           }
-          console.log( this.propForm.goods)
+       
         }
       )
 
@@ -573,6 +601,7 @@ export default {
            
              this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
           }
+       
           for(let i=0;i<this.recordInfo.recordData.length;i++){
             for(let j=0;j<this.manufacturerList.length;j++){
               if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
@@ -590,10 +619,19 @@ export default {
                    this.recordInfo.recordData[i].number = this.numberList[y].number
                }
             }
+            
+            for(let s=0;s<this.doctorList.length;s++){
+
+              if(this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name){
+                this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id
+              }
+
+            }
           }
           const params = {
             stockOut: this.recordInfo.recordData
           };
+        
           const loading = this.$loading({
             lock: true,
             text: 'Loading',
@@ -605,7 +643,8 @@ export default {
             this.warehouse_out_time,
             this.form.dealer,
             this.form.manufacturer,
-            this.type
+            this.type,
+            this.storehouse_id
           ).then(response => {
             if (response.data.state == 0) {
               this.$message.error("库存不足")
@@ -615,7 +654,8 @@ export default {
                var msg = response.data.data.msg
                var good_name = response.data.data.good_name
                var specification_name = response.data.data.specification_name
-               var str = good_name +"*" + specification_name +"无库存,请入库"
+               var storehose_name = response.data.data.storehose_name
+               var str = storehose_name + " " + good_name +"*" + specification_name +"无库存,请入库"
              
                if(msg == 1){
                   this.$message.error(str)
@@ -646,11 +686,11 @@ export default {
       if (keyword != undefined) {
         key = keyword
       }
-      console.log("keyrowrd",key)
+
       postSearchGoodList(key).then(response => {
         if (response.data.state == 1) {
             var list = response.data.data.list
-            console.log("33334445555",list)
+          
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
             this.manufacturerList = manufacturerList
@@ -681,14 +721,14 @@ export default {
       this.currentIndex = val
     },
     handleSelect(val){
-       
+       console.log("val232323",val)
         var arr = []
         for(let i=0;i<this.recordInfo.recordData.length;i++){
            arr.push(this.recordInfo.recordData[i].good_id)
         }
        
         var str = arr.join(",")
-        console.log("str",str,"good_id",val.id)
+       
         if(str.indexOf(val.id)!=-1){
           this.$message.error("该耗材已存在列表中")
           return
@@ -703,6 +743,7 @@ export default {
             this.recordInfo.recordData[i].name = val.specification_name +"/"+val.packing_unit
             this.recordInfo.recordData[i].manufacturer = val.manufacturer
             this.recordInfo.recordData[i].remark = val.remark
+          
             if(val.packing_price == 0){
               this.recordInfo.recordData[i].price =""
             }else{
@@ -729,7 +770,7 @@ export default {
       getStockBatchNumber(params).then(response=>{
         if(response.data.state == 1){
           var list = response.data.data.list
-          console.log("list2243444",list)
+ 
           this.numberList = list
         }
      })
@@ -738,19 +779,17 @@ export default {
       return getDataConfig(module, filed_name)
     },
     changeNumberList(val,index){
-
        for(let i=0;i<this.recordInfo.recordData.length;i++){
-        //  if(val.good_id == this.recordInfo.recordData[i].good_id){
-        //     this.recordInfo.recordData[i].warehouse_info_id = val.number
-        //  }
          if(index == i){
           this.recordInfo.recordData[i].warehouse_info_id = val.number
          }
        }  
-      console.log("表格",this.recordInfo.recordData)
-    }
+    
+    },
+    
   },
   created() {
+   
     var nowDate = new Date();
     var nowYear = nowDate.getFullYear();
     var nowMonth = nowDate.getMonth() + 1;
@@ -773,12 +812,13 @@ export default {
     tempObj["dealer"] = ""
     tempObj["license_number"] = ""
     tempObj["warehouse_info_id"] = 0
-    
+    tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
     this.recordInfo.recordData.push(tempObj);
     this.GetConfigInfo();
+  
     this.propForm.goodUnit = this.$store.getters.good_unit;
     this.unitList =  getDataConfig('hemodialysis','units')
-    console.log("单位",this.unitList)
+ 
   }
 };
 </script>

src/xt_pages/stock/stockOutOrderEdit.vue

@@ -13,7 +13,7 @@
 
     <div class="app-container">
 
-  
+
       <stock-in-dialog
         ref="dialog"
         :propForm="propForm"
@@ -24,6 +24,15 @@
       </stock-in-dialog>
 
       <div class="cell clearfix">
+         <label class="title"><span class="name"><span style="color:red">*</span>仓库</span> :</label>
+         <el-select size="small" v-model="storehouse_id" filterable placeholder="请选择仓库" style="width:200px" :disabled="true">
+              <el-option
+                v-for="(option, index) in storelist"
+                :key="index"
+                :label="option.storehouse_name"
+                :value="option.id">
+              </el-option>
+         </el-select>
         <label class="title"><span class="name">出库时间</span> : </label>
         <el-date-picker size="small" v-model="warehouse_out_time" prefix-icon="el-icon-date" :disabled="stockShow"
                         style="width: 200px;"
@@ -32,7 +41,7 @@
       </div>
 
 
-    
+
 
 
 
@@ -41,7 +50,7 @@
                   max-height="450" :header-cell-style="{ backgroundColor: 'rgb(245, 247, 250)'}"
         >
 
-       
+
           <el-table-column width="200" align="center">
               <template slot="header" slot-scope="scope">
                 <span>耗材名称</span>
@@ -60,7 +69,7 @@
                       @input="changeGoodName(scope.$index)"
                       style="width:150px;"
                       :disabled="stockShow"
-                      
+
                     >
                       <i class="el-icon-search el-input__icon" slot="suffix"></i>
                     <template slot-scope="{ item }">
@@ -86,8 +95,8 @@
               </el-form-item>
             </template>
           </el-table-column>
-          
-             
+
+
           <el-table-column width="140" align="center">
             <template slot="header" slot-scope="scope">
               <span>规格&单位<span style="color: red">*</span></span>
@@ -116,13 +125,13 @@
               </el-form-item>
             </template>
           </el-table-column> -->
-         
+
           <el-table-column width="150" align="center">
             <template slot="header" slot-scope="scope">
               <span>单价<span style="color: red">*</span></span>
             </template>
             <template slot-scope="scope">
-         
+
               <el-form-item :prop="'recordData.' + scope.$index + '.price'" :rules='tableRules.price'
                             style="padding-top: 17px">
                 <el-input type="number" v-model="scope.row.price"  :disabled="stockShow"></el-input>
@@ -144,6 +153,19 @@
             </template>
           </el-table-column>
 
+          <el-table-column label="出库对象"  width="150" align="center">
+            <template slot-scope="scope">
+               <el-select size="small" v-model="scope.row.admin_user_id" filterable placeholder="请选择厂商"  :disabled="stockShow">
+                <el-option
+                  v-for="(option, index) in doctorList"
+                  :key="index"
+                  :label="option.user_name"
+                  :value="option.admin_user_id">
+                </el-option>
+               </el-select>
+            </template>
+          </el-table-column>
+
           <el-table-column label="总价" width="150" align="center">
             <template slot-scope="scope">
               {{calculate(scope.row.price*scope.row.count)}}
@@ -159,7 +181,7 @@
                   :value="option.id">
                 </el-option>
                </el-select>
-            </template>   
+            </template>
           </el-table-column>
          <el-table-column label="生产日期"  width="150" align="center">
            <template slot-scope="scope">
@@ -190,7 +212,7 @@
               ></el-date-picker>
             </template>
           </el-table-column>
-          
+
         <el-table-column  width="150" align="center">
             <template slot="header" slot-scope="scope">
             <span>批准文号<span style="color: red"></span></span>
@@ -210,7 +232,7 @@
                   :value="option.id">
                 </el-option>
                </el-select>
-            </template>   
+            </template>
           </el-table-column>
 
           <el-table-column label="备注" width="150" align="center">
@@ -322,7 +344,9 @@
         numberList:[],
         stockShow:false,
         stockTrue:true,
-       
+        storelist:[],
+        storehouse_id:"",
+        doctorList:[],
       }
     },
     methods: {
@@ -364,7 +388,7 @@
         this.propForm.goods = [];
 
         this.propForm.goodType = [];
-      }, 
+      },
       GetConfigInfo: function() {
         const loading = this.$loading({
           lock: true,
@@ -400,11 +424,15 @@
           }
         }
         return name;
-      }, 
+      },
       handleEdit: function(index, row) {
+       if(parseInt(this.$route.query.is_sys) == 12){
+         this.$message.error("调拨出库数据不能新增!")
+          return
+       }
        if(row.supply_cancel_out_id >0){
           this.$message.error("采购出库数据不能新增!")
-          return 
+          return
         }
         this.stockTrue = false
         if(this.stockShow == true){
@@ -422,15 +450,19 @@
         tempObj['license_number'] = ""
         tempObj['dealer'] = ""
         tempObj['manufacturer'] = ""
+        tempObj["admin_user_id"] = this.$store.getters.xt_user.user.user_name
         this.recordInfo.recordData.push(tempObj)
-      }, 
+      },
       handleDelete: function(index, row) {
-      
+       if(parseInt(this.$route.query.is_sys) == 12){
+         this.$message.error("调拨出库数据不能删除!")
+          return
+       }
         if(row.supply_cancel_out_id >0){
           this.$message.error("采购出库数据不能删除!")
-          return 
+          return
         }
- 
+
         if(this.stockShow == true){
          this.$message.error("自动出库数据无法删除")
          return
@@ -534,7 +566,7 @@
         this.$router.go(-1)
       },
        submit() {
-       
+
         this.$refs['tableForm'].validate((valid) => {
           if (valid) {
             const array = this.recordInfo.recordData
@@ -554,12 +586,12 @@
              }
               if(this.recordInfo.recordData[i].expiry_date == "" || this.recordInfo.recordData[i].expiry_date == undefined){
                 this.recordInfo.recordData[i].expiry_date = ""
-              } 
+              }
               if(this.recordInfo.recordData[i].product_date == "" || this.recordInfo.recordData[i].product_date == undefined){
                 this.recordInfo.recordData[i].product_date = ""
               }
                this.recordInfo.recordData[i].price = this.recordInfo.recordData[i].price.toString()
-            
+
               for(let j=0;j<this.manufacturerList.length;j++){
                 if(this.recordInfo.recordData[i].manufacturer == this.manufacturerList[j].manufacturer_name){
                   this.recordInfo.recordData[i].manufacturer = this.manufacturerList[j].id
@@ -571,11 +603,20 @@
                 }
               }
 
-            for(let y=0;y<this.numberList.length;y++){
+             for(let y=0;y<this.numberList.length;y++){
                if(this.recordInfo.recordData[i].number == this.numberList[y].id){
                    this.recordInfo.recordData[i].number = this.numberList[y].number
                }
              }
+
+
+              for(let s=0;s<this.doctorList.length;s++){
+
+                if(this.recordInfo.recordData[i].admin_user_id == this.doctorList[s].user_name){
+                  this.recordInfo.recordData[i].admin_user_id = this.doctorList[s].admin_user_id
+                }
+
+              }
             }
               const loading = this.$loading({
                 lock: true,
@@ -587,11 +628,12 @@
               'warehouse_out_time':this.warehouse_out_time,
               'stockOut': this.recordInfo.recordData,
               "warehout_id":parseInt(this.$route.query.id),
+              "storehouse_id":parseInt(this.storehouse_id),
             }
-           
-            console.log("stockout",params,this.$route.query.id)
+
+
             var warehout_id = parseInt(this.$route.query.id)
-            editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer).then(response => {
+            editWarehouseoutInfo(params, this.warehouse_out_time, warehout_id, this.$route.query.type, this.form.manufacturer, this.form.dealer,this.storehouse_id).then(response => {
               if (response.data.state == 0) {
                 this.$message.error(response.data.msg)
                 loading.close()
@@ -611,7 +653,7 @@
                   var good_name = response.data.data.good_name
                   var specification_name = response.data.data.specification_name
                   var str = good_name +"*" + specification_name +"无库存,请入库"
-                
+
                   if(msg == 7){
                     this.$message.error(str)
                   }
@@ -626,7 +668,7 @@
             return false
           }
         })
-      }, 
+      },
      calculate: function(val) {
         if (val == 0) {
           return ''
@@ -642,10 +684,10 @@
       if (keyword != undefined) {
         key = keyword
       }
-      console.log("keyrowrd",key)
+
       postSearchGoodList(key).then(response => {
         if (response.data.state == 1) {
-          
+
             var list = response.data.data.list
             this.goodList = list
             var manufacturerList = response.data.data.manufacturerList
@@ -662,7 +704,7 @@
                 }
               }
             }
-          
+
             cb(this.goodList)
         } else {
           cb([])
@@ -678,7 +720,7 @@
            arr.push(this.recordInfo.recordData[i].good_id)
         }
         var str = arr.join(",")
-        console.log("str",str,"good_id",val.id)
+
         if(str.indexOf(val.id)!=-1){
           this.$message.error("该耗材已存在列表中")
           return
@@ -699,7 +741,7 @@
             }else{
                this.recordInfo.recordData[i].price = val.packing_price
             }
-           
+
             this.recordInfo.recordData[i].specification_name = val.specification_name
             this.recordInfo.recordData[i].good_id = val.id
              if(val.dealer == 0){
@@ -707,7 +749,7 @@
              }else{
                this.recordInfo.recordData[i].dealer = val.dealer
              }
-           
+
          }
       }
     },
@@ -724,15 +766,16 @@
         }
       getSingleOutOrderDetail(params).then(response=>{
         if(response.data.state == 1){
-         
+
           var dealerList = response.data.data.dealerList
           this.dealerList = dealerList
           var manufacturerList = response.data.data.manufacturerList
-         
+
           this.manufacturerList = manufacturerList
           this.goodType = response.data.data.goodType
+          this.doctorList = response.data.data.doctorlist
           for (let i = 0; i < response.data.data.list.length; i++) {
-           
+
             response.data.data.list[i].price = response.data.data.list[i].price.toString()
             response.data.data.list[i].count = response.data.data.list[i].count.toString()
             response.data.data.list[i].good_name = response.data.data.list[i].good_name
@@ -741,6 +784,7 @@
             response.data.data.list[i].expiry_date = this.getTime(response.data.data.list[i].expiry_date,"{y}-{m}-{d}")
             response.data.data.list[i].product_date = this.getTime(response.data.data.list[i].product_date,"{y}-{m}-{d}")
             response.data.data.list[i].remark = response.data.data.list[i].remark
+
             if(response.data.data.list[i].dealer == 0){
                response.data.data.list[i].dealer = ""
             }
@@ -749,6 +793,9 @@
             }
             this.recordInfo.recordData.push(response.data.data.list[i])
           }
+          this.storelist = response.data.data.storelist
+          this.warehouse_out_time = this.getTime(response.data.data.out.warehouse_out_time,"{y}-{m}-{d}")
+          this.storehouse_id = response.data.data.out.storehouse_id
           loading.close();
         }
       })
@@ -760,34 +807,36 @@
         getStockBatchNumber(params).then(response=>{
           if(response.data.state == 1){
             var list = response.data.data.list
-           
+
+
             this.numberList = list
           }
        })
       },
      changeNumberList(val,index){
-       
+
+
        for(let i=0;i<this.recordInfo.recordData.length;i++){
          if(index == i){
             this.recordInfo.recordData[i].warehouse_info_id = val.number
          }
-       }  
-      console.log("表格",this.recordInfo.recordData)
+       }
+
      }
     },
     created() {
-      var nowDate = new Date();
-      var nowYear = nowDate.getFullYear();
-      var nowMonth = nowDate.getMonth() + 1;
-      var nowDay = nowDate.getDate();
-      this.warehouse_out_time =
-        nowYear +
-        "-" +
-        (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
-        "-" +
-        (nowDay < 10 ? "0" + nowDay : nowDay);
+      // var nowDate = new Date();
+      // var nowYear = nowDate.getFullYear();
+      // var nowMonth = nowDate.getMonth() + 1;
+      // var nowDay = nowDate.getDate();
+      // this.warehouse_out_time =
+      //   nowYear +
+      //   "-" +
+      //   (nowMonth < 10 ? "0" + nowMonth : nowMonth) +
+      //   "-" +
+      //   (nowDay < 10 ? "0" + nowDay : nowDay);
       this.propForm.goodUnit = this.$store.getters.good_unit
-      const order_id = this.$route.query.id  
+      const order_id = this.$route.query.id
       this.getSingleOutOrderDetail(order_id)
       var is_sys = this.$route.query.is_sys
       if(is_sys == 0){
@@ -796,10 +845,13 @@
       if(is_sys == 1){
         this.stockShow = true
       }
+      if(is_sys == 12){
+        this.stockShow = true
+      }
       if(parseInt(this.$route.query.supply_cancel_out_id) >0){
         this.stockShow = true
       }
-      
+
     }
 
   }

src/xt_pages/stock/stockQuery.vue

@@ -13,6 +13,30 @@
         "
       >
         <div>
+          <span>仓库名称:</span>
+          <el-select v-model="storehouse_id" style="width:200px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeStorehouseName">
+            <el-option
+              v-for="item in houseList"
+              :key="item.id"
+              :label="item.storehouse_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <span>耗材名称:</span>
+          <el-select v-model="good_id" style="width:250px;margin-right:10px;" placeholder="请选择"
+          filterable
+           @change="changeGoodName">
+            <el-option
+              v-for="item in goodList"
+              :key="item.id"
+              :label="item.good_name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+          <!-- <el-select v-model="type_name" style="width:140px;margin-right:10px;" placeholder="请选择"
+          @change="changeTypeName">
           <el-select
             v-model="type_name"
             style="width: 140px; margin-right: 10px"
@@ -26,8 +50,8 @@
               :value="item.id"
             >
             </el-option>
-          </el-select>
-          <el-date-picker
+          </el-select> -->
+          <!-- <el-date-picker
             size="small"
             v-model="start_time"
             prefix-icon="el-icon-date"
@@ -55,20 +79,35 @@
             @change="endTimeChange"
           ></el-date-picker>
           <el-input
+           ></el-date-picker>-
+            <el-date-picker
+              size="small"
+              v-model="end_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="endTimeChange"
+          ></el-date-picker> -->
+          <!-- <el-input
             size="small"
             style="width: 200px; margin-left: 10px"
             class="filter-item"
             v-model.trim="keywords"
             placeholder="耗材名称"
-          />
-          <el-button
+          /> -->
+          <!-- <el-button
             size="small"
             class="filter-item"
             type="primary"
             icon="el-icon-search"
             @click="search"
             >搜索</el-button
-          >
+          > -->
         </div>
         <div>
           <el-button size="small" type="primary" @click="exportList"
@@ -81,6 +120,8 @@
       </div>
 
       <el-table
+       <el-table
+        :cell-class-name="cellStyle"
         :row-style="{ color: '#303133' }"
         :header-cell-style="{
           backgroundColor: 'rgb(245, 247, 250)',
@@ -90,6 +131,7 @@
         :class="signAndWeighBoxPatients"
         border
         v-loading="WarehouseInfo.loading"
+        :span-method="objectOneMethod"
       >
         <el-table-column label="耗材类型" align="center">
           <template slot-scope="scope">
@@ -131,6 +173,59 @@
             </span>
           </template>
         </el-table-column>
+       <el-table-column label="仓库名称" align="center" width="150">
+          <template slot-scope="scope">
+            <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center" >
+               {{getHouseName(item.storehouse_id)}}
+              </td>
+            </tr>
+          </template>
+        </el-table-column>
+       <el-table-column label="入库数量" align="center">
+         <template slot-scope="scope">
+
+            <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+               {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id)}}
+              </td>
+            </tr>
+         </template>
+       </el-table-column>
+       <el-table-column label="出库数量" align="center">
+         <template slot-scope="scope">
+          <span>
+             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+              {{getWareInfoCount(scope.row.xt_warehouse_info,item.storehouse_id) - getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}
+              </td>
+            </tr>
+         </span>
+
+         </template>
+       </el-table-column>
+
+        <el-table-column label="剩余库存量" align="center">
+         <template slot-scope="scope">
+             <tr style="background: none" v-for="(item,index) in scope.row.warehouse_info" :key="index">
+              <td style="border-right: none; border-inline-end: none;text-align: center">
+               {{getWareInfoCountOne(scope.row.xt_warehouse_info,item.storehouse_id)}}
+              </td>
+            </tr>
+         </template>
+       </el-table-column>
+
+       <el-table-column label="总库存量" align="center">
+         <template slot-scope="scope">
+           {{getOverFlushInfo(scope.row.xt_warehouse_info)}}
+         </template>
+       </el-table-column>
+
+      <el-table-column label="总库存量" align="center" v-if="showTwo">
+         <template slot-scope="scope">
+          <span>{{getWareInfoCountTwo(scope.row.xt_warehouse_info)}} </span>
+         </template>
+       </el-table-column>
         <el-table-column label="入库数量" align="center">
           <template slot-scope="scope">
               <span
@@ -139,7 +234,7 @@
                 {{ getWareInfo(scope.row.xt_warehouse_info)
                 }}{{ scope.row.packing_unit }}
               </span>
-           
+
             <!-- <span v-if="getWareInfo(scope.row.xt_warehouse_info)>0">{{getWareInfo(scope.row.xt_warehouse_info)}}{{scope.row.packing_unit}}</span> -->
           </template>
         </el-table-column>
@@ -183,7 +278,7 @@
 
         <el-table-column label="剩余库存量" align="center" v-if="showThree">
           <template slot-scope="scope">
-           
+
               <span
                 v-if="
                   org_id == 9671 ||
@@ -217,7 +312,7 @@
                   getCancelCount(scope.row.id)
                 }}
               </span>
-           
+
             <!-- <span
               v-if="
                 org_id == 9671 ||
@@ -271,6 +366,7 @@
           </template>
         </el-table-column>
 
+       <el-table-column label="操作" align="center" width="200px">
         <el-table-column label="操作" align="center" width="260px">
           <template slot-scope="scope">
             <el-button size="small" type="primary" @click="toClick(scope.row)"
@@ -367,6 +463,27 @@ export default {
       showTwo: false,
       showThree: true,
       showFour: false,
+      options:[],
+      value:"",
+      type_name:0,
+      types:[],
+      tableList:[],
+      manufacturerList:[],
+      countList:[],
+      outCountList:[],
+      autoCountList:[],
+      cancelCountList:[],
+      org_id:0,
+      showOne:true,
+      showTwo:false,
+      showThree:true,
+      showFour:false,
+      houseList:[],
+      storehouse_id:0,
+      goodList:[],
+      good_id:0,
+      tempArr:[],
+      storehouseList:[],
     };
   },
   methods: {
@@ -381,10 +498,38 @@ export default {
             type_name: "全部",
           };
           this.types.push(obj);
+           var obj = {
+            id:0,
+            type_name:'全部'
+          }
+          var objOne = {
+            id:0,
+            storehouse_name:"全部",
+          }
+          var objTwo = {
+            id:0,
+            good_name:"全部",
+          }
+          this.types.push(obj)
+          this.houseList.push(objOne)
+          this.goodList.push(objTwo)
           for (let i = 0; i < response.data.data.goodType.length; i++) {
             this.goodType.push(response.data.data.goodType[i]);
             this.types.push(response.data.data.goodType[i]);
           }
+          for(let i=0;i<response.data.data.houseList.length;i++){
+            this.houseList.push(response.data.data.houseList[i])
+          }
+          for(let i=0;i<response.data.data.goodInfo.length;i++){
+            for(let j=0;j<response.data.data.manufacturerList.length;j++){
+                if(response.data.data.goodInfo[i].manufacturer == response.data.data.manufacturerList[j].id){
+                   response.data.data.goodInfo[i].manufacturer = response.data.data.manufacturerList[j].manufacturer_name
+                }
+              }
+           response.data.data.goodInfo[i].good_name = response.data.data.goodInfo[i].good_name  + " " + response.data.data.goodInfo[i].specification_name + " " + response.data.data.goodInfo[i].manufacturer
+           this.goodList.push(response.data.data.goodInfo[i])
+          }
+          this.storehouseList = response.data.data.storehouseList
         }
       });
     },
@@ -480,6 +625,14 @@ export default {
         return "spanClass";
       }
     },
+        // 合并单元格样式
+    cellStyle({ row, column, rowIndex, columnIndex }) {
+      let arr = [6, 7, 8, 9];
+      if (arr.indexOf(columnIndex) > -1) {
+        return "spanClass";
+      }
+    },
+
 
     exportList() {
       import("@/vendor/Export2Excel").then((excel) => {
@@ -660,6 +813,11 @@ export default {
         start_time: this.start_time,
         end_time: this.end_time,
         type: this.type_name,
+        start_time:this.start_time,
+        end_time:this.end_time,
+        type:this.type_name,
+        good_id:this.good_id,
+        storehouse_id:this.storehouse_id,
       };
       console.log("params232322323", params);
       getAllStockList(params).then((response) => {
@@ -686,6 +844,16 @@ export default {
           this.manufacturerList = manufacturerList;
         }
       });
+    getAllStockList(params).then(response=>{
+      if(response.data.state == 1){
+          var list = response.data.data.list
+          this.tableList = list
+          var total = response.data.data.total
+          this.total = total
+          var manufacturerList = response.data.data.manufacturerList
+          this.manufacturerList = manufacturerList
+         }
+      })
     },
     getManufacture(id) {
       var name = "";
@@ -772,6 +940,24 @@ export default {
           this.cancelCountList = totalCount;
         }
       });
+    getStockDrugCount(){
+        var params ={
+           keywords: this.keywords,
+           start_time:this.start_time,
+           end_time:this.end_time,
+        }
+      getStockDrugCount(params).then(response=>{
+         if(response.data.state == 1){
+           var outlist = response.data.data.outList
+           this.outCountList = outlist
+           var autoCount = response.data.data.autoCount
+
+           this.autoCountList = autoCount
+           var totalCount = response.data.data.totalCount
+
+           this.cancelCountList = totalCount
+         }
+      })
     },
     getInCount(id) {
       var count = 0;
@@ -870,6 +1056,171 @@ export default {
       return cancle_toal;
     },
   },
+     return count
+   },
+   getAutoCount(id){
+     var count= 0
+     for(let i=0;i<this.autoCountList.length;i++){
+       if(id == this.autoCountList[i].good_id){
+         count = this.autoCountList[i].count
+       }
+     }
+     return count
+   },
+   getCancelCount(id){
+     var count = 0
+     for(let i=0;i<this.cancelCountList.length;i++){
+       if(id == this.cancelCountList[i].good_id){
+          count = this.cancelCountList[i].count
+       }
+     }
+     return count
+   },
+   getStockCount(id){
+     var stock_count = 0
+     for(let i=0;i<this.countList.length;i++){
+       if(id == this.countList[i].good_id){
+         stock_count = this.countList[i].stock_count
+       }
+     }
+     return stock_count
+   },
+   getWareInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+       for(let i=0;i<arr.length;i++){
+         total += parseInt(arr[i].warehousing_count)
+       }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverplus(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getCancelInfo(arr){
+     var total = 0
+     if(arr.length > 0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].count
+      }
+     }else{
+       total = ""
+     }
+     return total
+   },
+   getOverFlushInfo(arr){
+     var total = 0
+     if(arr.length >0){
+      for(let i=0;i<arr.length;i++){
+        total += arr[i].stock_count
+      }
+     }
+     return total
+   },
+   getCancelSotckInfo(arr){
+
+     var cancle_toal = 0
+     if(arr.length >0){
+      for(let z=0;z<arr.length;z++){
+        cancle_toal += arr[z].count
+      }
+     }
+     return cancle_toal
+   },
+   getHouseName(id){
+     var storehouse_name = ""
+     for(let i=0;i<this.storehouseList.length;i++){
+       if(id == this.storehouseList[i].id){
+         storehouse_name = this.storehouseList[i].storehouse_name
+       }
+     }
+     return storehouse_name
+   },
+   objectOneMethod({ row, column, rowIndex, columnIndex }) {
+     console.log("column",column)
+     console.log("rowindex",rowIndex)
+     console.log("columnninex",columnIndex)
+    //  if(columnIndex === 1){
+    //    if(rowIndex === 1){
+    //      return {
+    //         rowspan: 1,
+    //         colspan: 3
+    //       };
+    //    }
+    //  }
+   },
+   getWareInfoCount(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].warehousing_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getWareInfoCountOne(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         if(val[i].storehouse_id == storehouse_id){
+             count +=val[i].stock_count
+         }
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   getWareInfoCountTwo(val,storehouse_id){
+     var count = 0
+     if(val.length > 0){
+       for(let i=0;i<val.length;i++){
+         count +=val[i].stock_count
+       }
+     }
+     if(count > 0){
+       return count
+     }else{
+       return ""
+     }
+   },
+   changeStorehouseName(){
+     this.getlist()
+   },
+   changeGoodName(){
+    this.getlist()
+   },
+   arraySpanMethod({ row, column, rowIndex, columnIndex }) {
+     console.log("当前行",row)
+     console.log("当前列",column)
+     console.log("当前行号",rowIndex)
+     console.log("当前列号",columnIndex)
+     if(rowIndex == 1 && columnIndex === 4){
+       return {
+        rowspan: 2,
+        colspan: 1
+       };
+     }
+   },
+  }
 };
 </script>
 
@@ -944,4 +1295,26 @@ export default {
 .spanClass .cell tr:last-of-type td {
   border-bottom: none;
 }
+
+/* 合并表格线样式 */
+
+.spanClass .cell {
+  padding: 0 !important;
+}
+
+.spanClass .cell tr {
+  display: inline-block;
+  width: 100%;
+}
+
+.spanClass .cell tr td {
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+  display: block;
+  width: 100%;
+}
+.spanClass .cell tr:last-of-type td{
+  border-bottom: none;
+}
+
 </style>

src/xt_pages/supply/components/addGoodOrder.vue

@@ -1213,8 +1213,6 @@ export default {
     checkGoodOrder() {
       var id = this.warese_out_id;
       var warehousing_id = this.id;
-      console.log("采购单ID",id)
-      console.log("采购订单ID",warehousing_id)
       this.loading = true
       getGoodOrderCountList(id, warehousing_id).then((response) => {
         if (response.data.state == 1) {

src/xt_pages/supply/components/addGoodReturn.vue

@@ -1040,6 +1040,8 @@ export default {
                 orderInfo[i].drug.min_number,
                 orderInfo[i].warehouse_out_id
               );
+              }
+             orderInfo[i].count = this.getWarehoseInfoSix(orderInfo[i].drug_warehouse_info,orderInfo[i].drug.max_unit,orderInfo[i].drug.min_unit,orderInfo[i].drug.min_number,orderInfo[i].warehouse_out_id)
               // orderInfo[i].count = orderInfo[i].count + orderInfo[i].supply_unit
             }
 
@@ -1065,6 +1067,7 @@ export default {
 
           this.recordInfo.tableList = [];
           console.log("相亲233232322332323223322323", orderInfo);
+          console.log("乡里233232322332323223322323",orderInfo)
           this.recordInfo.tableList = orderInfo;
           this.tableDataList = [];
           this.tableDataList = orderInfo;
@@ -1460,6 +1463,30 @@ export default {
           for (let i = 0; i < this.recordInfo.tableList.length; i++) {
             if (index == i) {
               this.recordInfo.tableList[i].supply_count = supply_count;
+    getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
+     console.log("val23322323",sum_count)
+      var total_count = 0
+
+      if(type == 1){
+       if(supply_unit == max_unit){
+          total_count = supply_count * min_number
+       }
+       if(supply_unit == min_unit){
+         total_count = supply_count
+       }
+       console.log("sum_counts",sum_count)
+       console.log("count232232332",total_count)
+       if(total_count > sum_count){
+         this.$message.error("数量不能大于可退数量!")
+         for(let i=0;i<this.recordInfo.tableList.length;i++){
+           if(index == i){
+             this.recordInfo.tableList[i].supply_count = ""
+           }
+         }
+       }else{
+           for(let i=0;i<this.recordInfo.tableList.length;i++){
+            if(index == i){
+              this.recordInfo.tableList[i].supply_count = supply_count
             }
           }
         }
@@ -1487,6 +1514,8 @@ export default {
     },
 
     getWarehoseInfoSix(arr, max_unit, min_unit, min_number, warehouse_out_id) {
+
+   getWarehoseInfoSix(arr, max_unit, min_unit, min_number,warehouse_out_id) {
       var total = 0;
       var max_str = "";
       var min_str = "";

src/xt_pages/supply/components/editGoodReturn.vue

@@ -1004,7 +1004,7 @@ export default {
       this.payment = this.total_price - this.arrearage;
     },
     getSupplyCount(supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit,index){
-     console.log("val23322323",supply_count,sum_count,supply_unit,type,min_number,max_unit,min_unit)
+      console.log("sum_count2323232",sum_count)
       var total_count = 0
       
       if(type == 1){
@@ -1159,7 +1159,7 @@ export default {
                 // orderInfo[i].count = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
                // orderInfo[i].supply_total = this.getTotalStockCountTwo(goodList[j].good_warehouse_info);
               }
-              orderInfo[i].sum_count = orderInfo[i].count
+              orderInfo[i].sum_count = orderInfo[i].sum_count
               orderInfo[i].min_number = 0
               orderInfo[i].count = orderInfo[i].count;
               orderInfo[i].supply_total = orderInfo[i].supply_total

src/xt_pages/supply/purchaseOrderQuery.vue

@@ -103,9 +103,10 @@
         </el-table-column>
         <el-table-column label="关联采购单号" align="center" width="150">
           <template slot-scope="scope">
+            
             <tr style="background: none;" v-for="(item,index) in scope.row.orderOut" :key="index">
                  <td style="border-right: none;">{{item.good_number}}</td>
-              </tr>
+             </tr>
           </template>
         </el-table-column>
         <el-table-column label="采购金额" align="center">

src/xt_pages/supply/supplyQuery.vue

@@ -201,6 +201,7 @@ export default {
       tableList: [],
       tyep_name: "",
       sType: [],
+     
     };
   },
 

src/xt_pages/user/components/PatientDetail.vue

@@ -264,6 +264,13 @@
                   </el-checkbox>
                 </el-checkbox-group>
               </el-form-item>
+
+              <el-form-item label="疑难内瘘:">
+                <el-radio-group v-model="form.troble_shoot">
+                  <el-radio :label="1">是</el-radio>
+                  <el-radio :label="2">否</el-radio>
+                </el-radio-group>
+              </el-form-item>
             </el-col>
 
             <!--<el-col :span="16" >-->
@@ -1080,7 +1087,8 @@ const defaultForm = {
   expense_kind: "",
   contact_name: "",
   sch_remark:"",
-  org_id:0
+  org_id:0,
+  troble_shoot:"",
 };
 
 export default {
@@ -1169,7 +1177,11 @@ export default {
           { required: true, message: "请填写身份证号", trigger: "blur" }
         ],
         birth: [{ required: true, message: "请填写生日", trigger: "blur" }]
-      }
+      },
+      shootList:[
+       {id:1,name:"是"},
+       {id:2,name:"否"}
+      ]
     };
   },
   computed: {
@@ -1263,7 +1275,7 @@ export default {
             this.form.dialysisNo = patietInfo.dialysis_no;
             this.form.gender = patietInfo.gender;
             this.form.is_infectious = patietInfo.is_infectious;
-           
+            this.form.troble_shoot = patietInfo.troble_shoot
             // this.form.record_date = patietInfo.is_infectious
             this.form.response_result = patietInfo.response_result;
             this.form.remind_cycle = patietInfo.remind_cycle;

src/xt_pages/user/components/PatientForm.vue

@@ -335,6 +335,13 @@
                     >
                   </el-checkbox-group>
                 </el-form-item>
+
+                  <el-form-item label="疑难内瘘:">
+                    <el-radio-group v-model="form.troble_shoot">
+                      <el-radio :label="1">是</el-radio>
+                      <el-radio :label="2">否</el-radio>
+                    </el-radio-group>
+                   </el-form-item>
               </el-col>
               
               <!-- <el-col :span="8">
@@ -1005,7 +1012,7 @@ const defaultForm = {
   expense_kind: "",
   contact_name: "",
   user_sys_before_count: "",
-
+  troble_shoot:2,
   formItem: [
     {
       id: 0,
@@ -1438,6 +1445,7 @@ export default {
           if (this.isEdit) {
             this.form.age = parseInt(this.form.age);
             this.form.user_sys_before_count = this.form.user_sys_before_count.toString();
+            this.form.troble_shoot = parseInt(this.form.troble_shoot)
             if(this.form.avatar.indexOf('?imageView2/2/w/500/h/500/q/90')!=-1){
                this.form.avatar = this.form.avatar
             }else{
@@ -1475,6 +1483,7 @@ export default {
               });
           } else {
             this.form.age = parseInt(this.form.age);
+            this.form.troble_shoot = parseInt(this.form.troble_shoot)
             createPatient(this.form)
               .then(response => {
                 if (response.data.state == 0) {

src/xt_pages/user/doctorAdvice.vue

@@ -182,8 +182,7 @@
           <template slot-scope="scope">
             <el-dropdown trigger="click" v-if="scope.row.parent_id == 0">
               <span class="el-dropdown-link" v-if="scope.row.parent_id == 0">
-                {{ scope.row.advice_name
-                }}<i class="el-icon-arrow-down el-icon--right"></i>
+                {{ scope.row.advice_name}}<i class="el-icon-arrow-down el-icon--right"></i>
               </span>
 
               <el-dropdown-menu slot="dropdown">
@@ -3390,7 +3389,6 @@ export default {
             }
           });
           let list = Object.values(dataInfo);
-          // console.log("list", list);
           list.map(item => {
             for (let i = 0; i < advice.length; i++) {
               if (