feat(wms): 新增调拨批量确认功能，优化调拨查询与表格展示

1.  新增批量确认调拨单接口及前端实现
2.  调整调拨单号查询为模糊匹配
3.  新增调拨单号远程搜索功能
4.  优化调拨表格列宽与操作栏展示
5.  新增调拨记录删除功能
6.  新增调拨执行页面do.vue
7.  优化调拨管理页面代码格式

klp-ui/src/views/wms/move/batch.vue

@@ -2,26 +2,14 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="调拨单号" prop="transferNo">
-        <el-input
-          v-model="queryParams.transferNo"
-          placeholder="请输入调拨单号"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.transferNo" placeholder="请输入调拨单号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="调拨单名称" prop="transferName">
-        <el-input
-          v-model="queryParams.transferName"
-          placeholder="请输入调拨单名称，用于帮助记忆与沟通"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.transferName" placeholder="请输入调拨单名称，用于帮助记忆与沟通" clearable
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="调拨时间" prop="transferTime">
-        <el-date-picker clearable
-          v-model="queryParams.transferTime"
-          type="date"
-          value-format="yyyy-MM-dd"
+        <el-date-picker clearable v-model="queryParams.transferTime" type="date" value-format="yyyy-MM-dd"
           placeholder="请选择实际调拨时间">
         </el-date-picker>
       </el-form-item>
@@ -45,42 +33,18 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
+        <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single"
+          @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple"
+          @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
@@ -96,7 +60,7 @@
         </template>
       </el-table-column>
       <el-table-column label="调拨类型" align="center" prop="transferType" width="120"></el-table-column>
-       <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
+      <el-table-column label="审批状态" align="center" prop="approveStatus" width="120">
         <template slot-scope="scope">
           <el-tag :type="getapproveStatusType(scope.row.approveStatus)">
             {{ getapproveStatusText(scope.row.approveStatus) }}
@@ -104,7 +68,7 @@
         </template>
       </el-table-column>
       <el-table-column label="审批人" align="center" prop="approver" />
-     
+
       <el-table-column label="审批时间" align="center" prop="approveTime" width="180">
         <template slot-scope="scope">
           <span>{{ scope.row.approveTime ? parseTime(scope.row.approveTime, '{y}-{m}-{d} {h}:{i}') : '-' }}</span>
@@ -113,77 +77,27 @@
       <el-table-column label="备注" align="center" prop="remark" />
       <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-view"
-            @click="handleView(scope.row)"
-          >查看</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            :disabled="!canEdit(scope.row)"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            :disabled="!canDelete(scope.row)"
-          >删除</el-button>
-          <el-button
-            size="mini"
-            plain
-            type="text"
-            @click="handleSubmitapprove(scope.row)"
-            v-if="(scope.row.approveStatus || '0') == '0'"
-            icon="el-icon-check"
-          >提交</el-button>
-          <el-button
-            size="mini"
-            plain
-            type="text"
-            @click="handleWithdrawapprove(scope.row)"
-            v-if="scope.row.approveStatus == '1'"
-            icon="el-icon-refresh"
-          >撤回</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            plain
-            @click="handleReSubmit(scope.row)"
-            v-if="scope.row.approveStatus == '3'"
-            icon="el-icon-refresh"
-          >二次调整</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-hasPermi="['coil:move:approval']"
-            @click="handleResolve(scope.row)"
-            icon="el-icon-check"
-            v-if="scope.row.approveStatus == '1'"
-          >通过</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            v-hasPermi="['coil:move:approval']"
-            @click="handleReject(scope.row)"
-            v-if="scope.row.approveStatus == '1'"
-            icon="el-icon-close"
-          >驳回</el-button>
+          <el-button size="mini" type="text" icon="el-icon-view" @click="handleView(scope.row)">查看</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            :disabled="!canEdit(scope.row)">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            :disabled="!canDelete(scope.row)">删除</el-button>
+          <el-button size="mini" plain type="text" @click="handleSubmitapprove(scope.row)"
+            v-if="(scope.row.approveStatus || '0') == '0'" icon="el-icon-check">提交</el-button>
+          <el-button size="mini" plain type="text" @click="handleWithdrawapprove(scope.row)"
+            v-if="scope.row.approveStatus == '1'" icon="el-icon-refresh">撤回</el-button>
+          <el-button size="mini" type="text" plain @click="handleReSubmit(scope.row)"
+            v-if="scope.row.approveStatus == '3'" icon="el-icon-refresh">二次调整</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['coil:move:approval']" @click="handleResolve(scope.row)"
+            icon="el-icon-check" v-if="scope.row.approveStatus == '1'">通过</el-button>
+          <el-button size="mini" type="text" v-hasPermi="['coil:move:approval']" @click="handleReject(scope.row)"
+            v-if="scope.row.approveStatus == '1'" icon="el-icon-close">驳回</el-button>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
 
     <!-- 添加或修改调拨单主对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
