From 8e6c58eec222c4bbea613e02703d9af22da72bee Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 18:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/components/FormTemplate/index.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
index 6009b7e..b910397 100644
--- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue
+++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue
@@ -1,6 +1,7 @@
<template>
<el-dialog
:visible.sync="dialogVisible"
+ v-if="dialogVisible"
v-dialogDrag
top="0vh"
:title="title"
@@ -14,6 +15,7 @@
:visible="visible"
:type="type"
:rowOid="rowOid"
+ :templateOid="templateOid"
ref="FormTempalte"
@getFormData="getFormData"
></FormTempalte>
@@ -23,7 +25,8 @@
v-if="
type !== 'detail' &&
dialogVisible &&
- (showCodeApply || showResembleQuery)
+ (showCodeApply || showResembleQuery) &&
+ type !== 'preview'
"
>
<el-tabs v-model="activeName" type="border-card" @tab-click="handleClick">
@@ -57,7 +60,7 @@
<div class="avue-dialog__footer" v-if="type !== 'detail'">
<el-button @click="close()">鍙� 娑�</el-button>
<el-button @click="submit()" type="primary" :loading="submitBtnLoading"
- >纭� 瀹�</el-button
+ >{{ submitText }}</el-button
>
<el-button
@click="resembleQuerySubmit"
@@ -102,6 +105,10 @@
type: String,
default: "",
},
+ submitText: {
+ type: String,
+ default: '纭� 瀹�'
+ }
},
data() {
return {
@@ -160,7 +167,9 @@
methods: {
openDialog() {
this.getFormTemplate();
- this.getCodeRule();
+ if (this.type === 'add') {
+ this.getCodeRule();
+ }
},
close() {
this.dialogVisible = false;
--
Gitblit v1.9.3