From f4518be3f492e695b40d5e867bbe30b725ddbce2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Thu, 19 Mar 2026 16:14:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E3=80=81=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=8F=8A=E8=A1=A8=E6=A0=BC=E5=88=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix(leave): 将请假天数审批阈值从3天改为72小时
feat(coilTable): 添加分页大小和当前页改变处理方法
refactor(column): 简化发货相关表格列标题
feat(eqp): 在备件和辅料管理中添加机组筛选和显示
---
 klp-ui/src/views/mes/eqp/auxiliary/index.vue  | 21 +++++++++----------
 klp-ui/src/views/mes/eqp/ready/index.vue      | 12 ++++++++++-
 klp-ui/src/views/wms/hrm/apply/leave.vue      |  2 +-
 .../wms/report/components/coilTable/index.vue | 11 ++++++++++
 klp-ui/src/views/wms/report/js/column.js      |  8 +++----
 5 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/klp-ui/src/views/mes/eqp/auxiliary/index.vue b/klp-ui/src/views/mes/eqp/auxiliary/index.vue
index 50692f9a..0cf19fc8 100644
--- a/klp-ui/src/views/mes/eqp/auxiliary/index.vue
+++ b/klp-ui/src/views/mes/eqp/auxiliary/index.vue
@@ -33,11 +33,9 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <!-- <el-form-item label="关联设备" prop="equipmentId">
-        <el-select v-model="queryParams.equipmentId" placeholder="请选择关联设备" filterable>
-          <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
-        </el-select>
-      </el-form-item> -->
+      <el-form-item label="机组" prop="unitTeam">
+        <dict-select v-model="queryParams.unitTeam" dict-type="sys_lines" placeholder="请选择机组" filterable />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -91,6 +89,7 @@
       <el-table-column label="辅料名称" align="center" prop="auxiliaryName" />
       <el-table-column label="辅料品类" align="center" prop="materialCategory" />
       <el-table-column label="辅料品牌" align="center" prop="auxiliaryModel" />
+      <el-table-column label="机组" align="center" prop="unitTeam" />
       <el-table-column label="计量单位" align="center" prop="unit" />
       <!-- <el-table-column label="关联设备" align="center" prop="equipmentName" /> -->
       <el-table-column label="当前库存" align="center" prop="quantity" />
@@ -147,11 +146,9 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
-        <!-- <el-form-item label="关联设备ID" prop="equipmentId">
-          <el-select v-model="form.equipmentId" placeholder="请选择关联设备ID" filterable>
-            <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
-          </el-select>
-        </el-form-item> -->
+        <el-form-item label="机组" prop="unitTeam">
+          <dict-select v-model="form.unitTeam" dict-type="sys_lines" placeholder="请选择机组" filterable />
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -196,11 +193,13 @@
 import { listAuxiliaryMaterial, getAuxiliaryMaterial, delAuxiliaryMaterial, addAuxiliaryMaterial, updateAuxiliaryMaterial } from "@/api/mes/eqp/auxiliaryMaterial";
 import { changeStock } from "@/api/mes/eqp/auxiliaryMaterialChange";
 import auxiliaryChange from '../components/pages/auxiliaryChange.vue';
