From 9b4433fddf5b401edb0aace8a404ac733b122702 Mon Sep 17 00:00:00 2001 From: 田源 <tianyuan@vci-tech.com> Date: 星期四, 03 四月 2025 14:35:02 +0800 Subject: [PATCH] 添加非密字段显示 --- Source/UBCS-WEB/src/components/Master/MasterTransfer.vue | 64 +++++++++++++++++++++---------- 1 files changed, 43 insertions(+), 21 deletions(-) diff --git a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue index 00d593e..639cf39 100644 --- a/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue +++ b/Source/UBCS-WEB/src/components/Master/MasterTransfer.vue @@ -10,11 +10,11 @@ <el-radio :label="1">鍏ㄩ儴</el-radio> <el-radio :label="2">椤电爜</el-radio> </el-radio-group> - <span v-if="radio === 2" style="margin-left: 20px;"><el-input v-model="pageExport" - style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10锛�</span> + <span v-if="radio === 2" style="margin-left: 20px;color: #F56C6C; "> + <el-input v-model="pageExport" style="width: 150px"></el-input> 锛堣緭鍏ラ〉鐮佹垨鑰呴〉闈㈣寖鍥达紝濡傦細1-10锛�</span> </div> </div> - <div style="text-align: center"> + <div v-loading="isLoading" style="text-align: center"> <el-transfer v-model="value" :data="data" @@ -44,6 +44,7 @@ pageExport: "", data: [], value: [], + isLoading: false, filterMethod(query, item) { return item.label.indexOf(query) > -1; }, @@ -122,20 +123,22 @@ }, methods: { handlerFile(res) { - let reader = new FileReader(); - reader.readAsText(res.data); - reader.onload = (result) => { - try { - let resData = JSON.parse(result.target.result); // 瑙f瀽瀵硅薄鎴愬姛 - if (resData.code != 200) { - this.$message.error(resData.msg); - } - } catch (err) { - // console.log("err",err)// 瑙f瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴� - func.downloadFileByBlobHandler(res); - this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�'); - } - }; + // let reader = new FileReader(); + // reader.readAsText(res.data); + // reader.onload = (result) => { + // try { + // let resData = JSON.parse(result.target.result); // 瑙f瀽瀵硅薄鎴愬姛 + // if (resData.code != 200) { + // this.$message.error(resData.msg); + // } + // } catch (err) { + // // 瑙f瀽鎴愬璞″け璐ワ紝璇存槑鏄甯哥殑鏂囦欢娴� + // func.downloadFileByBlobHandler(res); + // this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�'); + // } + // }; + func.downloadFileByBlobHandler(res); + this.$message.success('涓嬭浇鎴愬姛锛岃鏌ョ湅锛�'); }, escHandler() { this.$emit('update:visible', false); @@ -154,6 +157,7 @@ if (this.selectRow.length <= 0) { this.$message.warning('璇烽�夋嫨瑕佸鍑虹殑妯℃澘') } else { + this.isLoading = true; //宸查�夋嫨澶氶�� const selectList = [] //宸查�夋嫨灞炴�� @@ -176,6 +180,9 @@ }).then(res => { this.handlerFile(res); this.escHandler(); + this.isLoading = false; + }).catch(error => { + this.isLoading = false; }) } else { @@ -186,12 +193,15 @@ // console.log('res',res) this.handlerFile(res); this.escHandler(); - + this.isLoading = false; + }).catch(error => { + this.isLoading = false; }) } } } else if (this.radio === 1) { + this.isLoading = true; if (this.value <= 0) { this.tableHeadData.map(item => item.prop) .forEach((prop, index) => { @@ -201,12 +211,18 @@ if (res) { func.downloadFileByBlobHandler(res); this.escHandler(); + this.isLoading = false; } + }).catch(error => { + this.isLoading = false; }) } else { exportCode({codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: -1}).then(res => { this.handlerFile(res); this.escHandler(); + this.isLoading = false; + }).catch(error => { + this.isLoading = false; }) } } else if (this.radio === 2) { @@ -235,6 +251,7 @@ } } if (this.value >= 1) { + this.isLoading = true; exportCode({ codeClassifyOid: this.codeClassifyOid, ...this.exportArr, limit: this.limit, @@ -244,9 +261,12 @@ // console.log('res',res) this.handlerFile(res); this.escHandler(); - + this.isLoading = false; + }).catch(error => { + this.isLoading = false; }); } else { + this.isLoading = true; this.tableHeadData.map(item => item.prop) .forEach((prop, index) => { this.exportArrTwo[`attrIdIndexMap[${index}]`] = prop; @@ -257,10 +277,12 @@ page: start, endPage: end }).then(res => { - console.log('res', res) + this.isLoading = false; this.handlerFile(res); this.escHandler(); - }) + }).catch(error => { + this.isLoading = false; + }); } } }, -- Gitblit v1.9.3