From dac9088c332ddfb6c9076e85fa1986d83b192141 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 05 六月 2023 16:56:55 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index 31fe475..1122205 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -1,33 +1,43 @@
 <template>
   <div>
     <el-button @click="visible = true">娴嬭瘯</el-button>
+    <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
     <FormTemplateDialog
       :visible.sync="visible"
-      :FormTemplateProp="FormTemplateProp"
       :type="this.type"
-      :editForm="editForm"
       :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>
-codeClassifyOid
 
 <script>
+import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
 export default {
   name: "FormTempalteTest",
+  components: { ResembleQueryDialog },
   data() {
     return {
       visible: false,
+      visible1: false,
       // 榛樿绂佺敤鐨勮〃鍏冪礌
       disabledProp: ["id"],
-      // 淇敼鍥炴樉鐨勬暟鎹�
-      editForm: {},
       // 琛ㄥ崟绫诲瀷
       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'
     };
   },
 };

--
Gitblit v1.9.3