From 485125c2b5b8862a5295216b24cf28121d8ca169 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 08 四月 2024 11:32:07 +0800
Subject: [PATCH] 解决冲突
---
Source/ProjectWeb/src/components/dynamic-components/dynamic-table-form.vue | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table-form.vue b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table-form.vue
index 924ccf2..1fe34cf 100644
--- a/Source/ProjectWeb/src/components/dynamic-components/dynamic-table-form.vue
+++ b/Source/ProjectWeb/src/components/dynamic-components/dynamic-table-form.vue
@@ -4,7 +4,7 @@
<avue-form v-model="form" :option="option" @submit="submitHandler" @reset-change="changeHandler">
<template v-for="item in slotData" :slot="item.prop + 'Label'">
<span>
- <span>{{ item.label }} </span>
+ <span>{{ item.label }}</span>
<el-tooltip
v-if="item.keyAttr"
class="item"
@@ -99,7 +99,7 @@
prop: item.field,
type: typeValue,
value: item.defaultValue,
- dicData: item.type === 'combox' ? item.dicData : null,
+ dicData: item.type === 'combox' ? item.dicData : item.dicUrl,
readonly: item.readOnly,
disabled: item.disabled,
labelSuffix: item.suffix,
--
Gitblit v1.9.3