From 1015c999309d3202c5710e5324c9148c8f2a5842 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Thu, 2 Jul 2026 17:41:41 +0800
Subject: [PATCH] =?UTF-8?q?2026-07-02=20=E6=A3=80=E9=AA=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/qc/FQCResultEntry.vue  | 22 ++++++++++++++++-----
 src/views/modules/qc/IPQCResultEntry.vue | 22 ++++++++++++++++-----
 src/views/modules/qc/IQCResultEntry.vue  | 22 ++++++++++++++++-----
 src/views/modules/qc/OQCResultEntry.vue  | 25 ++++++++++++++++++------
 4 files changed, 70 insertions(+), 21 deletions(-)

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 @@
                 <el-date-picker
                   v-model="searchData.startDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="开始日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -149,8 +149,8 @@
                 <el-date-picker
                   v-model="searchData.endDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="结束日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -291,7 +291,7 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">{{ formatMainListCellValue(scope.row, item) }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -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 @@
                 <el-date-picker
                   v-model="searchData.startDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="开始日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -178,8 +178,8 @@
                 <el-date-picker
                   v-model="searchData.endDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="结束日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -320,7 +320,7 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+          <span v-if="!item.columnHidden"> {{ formatMainListCellValue(scope.row, item) }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -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 @@
               <el-date-picker
                 v-model="searchData.startDate2"
                 type="datetime"
-                value-format='yyyy-MM-dd HH:mm'
-                format='yyyy-MM-dd HH:mm'
+                value-format='yyyy-MM-dd HH:mm:ss'
+                format='yyyy-MM-dd HH:mm:ss'
                 placeholder="开始日期"
                 style="width: 44%">
               </el-date-picker>
@@ -168,8 +168,8 @@
               <el-date-picker
                 v-model="searchData.endDate2"
                 type="datetime"
-                value-format='yyyy-MM-dd HH:mm'
-                format='yyyy-MM-dd HH:mm'
+                value-format='yyyy-MM-dd HH:mm:ss'
+                format='yyyy-MM-dd HH:mm:ss'
                 placeholder="结束日期"
                 style="width: 44%">
               </el-date-picker>
@@ -323,7 +323,7 @@
         :min-width="item.columnWidth"
         :label="item.columnLabel">
         <template slot-scope="scope">
-          <span v-if="!item.columnHidden">{{scope.row[item.columnProp]}}</span>
+          <span v-if="!item.columnHidden">{{ formatMainListCellValue(scope.row, item) }}</span>
           <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
         </template>
       </el-table-column>
@@ -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 @@
                 <el-date-picker
                   v-model="searchData.startDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="开始日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -146,8 +146,8 @@
                 <el-date-picker
                   v-model="searchData.endDate2"
                   type="datetime"
-                  value-format='yyyy-MM-dd HH:mm'
-                  format='yyyy-MM-dd HH:mm'
+                  value-format='yyyy-MM-dd HH:mm:ss'
+                  format='yyyy-MM-dd HH:mm:ss'
                   placeholder="结束日期"
                   style="width: 44%">
                 </el-date-picker>
@@ -278,11 +278,11 @@
         :label="item.columnLabel">
         <template slot-scope="scope">
           <div v-if="item.columnProp === 'inspectionResult' && scope.row.inspectionResult === '不合格' && scope.row.disposalMeasures === '拒收退回'">
-            <span v-if="!item.columnHidden" style="color: red"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="!item.columnHidden" style="color: red"> {{ formatMainListCellValue(scope.row, item) }}</span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
           </div>
           <div v-else>
-            <span v-if="!item.columnHidden"> {{ scope.row[item.columnProp] }}</span>
+            <span v-if="!item.columnHidden"> {{ formatMainListCellValue(scope.row, item) }}</span>
             <span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" style="width: 100px; height: 80px"/></span>
           </div>
         </template>
@@ -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 = {