From dcc3a4d842740f7ff6e79a58ddec945f50ea9b5d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 03 六月 2026 10:10:22 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_宁夏_英泽防锈

---
 src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
index 7933db5..18e5387 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
@@ -11,7 +11,7 @@
         v-for="field in fields"
         :key="field.key"
         :label="field.label"
-        :span="field.type === 'textarea' || field.type === 'datetimerange' ? 2 : 1"
+        :span="field.type === 'textarea' || field.type === 'datetimerange' || field.type === 'datetime' ? 2 : 1"
       >
         <span class="field-value">{{ displayValue(field) }}</span>
       </el-descriptions-item>
@@ -62,6 +62,15 @@
           style="width: 100%"
         />
         <el-date-picker
+          v-else-if="field.type === 'datetime'"
+          v-model="formPayload[field.key]"
+          type="datetime"
+          :placeholder="`璇烽�夋嫨${field.label}`"
+          format="YYYY-MM-DD HH:mm:ss"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          style="width: 100%"
+        />
+        <el-date-picker
           v-else-if="field.type === 'datetimerange'"
           v-model="formPayload[field.key]"
           type="datetimerange"

--
Gitblit v1.9.3