From e6d63ef4f7bfd7e64114d9ae00840a6ff2309087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 3 Apr 2026 13:21:38 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=BA=93=E5=AD=98=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E5=B0=86=E5=BA=93=E5=AD=98=E5=8F=98=E5=8A=A8=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E6=B6=88=E8=80=97=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改界面标签从"变动"改为"消耗"
- 移除增加/减少类型选择，只保留消耗功能
- 更新按钮图标和文字为消耗相关
- 为设备选择器添加可清空功能
- 初始化表单数量字段默认值为0
---
 klp-ui/src/views/mes/eqp/auxiliary/index.vue  | 30 +++++++-------
 .../eqp/components/pages/auxiliaryChange.vue  | 40 +++++++++----------
 .../mes/eqp/components/pages/partChange.vue   | 36 ++++++++---------
 klp-ui/src/views/mes/eqp/ready/index.vue      | 34 ++++++++--------
 4 files changed, 70 insertions(+), 70 deletions(-)

diff --git a/klp-ui/src/views/mes/eqp/auxiliary/index.vue b/klp-ui/src/views/mes/eqp/auxiliary/index.vue
index 0cf19fc8..93c28386 100644
--- a/klp-ui/src/views/mes/eqp/auxiliary/index.vue
+++ b/klp-ui/src/views/mes/eqp/auxiliary/index.vue
@@ -92,21 +92,21 @@
       <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" />
+      <el-table-column label="累计消耗" align="center" prop="quantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-plus"
             @click.native.stop="handleAddChange(scope.row)"
-          >增加</el-button>
-          <el-button
+          >消耗</el-button>
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click.native.stop="handleReduce(scope.row)"
-          >减少</el-button>
+          >减少</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -161,20 +161,20 @@
 
     <el-dialog title="库存变动" :visible.sync="changeOpen" width="500px" append-to-body>
       <el-form ref="changeForm" :model="changeForm" label-width="80px">
-        <el-form-item label="变动类型">
+        <!-- <el-form-item label="变动类型">
           <el-select v-model="changeForm.changeType" placeholder="请选择变动类型">
             <el-option label="增加" value="增加" />
             <el-option label="减少" value="减少" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="消耗数量">
+          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入消耗数量" size="mini"/>
         </el-form-item>
-        <el-form-item label="变动数量">
-          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入变动数量" size="mini"/>
-        </el-form-item>
-        <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
+        <!-- <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
           <el-input-number v-model="changeForm.inUnitPrice" :min="0" :step="0.01" :precision="6" placeholder="请输入入库单价" size="mini"/>
-        </el-form-item>
-        <el-form-item label="变动原因">
-          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入变动原因" size="mini"/>
+        </el-form-item> -->
+        <el-form-item label="消耗原因">
+          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入消耗原因" size="mini"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -273,8 +273,8 @@ export default {
       this.changeForm = {
         changeType: '增加',
         auxiliaryId: row.auxiliaryId,
-        inUnitPrice: undefined,
-        changeQuantity: undefined,
+        inUnitPrice: 0,
+        changeQuantity: 0,
         reason: undefined
       }
     },
diff --git a/klp-ui/src/views/mes/eqp/components/pages/auxiliaryChange.vue b/klp-ui/src/views/mes/eqp/components/pages/auxiliaryChange.vue
index 7376e4da..48a34adf 100644
--- a/klp-ui/src/views/mes/eqp/components/pages/auxiliaryChange.vue
+++ b/klp-ui/src/views/mes/eqp/components/pages/auxiliaryChange.vue
@@ -3,21 +3,21 @@
     <el-form v-if="!auxiliaryId" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
       label-width="68px">
       <el-form-item label="关联辅料" prop="auxiliaryId">
-        <el-select v-model="queryParams.auxiliaryId" placeholder="请选择关联辅料">
+        <el-select v-model="queryParams.auxiliaryId" placeholder="请选择关联辅料" clearable filterable>
           <el-option v-for="item in partList" :key="item.auxiliaryId" :label="item.auxiliaryName"
             :value="item.auxiliaryId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="变动数量" prop="changeQuantity">
-        <el-input v-model="queryParams.changeQuantity" placeholder="请输入变动数量" clearable
+      <el-form-item label="消耗数量" prop="changeQuantity">
+        <el-input v-model="queryParams.changeQuantity" placeholder="请输入消耗数量" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="变动原因" prop="reason">
-        <el-input v-model="queryParams.reason" placeholder="请输入变动原因" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="消耗原因" prop="reason">
+        <el-input v-model="queryParams.reason" placeholder="请输入消耗原因" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="变动时间" prop="changeTime">
+      <el-form-item label="消耗时间" prop="changeTime">
         <el-date-picker clearable v-model="queryParams.changeTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择变动时间">
