feat: 增加调拨单审批功能及界面优化

fix(调拨单): 修正审批状态校验逻辑
feat(调拨单): 添加审批API接口
refactor(调拨单明细): 重构表格组件支持不同状态操作
style(调拨单): 优化界面显示和操作按钮
perf(发货单): 自动设置发货时间为当前时间
chore: 删除无用调拨记录页面

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

@@ -25,6 +25,18 @@
           placeholder="请选择实际调拨时间">
         </el-date-picker>
       </el-form-item>
+      <el-form-item label="调拨类型" prop="transferType">
+        <dict-select v-model="queryParams.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+        </dict-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="approveStatus">
+        <el-select v-model="queryParams.approveStatus" placeholder="请选择审批状态" clearable>
+          <el-option label="未申请" :value="'0'" />
+          <el-option label="待审批" :value="'1'" />
+          <el-option label="已通过" :value="'2'" />
+          <el-option label="已驳回" :value="'3'" />
+        </el-select>
+      </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>
@@ -83,6 +95,21 @@
           <span>{{ parseTime(scope.row.transferTime, '{y}-{m}-{d}') }}</span>
         </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">
+        <template slot-scope="scope">
+          <el-tag :type="getapproveStatusType(scope.row.approveStatus)">
+            {{ getapproveStatusText(scope.row.approveStatus) }}
+          </el-tag>
+        </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>
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -97,13 +124,55 @@
             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' || scope.row.approveStatus == '2'"
+            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>
@@ -133,6 +202,10 @@
             placeholder="请选择调拨时间">
           </el-date-picker>
         </el-form-item>
+        <el-form-item label="调拨类型" prop="transferType">
+          <dict-select v-model="form.transferType" dict-type="coil_move_type" placeholder="请选择调拨类型" clearable>
+          </dict-select>
+        </el-form-item>
         <el-form-item label="备注" prop="remark">
           <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
         </el-form-item>
@@ -147,15 +220,16 @@
       <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" multiple @confirm="handleCoilChange"></coil-selector>
+        <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 :data="transferOrderItems" @refreshData="getDetailList" />
+      <transfer-item-table ref="transferItemTable" :data="transferOrderItems" @refreshData="getDetailList" :orderStatus="currentOrderStatus" :canEdit="canAddCoils" />
     </el-dialog>
   </div>
 </template>
 
 <script>
-import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder } from "@/api/wms/transferOrder";
+import { listTransferOrder, getTransferOrder, delTransferOrder, addTransferOrder, updateTransferOrder, approveTransferOrder } from "@/api/wms/transferOrder";
 import { listTransferOrderItem, batchAddTransferOrderItem } from "@/api/wms/transferOrderItem";
 import CoilSelector from "@/components/CoilSelector";
 import TransferItemTable from "@/views/wms/move/components/tranferItemTable.vue";
@@ -196,6 +270,7 @@ export default {
         transferName: undefined,
         transferStatus: undefined,
         transferTime: undefined,
+        approveStatus: undefined,
       },
       // 表单参数
       form: {},
@@ -220,6 +295,10 @@ export default {
       // 调拨单明细表格数据
       transferOrderItems: [],
       currentOrderId: undefined,
+      // 是否可以添加钢卷
+      canAddCoils: false,
+      // 当前审批状态
+      currentOrderStatus: undefined,
     };
   },
   created() {
@@ -235,6 +314,124 @@ export default {
         this.loading = false;
       });
     },
+    handleResolve(row) {
+      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('审批成功');
+        this.getList();
+      }).finally(() => {
+        this.loading = false;
+      });
+    },
+    /** 获取审批状态文本 */
+    getapproveStatusText(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return '未申请';
+      }
+      const statusMap = {
+        '0': '未申请',
+        '1': '待审批',
+        '2': '已通过',
+        '3': '已驳回'
+      };
+      return statusMap[status] || '未申请';
+    },
+    /** 获取审批状态标签类型 */
+    getapproveStatusType(status) {
+      // 如果没有状态字段，则视为未提交
+      if (!status) {
+        return 'info';
+      }
+      const typeMap = {
+        '0': 'info',
+        '1': 'warning',
+        '2': 'success',
+        '3': 'danger'
+      };
+      return typeMap[status] || 'info';
+    },
+    /** 判断是否可以编辑 */
+    canEdit(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0' || status === '1' || status === '3';
+    },
+    /** 判断是否可以删除 */
+    canDelete(row) {
+      // 如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      return status === '0';
+    },
+    /** 提交审批 */
+    handleSubmitapprove(row) {
+      this.$confirm('确定要提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '1',
+        }).then(response => {
+          this.$modal.msgSuccess('提交审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 撤回审批 */
+    handleWithdrawapprove(row) {
+      this.$confirm('确定要撤回审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.loading = true;
+        updateTransferOrder({
+          ...row,
+          approveStatus: '0',
+        }).then(response => {
+          this.$modal.msgSuccess('撤回审批成功');
+          this.getList();
+        }).finally(() => {
+          this.loading = false;
+        });
+      });
+    },
+    /** 重新提交 */
+    handleReSubmit(row) {
+      this.$confirm('确定要重新提交审批吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'info'
+      }).then(() => {
+        this.loading = true;
+        // 这里需要调用重新提交的API
+        // 假设API为reSubmitapprove
+        // reSubmitapprove(row.orderId).then(response => {
+        //   this.$modal.msgSuccess('重新提交成功');
+        //   this.getList();
+        // }).finally(() => {
+        //   this.loading = false;
+        // });
+        // 模拟API调用
+        setTimeout(() => {
+          this.loading = false;
+          this.$modal.msgSuccess('重新提交成功');
+          this.getList();
+        }, 1000);
+      });
+    },
     /** 刷新调拨单明细列表 */
     handleRefreshDetailList() {
       this.getDetailList();
@@ -354,24 +551,27 @@ 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
-      };
-      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 });
+      this.handleView({ orderId: this.currentOrderId, approveStatus: this.currentOrderStatus });
     },
     /** 查看按钮操作 */
     handleView(row) {
@@ -379,6 +579,10 @@ export default {
       this.detailLoading = true;
       this.detailOpen = true;
       this.currentOrderId = row.orderId;
+      // 根据审批状态设置是否可以添加钢卷，如果没有状态字段，则视为未提交
+      const status = row.approveStatus || '0';
+      this.currentOrderStatus = status;
+      this.canAddCoils = status === '0';
       listTransferOrderItem({ transferId: row.orderId }).then(response => {
         console.log(response.rows);
         this.transferOrderItems = response.rows;
@@ -483,6 +687,15 @@ export default {
       this.download('wms/transferOrder/export', {
         ...this.queryParams
       }, `transferOrder_${new Date().getTime()}.xlsx`)
+    },
+    /** 执行全部调拨 */
+    handleConfirmAll() {
+      if (this.$refs.transferItemTable) {
+        this.buttonLoading = true;
+        this.$refs.transferItemTable.handleConfirmAll().finally(() => {
+          this.buttonLoading = false;
+        });
+      }
     }
   }
 };