diff --git a/src/views/modules/qc/FQCResultEntry.vue b/src/views/modules/qc/FQCResultEntry.vue
index 9b973dd..57ee07e 100644
--- a/src/views/modules/qc/FQCResultEntry.vue
+++ b/src/views/modules/qc/FQCResultEntry.vue
@@ -140,8 +140,8 @@
@@ -149,8 +149,8 @@
@@ -291,7 +291,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{scope.row[item.columnProp]}}
+ {{ formatMainListCellValue(scope.row, item) }}
@@ -2897,6 +2897,18 @@
});
},
+ formatMainListCellValue (row, column) {
+ if (!row || !column) {
+ return ''
+ }
+ const value = row[column.columnProp]
+ if ((column.columnProp === 'taskDate' || column.columnProp === 'task_date') && value) {
+ const formattedValue = this.dayjs(value).format('YYYY-MM-DD HH:mm:ss')
+ return formattedValue === 'Invalid Date' ? value : formattedValue
+ }
+ return value
+ },
+
// 重置搜索条件
resetSearch() {
this.searchData = {
diff --git a/src/views/modules/qc/IPQCResultEntry.vue b/src/views/modules/qc/IPQCResultEntry.vue
index 33c36e3..4d4da0f 100644
--- a/src/views/modules/qc/IPQCResultEntry.vue
+++ b/src/views/modules/qc/IPQCResultEntry.vue
@@ -169,8 +169,8 @@
@@ -178,8 +178,8 @@
@@ -320,7 +320,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{ scope.row[item.columnProp] }}
+ {{ formatMainListCellValue(scope.row, item) }}
@@ -3177,6 +3177,18 @@
});
},
+ formatMainListCellValue (row, column) {
+ if (!row || !column) {
+ return ''
+ }
+ const value = row[column.columnProp]
+ if ((column.columnProp === 'taskDate' || column.columnProp === 'task_date') && value) {
+ const formattedValue = this.dayjs(value).format('YYYY-MM-DD HH:mm:ss')
+ return formattedValue === 'Invalid Date' ? value : formattedValue
+ }
+ return value
+ },
+
// 重置搜索条件
resetSearch() {
this.searchData = {
diff --git a/src/views/modules/qc/IQCResultEntry.vue b/src/views/modules/qc/IQCResultEntry.vue
index 6b926c9..ded66a6 100644
--- a/src/views/modules/qc/IQCResultEntry.vue
+++ b/src/views/modules/qc/IQCResultEntry.vue
@@ -159,8 +159,8 @@
@@ -168,8 +168,8 @@
@@ -323,7 +323,7 @@
:min-width="item.columnWidth"
:label="item.columnLabel">
- {{scope.row[item.columnProp]}}
+ {{ formatMainListCellValue(scope.row, item) }}
@@ -2437,6 +2437,18 @@
});
},
+ formatMainListCellValue (row, column) {
+ if (!row || !column) {
+ return ''
+ }
+ const value = row[column.columnProp]
+ if ((column.columnProp === 'taskDate' || column.columnProp === 'task_date') && value) {
+ const formattedValue = this.dayjs(value).format('YYYY-MM-DD HH:mm:ss')
+ return formattedValue === 'Invalid Date' ? value : formattedValue
+ }
+ return value
+ },
+
// 重置搜索条件
resetSearch() {
this.searchData = {
diff --git a/src/views/modules/qc/OQCResultEntry.vue b/src/views/modules/qc/OQCResultEntry.vue
index 238b99c..0577ca1 100644
--- a/src/views/modules/qc/OQCResultEntry.vue
+++ b/src/views/modules/qc/OQCResultEntry.vue
@@ -137,8 +137,8 @@
@@ -146,8 +146,8 @@
@@ -278,11 +278,11 @@
:label="item.columnLabel">
-
{{ scope.row[item.columnProp] }}
+
{{ formatMainListCellValue(scope.row, item) }}
-
{{ scope.row[item.columnProp] }}
+
{{ formatMainListCellValue(scope.row, item) }}
@@ -2151,6 +2151,19 @@
this.height = windowHeight - headerHeight - 65;
});
},
+
+ formatMainListCellValue (row, column) {
+ if (!row || !column) {
+ return ''
+ }
+ const value = row[column.columnProp]
+ if ((column.columnProp === 'taskDate' || column.columnProp === 'task_date') && value) {
+ const formattedValue = this.dayjs(value).format('YYYY-MM-DD HH:mm:ss')
+ return formattedValue === 'Invalid Date' ? value : formattedValue
+ }
+ return value
+ },
+
// 重置搜索条件
resetSearch() {
this.searchData = {