From 9474fadca23df051af1789b2078aca9c3163a017 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 17:05:54 +0800
Subject: [PATCH] 合并代码，解决代码冲突
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 44 +++++++++++++++++++++++++++++++++-----------
1 files changed, 33 insertions(+), 11 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index 54823a7..1122205 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -1,22 +1,44 @@
<template>
<div>
<el-button @click="visible = true">娴嬭瘯</el-button>
- <FormTemplate :visible.sync="visible"></FormTemplate>
+ <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
+ <FormTemplateDialog
+ :visible.sync="visible"
+ :type="this.type"
+ :templateOid="this.templateOid"
+ :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid"
+ :disabledProp="disabledProp"
+ :rowOid="rowOid"
+ ></FormTemplateDialog>
+ <ResembleQueryDialog
+ :visible.sync="visible1"
+ :type="this.type"
+ :templateOid="this.templateOid"
+ :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid"
+ ></ResembleQueryDialog>
</div>
</template>
<script>
-import FormTemplate from '../../components/FormTemplate/index'
+import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
export default {
- name: 'FormTempalteTest',
- components: { FormTemplate },
+ name: "FormTempalteTest",
+ components: { ResembleQueryDialog },
data() {
return {
- visible: false
- }
- }
-}
+ visible: false,
+ visible1: false,
+ // 榛樿绂佺敤鐨勮〃鍏冪礌
+ disabledProp: ["id"],
+ // 琛ㄥ崟绫诲瀷
+ type: "add",
+ templateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
+ codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
+ rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
+ };
+ },
+};
</script>
-<style lang='less' scoped>
-
-</style>
\ No newline at end of file
--
Gitblit v1.10.0