diff --git a/src/views/modules/qc/stagnationExpiredStock.vue b/src/views/modules/qc/stagnationExpiredStock.vue
index 80f76c1..4dc1703 100644
--- a/src/views/modules/qc/stagnationExpiredStock.vue
+++ b/src/views/modules/qc/stagnationExpiredStock.vue
@@ -41,24 +41,6 @@
           </el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="2">
-        <el-form-item label="呆滞天数">
-          <el-input
-            v-model="searchData.stagnationDays"
-            oninput="value=value.replace(/[^\d]/g,'')"
-            clearable>
-          </el-input>
-        </el-form-item>
-      </el-col>
-      <el-col :span="2">
-        <el-form-item label="类型">
-          <el-select v-model="searchData.type" clearable>
-            <el-option value="" label="全部"></el-option>
-            <el-option value="STAGNATION" label="呆滞品"></el-option>
-            <el-option value="EXPIRED" label="临期品"></el-option>
-          </el-select>
-        </el-form-item>
-      </el-col>
       <el-col :span="4">
         <el-form-item label=" ">
           <el-button type="primary" @click="search">查询</el-button>
@@ -82,23 +64,12 @@
     <el-table-column prop="partNo" label="物料编码" align="left" header-align="center" min-width="120"/>
     <el-table-column prop="partDescription" label="物料名称" align="left" header-align="center" min-width="200"/>
     <el-table-column prop="batchNo" label="批次号" align="left" header-align="center" min-width="120"/>
-    <el-table-column prop="type" label="类型" align="center" header-align="center" min-width="100">
-      <template slot-scope="scope">
-        <el-tag
-          :type="scope.row.type === 'STAGNATION' ? 'warning' : 'danger'"
-          size="small">
-          {{ scope.row.type === 'STAGNATION' ? '呆滞品' : '临期品' }}
-        </el-tag>
-      </template>
-    </el-table-column>
     <el-table-column prop="locationId" label="库位" align="left" header-align="center" min-width="100"/>
     <el-table-column prop="qtyOnHand" label="库存数量" align="right" header-align="center" min-width="100"/>
     <el-table-column prop="firstInDate" label="入库日期" align="left" header-align="center" min-width="110"/>
     <el-table-column prop="latestOutDate" label="最后出库日期" align="left" header-align="center" min-width="110"/>
     <el-table-column prop="latestInDate" label="最后入库日期" align="left" header-align="center" min-width="110"/>
     <el-table-column prop="expiredDate" label="失效日期" align="left" header-align="center" min-width="110"/>
-    <el-table-column prop="stagnationStartDate" label="呆滞起算日" align="left" header-align="center" min-width="120"/>
-    <el-table-column prop="stagnationDays" label="呆滞天数" align="right" header-align="center" min-width="100"/>
     <el-table-column prop="daysToExpire" label="距过期天数" align="right" header-align="center" min-width="100"/>
 
 
@@ -157,9 +128,7 @@ export default {
         batchNo: '',
         warehouseName: '',
         locationId: '',
-        daysToExpire: '',
-        stagnationDays: '',
-        type: ''
+        daysToExpire: ''
       },
       tableData: [],
       pageIndex: 1,
@@ -196,9 +165,7 @@ export default {
         batchNo: '',
         warehouseName: '',
         locationId: '',
-        daysToExpire: '',
-        stagnationDays: '',
-        type: ''
+        daysToExpire: ''
       }
       this.pageIndex = 1
       this.getDataList()
