From 3bcd305ef9408ae54f7ef62b8472d0813ae34333 Mon Sep 17 00:00:00 2001
From: fujunling <2984387807@qq.com>
Date: 星期五, 16 六月 2023 16:53:44 +0800
Subject: [PATCH] 解决冲突
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 110 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 60 insertions(+), 50 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index a0521bf..d140c92 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -1,50 +1,60 @@
-<template>
- <div>
- <el-button @click="visible = true">娴嬭瘯</el-button>
- <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"
- @submit="submit"
- ></FormTemplateDialog>
- <ResembleQueryDialog
- :visible.sync="visible1"
- :type="this.type"
- :templateOid="this.templateOid"
- :codeClassifyOid="this.codeClassifyOid"
- :codeRuleOid="this.codeRuleOid"
- ></ResembleQueryDialog>
- </div>
-</template>
-
-<script>
-import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
-export default {
- name: "FormTempalteTest",
- components: { ResembleQueryDialog },
- data() {
- return {
- visible: false,
- visible1: false,
- // 榛樿绂佺敤鐨勮〃鍏冪礌
- disabledProp: ["id", 'lcstatus'],
- // 琛ㄥ崟绫诲瀷
- type: "add",
- templateOid: "A12826E4-2B66-6D56-DE30-92BB1D7F607F",
- codeClassifyOid: "D9CF223F-317D-71EB-BD11-433A94CAD9F3",
- codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
- rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
- };
- },
- methods: {
- submit(data) {
- console.log(data);
- }
- }
-};
-</script>
+<template>
+ <div>
+ <el-button @click="visible = true">娴嬭瘯</el-button>
+ <el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
+ <el-button @click="visible2 = true">闄勪欢绠＄悊dialog</el-button>
+ <FormTemplateDialog
+ :visible.sync="visible"
+ :type="this.type"
+ :templateOid="this.templateOid"
+ :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid"
+ :disabledProp="disabledProp"
+ :rowOid="rowOid"
+ @submit="submit"
+ ></FormTemplateDialog>
+ <ResembleQueryDialog
+ :visible.sync="visible1"
+ :type="this.type"
+ :templateOid="this.templateOid"
+ :codeClassifyOid="this.codeClassifyOid"
+ :codeRuleOid="this.codeRuleOid"
+ ></ResembleQueryDialog>
+ <fileInHtml :options="{}"></fileInHtml>
+ <fileinDialog
+ :visible="visible2"
+ :options="{}"
+ @close="visible2=false"
+ ></fileinDialog>
+ </div>
+</template>
+
+<script>
+import ResembleQueryDialog from '@/components/FormTemplate/ResembleQueryDialog.vue';
+import fileInHtml from '@/components/file/inHtml.vue';
+import fileinDialog from '@/components/file/inDialog.vue';
+export default {
+ name: "FormTempalteTest",
+ components: { ResembleQueryDialog ,fileInHtml ,fileinDialog},
+ data() {
+ return {
+ visible: false,
+ visible1: false,
+ visible2: false,
+ // 榛樿绂佺敤鐨勮〃鍏冪礌
+ disabledProp: ["id", 'lcstatus'],
+ // 琛ㄥ崟绫诲瀷
+ 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'
+ };
+ },
+ methods: {
+ submit(data) {
+ console.log(data);
+ }
+ }
+};
+</script>
--
Gitblit v1.9.3