diff --git a/public/static/tpl/import_countryArea.xlsx b/public/static/tpl/import_countryArea.xlsx new file mode 100644 index 00000000..3d261e84 Binary files /dev/null and b/public/static/tpl/import_countryArea.xlsx differ diff --git a/public/static/tpl/import_region.xlsx b/public/static/tpl/import_region.xlsx new file mode 100644 index 00000000..17c3f5a4 Binary files /dev/null and b/public/static/tpl/import_region.xlsx differ diff --git a/src/api/emis/emisCountryArea.js b/src/api/emis/emisCountryArea.js index 6f01c2e2..3e81f8db 100644 --- a/src/api/emis/emisCountryArea.js +++ b/src/api/emis/emisCountryArea.js @@ -42,3 +42,12 @@ export function delEmisCountryArea(id) { method: 'delete' }) } + +// 批量导入国家大区表 +export function draftSubmitCountryArea(data) { + return request({ + url: '/emisCountryArea/draftSubmitCountryArea', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/api/emis/emisRegion.js b/src/api/emis/emisRegion.js index 5f6bebee..e82013aa 100644 --- a/src/api/emis/emisRegion.js +++ b/src/api/emis/emisRegion.js @@ -52,3 +52,11 @@ export function delEmisRegion(id) { method: 'delete' }) } +// 批量导入四级省市区镇表 +export function draftSubmitRegion(data) { + return request({ + url: '/emis/emisRegion/draftSubmitRegion', + method: 'post', + data: data + }) +} \ No newline at end of file diff --git a/src/views/emis/emisCountryArea/batchImportCountryArea.vue b/src/views/emis/emisCountryArea/batchImportCountryArea.vue new file mode 100644 index 00000000..bb196f89 --- /dev/null +++ b/src/views/emis/emisCountryArea/batchImportCountryArea.vue @@ -0,0 +1,392 @@ + + + + + + + + + + 选择文件 + 下载导入Excel模板 + + + + 批量发送 + + + 删除 + + + + + + + + 发送成功 + 待发送 + 发送异常 + + + + + {{ scope.row.errorInfo }} + 发送成功 + 待发送 + + + + + + + + + + + + + + + + diff --git a/src/views/emis/emisCountryArea/indexPanel.vue b/src/views/emis/emisCountryArea/indexPanel.vue index 79d41ae1..63721c96 100644 --- a/src/views/emis/emisCountryArea/indexPanel.vue +++ b/src/views/emis/emisCountryArea/indexPanel.vue @@ -80,6 +80,16 @@ v-hasPermi="['emis:emisCountryArea:export']" >导出 --> + + 批量导入 + @@ -109,8 +119,10 @@ - - + + + + @@ -118,9 +130,10 @@ import { listEmisCountryArea, getEmisCountryArea, delEmisCountryArea, addEmisCountryArea, updateEmisCountryArea } from "@/api/emis/emisCountryArea"; import emisCountryAreaForm from '@/views/emis/emisCountryArea/emisCountryAreaForm'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; +import batchImportCountryArea from '@/views/emis/emisCountryArea/batchImportCountryArea.vue'; export default { name: "emisCountryArea", - components: { emisCountryAreaForm,CountryPicker }, + components: { emisCountryAreaForm,CountryPicker,batchImportCountryArea }, dicts: [ ], props: { @@ -170,6 +183,8 @@ export default { daterangeCreateTime: [], // 删除标志(0代表存在时间范围 daterangeUpdateTime: [], + openBatchAdd: false, + batchAddTitleForm: "", // 查询参数 queryParams: { pageNum: 1, @@ -393,6 +408,10 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + handleBatchAdd(){ + this.openBatchAdd= true; + this.batchAddTitleForm = "批量导入"; + }, } }; diff --git a/src/views/emis/emisRegion/PcdPanel.vue b/src/views/emis/emisRegion/PcdPanel.vue index 82b76c01..f53cd390 100644 --- a/src/views/emis/emisRegion/PcdPanel.vue +++ b/src/views/emis/emisRegion/PcdPanel.vue @@ -99,6 +99,16 @@ --> + + 批量导入 + @@ -153,7 +163,10 @@ - + + + + @@ -162,10 +175,11 @@ import { listEmisRegion, delEmisRegion} from "@/api/emis/emisRegion"; import emisRegionForm from '@/views/emis/emisRegion/emisRegionForm'; import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue'; import CountryAreaPicker from '@/views/emis/EmisBaseTools/CountryAreaPicker.vue'; +import batchImportRegion from '@/views/emis/emisRegion/batchImportRegion.vue'; export default { name: "emisRegion", - components: { emisRegionForm,CountryPicker,CountryAreaPicker }, + components: { emisRegionForm,CountryPicker,CountryAreaPicker,batchImportRegion,batchImportRegion }, props: { countryCode: { type: String, @@ -222,6 +236,9 @@ export default { daterangeCreateTime: [], // 删除标志(0代表存在时间范围 daterangeUpdateTime: [], + // 批量导入弹出层 + openBatchAdd: false, + batchAddTitleForm: "", // 查询参数 queryParams: { pageNum: 1, @@ -422,6 +439,10 @@ export default { dateTimeChange(value){ this.dateTimeRange=value; }, + handleBatchAdd(){ + this.openBatchAdd= true; + this.batchAddTitleForm = "批量导入"; + }, } }; diff --git a/src/views/emis/emisRegion/batchImportRegion.vue b/src/views/emis/emisRegion/batchImportRegion.vue new file mode 100644 index 00000000..201b11f9 --- /dev/null +++ b/src/views/emis/emisRegion/batchImportRegion.vue @@ -0,0 +1,396 @@ + + + + + + + + + + 选择文件 + 下载导入Excel模板 + + + + 批量发送 + + + 删除 + + + + + + + + 发送成功 + 待发送 + 发送异常 + + + + + {{ scope.row.errorInfo }} + 发送成功 + 待发送 + + + + + + + + + + + + + + + + + +