From 08e85d26f1a995ac13de724ddc683fa241b5ccc2 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期四, 07 十二月 2023 16:53:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index efffed5..a5dc154 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -23,14 +23,15 @@
:codeRuleOid="codeRuleOid"
></ResembleQueryDialog>
<BatchImport
- :visible="visible3"
+ :visible.sync="visible3"
type="historyImport"
:downloadTemplateFun="downloadTemplateFun"
+ :codeClassifyOid="codeClassifyOid"
></BatchImport>
- <fileInHtml :options="{}"></fileInHtml>
+ <fileInHtml :options="fileOptions"></fileInHtml>
<fileinDialog
:visible="visible2"
- :options="{}"
+ :options="fileOptions"
@close="visible2 = false"
></fileinDialog>
</div>
@@ -42,7 +43,7 @@
import fileinDialog from "@/components/file/inDialog.vue";
import BatchImport from "@/components/BatchImport";
export default {
- name: "FormTempalteTest",
+ name: "FormTemplateTest",
components: { ResembleQueryDialog, fileInHtml, fileinDialog, BatchImport },
data() {
return {
@@ -53,19 +54,28 @@
// 榛樿绂佺敤鐨勮〃鍏冪礌
disabledProp: ["id", "lcstatus"],
// 琛ㄥ崟绫诲瀷
- type: "edit",
+ type: "add",
templateOid: "f441b131-5ea0-4672-ab74-735b11161928",
- codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ codeClassifyOid: "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
rowOid: "551FBA49-9A94-2F83-9126-9DD4F9BB14B5",
+ fileOptions:{
+ ownbizOid:"6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9",
+ ownbizBtm:"wupin",
+ fileDocClassify:'!=processAuditSuggest',
+ fileDocClassifyName:'',
+ hasDownload:true,
+ hasUpload:true,
+ tableHeight: 'auto'
+ }
};
},
methods: {
submit(data) {
- console.log(data);
+ //console.log(data);
},
downloadTemplateFun() {
-
+
}
},
};
--
Gitblit v1.9.3