@@ -195,10 +109,7 @@
           <el-input v-model="form.transferName" placeholder="请输入调拨单名称，用于帮助记忆与沟通" />
         </el-form-item>
         <el-form-item label="调拨时间" prop="transferTime">
-          <el-date-picker clearable
-            v-model="form.transferTime"
-            type="datetime"
-            value-format="yyyy-MM-dd HH:mm:ss"
+          <el-date-picker clearable v-model="form.transferTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="请选择调拨时间">
           </el-date-picker>
         </el-form-item>
@@ -219,11 +130,14 @@
     <el-dialog title="调拨单明细" v-loading="detailLoading" :visible.sync="detailOpen" fullscreen>
       <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>
-        <coil-selector v-loading="buttonLoading" ref="coilSelector" :filters="{ dataType: 1, status: 0 }" multiple @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
+        <el-button style="margin-right: 10px;" icon="el-icon-refresh" type="success" plain
+          @click="handleRefreshDetailList">刷新</el-button>
+        <coil-selector v-loading="buttonLoading" ref="coilSelector" :filters="{ dataType: 1, status: 0 }" multiple
+          @confirm="handleCoilChange" v-if="canAddCoils"></coil-selector>
         <el-checkbox v-model="batchEdit" style="margin-right: 10px;">批量操作</el-checkbox>
       </div>
-      <transfer-item-table ref="transferItemTable" :data="transferOrderItems" :batchEdit="batchEdit" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
+      <transfer-item-table ref="transferItemTable" :data="transferOrderItems" :batchEdit="batchEdit"
+        @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
     </el-dialog>
   </div>
 </template>
