From d419a8944981bc3235392a57c84d241e6c47335a Mon Sep 17 00:00:00 2001
From: wang1 <844966816@qq.com>
Date: 星期一, 19 六月 2023 16:33:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 48 ++++++++++++++++++++++++++++++------------------
1 files changed, 30 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index d140c92..efffed5 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -2,59 +2,71 @@
<div>
<el-button @click="visible = true">娴嬭瘯</el-button>
<el-button @click="visible1 = true">鐩镐技椤规煡璇�</el-button>
+ <el-button @click="visible3 = 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"
+ :type="type"
+ :templateOid="templateOid"
+ :codeClassifyOid="codeClassifyOid"
+ :codeRuleOid="codeRuleOid"
:disabledProp="disabledProp"
:rowOid="rowOid"
@submit="submit"
></FormTemplateDialog>
<ResembleQueryDialog
:visible.sync="visible1"
- :type="this.type"
- :templateOid="this.templateOid"
- :codeClassifyOid="this.codeClassifyOid"
- :codeRuleOid="this.codeRuleOid"
+ :type="type"
+ :templateOid="templateOid"
+ :codeClassifyOid="codeClassifyOid"
+ :rowOid="rowOid"
+ :codeRuleOid="codeRuleOid"
></ResembleQueryDialog>
+ <BatchImport
+ :visible="visible3"
+ type="historyImport"
+ :downloadTemplateFun="downloadTemplateFun"
+ ></BatchImport>
<fileInHtml :options="{}"></fileInHtml>
<fileinDialog
:visible="visible2"
:options="{}"
- @close="visible2=false"
+ @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';
+import ResembleQueryDialog from "@/components/FormTemplate/ResembleQueryDialog.vue";
+import fileInHtml from "@/components/file/inHtml.vue";
+import fileinDialog from "@/components/file/inDialog.vue";
+import BatchImport from "@/components/BatchImport";
export default {
name: "FormTempalteTest",
- components: { ResembleQueryDialog ,fileInHtml ,fileinDialog},
+ components: { ResembleQueryDialog, fileInHtml, fileinDialog, BatchImport },
data() {
return {
visible: false,
visible1: false,
visible2: false,
+ visible3: false,
// 榛樿绂佺敤鐨勮〃鍏冪礌
- disabledProp: ["id", 'lcstatus'],
+ disabledProp: ["id", "lcstatus"],
// 琛ㄥ崟绫诲瀷
- type: "add",
- templateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
+ type: "edit",
+ templateOid: "f441b131-5ea0-4672-ab74-735b11161928",
codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
- rowOid: '6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9'
+ rowOid: "551FBA49-9A94-2F83-9126-9DD4F9BB14B5",
};
},
methods: {
submit(data) {
console.log(data);
+ },
+ downloadTemplateFun() {
+
}
- }
+ },
};
</script>
--
Gitblit v1.9.3