diff --git a/src/views/inventory/InvProducts.vue b/src/views/inventory/InvProducts.vue
index 3b58627d..717682cb 100644
--- a/src/views/inventory/InvProducts.vue
+++ b/src/views/inventory/InvProducts.vue
@@ -3,28 +3,28 @@
     <el-card class="el-card">
       <el-form :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="产品标识DI:">
               <el-input v-model="filterQuery.nameCode" placeholder="产品标识DI"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="产品名称:">
               <el-input v-model="filterQuery.cpmctymc" placeholder="产品名称"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="批次号:">
               <el-input v-model="filterQuery.batchNo" placeholder="批次号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="供应商名称:">
               <el-select
                 v-model="filterQuery.supId"
@@ -53,28 +53,28 @@
         </el-row>
 
         <el-row>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="规格型号:">
               <el-input v-model="filterQuery.ggxh" placeholder="规格型号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="批准文号:">
               <el-input v-model="filterQuery.zczbhhzbapzbh" placeholder="批准文号"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="生产厂家:">
               <el-input v-model="filterQuery.ylqxzcrbarmc" placeholder="生产厂家"
                         style="width: 90%"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="4">
             <el-form-item class="query-form-item" label="所属仓库:">
               <el-select v-model="filterQuery.invCode" placeholder="请选择所属仓库" clearable="true"
                          style="width: 90%"
@@ -108,10 +108,9 @@
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border
-                @current-change="handleSelectionChange">
+                border>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="产品标识" prop="nameCode" ></el-table-column>
+        <el-table-column label="产品标识" prop="nameCode"></el-table-column>
         <el-table-column label="产品名称" prop="cpmctymc"></el-table-column>
         <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
         <el-table-column label="批次号" prop="batchNo" width="120"></el-table-column>
@@ -156,6 +155,20 @@
       ></pagination>
     </el-card>
 
+    <el-dialog
+      title="库存详情"
+      :visible.sync="detailDialogVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="85%"
+      v-if="detailDialogVisible"
+    >
+      <invProductsDetail
+        :inputQuery="inputQuery"
+        v-on:closeDetailDialog="closeDetailDialog"
+      ></invProductsDetail>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -164,13 +177,7 @@ import {findInvByUser} from "@/api/system/invSubWarehouse";
 import {getInvProduct, deleteInvProduct} from "@/api/inventory/invPorduct";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {isBlank} from "@/utils/strUtil";
-
-const formJson = {
-  site_id: "",
-  site_name: "",
-  describe: "",
-  ads: [],
-};
+import invProductsDetail from "@/views/inventory/InvProductsDetail.vue";
 
 export default {
   name: "InvProducts",
@@ -201,11 +208,20 @@ export default {
       dialogVisible: false,
       fromOptions: [],
       showSup: false,
-
-
+      detailDialogVisible: false,
+      inputQuery: {
+        cpmctymc: null,
+        nameCode: null,
+        batchNo: null,
+        ggxh: null,
+        productionDate: null,
+        expireDate: null,
+        supId: null,
+        deptCode: null,
+        invCode: null
+      }
     };
   },
