diff --git a/klp-ui/src/components/TimeInput.vue b/klp-ui/src/components/TimeInput.vue
new file mode 100644
index 00000000..51968fd1
--- /dev/null
+++ b/klp-ui/src/components/TimeInput.vue
@@ -0,0 +1,86 @@
+
+
+
+ @
+
+ :
+
+ :00
+ 此刻
+
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/abnormal.vue b/klp-ui/src/views/wms/coil/abnormal.vue
index db0bbe06..456543e6 100644
--- a/klp-ui/src/views/wms/coil/abnormal.vue
+++ b/klp-ui/src/views/wms/coil/abnormal.vue
@@ -14,7 +14,7 @@ export default {
querys: {
dataType: 1,
// 筛选异常数量大于等于1的
- minAbnormalCount: 1
+ // minAbnormalCount: 1
},
labelType: '2',
qrcode: false,
diff --git a/klp-ui/src/views/wms/coil/abnormalCoil.vue b/klp-ui/src/views/wms/coil/abnormalCoil.vue
index eb989a65..10dfd152 100644
--- a/klp-ui/src/views/wms/coil/abnormalCoil.vue
+++ b/klp-ui/src/views/wms/coil/abnormalCoil.vue
@@ -65,7 +65,9 @@
-
+
+
+
@@ -120,7 +122,10 @@
-
+
+
+
+
@@ -339,7 +344,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
- updateCoilAbnormal(this.form).then(response => {
+ updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -347,7 +352,7 @@ export default {
this.buttonLoading = false;
});
} else {
- addCoilAbnormal(this.form).then(response => {
+ addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
diff --git a/klp-ui/src/views/wms/coil/abnormalDetail.vue b/klp-ui/src/views/wms/coil/abnormalDetail.vue
index e9e8a433..faa8929a 100644
--- a/klp-ui/src/views/wms/coil/abnormalDetail.vue
+++ b/klp-ui/src/views/wms/coil/abnormalDetail.vue
@@ -58,7 +58,9 @@
-
+
+
+
@@ -106,9 +108,15 @@
dict.label }}
-
-
+
+
+
+
+
+
{{
@@ -293,7 +301,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
- updateCoilAbnormal(this.form).then(response => {
+ updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -301,7 +309,7 @@ export default {
this.buttonLoading = false;
});
} else {
- addCoilAbnormal(this.form).then(response => {
+ addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
diff --git a/klp-ui/src/views/wms/coil/merge.vue b/klp-ui/src/views/wms/coil/merge.vue
index 31550619..61d9052b 100644
--- a/klp-ui/src/views/wms/coil/merge.vue
+++ b/klp-ui/src/views/wms/coil/merge.vue
@@ -215,6 +215,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -231,6 +246,7 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
import RawMaterialSelector from "@/components/KLPService/RawMaterialSelect";
import ProductSelector from "@/components/KLPService/ProductSelect";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import TimeInput from "@/components/TimeInput";
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
export default {
@@ -240,7 +256,8 @@ export default {
ActualWarehouseSelect,
RawMaterialSelector,
ProductSelector,
- WarehouseSelect
+ WarehouseSelect,
+ TimeInput
},
dicts: ['coil_quality_status'],
data() {
@@ -270,6 +287,10 @@ export default {
coatingType: '',
actualLength: undefined,
actualWidth: undefined,
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
},
rules: {
currentCoilNo: [
@@ -759,6 +780,49 @@ export default {
this.$router.back();
},
+ // 格式化毫秒值为xx天xx小时xx分钟
+ formatDuration(milliseconds) {
+ if (!milliseconds || milliseconds < 0) return '';
+
+ const seconds = Math.floor(milliseconds / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ const remainingHours = hours % 24;
+ const remainingMinutes = minutes % 60;
+
+ let result = '';
+ if (days > 0) result += `${days}天`;
+ if (remainingHours > 0) result += `${remainingHours}小时`;
+ if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+
+ return result || '0分钟';
+ },
+ // 计算生产耗时
+ calculateProductionDuration() {
+ const { productionStartTime, productionEndTime } = this.targetCoil;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ this.$set(this.targetCoil, 'productionDuration', '');
+ this.$set(this.targetCoil, 'formattedDuration', '');
+ } else {
+ const durationMs = end - start;
+ const durationMinutes = Math.round(durationMs / (1000 * 60));
+ this.$set(this.targetCoil, 'productionDuration', durationMinutes);
+ this.$set(this.targetCoil, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000));
+ }
+ } else {
+ this.$set(this.targetCoil, 'productionDuration', '');
+ this.$set(this.targetCoil, 'formattedDuration', '');
+ }
+ },
// closePage 关闭当前页面
closePage() {
this.$router.back();
diff --git a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
index cbc2afd9..d7384576 100644
--- a/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
+++ b/klp-ui/src/views/wms/coil/panels/LabelRender/MaterialTag.vue
@@ -54,12 +54,12 @@
- 实际库区
+ 厂家名称
-
+ {{ content.manufacturer || '' }}
+
+
+
@@ -228,7 +233,7 @@ export default {
if (valid) {
this.buttonLoading = true;
if (this.form.abnormalId != null) {
- updateCoilAbnormal(this.form).then(response => {
+ updateCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("修改成功");
this.open = false;
this.getList();
@@ -236,7 +241,7 @@ export default {
this.buttonLoading = false;
});
} else {
- addCoilAbnormal(this.form).then(response => {
+ addCoilAbnormal({...this.form, length: this.form.endPosition - this.form.startPosition}).then(response => {
this.$modal.msgSuccess("新增成功");
this.open = false;
this.getList();
diff --git a/klp-ui/src/views/wms/coil/panels/base.vue b/klp-ui/src/views/wms/coil/panels/base.vue
index 977d2b3e..d017cae7 100644
--- a/klp-ui/src/views/wms/coil/panels/base.vue
+++ b/klp-ui/src/views/wms/coil/panels/base.vue
@@ -173,7 +173,7 @@
+ @change="handleRowChange(scope.row)">
@@ -182,8 +182,8 @@
-
+
@@ -230,7 +230,21 @@
未发货
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -247,18 +261,16 @@
@click="handleCancelExport(scope.row)">
撤回发货
+
+ 加工修正
+
退货钢卷
- 查看异常
修正
-
-
追溯
@@ -396,10 +408,32 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -553,7 +587,17 @@ export default {
showNewExport: {
type: Boolean,
default: false,
- }
+ },
+ // 展示宽度快捷编辑
+ showWidthEdit: {
+ type: Boolean,
+ default: false,
+ },
+ // 展示生产时间快捷编辑
+ showProductionTimeEdit: {
+ type: Boolean,
+ default: false,
+ },
},
data() {
return {
@@ -724,6 +768,18 @@ export default {
currentCoilId: '',
userList: [],
logOpen: false,
+ productionTimeForm: {
+ productionStartTime: '',
+ productionEndTime: '',
+ formattedDuration: '',
+ productionDuration: 0,
+ },
+ productionTimeFormRules: {
+ productionTime: [
+ { required: true, message: "生产时间不能为空", trigger: "blur" }
+ ],
+ },
+ productionTimeFormVisible: false,
};
},
computed: {
@@ -759,6 +815,88 @@ export default {
this.userList = res.rows || [];
});
},
+ handleProductionTimeEdit(row) {
+ // 创建一个新对象，避免直接引用row
+ this.productionTimeForm = { ...row };
+ this.productionTimeFormVisible = true;
+ // 初始化时计算一次
+ this.calculateProductionDuration();
+ },
+ // 格式化毫秒值为xx天xx小时xx分钟
+ formatDuration(milliseconds) {
+ if (!milliseconds || milliseconds < 0) return '';
+
+ const seconds = Math.floor(milliseconds / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ const remainingHours = hours % 24;
+ const remainingMinutes = minutes % 60;
+
+ let result = '';
+ if (days > 0) result += `${days}天`;
+ if (remainingHours > 0) result += `${remainingHours}小时`;
+ if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+
+ return result || '0分钟';
+ },
+ // 计算生产耗时
+ calculateProductionDuration() {
+ const { productionStartTime, productionEndTime } = this.productionTimeForm;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ this.$set(this.productionTimeForm, 'productionDuration', '');
+ this.$set(this.productionTimeForm, 'formattedDuration', '');
+ } else {
+ const durationMs = end - start;
+ const durationMinutes = Math.round(durationMs / (1000 * 60));
+ this.$set(this.productionTimeForm, 'productionDuration', durationMinutes);
+ // 同时保存格式化后的显示值
+ this.$set(this.productionTimeForm, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000));
+ }
+ } else {
+ this.$set(this.productionTimeForm, 'productionDuration', '');
+ this.$set(this.productionTimeForm, 'formattedDuration', '');
+ }
+ },
+ // 处理生产时间提交
+ submitProductionTimeForm() {
+ this.$refs.productionTimeForm.validate((valid) => {
+ if (valid) {
+ // 再次验证时间逻辑
+ const { productionStartTime, productionEndTime } = this.productionTimeForm;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ return false;
+ }
+ }
+ this.buttonLoading = true;
+ updateMaterialCoilSimple(this.productionTimeForm).then(res => {
+ this.buttonLoading = false;
+ this.$message({
+ message: '更新成功',
+ type: 'success',
+ });
+ this.productionTimeFormVisible = false;
+ })
+ } else {
+ return false;
+ }
+ })
+ },
handleNextWarehouseChange(row) {
if (!this.editNext) {
return;
@@ -777,37 +915,13 @@ export default {
}
})
},
- handleBusinessPurposeChange(row) {
- if (!this.showBusinessPurpose) {
- return;
- }
+ // 处理行数据变化
+ handleRowChange(row) {
updateMaterialCoilSimple(row).then(res => {
- if (res.code === 200) {
- this.$message({
- message: '更新成功',
- type: 'success',
- });
- } else {
- this.$message({
- message: res.msg || '更新失败',
- type: 'error',
- });
- }
- })
- },
- handleRelatedToOrderChange(row) {
- updateMaterialCoilSimple(row).then(res => {
- if (res.code === 200) {
- this.$message({
- message: '更新成功',
- type: 'success',
- });
- } else {
- this.$message({
- message: res.msg || '更新失败',
- type: 'error',
- });
- }
+ this.$message({
+ message: '更新成功',
+ type: 'success',
+ });
})
},
// 打印标签
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 36b0b31e..ed371f96 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -422,6 +422,7 @@
+
-
+
+
+ -
+
+
@@ -557,6 +562,8 @@ export default {
coilId: null,
position: null,
lengthCoord: null,
+ startPosition: 0,
+ endPosition: 0,
defectCode: null,
degree: null,
remark: null
@@ -975,7 +982,10 @@ export default {
this.exceptionDialogVisible = true
},
confirmException() {
- addCoilAbnormal(this.exceptionForm).then(response => {
+ addCoilAbnormal({
+ ...this.exceptionForm,
+ length: this.exceptionForm.endPosition - this.exceptionForm.startPosition,
+ }).then(response => {
this.$message.success('异常记录添加成功')
this.cancelException();
// 重置表单
@@ -1033,7 +1043,9 @@ export default {
this.exceptionForm = {
coilId: null,
position: null,
- lengthCoord: null,
+ lengthCoord: 0,
+ startPosition: 0,
+ endPosition: 0,
defectCode: null,
degree: null,
remark: null
diff --git a/klp-ui/src/views/wms/coil/panels/stepSplit.vue b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
index ccd75fb7..2493ee1b 100644
--- a/klp-ui/src/views/wms/coil/panels/stepSplit.vue
+++ b/klp-ui/src/views/wms/coil/panels/stepSplit.vue
@@ -149,6 +149,15 @@
+
+
+
+
+
+
+
+
+
@@ -187,6 +196,9 @@
m
{{ selectedSplitItem.temperGrade || '-' }}
{{ selectedSplitItem.coatingType || '-' }}
+ {{ selectedSplitItem.productionStartTime || '-' }}
+ {{ selectedSplitItem.productionEndTime || '-' }}
+ {{ selectedSplitItem.formattedDuration || (selectedSplitItem.productionDuration ? selectedSplitItem.productionDuration + ' 分钟' : '-') }}
{{ selectedSplitItem.remark || '-' }}
@@ -208,6 +220,7 @@ import ProductSelect from "@/components/KLPService/ProductSelect";
import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect";
+import TimeInput from "@/components/TimeInput";
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
export default {
@@ -231,6 +244,7 @@ export default {
RawMaterialSelect,
WarehouseSelect,
ActualWarehouseSelect,
+ TimeInput,
},
dicts: ['coil_quality_status'],
data() {
@@ -264,6 +278,10 @@ export default {
temperGrade: '',
coatingType: '',
remark: '',
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
},
// 已分条钢卷列表
splitList: [],
@@ -443,6 +461,10 @@ export default {
temperGrade: '',
coatingType: '',
remark: '',
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
parentCoilId: this.coilId,
}
},
@@ -547,6 +569,49 @@ export default {
}
})
},
+ // 格式化毫秒值为xx天xx小时xx分钟
+ formatDuration(milliseconds) {
+ if (!milliseconds || milliseconds < 0) return '';
+
+ const seconds = Math.floor(milliseconds / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ const remainingHours = hours % 24;
+ const remainingMinutes = minutes % 60;
+
+ let result = '';
+ if (days > 0) result += `${days}天`;
+ if (remainingHours > 0) result += `${remainingHours}小时`;
+ if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+
+ return result || '0分钟';
+ },
+ // 计算生产耗时
+ calculateProductionDuration() {
+ const { productionStartTime, productionEndTime } = this.splitForm;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ this.$set(this.splitForm, 'productionDuration', '');
+ this.$set(this.splitForm, 'formattedDuration', '');
+ } else {
+ const durationMs = end - start;
+ const durationMinutes = Math.round(durationMs / (1000 * 60));
+ this.$set(this.splitForm, 'productionDuration', durationMinutes);
+ this.$set(this.splitForm, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000));
+ }
+ } else {
+ this.$set(this.splitForm, 'productionDuration', '');
+ this.$set(this.splitForm, 'formattedDuration', '');
+ }
+ }
},
}
diff --git a/klp-ui/src/views/wms/coil/split.vue b/klp-ui/src/views/wms/coil/split.vue
index 6246b293..13e8e6b3 100644
--- a/klp-ui/src/views/wms/coil/split.vue
+++ b/klp-ui/src/views/wms/coil/split.vue
@@ -218,6 +218,15 @@
-->
+
+
+
+
+
+
+
+
+
@@ -238,6 +247,7 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
import ProductSelect from "@/components/KLPService/ProductSelect";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import TimeInput from "@/components/TimeInput";
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
export default {
@@ -247,6 +257,7 @@ export default {
RawMaterialSelect,
ProductSelect,
WarehouseSelect,
+ TimeInput,
},
dicts: ['coil_quality_status'],
data() {
@@ -289,6 +300,10 @@ export default {
coatingType: '',
actualLength: undefined,
actualWidth: undefined,
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
}
],
loading: false,
@@ -475,6 +490,10 @@ export default {
coatingType: '',
actualLength: undefined,
actualWidth: undefined,
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
});
},
@@ -612,6 +631,51 @@ export default {
// 不再预加载物品列表，改为实时搜索
this.$message.success('已复制到所有子卷');
+ },
+ // 格式化毫秒值为xx天xx小时xx分钟
+ formatDuration(milliseconds) {
+ if (!milliseconds || milliseconds < 0) return '';
+
+ const seconds = Math.floor(milliseconds / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ const remainingHours = hours % 24;
+ const remainingMinutes = minutes % 60;
+
+ let result = '';
+ if (days > 0) result += `${days}天`;
+ if (remainingHours > 0) result += `${remainingHours}小时`;
+ if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+
+ return result || '0分钟';
+ },
+ // 计算生产耗时
+ calculateProductionDuration(item) {
+ if (!item) return;
+
+ const { productionStartTime, productionEndTime } = item;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ this.$set(item, 'productionDuration', '');
+ this.$set(item, 'formattedDuration', '');
+ } else {
+ const durationMs = end - start;
+ const durationMinutes = Math.round(durationMs / (1000 * 60));
+ this.$set(item, 'productionDuration', durationMinutes);
+ this.$set(item, 'formattedDuration', this.formatDuration(durationMinutes * 60 * 1000));
+ }
+ } else {
+ this.$set(item, 'productionDuration', '');
+ this.$set(item, 'formattedDuration', '');
+ }
}
}
};
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index 9db8a5f1..140f19ac 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -192,6 +192,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -237,6 +249,7 @@ import ActualWarehouseSelect from "@/components/KLPService/ActualWarehouseSelect
import RawMaterialSelect from "@/components/KLPService/RawMaterialSelect";
import ProductSelect from "@/components/KLPService/ProductSelect";
import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
+import TimeInput from "@/components/TimeInput";
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
export default {
@@ -246,6 +259,7 @@ export default {
RawMaterialSelect,
ProductSelect,
WarehouseSelect,
+ TimeInput,
},
dicts: ['coil_quality_status'],
data() {
@@ -292,6 +306,10 @@ export default {
coatingType: '',
actualLength: undefined,
actualWidth: undefined,
+ productionStartTime: '',
+ productionEndTime: '',
+ productionDuration: '',
+ formattedDuration: '',
},
rules: {
currentCoilNo: [
@@ -556,6 +574,18 @@ export default {
nextWarehouseName: this.getWarehouseName(data.warehouseId),
};
+ // 填充时间相关字段
+ if (data.productionStartTime) {
+ this.updateForm.productionStartTime = data.productionStartTime;
+ }
+ if (data.productionEndTime) {
+ this.updateForm.productionEndTime = data.productionEndTime;
+ }
+ if (data.productionDuration) {
+ this.updateForm.productionDuration = data.productionDuration;
+ this.updateForm.formattedDuration = this.formatDuration(data.productionDuration);
+ }
+
// 不再预加载物品列表，改为实时搜索
// 加载变更历史
@@ -751,6 +781,20 @@ export default {
return false;
}
+ // 验证时间逻辑
+ const { productionStartTime, productionEndTime } = this.updateForm;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ return false;
+ }
+ }
+
const loadingInstance = this.$loading({
lock: true,
text: '正在更新钢卷信息，请稍后...',
@@ -796,6 +840,50 @@ export default {
});
},
+
+ // 格式化毫秒值为xx天xx小时xx分钟
+ formatDuration(milliseconds) {
+ if (!milliseconds || milliseconds < 0) return '';
+
+ const seconds = Math.floor(milliseconds / 1000);
+ const minutes = Math.floor(seconds / 60);
+ const hours = Math.floor(minutes / 60);
+ const days = Math.floor(hours / 24);
+
+ const remainingHours = hours % 24;
+ const remainingMinutes = minutes % 60;
+
+ let result = '';
+ if (days > 0) result += `${days}天`;
+ if (remainingHours > 0) result += `${remainingHours}小时`;
+ if (remainingMinutes > 0) result += `${remainingMinutes}分钟`;
+
+ return result || '0分钟';
+ },
+ // 计算生产耗时
+ calculateProductionDuration() {
+ const { productionStartTime, productionEndTime } = this.updateForm;
+ if (productionStartTime && productionEndTime) {
+ const start = new Date(productionStartTime).getTime();
+ const end = new Date(productionEndTime).getTime();
+ if (end < start) {
+ this.$message({
+ message: '结束时间不能早于开始时间',
+ type: 'error',
+ });
+ this.updateForm.productionDuration = '';
+ this.updateForm.formattedDuration = '';
+ } else {
+ const durationMs = end - start;
+ const durationMinutes = Math.round(durationMs / (1000 * 60));
+ this.updateForm.productionDuration = durationMinutes;
+ this.updateForm.formattedDuration = this.formatDuration(durationMinutes * 60 * 1000);
+ }
+ } else {
+ this.updateForm.productionDuration = '';
+ this.updateForm.formattedDuration = '';
+ }
+ },
// 取消操作
handleCancel() {
this.$router.back();
@@ -980,6 +1068,8 @@ export default {
}
}
+
+
/* 表单样式优化 */
.form-card {
::v-deep .el-input-number {
diff --git a/klp-ui/src/views/wms/coil/views/base/timeEdit.vue b/klp-ui/src/views/wms/coil/views/base/timeEdit.vue
new file mode 100644
index 00000000..bc6df62c
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/base/timeEdit.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/coil/views/base/widthEdit.vue b/klp-ui/src/views/wms/coil/views/base/widthEdit.vue
new file mode 100644
index 00000000..1ad1bfd2
--- /dev/null
+++ b/klp-ui/src/views/wms/coil/views/base/widthEdit.vue
@@ -0,0 +1,27 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/klp-ui/src/views/wms/delivery/components/planList.vue b/klp-ui/src/views/wms/delivery/components/planList.vue
index 10cfdb51..3443b760 100644
--- a/klp-ui/src/views/wms/delivery/components/planList.vue
+++ b/klp-ui/src/views/wms/delivery/components/planList.vue
@@ -10,7 +10,6 @@
/>
-
打印发货单
+ @click.stop="handlePrint(scope.row, 0)">打印发货单
简单打印
+ @click.stop="handlePrint(scope.row, 1)">简单打印
复制新增
+
+
+
+
+
+
@@ -147,6 +153,7 @@
diff --git a/klp-ui/src/views/wms/report/merge/index.vue b/klp-ui/src/views/wms/report/merge/index.vue
new file mode 100644
index 00000000..9ccc702d
--- /dev/null
+++ b/klp-ui/src/views/wms/report/merge/index.vue
@@ -0,0 +1,297 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 查询
+ 导出产出钢卷
+ 导出消耗钢卷
+
+
+
+
+
+ {{ summary.outCount }}
+ {{ summary.outTotalWeight }}t
+ {{ summary.outAvgWeight }}t
+
+ {{ summary.lossCount }}
+ {{ summary.lossTotalWeight }}t
+ {{ summary.lossAvgWeight }}t
+
+ {{ summary.totalCount }}
+ {{ summary.totalWeight }}t
+ {{ summary.totalAvgWeight }}t
+
+
+ {{ summary.passRate }}
+ {{ summary.lossRate }}
+
+ {{ summary.abRate }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.status === 0 ? '在库' : '已出库' }}
+
+
+
+
+
+
+
+