diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 4f292609..e1d3ee24 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -160,12 +160,12 @@
-->
-
+
@@ -175,6 +175,9 @@
+
+
+
移出发货单
+
+ 改判
+
+
+ 重贴标签
+
@@ -504,6 +514,70 @@
+
+
+
+
+ {{ judgeForm.enterCoilNo || '-' }}
+ {{ judgeForm.currentCoilNo || '-' }}
+ {{ judgeForm.supplierCoilNo || '-' }}
+ {{ judgeForm.warehouseName || '-' }}
+ {{ judgeForm.actualWarehouseName || '-' }}
+ {{ judgeForm.team || '-' }}
+ {{ judgeForm.materialType || '-' }}
+ {{ judgeForm.itemName || '-' }}
+
+ {{ judgeForm.specification || '-' }}
+ {{ judgeForm.material || '-' }}
+ {{ judgeForm.manufacturer || '-' }}
+ {{ judgeForm.zincLayer || '-' }}
+ {{ judgeForm.surfaceTreatmentDesc || '-'
+ }}
+
+
+ {{ judgeForm.qualityStatus || '-' }}
+ {{ judgeForm.trimmingRequirement || '-'
+ }}
+ {{ judgeForm.packingStatus || '-' }}
+ {{ judgeForm.packagingRequirement || '-'
+ }}
+ {{ judgeForm.actualThickness || '-' }}
+ m
+ {{ judgeForm.actualWidth || '-' }}
+ m
+ {{ judgeForm.length || '-' }}
+ m
+ {{ judgeForm.grossWeight || '-' }} t
+ {{ judgeForm.netWeight || '-' }} t
+
+ {{ judgeForm.productionStartTime || '-'
+ }}
+ {{ judgeForm.productionEndTime || '-'
+ }}
+ {{ judgeForm.temperGrade || '-' }}
+ {{ judgeForm.coatingType || '-' }}
+ {{ judgeForm.coilSurfaceTreatment || '-' }}
+ {{ judgeForm.remark || '-' }}
+
+
+
+
+
+
+
+
+
+
+ 是否通知重贴标签
+
+
+
+
+
+
@@ -675,6 +749,10 @@ export default {
type: Boolean,
default: false,
},
+ hasTransferType: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
@@ -851,6 +929,22 @@ export default {
shippedCount: 0,
unshippedCount: 0,
statistics: {},
+ // 钢卷改判弹窗
+ judgeDialogVisible: false,
+ judgeForm: {
+ coilId: undefined,
+ enterCoilNo: undefined,
+ currentCoilNo: undefined,
+ netWeight: undefined,
+ warehouseName: undefined,
+ actualWarehouseName: undefined,
+ qualityStatus: undefined,
+ itemName: undefined,
+ itemMaterial: undefined,
+ itemSpecification: undefined,
+ itemManufacturer: undefined,
+ notifyReLabel: false
+ },
};
},
computed: {
@@ -933,6 +1027,19 @@ export default {
})
// 打开一个弹窗列出查询到的所有单据明细
},
+ // 处理重贴标签
+ handleReplaceLabel(row) {
+ updateMaterialCoilSimple({
+ ...row,
+ transferType: '',
+ }).then(res => {
+ this.$message({
+ message: '标签已重贴，记录移除',
+ type: 'success',
+ });
+ this.getList();
+ })
+ },
// 格式化毫秒值为xx天xx小时xx分钟
formatDuration(milliseconds) {
if (!milliseconds || milliseconds < 0) return '';
@@ -1413,6 +1520,39 @@ export default {
this.buttonLoading = false;
});
},
+ /** 改判按钮操作 */
+ handleJudge(row) {
+ // 填充改判表单数据
+ this.judgeForm = {
+ ...row,
+ notifyReLabel: true
+ };
+ this.judgeDialogVisible = true;
+ },
+ /** 提交改判表单 */
+ submitJudgeForm() {
+ this.buttonLoading = true;
+ const submitData = {
+ ...this.judgeForm,
+ // 如果通知重贴标签，则设置 transferType 为技术部改判
+ transferType: this.judgeForm.notifyReLabel ? '技术部改判' : null
+ };
+ updateMaterialCoilSimple(submitData).then(res => {
+ this.buttonLoading = false;
+ this.$message({
+ message: '改判成功',
+ type: 'success'
+ });
+ this.judgeDialogVisible = false;
+ this.getList();
+ }).catch(err => {
+ this.buttonLoading = false;
+ this.$message({
+ message: '改判失败',
+ type: 'error'
+ });
+ });
+ },
/** 删除按钮操作 */
handleDelete(row) {
const coilIds = row.coilId || this.ids;
diff --git a/klp-ui/src/views/wms/coil/views/base/tranfer.vue b/klp-ui/src/views/wms/coil/views/base/tranfer.vue
new file mode 100644
index 00000000..6f7a4f76
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/base/tranfer.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file