From 093d3ef2cbf1162bacb20698a5f44d8dabd858a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A0=82=E7=B3=96?= <qq2178503051@163.com>
Date: Sat, 28 Feb 2026 13:59:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=92=A2=E5=8D=B7=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=92=A2=E5=8D=B7=E9=80=80=E8=B4=A7=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=8F=8A=E7=9B=B8=E5=85=B3=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在coil.js中新增returnCoil接口用于处理钢卷退货
- 添加exit.vue作为退货钢卷管理页面
- 在base.vue中添加退货按钮及相关处理逻辑
- 新增仓库图标资源
- 调整报表页面日期选择器的时间格式
---
 klp-ui/src/api/wms/coil.js                | 15 ++++++++
 klp-ui/src/assets/icons/svg/warehouse.svg |  1 +
 klp-ui/src/views/wms/coil/panels/base.vue | 20 ++++++++++-
 klp-ui/src/views/wms/coil/views/exit.vue  | 44 +++++++++++++++++++++++
 klp-ui/src/views/wms/report/zha/team.vue  |  4 +--
 5 files changed, 81 insertions(+), 3 deletions(-)
 create mode 100644 klp-ui/src/assets/icons/svg/warehouse.svg
 create mode 100644 klp-ui/src/views/wms/coil/views/exit.vue

diff --git a/klp-ui/src/api/wms/coil.js b/klp-ui/src/api/wms/coil.js
index a140934c..82d278a7 100644
--- a/klp-ui/src/api/wms/coil.js
+++ b/klp-ui/src/api/wms/coil.js
@@ -305,3 +305,18 @@ export function cancelSpecialSplit(pendingActionId) {
   })
 }
 
+/**
+ * 钢卷被退货，发给客户的钢卷被退货
+ */
+export function returnCoil(coilId) {
+  if (!coilId) {
+    return Promise.reject(new Error('coilId is required'))
+  }
+  return request({
+    url: '/wms/materialCoil/return',
+    method: 'post',
+    params: {
+      coilId
+    }
+  })
+}
diff --git a/klp-ui/src/assets/icons/svg/warehouse.svg b/klp-ui/src/assets/icons/svg/warehouse.svg
new file mode 100644
index 00000000..69755c97
--- /dev/null
+++ b/klp-ui/src/assets/icons/svg/warehouse.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1772256771224" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5424" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M896 640h-42.666667v-89.6l-320-320L213.333333 550.4V810.666667h341.333334v42.666666H170.666667v-277.333333H128L533.333333 170.666667l405.333334 405.333333h-42.666667V640z m0 128v128h-128v-128h128z m-170.666667 0v128h-128v-128h128z m85.333334-170.666667v128h-128v-128h128z m-42.666667 42.666667h-42.666667v42.666667h42.666667v-42.666667z m-85.333333 170.666667h-42.666667v42.666666h42.666667v-42.666666z m170.666666 0h-42.666666v42.666666h42.666666v-42.666666z" fill="#444444" p-id="5425"></path></svg>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 4ab14ebe..5e56c867 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -173,6 +173,10 @@
           <el-button size="mini" v-if="showExportTime" type="text" icon="el-icon-close"
             @click="handleCancelExport(scope.row)">
             撤回发货
+          </el-button>
+           <el-button size="mini" v-if="showExportTime" type="text" icon="el-icon-sold-out"
+            @click="handleReturnCoil(scope.row)">
+            退货钢卷
           </el-button>
           <el-button size="mini" v-if="showAbnormal" type="text" icon="el-icon-upload"
             @click="handleAbnormal(scope.row)">查看异常</el-button>
@@ -325,7 +329,8 @@ import {
   getMaterialCoilTrace,
   exportCoil,
   cancelExportCoil,
-  checkCoilNo
+  checkCoilNo,
+  returnCoil
 } from "@/api/wms/coil";
 import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
 import QRCode from "../../print/components/QRCode.vue";
@@ -943,6 +948,19 @@ export default {
       }).catch(() => {
       });
     },
+    handleReturnCoil(row) {
+      this.$modal.confirm('是否确认退货钢卷编号为"' + row.currentCoilNo + '"的退货操作？').then(() => {
+        this.buttonLoading = true;
+        returnCoil(row.coilId).then(response => {
+          this.$modal.msgSuccess("退货成功");
+          this.getList();
+        }).catch(error => {
+          this.$modal.msgError("退货失败");
+        }).finally(() => {
+          this.buttonLoading = false;
+        });
+      })
+    },
     handleExportTimeChange(row) {
       if (row.exportTime) {
         row.exportTime = row.exportTime.replace('T', ' ');
diff --git a/klp-ui/src/views/wms/coil/views/exit.vue b/klp-ui/src/views/wms/coil/views/exit.vue
new file mode 100644
index 00000000..949c624e
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/exit.vue
@@ -0,0 +1,44 @@
+<template>
+  <el-tabs class="app-container" v-model="activeTab">
+    <el-tab-pane label="待收卷" name="second">
+      <BasePage :qrcode="qrcode" :querys="querys2" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane>
+    <el-tab-pane label="已收卷" name="first">
+      <BasePage :qrcode="qrcode" :querys="querys" :labelType="labelType" :hideWarehouseQuery="hideWarehouseQuery"
+        :hideType="hideType" />
+    </el-tab-pane> 
+  </el-tabs>
+</template>
+
+<script>
+import BasePage from '../panels/base.vue';
+
+export default {
+  components: {
+    BasePage
+  },
+  data() {
+    return {
+      qrcode: false,
+      activeTab: 'second',
+      querys: {
+        dataType: 1,
+        status: 0,
+        warehouseId: '2027614132626063361', // 退回仓逻辑库
+        // materialType: '废品'
+      },
+      querys2: {
+        dataType: 1,
+        status: 0,
+        nextWarehouseId: '2027614132626063361', // 退回仓逻辑库
+        // materialType: '废品'
+      },
+      hideWarehouseQuery: true,
+      showAbnormal: true,
+      labelType: '2',
+      hideType: false,
+    }
+  }
+}
+</script>
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/report/zha/team.vue b/klp-ui/src/views/wms/report/zha/team.vue
index 4890d803..8771cc09 100644
--- a/klp-ui/src/views/wms/report/zha/team.vue
+++ b/klp-ui/src/views/wms/report/zha/team.vue
@@ -4,11 +4,11 @@
       <el-form label-width="80px" inline>
         <el-form-item label="开始日期" prop="date">
           <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeStart" type="date"
-            value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="结束日期" prop="date">
           <el-date-picker style="width: 200px;" v-model="queryParams.byCreateTimeEnd" type="date"
-            value-format="yyyy-MM-dd" placeholder="选择日期"></el-date-picker>
+            value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期"></el-date-picker>
         </el-form-item>
         <el-form-item label="班组" prop="team">
           <el-select v-model="queryParams.team" placeholder="请选择班组" style="width: 200px;">