From c7aa60c3241f306ec66fdea86f78249d742e63d2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 24 八月 2023 09:25:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 42 ++++++++++++++++++++++++++----------------
1 files changed, 26 insertions(+), 16 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index 8704a87..f65423b 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -6,30 +6,32 @@
<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"
+ :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>
@@ -41,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,10 +55,18 @@
disabledProp: ["id", "lcstatus"],
// 琛ㄥ崟绫诲瀷
type: "add",
- templateOid: "78B8C7C5-A042-0B96-FE6D-65421451782A",
- codeClassifyOid: "4524E801-6CC6-92E8-1AC3-2AB9604E8F96",
+ templateOid: "f441b131-5ea0-4672-ab74-735b11161928",
+ codeClassifyOid: "535FC9B6-FE27-241F-5FCA-ED4DC17CF95B",
codeRuleOid: "B95872A6-9CEA-D490-8F1B-9D26548CAF96",
- rowOid: "6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9",
+ rowOid: "551FBA49-9A94-2F83-9126-9DD4F9BB14B5",
+ fileOptions:{
+ ownbizOid:"6EF696C3-CD87-0E7C-1EA1-8DE3913A95C9",
+ ownbizBtm:"wupin",
+ fileDocClassify:'!=processAuditSuggest',
+ fileDocClassifyName:'',
+ hasDownload:true,
+ hasUpload:true
+ }
};
},
methods: {
@@ -64,7 +74,7 @@
console.log(data);
},
downloadTemplateFun() {
-
+
}
},
};
--
Gitblit v1.9.3