From bd33f60a24dea477314e0362183178ddabb0b2d5 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 15 九月 2023 14:13:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/docking/infoForm.vue | 4 ++++
Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 1 +
Source/UBCS-WEB/src/components/work/BusinessWork.vue | 4 +++-
3 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
index 4eb070b..14f0c2d 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue
@@ -26,6 +26,7 @@
</template>
<template :slot="item.prop + ''" v-for="item in slotColumnList">
<vciWebRefer
+ :key="item.prop" :data-key="item.prop"
v-if="item.type == 'refer'"
:referConfig="item.referConfig || {}"
:value="form[item.referConfig.field] || item.value"
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 24a6a7e..6a65f49 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -46,7 +46,9 @@
:type="item.edit" :format="item.dateFormate" :value-format="item.dateFormate"
placeholder="閫夋嫨鏃ユ湡">
</el-date-picker>
- <vciWebRefer v-if="editingRow === row && editShow== item.prop && item.edit == 'refer'"
+ <vciWebRefer
+ :key="item.prop" :data-key="item.prop"
+ v-if="editingRow === row && editShow== item.prop && item.edit == 'refer'"
:referConfig="item.referConfig || {}"
:value="row[item.referConfig.field] || row[item.prop]"
:text="row[item.referConfig.showField]" :disabled="item.disabled" :display="item.display"
diff --git a/Source/UBCS-WEB/src/views/docking/infoForm.vue b/Source/UBCS-WEB/src/views/docking/infoForm.vue
index 10fb23c..a5772d4 100644
--- a/Source/UBCS-WEB/src/views/docking/infoForm.vue
+++ b/Source/UBCS-WEB/src/views/docking/infoForm.vue
@@ -31,6 +31,7 @@
<div v-if="formData.dataFlowType=='push'">
<el-form-item label="鍒嗙被閫夋嫨" prop="classifyName">
<vciWebRefer
+ key="classifyName" data-key="classifyName"
:referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
@@ -48,6 +49,7 @@
</el-form-item>
<el-form-item label="闆嗘垚绯荤粺" prop="targetSystemName">
<vciWebRefer
+ key="targetSystemName" data-key="targetSystemName"
:referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'targetSystemName',
@@ -69,6 +71,7 @@
<!-- </el-form-item>-->
<el-form-item label="鍒嗙被閫夋嫨" prop="classifyName" v-if="formData.pushType !='5' && formData.pushType !='6'">
<vciWebRefer
+ key="classifyName" data-key="classifyName"
:referConfig="{
title: '鍒嗙被閫夋嫨',
showField: 'classifyName',
@@ -86,6 +89,7 @@
</el-form-item>
<el-form-item label="闆嗘垚绯荤粺" prop="sourceSystemName">
<vciWebRefer
+ key="sourceSystemName" data-key="sourceSystemName"
:referConfig="{
title: '闆嗘垚绯荤粺',
showField: 'sourceSystemName',
--
Gitblit v1.9.3