@@ -317,20 +231,34 @@ export default {
       });
     },
     handleResolve(row) {
-      approveTransferOrder(row.orderId, '2').then(response => {
+      updateTransferOrder({
+        ...row,
+        approveStatus: '2',
+      }).then(_ => {
         this.$modal.msgSuccess('审批成功');
         this.getList();
-      }).finally(() => {
-        this.loading = false;
-      });
+      })
+      // approveTransferOrder(row.orderId, '2').then(response => {
+      //   this.$modal.msgSuccess('审批成功');
+      //   this.getList();
+      // }).finally(() => {
+      //   this.loading = false;
+      // });
     },
     handleReject(row) {
-      approveTransferOrder(row.orderId, '3').then(response => {
-        this.$modal.msgSuccess('审批成功');
+      updateTransferOrder({
+        ...row,
+        approveStatus: '3',
+      }).then(_ => {
+        this.$modal.msgSuccess('已驳回调拨单');
         this.getList();
-      }).finally(() => {
-        this.loading = false;
-      });
+      })
+      // approveTransferOrder(row.orderId, '3').then(response => {
+      //   this.$modal.msgSuccess('已驳回调拨单');
+      //   this.getList();
+      // }).finally(() => {
+      //   this.loading = false;
+      // });
     },
     /** 获取审批状态文本 */
     getapproveStatusText(status) {
@@ -468,7 +396,7 @@ export default {
         'coil_supplierCoilNo': '厂家卷号',
         // 'coil_warehouseName': '逻辑库区',
         'coil_netWeight': '净重',
-        
+
         // 'coil_itemName': '物品名称',
         // 'coil_materialType': '物料类型',
         'coil_qualityStatus': '质量状态',
@@ -484,7 +412,7 @@ export default {
       // 准备导出数据
       const exportData = this.transferOrderItems.map(item => {
         const flatItem = {};
-        
+
         // 处理Before和After字段
         exportFields.forEach(field => {
           if (field.startsWith('coil_')) {
@@ -494,7 +422,7 @@ export default {
             flatItem[field] = item[field] !== null && item[field] !== undefined ? item[field] : '';
           }
         });
-        
+
         return flatItem;
       });
 
@@ -525,7 +453,7 @@ export default {
       document.body.appendChild(link);
       link.click();
       document.body.removeChild(link);
-    }, 
+    },
     /** 钢卷选择器改变 */
     handleCoilChange(coils) {
       console.log(coils);
@@ -550,25 +478,25 @@ export default {
       this.reset();
     },
     // 表单重置
-      reset() {
-        this.form = {
-          orderId: undefined,
-          transferNo: undefined,
-          transferName: undefined,
-          transferStatus: undefined,
-          transferTime: undefined,
-          remark: undefined,
-          delFlag: undefined,
-          createBy: undefined,
-          updateBy: undefined,
-          createTime: undefined,
-          updateTime: undefined,
-          approveStatus: '0',
-          approver: undefined,
-          approveTime: undefined
-        };
-        this.resetForm("form");
-      },
+    reset() {
+      this.form = {
+        orderId: undefined,
+        transferNo: undefined,
+        transferName: undefined,
+        transferStatus: undefined,
+        transferTime: undefined,
+        remark: undefined,
+        delFlag: undefined,
+        createBy: undefined,
+        updateBy: undefined,
+        createTime: undefined,
+        updateTime: undefined,
+        approveStatus: '0',
+        approver: undefined,
+        approveTime: undefined
+      };
+      this.resetForm("form");
+    },
     getDetailList() {
       this.handleView({ orderId: this.currentOrderId, approveStatus: this.currentOrderStatus });
     },
@@ -601,7 +529,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.orderId)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -610,18 +538,18 @@ export default {
       // 生成当前时间
       const currentDate = new Date();
       // 生成调拨单号：TR + 年月日时分秒
-      const transferNo = 'TR' + currentDate.getFullYear() + 
-        String(currentDate.getMonth() + 1).padStart(2, '0') + 
-        String(currentDate.getDate()).padStart(2, '0') + 
-        String(currentDate.getHours()).padStart(2, '0') + 
-        String(currentDate.getMinutes()).padStart(2, '0') + 
+      const transferNo = 'TR' + currentDate.getFullYear() +
+        String(currentDate.getMonth() + 1).padStart(2, '0') +
+        String(currentDate.getDate()).padStart(2, '0') +
+        String(currentDate.getHours()).padStart(2, '0') +
+        String(currentDate.getMinutes()).padStart(2, '0') +
         String(currentDate.getSeconds()).padStart(2, '0');
       // 生成调拨时间：YYYY-MM-DD HH:mm:ss
-      const transferTime = currentDate.getFullYear() + '-' + 
-        String(currentDate.getMonth() + 1).padStart(2, '0') + '-' + 
-        String(currentDate.getDate()).padStart(2, '0') + ' ' + 
-        String(currentDate.getHours()).padStart(2, '0') + ':' + 
-        String(currentDate.getMinutes()).padStart(2, '0') + ':' + 
+      const transferTime = currentDate.getFullYear() + '-' +
+        String(currentDate.getMonth() + 1).padStart(2, '0') + '-' +
+        String(currentDate.getDate()).padStart(2, '0') + ' ' +
+        String(currentDate.getHours()).padStart(2, '0') + ':' +
+        String(currentDate.getMinutes()).padStart(2, '0') + ':' +
         String(currentDate.getSeconds()).padStart(2, '0');
       // 填充表单
       this.form.transferNo = transferNo;