+import dictSelect from '@/components/DictSelect';
 
 export default {
   name: "Auxiliary",
   components: {
-    auxiliaryChange
+    auxiliaryChange,
+    dictSelect
   },
   data() {
     return {
diff --git a/klp-ui/src/views/mes/eqp/ready/index.vue b/klp-ui/src/views/mes/eqp/ready/index.vue
index 87200548..a7b5ca2d 100644
--- a/klp-ui/src/views/mes/eqp/ready/index.vue
+++ b/klp-ui/src/views/mes/eqp/ready/index.vue
@@ -38,6 +38,9 @@
           <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
         </el-select>
       </el-form-item>
+      <el-form-item label="机组" prop="unitTeam">
+        <dict-select v-model="queryParams.unitTeam" dict-type="sys_lines" placeholder="请选择机组" filterable />
+      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -92,6 +95,7 @@
       <el-table-column label="物料品类" align="center" prop="materialCategory" />
       <el-table-column label="备件型号" align="center" prop="model" />
       <el-table-column label="计量单位" align="center" prop="unit" />
+      <el-table-column label="机组" align="center" prop="unitTeam" />
       <el-table-column label="关联设备" align="center" prop="equipmentName" />
       <el-table-column label="当前库存" align="center" prop="quantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -147,6 +151,9 @@
         <el-form-item label="计量单位" prop="unit">
           <el-input v-model="form.unit" placeholder="请输入计量单位" />
         </el-form-item>
+        <el-form-item label="机组" prop="unitTeam">
+          <dict-select v-model="form.unitTeam" dict-type="sys_lines" placeholder="请选择机组" filterable />
+        </el-form-item>
         <el-form-item label="关联设备ID" prop="equipmentId">
           <el-select v-model="form.equipmentId" placeholder="请选择关联设备ID" filterable>
             <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
@@ -197,11 +204,14 @@ import { listSparePart, getSparePart, delSparePart, addSparePart, updateSparePar
 import { listEquipmentManagement } from "@/api/mes/eqp/equipmentManagement";
 import { changeStock } from "@/api/mes/eqp/sparePartsChange";
 import partChange from '../components/pages/partChange.vue';
+import dictSelect from '@/components/DictSelect';
+
 
 export default {
   name: "SparePart",
   components: {
-    partChange
+    partChange,
+    dictSelect
   },
   data() {
     return {
diff --git a/klp-ui/src/views/wms/hrm/apply/leave.vue b/klp-ui/src/views/wms/hrm/apply/leave.vue
index c2881e38..f4ebd8ad 100644
--- a/klp-ui/src/views/wms/hrm/apply/leave.vue
+++ b/klp-ui/src/views/wms/hrm/apply/leave.vue
@@ -331,7 +331,7 @@ export default {
         // 2. 循环处理每个时段，逐个发送请求
         for (let i = 0; i < list.length; i++) {
           const item = list[i];
-          const approvalType = parseInt(item.leaveDays) > 3 ? 'multi' : 'single';
+          const approvalType = parseInt(item.leaveDays) > 72 ? 'multi' : 'single';
           const singleRequestData = {
             ...commonFields,
             startTime: item.startTime,
diff --git a/klp-ui/src/views/wms/report/components/coilTable/index.vue b/klp-ui/src/views/wms/report/components/coilTable/index.vue
index e9eeb17c..5bd75853 100644
--- a/klp-ui/src/views/wms/report/components/coilTable/index.vue
+++ b/klp-ui/src/views/wms/report/components/coilTable/index.vue
@@ -81,6 +81,17 @@ export default {
     showPagination() {
       return this.totalPage > 1
     }
+  },
+  methods: {
+    // 分页大小改变时触发
+    handleSizeChange(val) {
+      this.pageSize = val
+      this.pageNum = 1
+    },
+    // 分页当前页改变时触发
+    handleCurrentChange(val) {
+      this.pageNum = val
+    },
   }
 }
 </script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/js/column.js b/klp-ui/src/views/wms/report/js/column.js
index 8c3a6767..9a35b44c 100644
--- a/klp-ui/src/views/wms/report/js/column.js
+++ b/klp-ui/src/views/wms/report/js/column.js
@@ -248,22 +248,22 @@ const defaultColumns = {
       align: "center",
     },
     {
-      title: "发货绑定车牌号",
+      title: "车牌号",
       prop: "bindLicensePlate",
       align: "center",
     },
     {
-      title: "发货绑定目标客户",
+      title: "目标客户",
       prop: "bindConsigneeUnit",
       align: "center",
     },
     {
-      title: "发货绑定单位",
+      title: "发货单位",
       prop: "bindSenderUnit",
       align: "center",
     },
     {
-      title: "发货绑定负责人",
+      title: "发货负责人",
       prop: "bindPrincipal",
       align: "center",
     },