diff --git a/klp-ui/src/views/wms/coil/components/CoilInfo.vue b/klp-ui/src/views/wms/coil/components/CoilInfo.vue index 086681805..b7dabe776 100644 --- a/klp-ui/src/views/wms/coil/components/CoilInfo.vue +++ b/klp-ui/src/views/wms/coil/components/CoilInfo.vue @@ -87,6 +87,7 @@ export default { { label: '调制度', key: 'temperGrade' }, { label: '镀层种类', key: 'coatingType' }, { label: '钢卷表面处理', key: 'coilSurfaceTreatment' }, + { label: '创建时间', key: 'createTime' }, { label: '备注', key: 'remark', span: this.column > 2 ? this.column - 2 : 1 } ] }, @@ -101,9 +102,13 @@ export default { })) } } + let value = this.coilInfo[item.key] + if (item.key === 'createTime' && value) { + value = `${value}(${this.getDaysAgo(value)})` + } return { ...item, - value: this.coilInfo[item.key] + value } }) @@ -119,6 +124,18 @@ export default { return fields } }, + methods: { + getDaysAgo(dateStr) { + if (!dateStr) return '' + const date = new Date(dateStr) + const now = new Date() + const diffTime = now.getTime() - date.getTime() + const diffDays = Math.floor(diffTime / (1000 * 60 * 60 * 24)) + if (diffDays === 0) return '今天' + if (diffDays === 1) return '昨天' + return `${diffDays}天前` + } + } } diff --git a/klp-ui/src/views/wms/coil/materialWarning/index.vue b/klp-ui/src/views/wms/coil/materialWarning/index.vue index 0ae6248d2..73f2a830a 100644 --- a/klp-ui/src/views/wms/coil/materialWarning/index.vue +++ b/klp-ui/src/views/wms/coil/materialWarning/index.vue @@ -1,723 +1,30 @@ - diff --git a/klp-ui/src/views/wms/coil/materialWarning/size.vue b/klp-ui/src/views/wms/coil/materialWarning/size.vue new file mode 100644 index 000000000..e3147c1d5 --- /dev/null +++ b/klp-ui/src/views/wms/coil/materialWarning/size.vue @@ -0,0 +1,716 @@ + + + + diff --git a/klp-ui/src/views/wms/coil/materialWarning/time.vue b/klp-ui/src/views/wms/coil/materialWarning/time.vue new file mode 100644 index 000000000..752c89e7c --- /dev/null +++ b/klp-ui/src/views/wms/coil/materialWarning/time.vue @@ -0,0 +1,244 @@ + + +