From d412b20565237295a8b14f453cb6d54457df8a1d Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期一, 03 七月 2023 18:16:55 +0800 Subject: [PATCH] 历史导入 --- Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue | 4 ++-- Source/UBCS-WEB/src/api/resource/file.js | 5 ----- Source/UBCS-WEB/src/components/FormTemplate/index.vue | 16 ++++++++-------- Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue | 4 ++-- Source/UBCS-WEB/src/components/BatchImport/index.vue | 11 +++++++++-- Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue | 2 +- Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue | 4 ++-- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/Source/UBCS-WEB/src/api/resource/file.js b/Source/UBCS-WEB/src/api/resource/file.js index e9d0482..ef26a06 100644 --- a/Source/UBCS-WEB/src/api/resource/file.js +++ b/Source/UBCS-WEB/src/api/resource/file.js @@ -40,14 +40,9 @@ return request({ url: '/api/ubcs-resource/fileController/downloadFilesByOids', method: 'post', -<<<<<<< HEAD - // headers:{'Content-Type':'application/x-www-form-urlencoded'}, - params: fileOids -======= headers:{'Content-Type':'application/x-www-form-urlencoded;charset=UTF-8'}, data: data ->>>>>>> 3e35833e70a7532d4ae8da0dcd905627230f2b2c }) } diff --git a/Source/UBCS-WEB/src/components/BatchImport/index.vue b/Source/UBCS-WEB/src/components/BatchImport/index.vue index b517e50..1d9c488 100644 --- a/Source/UBCS-WEB/src/components/BatchImport/index.vue +++ b/Source/UBCS-WEB/src/components/BatchImport/index.vue @@ -84,7 +84,7 @@ import { downloadHistoryImportTemplate, downloadErrorFile, - getHistoryLeftTree, + importDataShow, downloadBatchImportApplyTemplate, downloadBatchApplyCodeTemplate, } from "../../api/batchImport/index"; @@ -208,6 +208,7 @@ }, methods: { async beforeUpload(file) { + console.log(file, 'file'); const fileType = file.name.split(".").pop(); if (fileType !== "xlsx" && fileType !== "xls") { // 涓婁紶鏍煎紡涓嶇鍚堣姹傦紝鎻愮ず閿欒淇℃伅骞跺彇娑堜笂浼� @@ -243,6 +244,11 @@ }); }, onSuccess(res) { + if (Object.keys(res.data).length === 0) { + this.$message.success(this.title + '瀵煎叆鎴愬姛锛�') + this.dialogVisible = false + return + } let fileName = res.data.filePath.split("/").pop(); if (res.data.fileOid) { this.$message.error("璇蜂笅杞介敊璇俊鎭枃浠惰繘琛屾煡鐪嬶紒"); @@ -252,7 +258,7 @@ } if (res.data.redisUuid) { this.redisOid = res.data.redisUuid; - getHistoryLeftTree(res.data.redisUuid).then((res) => { + importDataShow(res.data.redisUuid).then((res) => { this.leftTree = res.obj.map((item) => { return { ...item.codeClassifyTemplateVO, @@ -264,6 +270,7 @@ } }, uploadChange(file) { + console.log(file, 'file', file.status === "success"); if (file.status === "success" || file.status === "error") { this.pageLoading.close(); } diff --git a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue index 8d0c452..3023328 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue @@ -5,7 +5,6 @@ <avue-form v-model="form" :option="option" - v-loading="loading" ref="form" :style="{ minHeight: loading ? '300px' : '' }" :key="updateIndex" @@ -604,6 +603,7 @@ if (this.type === "add") { this.loading = false; } + this.geDictData(dictKeys); this.getFormDetail(); }, diff --git a/Source/UBCS-WEB/src/components/FormTemplate/index.vue b/Source/UBCS-WEB/src/components/FormTemplate/index.vue index 57cfa45..45f318e 100644 --- a/Source/UBCS-WEB/src/components/FormTemplate/index.vue +++ b/Source/UBCS-WEB/src/components/FormTemplate/index.vue @@ -11,14 +11,12 @@ > <FormTemplate v-bind="$attrs" - :visible="visible" :type="type" :rowOid="rowOid" :templateOid="templateOid" ref="FormTemplate" @getFormData="getFormData" ></FormTemplate> - <div class="tab_box" v-if=" @@ -127,8 +125,8 @@ form: {}, codeApplyForm: {}, activeName: "codeApply", - showCodeApply: true, - showResembleQuery: true, + showCodeApply: false, + showResembleQuery: false, selfColumnType: { codefixedsec: "combox", codeclassifysec: "refer", @@ -233,7 +231,9 @@ this.activeName = "resembleQuery"; this.showResembleQuery = true; } - this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items); + this.$nextTick(() => { + this.$refs.FormTemplate.templateRender(res.data.formDefineVO.items); + }) } }) .catch(() => { @@ -253,15 +253,15 @@ this.secVOList = (res.data.data.secVOList || []).filter((item) => typeList.includes(item.secType) ); - this.$nextTick(() => { if (this.secVOList.length > 0 && this.type === "add") { this.showCodeApply = true; this.activeName = "codeApply"; - this.$refs.CodeApply.templateRender(this.secVOList); + this.$nextTick(() => { + this.$refs.CodeApply.templateRender(this.secVOList); + }) } else { this.showCodeApply = false; } - }); } }); }, diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue index bac7f47..18bf484 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferDefalut.vue @@ -81,8 +81,8 @@ }, created() { this.getParams(); - console.log('referConfig:') - console.log(this.referConfig) + // console.log('referConfig:') + // console.log(this.referConfig) }, mounted() { if(this.referConfig.options.page){ diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue index 08ab794..cfef5d5 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTable.vue @@ -85,8 +85,8 @@ }, created() { this.getParams(); - console.log('referConfig:') - console.log(this.referConfig) + // console.log('referConfig:') + // console.log(this.referConfig) }, mounted() { if(this.referConfig.options.page){ diff --git a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue index dcbb537..8abf926 100644 --- a/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue +++ b/Source/UBCS-WEB/src/components/refer/vciWebReferTree.vue @@ -34,8 +34,8 @@ }, created() { this.getParams(); - console.log('referConfig:') - console.log(this.referConfig) + // console.log('referConfig:') + // console.log(this.referConfig) }, mounted() { if(!this.lazy){ -- Gitblit v1.9.3