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 | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 50 insertions(+), 5 deletions(-)
diff --git a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
index 6cdc627..18e5387 100644
--- a/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
+++ b/src/views/officeProcessAutomation/ApproveManage/approve-list/components/FormPayloadFields.vue
@@ -11,18 +11,23 @@
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>
</el-descriptions>
- <el-form v-else label-width="120px" class="form-payload-edit">
+ <div
+ v-else
+ class="form-payload-edit"
+ v-loading="optionSourceLoading"
+ >
<el-form-item
v-for="field in fields"
:key="field.key"
:label="field.label"
:prop="`formPayload.${field.key}`"
+ :required="Boolean(field.required)"
>
<el-input
v-if="field.type === 'text'"
@@ -57,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"
@@ -73,17 +87,25 @@
:placeholder="`璇烽�夋嫨${field.label}`"
style="width: 100%"
clearable
+ filterable
>
- <el-option v-for="o in field.options" :key="o.value" :label="o.label" :value="o.value" />
+ <el-option
+ v-for="o in getOptions(field)"
+ :key="String(o.value)"
+ :label="o.label"
+ :value="o.value"
+ />
</el-select>
<span v-else class="field-value">{{ displayValue(field) }}</span>
</el-form-item>
- </el-form>
+ </div>
</template>
<el-empty v-else description="鏆傛棤濉姤椤�" :image-size="48" />
</template>
<script setup>
+import { onMounted, watch } from "vue";
+import { useSelectOptionSources } from "../../approve-template/useSelectOptionSources.js";
import { formatFieldDisplayValue } from "../approveListConstants.js";
const props = defineProps({
@@ -92,8 +114,31 @@
readonly: { type: Boolean, default: false },
});
+const { loading: optionSourceLoading, ensureForFields, getOptions, getDisplayLabel } =
+ useSelectOptionSources();
+
+async function loadOptionCaches() {
+ await ensureForFields(props.fields);
+}
+
+onMounted(() => {
+ loadOptionCaches();
+});
+
+watch(
+ () => props.fields,
+ () => {
+ loadOptionCaches();
+ },
+ { deep: true }
+);
+
function displayValue(field) {
- return formatFieldDisplayValue(field, props.formPayload?.[field.key]);
+ const val = props.formPayload?.[field.key];
+ if (field.type === "select" && field.optionSource && field.optionSource !== "static") {
+ return getDisplayLabel(field, val);
+ }
+ return formatFieldDisplayValue(field, val);
}
</script>
--
Gitblit v1.9.3