+          placeholder="请选择消耗时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -43,10 +43,10 @@
           <span>{{ getAuxiliaryMaterialName(scope.row.auxiliaryId) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="变动类型" align="center" prop="changeType" />
-      <el-table-column label="变动数量" align="center" prop="changeQuantity" />
-      <el-table-column label="变动原因" align="center" prop="reason" />
-      <el-table-column label="变动时间" align="center" prop="changeTime" width="180">
+      <!-- <el-table-column label="变动类型" align="center" prop="changeType" /> -->
+      <el-table-column label="消耗数量" align="center" prop="changeQuantity" />
+      <el-table-column label="消耗原因" align="center" prop="reason" />
+      <el-table-column label="消耗时间" align="center" prop="changeTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -60,7 +60,7 @@
     <el-dialog title="库存变动" :visible.sync="changeOpen" width="500px" append-to-body>
       <el-form ref="changeForm" :model="changeForm" label-width="80px">
         <el-form-item label="关联辅料">
-          <el-select v-model="changeForm.auxiliaryId" placeholder="请选择关联辅料" filterable>
+          <el-select v-model="changeForm.auxiliaryId" placeholder="请选择关联辅料" filterable clearable>
             <el-option v-for="item in partList" :key="item.auxiliaryId" :label="item.auxiliaryName"
               :value="item.auxiliaryId" />
              <template slot="empty">
@@ -71,21 +71,21 @@
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="变动类型">
+        <!-- <el-form-item label="变动类型">
           <el-select v-model="changeForm.changeType" placeholder="请选择变动类型">
             <el-option label="增加" value="增加" />
             <el-option label="减少" value="减少" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="消耗数量">
+          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入消耗数量" size="mini" />
         </el-form-item>
-        <el-form-item label="变动数量">
-          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入变动数量" size="mini" />
-        </el-form-item>
-        <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
+        <!-- <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
           <el-input-number v-model="changeForm.inUnitPrice" :min="0" :step="0.01" :precision="6" placeholder="请输入入库单价"
             size="mini" />
-        </el-form-item>
-        <el-form-item label="变动原因">
-          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入变动原因" size="mini" />
+        </el-form-item> -->
+        <el-form-item label="消耗原因">
+          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入消耗原因" size="mini" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/klp-ui/src/views/mes/eqp/components/pages/partChange.vue b/klp-ui/src/views/mes/eqp/components/pages/partChange.vue
index bd0e549a..836b569e 100644
--- a/klp-ui/src/views/mes/eqp/components/pages/partChange.vue
+++ b/klp-ui/src/views/mes/eqp/components/pages/partChange.vue
@@ -7,16 +7,16 @@
           <el-option v-for="item in partList" :key="item.partId" :label="item.partName" :value="item.partId" />
         </el-select>
       </el-form-item>
-      <el-form-item label="变动数量" prop="changeQuantity">
-        <el-input v-model="queryParams.changeQuantity" placeholder="请输入变动数量" clearable
+      <el-form-item label="消耗数量" prop="changeQuantity">
+        <el-input v-model="queryParams.changeQuantity" placeholder="请输入消耗数量" clearable
           @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="变动原因" prop="reason">
-        <el-input v-model="queryParams.reason" placeholder="请输入变动原因" clearable @keyup.enter.native="handleQuery" />
+      <el-form-item label="消耗原因" prop="reason">
+        <el-input v-model="queryParams.reason" placeholder="请输入消耗原因" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="变动时间" prop="changeTime">
+      <el-form-item label="消耗时间" prop="changeTime">
         <el-date-picker clearable v-model="queryParams.changeTime" type="date" value-format="yyyy-MM-dd"
-          placeholder="请选择变动时间">
+          placeholder="请选择消耗时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -38,10 +38,10 @@
     <el-table v-loading="loading" :data="sparePartsChangeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="关联备件" align="center" prop="partName" v-if="!partId" />
-      <el-table-column label="变动类型" align="center" prop="changeType" />
-      <el-table-column label="变动数量" align="center" prop="changeQuantity" />
-      <el-table-column label="变动原因" align="center" prop="reason" />
-      <el-table-column label="变动时间" align="center" prop="changeTime" width="180">
+      <!-- <el-table-column label="消耗类型" align="center" prop="changeType" /> -->
+      <el-table-column label="消耗数量" align="center" prop="changeQuantity" />
+      <el-table-column label="消耗原因" align="center" prop="reason" />
+      <el-table-column label="消耗时间" align="center" prop="changeTime" width="180">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.changeTime, '{y}-{m}-{d}') }}</span>
         </template>
