From f7320eaa464827ca4a29b5f4b49dce7fd8a91cde Mon Sep 17 00:00:00 2001
From: Yangwl <1726150332@qq.com>
Date: Thu, 4 Sep 2025 16:30:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E5=93=81=E5=A4=87=E4=BB=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=EF=BC=8C=E8=AE=BE=E5=A4=87=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=A2=9E=E5=8A=A0=E4=BA=A7=E7=BA=BF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/sparePartsLedger/index.vue   | 27 ++++++++++++-
 .../device/sparepartsInOutStorage/index.vue   | 40 +++++++++++++++----
 src/views/wms/equipment/index.vue             | 10 +++++
 3 files changed, 69 insertions(+), 8 deletions(-)

diff --git a/src/views/device/sparePartsLedger/index.vue b/src/views/device/sparePartsLedger/index.vue
index a4f02d3..154da55 100644
--- a/src/views/device/sparePartsLedger/index.vue
+++ b/src/views/device/sparePartsLedger/index.vue
@@ -44,6 +44,27 @@
           style="width: 150px"
         />
       </el-form-item>
+      <el-form-item label="出入库日期">
+        <el-date-picker
+          v-model="dateRange"
+          style="width: 240px"
+          value-format="yyyy-MM-dd"
+          type="daterange"
+          range-separator="-"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        ></el-date-picker>
+      </el-form-item>
+      <el-form-item label="低于安全库存" prop="isLow">
+        <el-select v-model="queryParams.isLow" placeholder="数据状态" clearable>
+          <el-option
+            v-for="dict in dict.type.safety_stock"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
       <!-- <el-form-item label="备件类型" prop="spareType">
         <el-select
           v-model="queryParams.spareType"
@@ -764,6 +785,7 @@ import QRCode from 'qrcode';
 
 export default {
   name: "SparePartsLedger",
+  dicts: ['safety_stock'],
   data() {
     return {
       // 导入数据
@@ -872,7 +894,10 @@ export default {
         ownEquipmentCode: null,
         unitPrice: null,
         procurementMethod: null,
+        isLow: null,
       },
+      // 日期范围
+      dateRange: [],
       options: [
         {
           spareType: "专用",
@@ -922,7 +947,7 @@ export default {
     /** 查询备品备件台账管理列表 */
     getList() {
       this.loading = true;
-      listSparePartsLedger(this.queryParams).then((response) => {
+      listSparePartsLedger(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.sparePartsLedgerList = response.rows;
         this.total = response.total;
         this.loading = false;
diff --git a/src/views/device/sparepartsInOutStorage/index.vue b/src/views/device/sparepartsInOutStorage/index.vue
index 12ada08..35ed315 100644
--- a/src/views/device/sparepartsInOutStorage/index.vue
+++ b/src/views/device/sparepartsInOutStorage/index.vue
@@ -49,16 +49,16 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="日期" prop="spareName">
+      <el-form-item label="日期">
         <el-date-picker
-          v-model="queryParams.planDateArray"
+          v-model="dateRange"
+          style="width: 240px"
           value-format="yyyy-MM-dd"
           type="daterange"
-          range-separator="至"
+          range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
-        >
-        </el-date-picker>
+        ></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button
@@ -131,6 +131,8 @@
       v-loading="loading"
       :data="sparepartsInOutStorageList"
       @selection-change="handleSelectionChange"
+      :summary-method="getSummaries"
+      show-summary
     >
       <el-table-column type="selection" width="55" align="center" />
       <!-- 序号 -->
@@ -232,10 +234,11 @@
     </el-table>
 
     <pagination
-      v-show="total > 0"
+      v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
+      :pageSizes="[50,100,200,500]"
       @pagination="getList"
     />
 
@@ -374,6 +377,8 @@ export default {
         delFlag: null,
         factoryCode: null,
       },
+      // 日期范围
+      dateRange: [],
       // 表单参数
       form: {},
       // 表单校验
@@ -412,12 +417,32 @@ export default {
     /** 查询备品备件出入库列表 */
     getList() {
       this.loading = true;
-      listSparepartsInOutStorage(this.queryParams).then((response) => {
+      listSparepartsInOutStorage(this.addDateRange(this.queryParams, this.dateRange)).then((response) => {
         this.sparepartsInOutStorageList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+
+      // 初始化所有列
+      columns.forEach((column, index) => {
+        if (index === 1) {
+          sums[index] = '总数'; // 第一列显示固定文本
+        } else if (column.property === 'amount') {
+          // 计算amount列合计
+          const total = data.reduce((sum, item) => {
+            const val = Number(item.amount);
+            return sum + (isNaN(val) ? 0 : val);
+          }, 0);
+          sums[index] = total + ' 个';
+        }
+      });
+
+      return sums;
+    },
     // 取消按钮
     cancel() {
       this.open = false;
@@ -452,6 +477,7 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.dateRange = [];
       this.resetForm("queryForm");
       this.handleQuery();
     },
diff --git a/src/views/wms/equipment/index.vue b/src/views/wms/equipment/index.vue
index 026bec2..ac294e9 100644
--- a/src/views/wms/equipment/index.vue
+++ b/src/views/wms/equipment/index.vue
@@ -689,6 +689,14 @@
                 />
               </el-form-item>
             </el-col>
+            <el-col :span="8">
+              <el-form-item label="产线代号" prop="dh">
+                <el-input
+                  v-model="form.dh"
+                  placeholder="请输入产线代号"
+                />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row :gutter="10" class="mb8">
             <el-col :span="24">
@@ -1383,6 +1391,7 @@ export default {
         equipmentCategory: null,
         factoryWorkshop: null,
         sapAsset: null,
+        dh: null
       },
       queryEquipmentHeadParams: {
         pageNum: 1,
@@ -1609,6 +1618,7 @@ export default {
         sapName: null,
         factoryWorkshop: null,
         sapAsset: null,
+        dh: null,
       };
       this.resetForm("form");
     },