@@ -207,6 +174,8 @@ export default {
       this.loading = true
       const params = {
         ...this.searchData,
+        // 本页面只查询临期品
+        type: 'EXPIRED',
         page: this.pageIndex,
         limit: this.pageSize
       }
diff --git a/src/views/modules/qc/stagnationStock.vue b/src/views/modules/qc/stagnationStock.vue
new file mode 100644
index 0000000..9f0d43f
--- /dev/null
+++ b/src/views/modules/qc/stagnationStock.vue
@@ -0,0 +1,234 @@
+<template>
+<div>
+  <el-form :model="searchData" label-position="top" style="max-width: 1400px">
+    <el-row :gutter="5">
+      <el-col :span="2">
+        <el-form-item label="工厂编码">
+          <el-input v-model="searchData.site" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="3">
+        <el-form-item label="物料编码">
+          <el-input v-model="searchData.partNo" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="3">
+        <el-form-item label="物料名称">
+          <el-input v-model="searchData.partDescription" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2">
+        <el-form-item label="批次号">
+          <el-input v-model="searchData.batchNo" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2">
+        <el-form-item label="仓库">
+          <el-input v-model="searchData.warehouseName" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2">
+        <el-form-item label="库位">
+          <el-input v-model="searchData.locationId" clearable></el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2">
+        <el-form-item label="呆滞天数">
+          <el-input
+            v-model="searchData.stagnationDays"
+            oninput="value=value.replace(/[^\d]/g,'')"
+            clearable>
+          </el-input>
+        </el-form-item>
+      </el-col>
+      <el-col :span="4">
+        <el-form-item label=" ">
+          <el-button type="primary" @click="search">查询</el-button>
+          <el-button @click="reset">重置</el-button>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form>
+
+  <el-table :data="tableData" border v-loading="loading" height="calc(100vh - 190px)">
+    <el-table-column label="操作" width="100" align="center">
+      <template slot-scope="scope">
+        <a @click="showBagDetail(scope.row)">袋装明细</a>
+      </template>
+    </el-table-column>
+    <el-table-column prop="site" label="工厂编码" align="left" header-align="center" min-width="80"/>
+    <el-table-column prop="warehouseId" label="仓库ID" align="left" header-align="center" min-width="100"/>
+    <el-table-column prop="warehouseName" label="仓库名称" align="left" header-align="center" min-width="120"/>
+    <el-table-column prop="partNo" label="物料编码" align="left" header-align="center" min-width="120"/>
+    <el-table-column prop="partDescription" label="物料名称" align="left" header-align="center" min-width="200"/>
+    <el-table-column prop="batchNo" label="批次号" align="left" header-align="center" min-width="120"/>
+    <el-table-column prop="locationId" label="库位" align="left" header-align="center" min-width="100"/>
+    <el-table-column prop="qtyOnHand" label="库存数量" align="right" header-align="center" min-width="100"/>
+    <el-table-column prop="firstInDate" label="入库日期" align="left" header-align="center" min-width="110"/>
+    <el-table-column prop="latestOutDate" label="最后出库日期" align="left" header-align="center" min-width="110"/>
+    <el-table-column prop="latestInDate" label="最后入库日期" align="left" header-align="center" min-width="110"/>
+    <el-table-column prop="expiredDate" label="失效日期" align="left" header-align="center" min-width="110"/>
+    <el-table-column prop="stagnationStartDate" label="呆滞起算日" align="left" header-align="center" min-width="120"/>
+    <el-table-column prop="stagnationDays" label="呆滞天数" align="right" header-align="center" min-width="100"/>
+
+    <el-table-column prop="expireDateControlFlag" label="有效期管理" align="center" header-align="center" min-width="120">
+      <template slot-scope="scope">
+        {{ scope.row.expireDateControlFlag === 'Y' ? '是' : '否' }}
+      </template>
+    </el-table-column>
+    <el-table-column prop="toExpireDays" label="有效期天数" align="right" header-align="center" min-width="100"/>
+  </el-table>
+
+
+  <el-pagination
+    @size-change="sizeChangeHandle"
+    @current-change="currentChangeHandle"
+    :current-page.sync="pageIndex"
+    :page-sizes="[10, 20, 50, 100, 200]"
+    :page-size="pageSize"
+    layout="total,sizes, prev, pager, next"
+    :total="totalPage">
+  </el-pagination>
+
+  <el-dialog :visible.sync="bagDetailVisible" v-drag top="5vh" title="袋装明细" width="80%" :close-on-click-modal="false">
+    <el-table :data="bagDetailData" border v-loading="bagDetailLoading" height="400px">
+      <el-table-column prop="site" label="工厂编码" align="left" header-align="center" min-width="80"/>
+      <el-table-column prop="partNo" label="物料编码" align="left" header-align="center" min-width="120"/>
+      <el-table-column prop="partDescription" label="物料名称" align="left" header-align="center" min-width="200"/>
+      <el-table-column prop="seqNo" label="Seq No" align="left" header-align="center" min-width="100"/>
+      <el-table-column prop="itemNo" label="序号" align="left" header-align="center" min-width="60"/>
+      <el-table-column prop="printQty" label="数量" align="right" header-align="center" min-width="80"/>
+      <el-table-column prop="batchNo" label="批次号" align="left" header-align="center" min-width="120"/>
+      <el-table-column prop="warehouseName" label="仓库" align="left" header-align="center" min-width="120"/>
+      <el-table-column prop="locationId" label="库位" align="left" header-align="center" min-width="100"/>
+      <el-table-column prop="status" label="状态" align="center" header-align="center" min-width="80"/>
+      <el-table-column prop="weight" label="重量" align="right" header-align="center" min-width="80"/>
+      <el-table-column prop="createTime" label="创建时间" align="center" header-align="center" min-width="120"/>
+      <el-table-column prop="updateTime" label="入库时间" align="center" header-align="center" min-width="120"/>
+    </el-table>
+    <span slot="footer" class="dialog-footer" style="text-align: center">
+      <el-button type="primary" @click="bagDetailVisible = false">关闭</el-button>
+    </span>
+  </el-dialog>
+</div>
+</template>
+
+<script>
+import { queryStagnationExpiredStock, queryPrintLabelBagList } from '@/api/pms/inventoryStock'
+
+export default {
+  data() {
+    return {
+      searchData: {
+        site: '',
+        partNo: '',
+        partDescription: '',
+        batchNo: '',
+        warehouseName: '',
+        locationId: '',
+        stagnationDays: ''
+      },
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 50,
+      totalPage: 0,
+      loading: false,
+      // 袋装明细相关
+      bagDetailVisible: false,
+      bagDetailLoading: false,
+      bagDetailData: [],
+      currentRow: {}
+    }
+  },
+  mounted() {
+    // 进入页面不默认查询数据
+  },
+  methods: {
+    search() {
+      // 验证工厂编码必填
+      if (!this.searchData.site || this.searchData.site.trim() === '') {
+        this.$message.warning('工厂编码为必填项')
+        return
+      }
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    reset() {
+      this.searchData = {
+        site: '',
+        partNo: '',
+        partDescription: '',
+        batchNo: '',
+        warehouseName: '',
+        locationId: '',
+        stagnationDays: ''
+      }
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    getDataList() {
+      this.loading = true
+      const params = {
+        ...this.searchData,
+        // 本页面只查询呆滞品
+        type: 'STAGNATION',
+        page: this.pageIndex,
+        limit: this.pageSize
+      }
+
+      queryStagnationExpiredStock(params).then(({ data: res }) => {
+        this.loading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.tableData = res.page.list || []
+        this.totalPage = res.page.totalCount || 0
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    sizeChangeHandle(val) {
+      this.pageSize = val
+      this.pageIndex = 1
+      this.getDataList()
+    },
+    currentChangeHandle(val) {
+      this.pageIndex = val
+      this.getDataList()
+    },
+    // 显示袋装明细
+    showBagDetail(row) {
+      this.currentRow = row
+      this.bagDetailVisible = true
+      this.getBagDetailList()
+    },
+    // 获取袋装明细列表
+    getBagDetailList() {
+      this.bagDetailLoading = true
+      const params = {
+        site: this.currentRow.site,
+        partNo: this.currentRow.partNo,
+        batchNo: this.currentRow.batchNo,
+        warehouseId: this.currentRow.warehouseId,
+        locationId: this.currentRow.locationId,
+        page: 1,
+        limit: 100
+      }
+
+      queryPrintLabelBagList(params).then(({ data: res }) => {
+        this.bagDetailLoading = false
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.bagDetailData = res.page.list || []
+      }).catch(() => {
+        this.bagDetailLoading = false
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>