@@ -66,21 +66,21 @@
             </template>
           </el-select>
         </el-form-item>
-        <el-form-item label="变动类型">
+        <!-- <el-form-item label="变动类型">
           <el-select v-model="changeForm.changeType" placeholder="请选择变动类型">
             <el-option label="增加" value="增加" />
             <el-option label="减少" value="减少" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="消耗数量">
+          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入消耗数量" size="mini" />
         </el-form-item>
-        <el-form-item label="变动数量">
-          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入变动数量" size="mini" />
-        </el-form-item>
-        <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
+        <!-- <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
           <el-input-number v-model="changeForm.inUnitPrice" :min="0" :step="0.01" :precision="6" placeholder="请输入入库单价"
             size="mini" />
-        </el-form-item>
-        <el-form-item label="变动原因">
-          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入变动原因" size="mini" />
+        </el-form-item> -->
+        <el-form-item label="消耗原因">
+          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入消耗原因" size="mini" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
diff --git a/klp-ui/src/views/mes/eqp/ready/index.vue b/klp-ui/src/views/mes/eqp/ready/index.vue
index a7b5ca2d..96a83dbe 100644
--- a/klp-ui/src/views/mes/eqp/ready/index.vue
+++ b/klp-ui/src/views/mes/eqp/ready/index.vue
@@ -34,7 +34,7 @@
         />
       </el-form-item>
       <el-form-item label="关联设备" prop="equipmentId">
-        <el-select v-model="queryParams.equipmentId" placeholder="请选择关联设备" filterable>
+        <el-select v-model="queryParams.equipmentId" placeholder="请选择关联设备" filterable clearable>
           <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
         </el-select>
       </el-form-item>
@@ -97,21 +97,21 @@
       <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" prop="quantity" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
+            icon="el-icon-plus"
             @click.native.stop="handleAddChange(scope.row)"
-          >增加</el-button>
-          <el-button
+          >消耗</el-button>
+          <!-- <el-button
             size="mini"
             type="text"
             icon="el-icon-edit"
             @click.native.stop="handleReduce(scope.row)"
-          >减少</el-button>
+          >减少</el-button> -->
           <el-button
             size="mini"
             type="text"
@@ -155,7 +155,7 @@
           <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-select v-model="form.equipmentId" placeholder="请选择关联设备ID" filterable clearable>
             <el-option v-for="item in equipmentList" :key="item.equipmentId" :label="item.equipmentName" :value="item.equipmentId" />
           </el-select>
         </el-form-item>
@@ -171,20 +171,20 @@
 
     <el-dialog title="库存变动" :visible.sync="changeOpen" width="500px" append-to-body>
       <el-form ref="changeForm" :model="changeForm" label-width="80px">
-        <el-form-item label="变动类型">
+        <!-- <el-form-item label="变动类型">
           <el-select v-model="changeForm.changeType" placeholder="请选择变动类型">
             <el-option label="增加" value="增加" />
             <el-option label="减少" value="减少" />
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="消耗数量">
+          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入消耗数量" size="mini"/>
         </el-form-item>
-        <el-form-item label="变动数量">
-          <el-input-number v-model="changeForm.changeQuantity" :min="0" :step="1" placeholder="请输入变动数量" size="mini"/>
-        </el-form-item>
-        <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
+        <!-- <el-form-item label="入库单价" v-if="changeForm.changeType === '增加'">
           <el-input-number v-model="changeForm.inUnitPrice" :min="0" :step="0.01" :precision="6" placeholder="请输入入库单价" size="mini"/>
-        </el-form-item>
-        <el-form-item label="变动原因">
-          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入变动原因" size="mini"/>
+        </el-form-item> -->
+        <el-form-item label="消耗原因">
+          <el-input type="textarea" v-model="changeForm.reason" placeholder="请输入消耗原因" size="mini"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -285,8 +285,8 @@ export default {
       this.changeForm = {
         changeType: '增加',
         partId: row.partId,
-        inUnitPrice: undefined,
-        changeQuantity: undefined,
+        inUnitPrice: 0,
+        changeQuantity: 0,
         reason: undefined
       }
     },