-  components: {},
   methods: {
     onReset() {
       this.$router.push({
@@ -240,9 +256,6 @@ export default {
       this.filterQuery.page = val;
       this.getList();
     },
-    handleSelectionChange(val) {
-      this.getOrderDetails();
-    },
     getList() {
       this.loading = true;
       getInvProduct(this.filterQuery).then((res) => {
@@ -292,8 +305,23 @@ export default {
         this.findMethod(value);
       }
     },
-    detailDialog() {
-
+    detailDialog(row) {
+      this.detailDialogVisible = true;
+      this.inputQuery = {
+        relId: row.relId,
+        cpmctymc: row.cpmctymc,
+        nameCode: row.nameCode,
+        batchNo: row.batchNo,
+        ggxh: row.ggxh,
+        productionDate: row.productionDate,
+        expireDate: row.expireDate,
+        supId: row.supId,
+        deptCode: row.deptCode,
+        invCode: row.invCode
+      }
+    },
+    closeDetailDialog() {
+      this.detailDialogVisible = false;
     },
     deleteDialog(id) {
       this.$confirm("此操作将永久删除此库存信息，是否继续？", "提示", {
@@ -306,19 +334,22 @@ export default {
       });
     },
     deleteInvProduct(id) {
-        let params = {id: id};
-        deleteInvProduct(params).then((res) => {
-          if (res.code === 20000) {
-            this.$message.success("删除成功！");
-            this.getList();
-          } else {
-            this.$message.error(res.message);
-          }
-        }).catch((error) => {
-          this.$message.error(error.message);
-        });
+      let params = {id: id};
+      deleteInvProduct(params).then((res) => {
+        if (res.code === 20000) {
+          this.$message.success("删除成功！");
+          this.getList();
+        } else {
+          this.$message.error(res.message);
+        }
+      }).catch((error) => {
+        this.$message.error(error.message);
+      });
     }
   },
+  components: {
+    invProductsDetail
+  },
   mounted() {
     document.body.ondrop = function (event) {
       event.preventDefault();
diff --git a/src/views/inventory/InvProductsDetail.vue b/src/views/inventory/InvProductsDetail.vue
new file mode 100644
index 00000000..7b021218
--- /dev/null
+++ b/src/views/inventory/InvProductsDetail.vue
@@ -0,0 +1,213 @@
+<template>
+  <div>
+    <el-descriptions class="margin-top" title="产品信息" :column="3" :size="size" border>
+      <el-descriptions-item>
+        <template slot="label">
+          产品名称
+        </template>
+        {{ inputQuery.cpmctymc }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          产品标识
+        </template>
+        {{ inputQuery.nameCode }}
+      </el-descriptions-item>
+
+      <el-descriptions-item>
+        <template slot="label">
+          批次号
+        </template>
+        {{ inputQuery.batchNo }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          规格型号
+        </template>
+        {{ inputQuery.ggxh }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          生产日期
+        </template>
+        {{ inputQuery.productionDate }}
+      </el-descriptions-item>
+      <el-descriptions-item>
+        <template slot="label">
+          失效日期
+        </template>
+        {{ inputQuery.expireDate }}
+      </el-descriptions-item>
+    </el-descriptions>
+
+    <el-form :inline="true" :model="invProductDetailQuery" style="margin-top: 10px;" size="mini">
+      <el-form-item class="query-form-item" label="条码:">
+        <el-input v-model="invProductDetailQuery.code"
+                  placeholder="条码查询"
+                  clearable
+                  style="width: 100%"
+        ></el-input>
+      </el-form-item>
+
+      <el-form-item>
+        <el-button-group>
+          <el-button type="primary" icon="search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+        </el-button-group>
+      </el-form-item>
+    </el-form>
+    <el-table v-loading="loading" :data="list" style="width: 100%">
+      <el-table-column label="序号" type="index"></el-table-column>
+      <el-table-column
+        label="条码"
+        prop="originCode"
+        width="500"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="单据类型"
+        prop="actionName"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        label="出入库类型"
+        prop="mainActionStr"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="入库数量"
+        prop="inCount"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="出库数量"
+        prop="outCount"
+        width="120"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="订单日期"
+        prop="orderTime"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        label="所属单据"
+        prop="orderId"
+        show-overflow-tooltip
+      ></el-table-column>
+    </el-table>
+
+    <el-pagination
+      :page-size="invProductDetailQuery.limit"
+      @current-change="handleCurrentChange"
+      layout="prev, pager, next,total"
+      :total="total"
+      :current-page="invProductDetailQuery.page"
+    >
+    </el-pagination>
+
+
+  </div>
+</template>
+
+<script>
+import {getInvProductDetail} from "@/api/inventory/invPorduct";
+import {isBlank} from "@/utils/strUtil";
+
+export default {
+  name: "InvProductsDetail",
+  props: {
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      invProductDetailQuery: {
+        code: null,
+        relId: null,
+        supId: null,
+        batchNo: null,
+        deptCode: null,
+        invCode: null,
+        page: 1,
+        limit: 10
+      },
+      list: [],
+      total: 0,
+      loading: false,
+    };
+  },
+  methods: {
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.invProductDetailQuery = {
+        code: null,
+        page: 1,
+        limit: 10
+      };
+      this.getList();
+    },
+    onSubmit() {
+      this.invProductDetailQuery.page = 1;
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleSizeChange(val) {
+      this.invProductDetailQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.invProductDetailQuery.page = val;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      this.invProductDetailQuery.relId = this.inputQuery.relId;
+      this.invProductDetailQuery.supId = this.inputQuery.supId;
+      this.invProductDetailQuery.batchNo = this.inputQuery.batchNo;
+      this.invProductDetailQuery.deptCode = this.inputQuery.deptCode;
+      this.invProductDetailQuery.invCode = this.inputQuery.invCode;
+      getInvProductDetail(this.invProductDetailQuery).then((res) => {
+        this.loading = false;
+        if (res.code === 20000) {
+          this.list = res.data.list || [];
+          this.total = res.data.total || 0;
+        } else {
+          this.$message.error(res.message);
+          this.list = [];
+          this.total = 0;
+        }
+      }).catch((error) => {
+        this.loading = false;
+        this.$message.error(error.message);
+        this.list = [];
+        this.total = 0;
+      })
+    },
+  },
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    this.getList();
+  },
+};
+</script>
+
+<style type="text/scss" lang="scss">
+</style>
+