From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 24 七月 2023 17:29:24 +0800
Subject: [PATCH] 1、修改查询按钮时的条件，使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。
---
Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue | 63 +++++++++++++++++++++----------
1 files changed, 42 insertions(+), 21 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
index d140c92..f65423b 100644
--- a/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
+++ b/Source/UBCS-WEB/src/views/MasterData/FormTempalteTest.vue
@@ -2,59 +2,80 @@
<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>
- <fileInHtml :options="{}"></fileInHtml>
+ <BatchImport
+ :visible.sync="visible3"
+ type="historyImport"
+ :downloadTemplateFun="downloadTemplateFun"
+ :codeClassifyOid="codeClassifyOid"
+ ></BatchImport>
+ <fileInHtml :options="fileOptions"></fileInHtml>
<fileinDialog
:visible="visible2"
- :options="{}"
- @close="visible2=false"
+ :options="fileOptions"
+ @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},
+ name: "FormTemplateTest",
+ 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",
- 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: {
submit(data) {
console.log(data);
+ },
+ downloadTemplateFun() {
+
}
- }
+ },
};
</script>
--
Gitblit v1.9.3