diff --git a/src/views/modules/warehouse/labelQuery.vue b/src/views/modules/warehouse/labelQuery.vue
index 8f11c25..da74bbd 100644
--- a/src/views/modules/warehouse/labelQuery.vue
+++ b/src/views/modules/warehouse/labelQuery.vue
@@ -9,6 +9,14 @@
           <el-option label="在库" value="Y"></el-option>
         </el-select>
       </el-form-item>
+      <!-- 本期盘点筛选，空=全部不入 SQL - rqrq -->
+      <el-form-item label="本期盘点">
+        <el-select v-model="queryHeaderData.countFlag" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部(ALL)" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="物料编号">
         <el-input style="width: 120px;" v-model="queryHeaderData.partNo" placeholder="请输入物料编号" @keyup.enter.native="getDataList()"></el-input>
       </el-form-item>
@@ -102,9 +110,14 @@
             <span v-else-if="scope.row.inStockFlag === 'X'" type="warning">未入库</span>
             <span v-else>{{ scope.row.inStockFlag }}</span>
           </span>
-          <span v-else-if="item.columnProp === 'lastPrintDate' || item.columnProp === 'createdDate'">
+          <span v-else-if="item.columnProp === 'lastPrintDate' || item.columnProp === 'createdDate' || item.columnProp === 'lastCountDate'">
             {{ formatDate(scope.row[item.columnProp]) }}
           </span>
+          <span v-else-if="item.columnProp === 'countFlag'">
+            <span v-if="scope.row.countFlag === 'Y'">Y</span>
+            <span v-else-if="scope.row.countFlag === 'N'">N</span>
+            <span v-else>{{ scope.row.countFlag }}</span>
+          </span>
           <span v-else-if="item.columnProp === 'reserveFlag'">
             {{ scope.row.reserveFlag === 'Y' ? '是' : '否' }}
           </span>
@@ -411,6 +424,26 @@ export default {
           showOverflowTooltip: true,
           fixed: ""
         },
+        {
+          columnProp: "countFlag",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "本期盘点",
+          columnWidth: 90,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
+        {
+          columnProp: "lastCountDate",
+          headerAlign: "center",
+          align: "center",
+          columnLabel: "最后盘点日期",
+          columnWidth: 150,
+          columnSortable: false,
+          showOverflowTooltip: true,
+          fixed: ""
+        },
         {
           columnProp: "printCount",
           headerAlign: "center",
@@ -514,11 +547,13 @@ export default {
       ],
       queryHeaderData: {
         inStockFlag: '',
+        countFlag: '',
         partNo: '',
         batchNo: '',
         locationId: '',
         unitId: '',
         partDesc: '',
+        sourceType: '',
         startDate: '',
         endDate: '',
       },
@@ -625,11 +660,13 @@ export default {
     resetQuery() {
       this.queryHeaderData = {
         inStockFlag: '',
+        countFlag: '',
         partNo: '',
         batchNo: '',
         locationId: '',
         unitId: '',
         partDesc: '',
+        sourceType: '',
         startDate: '',
         endDate: '',
       }
@@ -755,7 +792,8 @@ export default {
             inStockFlag: item.inStockFlag === 'Y' ? '在库' : item.inStockFlag === 'N' ? '已出库' : item.inStockFlag === 'X' ? '未入库' : item.inStockFlag,
             reserveFlag: item.reserveFlag === 'Y' ? '是' : '否',
             lastPrintDate: this.formatDate(item.lastPrintDate),
-            createdDate: this.formatDate(item.createdDate)
+            createdDate: this.formatDate(item.createdDate),
+            lastCountDate: this.formatDate(item.lastCountDate)
           }
         })
       }
diff --git a/src/views/modules/warehouse/labelQueryLocation.vue b/src/views/modules/warehouse/labelQueryLocation.vue
index 68cf877..76a249b 100644
--- a/src/views/modules/warehouse/labelQueryLocation.vue
+++ b/src/views/modules/warehouse/labelQueryLocation.vue
@@ -9,6 +9,14 @@
           <el-option label="在库" value="Y"></el-option>
         </el-select>
       </el-form-item>
+      <!-- 本期盘点筛选，空=全部不入 SQL - rqrq -->
+      <el-form-item label="本期盘点">
+        <el-select v-model="queryHeaderData.countFlag" placeholder="请选择" style="width: 120px;">
+          <el-option label="全部(ALL)" value=""></el-option>
+          <el-option label="Y" value="Y"></el-option>
+          <el-option label="N" value="N"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="物料编号">
         <el-input style="width: 120px;" v-model="queryHeaderData.partNo" placeholder="请输入物料编号" @keyup.enter.native="getDataList()"></el-input>
       </el-form-item>
@@ -74,6 +82,14 @@
           <span v-if="item.columnProp === 'reserveFlag'">
             {{ scope.row.reserveFlag === 'Y' ? '是' : '否' }}
           </span>
+          <span v-else-if="item.columnProp === 'lastCountDate'">
+            {{ formatDate(scope.row.lastCountDate) }}
+          </span>
+          <span v-else-if="item.columnProp === 'countFlag'">
+            <span v-if="scope.row.countFlag === 'Y'">Y</span>
+            <span v-else-if="scope.row.countFlag === 'N'">N</span>
+            <span v-else>{{ scope.row.countFlag }}</span>
+          </span>
           <span v-else>{{ scope.row[item.columnProp] }}</span>
         </template>
       </el-table-column>
@@ -142,9 +158,12 @@ export default {
         {columnProp: "engChgLevel", headerAlign: "center", align: "center", columnLabel: "版本号", columnWidth: 80, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "expiredDate", headerAlign: "center", align: "center", columnLabel: "失效日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
         {columnProp: "receiveDate", headerAlign: "center", align: "center", columnLabel: "接收日期", columnWidth: 120, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "countFlag", headerAlign: "center", align: "center", columnLabel: "本期盘点", columnWidth: 90, columnSortable: false, showOverflowTooltip: true, fixed: ""},
+        {columnProp: "lastCountDate", headerAlign: "center", align: "center", columnLabel: "最后盘点日期", columnWidth: 150, columnSortable: false, showOverflowTooltip: true, fixed: ""},
       ],
       queryHeaderData: {
         inStockFlag: 'Y',
+        countFlag: '',
         partNo: '',
         batchNo: '',
         locationId: '',
@@ -251,11 +270,14 @@ export default {
     resetQuery() {
       this.queryHeaderData = {
         inStockFlag: 'Y',
+        countFlag: '',
         partNo: '',
         batchNo: '',
         locationId: '',
         unitId: '',
-        partDesc: ''
+        partDesc: '',
+        stationArea: '',
+        palletId: ''
       }
       this.pageIndex = 1
       this.getDataList()
@@ -311,7 +333,8 @@ export default {
         return (data.page.list || []).map(item => {
           return {
             ...item,
-            reserveFlag: item.reserveFlag === 'Y' ? '是' : '否'
+            reserveFlag: item.reserveFlag === 'Y' ? '是' : '否',
+            lastCountDate: this.formatDate(item.lastCountDate)
           }
         })
       }