From 8e2069cecf7deb8b4159fb0ec4b01d0721be1c72 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Fri, 10 Apr 2026 13:27:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(wms):=20=E4=BF=AE=E5=A4=8D=E8=B0=83?=
 =?UTF-8?q?=E6=8B=A8=E5=8D=95=E4=BA=8C=E6=AC=A1=E8=B0=83=E6=95=B4=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E6=98=BE=E7=A4=BA=E5=8F=8A=E4=BB=93=E5=BA=93=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复调拨单列表中二次调整按钮的显示条件，从原审批状态为2或3改为仅状态为3时显示
移除执行全部按钮的注释状态
为仓库选择添加change事件自动保存功能
调整重新提交审批的提示信息和成功消息
---
 klp-ui/src/views/wms/move/batch.vue                | 12 ++++++------
 .../views/wms/move/components/tranferItemTable.vue | 14 +++++++++-----
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/klp-ui/src/views/wms/move/batch.vue b/klp-ui/src/views/wms/move/batch.vue
index cfd674db..088cb346 100644
--- a/klp-ui/src/views/wms/move/batch.vue
+++ b/klp-ui/src/views/wms/move/batch.vue
@@ -149,14 +149,14 @@
             v-if="scope.row.approveStatus == '1'"
             icon="el-icon-refresh"
           >撤回</el-button>
-          <!-- <el-button
+          <el-button
             size="mini"
             type="text"
             plain
             @click="handleReSubmit(scope.row)"
-            v-if="scope.row.approveStatus == '3' || scope.row.approveStatus == '2'"
+            v-if="scope.row.approveStatus == '3'"
             icon="el-icon-refresh"
-          >二次调整</el-button> -->
+          >二次调整</el-button>
           <el-button
             size="mini"
             type="text"
@@ -220,7 +220,7 @@
       <div style="margin-bottom: 10px; display: flex; align-items: center;">
         <el-button icon="el-icon-download" type="warning" plain @click="handleExportDetail">导出</el-button>
         <el-button style="margin-right: 10px;" icon="el-icon-refresh" type="success" plain @click="handleRefreshDetailList">刷新</el-button>
-        <el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button>
+        <!-- <el-button :loading="buttonLoading" style="margin-right: 10px;" icon="el-icon-check" type="primary" plain @click="handleConfirmAll" v-if="currentOrderStatus == '2'">执行全部</el-button> -->
         <coil-selector v-loading="buttonLoading" ref="coilSelector" multiple @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
       </div>
       <transfer-item-table ref="transferItemTable" :data="transferOrderItems" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
@@ -410,7 +410,7 @@ export default {
     },
     /** 重新提交 */
     handleReSubmit(row) {
-      this.$confirm('确定要重新提交审批吗？', '提示', {
+      this.$confirm('确定要调整后重新提交审批吗？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'info'
@@ -422,7 +422,7 @@ export default {
           ...row,
           approveStatus: '0',
         }).then(response => {
-          this.$modal.msgSuccess('重新提交成功');
+          this.$modal.msgSuccess('请调整后重新提交审批');
           this.getList();
         }).finally(() => {
           this.loading = false;
diff --git a/klp-ui/src/views/wms/move/components/tranferItemTable.vue b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
index 1d326e9f..939a1a3d 100644
--- a/klp-ui/src/views/wms/move/components/tranferItemTable.vue
+++ b/klp-ui/src/views/wms/move/components/tranferItemTable.vue
@@ -49,7 +49,7 @@
     </el-table-column>
     <el-table-column prop="warehouseIdAfter" label="调拨后库区" width="200">
       <template slot-scope="scope">
-        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" placeholder="请选择">
+        <el-select v-if="!scope.row.isConfirmed && canEdit" v-model="scope.row.warehouseIdAfter" @change="handleWarehouseChange(scope.row)" placeholder="请选择">
           <el-option v-for="item in warehouseList" :disabled="!item.isEnabled" :key="item.warehouseId"
             :label="item.warehouseName" :value="item.warehouseId" />
         </el-select>
@@ -62,14 +62,14 @@
     <el-table-column type="action" label="操作" width="180">
       <template slot-scope="scope">
         <div v-if="orderStatus == 0">
-          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
-            :loading="buttonLoading">保存</el-button>
+          <!-- <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleUpdate(scope.row)"
+            :loading="buttonLoading">保存</el-button> -->
           <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
             :loading="buttonLoading">删除</el-button>
         </div>
         <div v-else>
-          <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
-            :loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button>
+          <!-- <el-button icon="el-icon-check" size="mini" v-if="!scope.row.isConfirmed" @click="handleConfirm(scope.row)"
+            :loading="buttonLoading" :disabled="orderStatus != '2'">执行</el-button> -->
           <!-- <el-button icon="el-icon-close" size="mini" @click="handleCancel(scope.row)"
             :loading="buttonLoading" :disabled="orderStatus !== '2'">取消</el-button> -->
         </div>
@@ -278,10 +278,14 @@ export default {
         itemId: row.itemIdAfter
       }).then(res => {
         row.itemIdAfter = res.data
+        updateTransferOrderItem(row)
         this.materialLoading = false
       }).catch(() => {
         this.materialLoading = false
       })
+    },
+    handleWarehouseChange(row) {
+      updateTransferOrderItem(row)
     }
   }
 }