diff --git a/src/api/dev/deviceBusinessProjectApi.js b/src/api/dev/deviceBusinessProjectApi.js index 4102945f..a0caa349 100644 --- a/src/api/dev/deviceBusinessProjectApi.js +++ b/src/api/dev/deviceBusinessProjectApi.js @@ -62,3 +62,21 @@ export function businessPage(query) { ) } + +export function excelBusinessProjectImport(params) { + return axios({ + url: "/udi/device/businessProject/exportExcel", + method: "get", + responseType: 'blob', + params: params + }); +} + +export function postExcelBusinessProjectImport(data) { + return axios({ + url: "/udi/device/businessProject/selectExportExcel", + method: "post", + responseType: 'blob', + data: data + }); +} diff --git a/src/views/dev/js/deviceInfoFull.js b/src/views/dev/js/deviceInfoFull.js index a367d0a8..40b7635f 100644 --- a/src/views/dev/js/deviceInfoFull.js +++ b/src/views/dev/js/deviceInfoFull.js @@ -267,7 +267,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); @@ -314,7 +314,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inout/stat/IoStatCustomSearch.vue b/src/views/inout/stat/IoStatCustomSearch.vue index 42bd3d16..bc37c2e3 100644 --- a/src/views/inout/stat/IoStatCustomSearch.vue +++ b/src/views/inout/stat/IoStatCustomSearch.vue @@ -336,7 +336,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }, diff --git a/src/views/inout/stat/IoStatDaySearch.vue b/src/views/inout/stat/IoStatDaySearch.vue index 01b05d97..12d73f2d 100644 --- a/src/views/inout/stat/IoStatDaySearch.vue +++ b/src/views/inout/stat/IoStatDaySearch.vue @@ -297,7 +297,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }, diff --git a/src/views/inout/stat/IoStatMonthSearch.vue b/src/views/inout/stat/IoStatMonthSearch.vue index b52f526f..d8294dbc 100644 --- a/src/views/inout/stat/IoStatMonthSearch.vue +++ b/src/views/inout/stat/IoStatMonthSearch.vue @@ -275,7 +275,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }, diff --git a/src/views/inout/stat/IoStatQuarterSearch.vue b/src/views/inout/stat/IoStatQuarterSearch.vue index 4fb88bfb..9693b204 100644 --- a/src/views/inout/stat/IoStatQuarterSearch.vue +++ b/src/views/inout/stat/IoStatQuarterSearch.vue @@ -295,7 +295,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }, diff --git a/src/views/inout/stat/IoStatYearSearch.vue b/src/views/inout/stat/IoStatYearSearch.vue index 219e4676..f26fbad0 100644 --- a/src/views/inout/stat/IoStatYearSearch.vue +++ b/src/views/inout/stat/IoStatYearSearch.vue @@ -270,7 +270,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }, diff --git a/src/views/inventory/count/InvCountOrderCompletedSum.vue b/src/views/inventory/count/InvCountOrderCompletedSum.vue index 8ddf819a..870c4be7 100644 --- a/src/views/inventory/count/InvCountOrderCompletedSum.vue +++ b/src/views/inventory/count/InvCountOrderCompletedSum.vue @@ -584,7 +584,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -642,7 +642,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inventory/supInoutSearchOrder.vue b/src/views/inventory/supInoutSearchOrder.vue index fe484234..ad303520 100644 --- a/src/views/inventory/supInoutSearchOrder.vue +++ b/src/views/inventory/supInoutSearchOrder.vue @@ -785,7 +785,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -843,7 +843,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inventory/supInoutSearchOrderDept.vue b/src/views/inventory/supInoutSearchOrderDept.vue index 26458f10..9f2af64e 100644 --- a/src/views/inventory/supInoutSearchOrderDept.vue +++ b/src/views/inventory/supInoutSearchOrderDept.vue @@ -581,7 +581,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -639,7 +639,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inventory/supInoutSearchOrderProduct.vue b/src/views/inventory/supInoutSearchOrderProduct.vue index 0fb139b8..c5e03194 100644 --- a/src/views/inventory/supInoutSearchOrderProduct.vue +++ b/src/views/inventory/supInoutSearchOrderProduct.vue @@ -586,7 +586,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -644,7 +644,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inventory/supInoutSearchOrderProductOut.vue b/src/views/inventory/supInoutSearchOrderProductOut.vue index b619ac08..c7457abe 100644 --- a/src/views/inventory/supInoutSearchOrderProductOut.vue +++ b/src/views/inventory/supInoutSearchOrderProductOut.vue @@ -636,7 +636,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -674,7 +674,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/inventory/supInoutSearchOrderSup.vue b/src/views/inventory/supInoutSearchOrderSup.vue index 051d6d8a..2c7266ca 100644 --- a/src/views/inventory/supInoutSearchOrderSup.vue +++ b/src/views/inventory/supInoutSearchOrderSup.vue @@ -603,7 +603,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }).catch(() => { this.selectExportLoading = false }) @@ -661,7 +661,7 @@ export default { let a = document.createElement("a"); a.href = url; a.click(); - this.$message("成功") + this.$message.success("成功") }) }); diff --git a/src/views/purchase/benefitManagement/deviceBenefit.vue b/src/views/purchase/benefitManagement/deviceBenefit.vue index 218e395c..d20be3ce 100644 --- a/src/views/purchase/benefitManagement/deviceBenefit.vue +++ b/src/views/purchase/benefitManagement/deviceBenefit.vue @@ -3,70 +3,31 @@ - - - - - {{ item.label }} - - - + + + - - - - - - - + + + - - - - - {{ item.label }} - - - + + + - - - - - - - - - - - - - + @@ -96,10 +57,10 @@ >查询 - - - 选中打印 - 查询结果打印 + 选中导出Excel + 结果导出Excel + + @@ -112,8 +73,8 @@ - - + + @@ -131,13 +92,7 @@