From c24b7fdfc3c984365dc1b1e135ba1e9496f2c9c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E8=BF=90=E6=A8=A1?= <1724894114@qq.com> Date: Mon, 12 May 2025 10:28:28 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/scImport/index.vue | 39 +++++++++++++++---- src/views/cost/feeRecords/index.vue | 6 ++- src/views/inventory/inoutRecord/index.vue | 7 +++- src/views/order/inventoryList/index.vue | 6 ++- src/views/order/inventoryStatistics/index.vue | 7 +++- src/views/order/orderList/index.vue | 6 ++- src/views/reports/keepRepairReports/index.vue | 7 +++- src/views/reports/shipmentReports/index.vue | 7 +++- src/views/setting/advanced/setup/material.vue | 6 ++- src/views/setting/advanced/setup/region.vue | 6 ++- .../setting/advanced/setup/spareParts.vue | 6 ++- src/views/setting/bom/index.vue | 6 ++- src/views/setting/company/index.vue | 6 ++- .../setting/partsMag/components/info.vue | 6 ++- .../setting/partsMag/components/library.vue | 6 ++- src/views/setting/user/index.vue | 6 ++- .../shipment/shipmentDataConfirm/index.vue | 7 +++- src/views/shipment/shipmentList/list.vue | 8 +++- .../shipment/shipmentStatistics/index.vue | 7 +++- 19 files changed, 112 insertions(+), 43 deletions(-) diff --git a/src/components/scImport/index.vue b/src/components/scImport/index.vue index 793fe4d..2100147 100644 --- a/src/components/scImport/index.vue +++ b/src/components/scImport/index.vue @@ -1,7 +1,7 @@ @@ -91,6 +91,7 @@ export default { importDis:false, importTrue:false, progressShow:false, + progressTrue:false, errorShow:false, importInfo:{}, errorList:[], @@ -116,13 +117,18 @@ export default { if(this.type == res.data.type){ this.importInfo = res.data; this.progressShow = true; + this.progressTrue = true; + this.importTrue = true; if(res.data.status == 0 || res.data.status == 1){ this.errorShow = true; let text = res.data; this.errorList.push(text); + + this.scrollDown(); } if(res.data.rate == 100){ - this.progressShow = false; + // this.progressShow = false; + this.progressTrue = false; this.$emit('importSuccess'); } } @@ -153,6 +159,7 @@ export default { this.params = formData; this.importTrue = true; this.importDis = true; + this.progressShow = false; } catch (error) { console.log(error) } @@ -161,6 +168,7 @@ export default { this.importTrue = false; setTimeout(()=>{ this.importDis = false; + this.$emit('importSuccess',{refresh:false}); this.errorClick(); },100) }, @@ -168,6 +176,11 @@ export default { this.errorShow= false; this.errorList= [] }, + closeVisible(){ + this.visible = false; + this.progressShow = false; + this.importTrue = false; + }, save(){ this.errorClick(); this.$emit('parentParams',this.params); @@ -179,7 +192,19 @@ export default { // 上传失败 handleError(){ this.$message.warning('上传失败请重新上传'); - } + }, + + scrollDown() { + this.$nextTick(() => { + const wrap = this.$refs.scrollbar; + if(wrap){ + const e = wrap.$el.querySelector('.el-scrollbar__wrap') + if(e){ + e.scrollTop = e.scrollHeight; + } + } + }) + }, } } diff --git a/src/views/cost/feeRecords/index.vue b/src/views/cost/feeRecords/index.vue index 64ae763..f05664b 100644 --- a/src/views/cost/feeRecords/index.vue +++ b/src/views/cost/feeRecords/index.vue @@ -237,9 +237,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/inventory/inoutRecord/index.vue b/src/views/inventory/inoutRecord/index.vue index 1c6b2d2..8c8aeb2 100644 --- a/src/views/inventory/inoutRecord/index.vue +++ b/src/views/inventory/inoutRecord/index.vue @@ -178,8 +178,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/order/inventoryList/index.vue b/src/views/order/inventoryList/index.vue index d68a64e..c2218f1 100644 --- a/src/views/order/inventoryList/index.vue +++ b/src/views/order/inventoryList/index.vue @@ -223,9 +223,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/order/inventoryStatistics/index.vue b/src/views/order/inventoryStatistics/index.vue index 2c36d84..0877f58 100644 --- a/src/views/order/inventoryStatistics/index.vue +++ b/src/views/order/inventoryStatistics/index.vue @@ -179,8 +179,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue index 626d260..4223b53 100644 --- a/src/views/order/orderList/index.vue +++ b/src/views/order/orderList/index.vue @@ -282,9 +282,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/reports/keepRepairReports/index.vue b/src/views/reports/keepRepairReports/index.vue index fed8ba7..499ee0a 100644 --- a/src/views/reports/keepRepairReports/index.vue +++ b/src/views/reports/keepRepairReports/index.vue @@ -178,8 +178,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/reports/shipmentReports/index.vue b/src/views/reports/shipmentReports/index.vue index fed8ba7..499ee0a 100644 --- a/src/views/reports/shipmentReports/index.vue +++ b/src/views/reports/shipmentReports/index.vue @@ -178,8 +178,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/setting/advanced/setup/material.vue b/src/views/setting/advanced/setup/material.vue index 0f1fe92..1d706f0 100644 --- a/src/views/setting/advanced/setup/material.vue +++ b/src/views/setting/advanced/setup/material.vue @@ -114,9 +114,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //表格选择后回调事件 diff --git a/src/views/setting/advanced/setup/region.vue b/src/views/setting/advanced/setup/region.vue index 4bf23f0..cbb427a 100644 --- a/src/views/setting/advanced/setup/region.vue +++ b/src/views/setting/advanced/setup/region.vue @@ -131,9 +131,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //表格选择后回调事件 diff --git a/src/views/setting/advanced/setup/spareParts.vue b/src/views/setting/advanced/setup/spareParts.vue index 0d2194a..cd6e5f6 100644 --- a/src/views/setting/advanced/setup/spareParts.vue +++ b/src/views/setting/advanced/setup/spareParts.vue @@ -109,9 +109,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //表格选择后回调事件 selectionChange(selection){ diff --git a/src/views/setting/bom/index.vue b/src/views/setting/bom/index.vue index 50af439..68cd7e8 100644 --- a/src/views/setting/bom/index.vue +++ b/src/views/setting/bom/index.vue @@ -211,9 +211,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //添加 diff --git a/src/views/setting/company/index.vue b/src/views/setting/company/index.vue index 559df63..a13e6f2 100644 --- a/src/views/setting/company/index.vue +++ b/src/views/setting/company/index.vue @@ -285,9 +285,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/setting/partsMag/components/info.vue b/src/views/setting/partsMag/components/info.vue index 9bc1dbc..ead28de 100644 --- a/src/views/setting/partsMag/components/info.vue +++ b/src/views/setting/partsMag/components/info.vue @@ -247,9 +247,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 table_edit(row){ diff --git a/src/views/setting/partsMag/components/library.vue b/src/views/setting/partsMag/components/library.vue index 2467c5a..1266f00 100644 --- a/src/views/setting/partsMag/components/library.vue +++ b/src/views/setting/partsMag/components/library.vue @@ -226,9 +226,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/setting/user/index.vue b/src/views/setting/user/index.vue index 4f43118..e7b8edd 100644 --- a/src/views/setting/user/index.vue +++ b/src/views/setting/user/index.vue @@ -303,9 +303,11 @@ this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ + importSuccess(refresh){ this.httpDisabled = false; - this.$refs.table.refresh() + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/shipment/shipmentDataConfirm/index.vue b/src/views/shipment/shipmentDataConfirm/index.vue index 82283fb..64f0b4b 100644 --- a/src/views/shipment/shipmentDataConfirm/index.vue +++ b/src/views/shipment/shipmentDataConfirm/index.vue @@ -179,8 +179,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑 diff --git a/src/views/shipment/shipmentList/list.vue b/src/views/shipment/shipmentList/list.vue index 4913e87..a1237ff 100644 --- a/src/views/shipment/shipmentList/list.vue +++ b/src/views/shipment/shipmentList/list.vue @@ -211,13 +211,17 @@ export default { }; updateOrAppend(params, 'is_save_repeat', this.importParams.is_save_repeat); + this.httpDisabled = true; const res = await this.$API.shipment.out.import.post(params); if(res.code == 200){ this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, // 删除 batch_del(){ diff --git a/src/views/shipment/shipmentStatistics/index.vue b/src/views/shipment/shipmentStatistics/index.vue index aee3c1b..b9e1bac 100644 --- a/src/views/shipment/shipmentStatistics/index.vue +++ b/src/views/shipment/shipmentStatistics/index.vue @@ -179,8 +179,11 @@ export default { this.$message.success('上传成功，开始导入数据'); } }, - importSuccess(){ - this.$refs.table.refresh() + importSuccess(refresh){ + this.httpDisabled = false; + if(!refresh){ + this.$refs.table.refresh() + } }, //编辑