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 @@
+
\ 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..2c2256b7 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -138,6 +138,7 @@
—
+
@@ -146,6 +147,11 @@
+
+
+
+
+
@@ -173,6 +179,10 @@
撤回发货
+
+
+ 退货钢卷
查看异常
@@ -325,7 +335,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";
@@ -430,6 +441,10 @@ export default {
type: String,
required: false,
},
+ editWarehouse: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
@@ -714,6 +729,15 @@ export default {
this.getList(); // 刷新列表
})
},
+ handleWarehouseChange(row) {
+ if (!this.editWarehouse) {
+ return;
+ }
+ updateMaterialCoilSimple(row).then(res => {
+ this.$message.success('库位更新成功');
+ this.getList(); // 刷新列表
+ })
+ },
/** 预览标签 */
handlePreviewLabel(row) {
this.labelRender.visible = true;
@@ -943,6 +967,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 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/views/jishu.vue b/klp-ui/src/views/wms/coil/views/jishu.vue
index ea80ef7c..5a877416 100644
--- a/klp-ui/src/views/wms/coil/views/jishu.vue
+++ b/klp-ui/src/views/wms/coil/views/jishu.vue
@@ -2,11 +2,11 @@
+ :hideType="hideType" :editWarehouse="editWarehouse" />
+ :hideType="hideType" :editWarehouse="editWarehouse" />
@@ -38,6 +38,7 @@ export default {
showAbnormal: true,
labelType: '2',
hideType: false,
+ editWarehouse: true,
}
}
}
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 @@
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">
+ value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期">