diff --git a/src/assets/images/box-bc.png b/src/assets/images/box-bc.png new file mode 100644 index 0000000..61e7cc8 --- /dev/null +++ b/src/assets/images/box-bc.png diff --git a/src/components/CompanyForm/index.vue b/src/components/CompanyForm/index.vue index 73775e6..119b976 100644 --- a/src/components/CompanyForm/index.vue +++ b/src/components/CompanyForm/index.vue @@ -2,11 +2,11 @@
点击新增企业点击新增运营主体
- @@ -25,7 +25,7 @@ - + @@ -39,13 +39,13 @@ - + - + diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index ce2c03d..8a62edb 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -54,13 +54,13 @@
- 企业归属：{{ companyInfo.areaName || "--" }} + 运营主体归属：{{ companyInfo.areaName || "--" }}
联系人：{{ companyInfo.contactUser || "--" }}
- 公司地址：{{ companyInfo.address || "--" }} + 运营主体地址：{{ companyInfo.address || "--" }}
@@ -227,7 +227,7 @@ - + --> - - + + diff --git a/src/views/baseComapnyInfo/Form.vue b/src/views/baseComapnyInfo/Form.vue index c9cdb62..7d4778f 100644 --- a/src/views/baseComapnyInfo/Form.vue +++ b/src/views/baseComapnyInfo/Form.vue @@ -2,7 +2,7 @@ - @@ -11,7 +11,7 @@ - + @@ -25,13 +25,13 @@ - + - + diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue index 147f8a0..2693127 100644 --- a/src/views/baseComapnyInfo/index.vue +++ b/src/views/baseComapnyInfo/index.vue @@ -8,105 +8,64 @@ - + - + - + - 搜索 + 搜索
新增 - 导出 +
- - - - + + + + - + - +
- +
@@ -119,6 +78,8 @@ import { } from "@/api/baseData/company"; import NCCForm from "./Form"; import ExportBox from "./ExportBox"; +import request from "@/utils/request"; +import define from '@/utils/define' export default { components: { NCCForm, ExportBox }, data() { @@ -139,8 +100,10 @@ export default { sort: "desc", sidx: "", }, + exportBtnLoading: false, formVisible: false, exportBoxVisible: false, + uploadHeaders: { Authorization: this.$store.getters.token }, columnList: [ { prop: "id", label: "主键" }, { prop: "companyName", label: "公司名称" }, @@ -198,11 +161,48 @@ export default { this.$refs.NCCForm.init(id, isDetail); }); }, - exportData() { - this.exportBoxVisible = true; - this.$nextTick(() => { - this.$refs.ExportBox.init(this.columnList); - }); + toUpload(response, file, fileList) { + console.log(response, file, fileList); + }, + exportData(type) { + let obj = {}; + if(type) { + obj = { + url: '/Extend/basecomapnyinfo/Actions/GenerateImportTemplate', + method: "GET", + } + } else { + let _query = { + ...this.query, + }; + let query = {}; + for (let key in _query) { + if (Array.isArray(_query[key])) { + query[key] = _query[key].join(); + } else { + query[key] = _query[key]; + } + } + obj ={ + url: '/Extend/basecomapnyinfo/Actions/ImportByExcel', + method: "POST", + data: query, + } + }; + request(obj).then((res) => { + console.log(res); + const url = define.APIURl + res.data.url; + const link = document.createElement("a"); + link.href = url; + link.download = res.data.name; + link.click(); + }).catch(() => this.exportBtnLoading = false); + }, + exportForm(url) { + const link = document.createElement("a"); + link.href = url; + link.download = '公司信息模板.xlsx'; + link.click(); }, async download(data) { let query = { ...data, ...this.listQuery, ...this.query }; @@ -250,4 +250,8 @@ export default { height: calc(100% - 35px); } } +.uploadXlax { + display: inline-block; + margin: 0 8px; +} diff --git a/src/views/baseInspectionReport/index.vue b/src/views/baseInspectionReport/index.vue index d50d99c..a32324a 100644 --- a/src/views/baseInspectionReport/index.vue +++ b/src/views/baseInspectionReport/index.vue @@ -8,12 +8,12 @@ - + - + @@ -36,13 +36,11 @@
- - + + - - - + diff --git a/src/views/baseSystemInfo/DetailForm.vue b/src/views/baseSystemInfo/DetailForm.vue index 4963516..9e9975f 100644 --- a/src/views/baseSystemInfo/DetailForm.vue +++ b/src/views/baseSystemInfo/DetailForm.vue @@ -5,21 +5,21 @@ :visible.sync="visible" class="NCC-dialog NCC-dialog_center systemInfoDialog" lock-scroll - width="40%" + width="70%" > - +
-
主体企业:
+
运营主体:
{{ dataForm.companyName || "--" }}
-
系统类型:
+
应用类型:
{{ dataForm.systemType | dynamicTextUP(systemTypeOptions) }}
@@ -56,13 +56,13 @@
-
系统名称:
+
应用名称:
{{ dataForm.systemName || "--" }}
-
系统分类:
+
应用分类:
{{ dataForm.systemClass | dynamicTextClassName(systemClassOptions) }}
@@ -116,17 +116,17 @@
-
系统图标:
+
应用图标:
{{ dataForm.systemIcon || "--" }}
- +
-
公司名称:
+
运营主体名称:
{{ companyForm.companyName || "--" }}
@@ -138,13 +138,13 @@
-
公司法人:
+
运营主体法人:
{{ companyForm.legalPerson || "--" }}
-
公司地址:
+
运营主体地址:
{{ companyForm.address || "--" }}
@@ -175,17 +175,27 @@
- - - + + + + + - - - - - + + + + + + + + + + + @@ -256,11 +266,10 @@ export default { // 公司信息 companyForm: {}, - - // 核查处置记录 + // 网信执法记录 handingList: [], - // 网信执法记录 + // 核查处置记录 inspectionList: [], // 数据日志 @@ -270,7 +279,9 @@ export default { pageSize: 10, }, updataRecordList: [], - record_total: '' + record_total: '', + questionTypeOptions : [], + stateOptions: [], }; }, computed: { @@ -283,36 +294,37 @@ export default { }, watch: {}, created() { + this.initStateTypeOption(); this.initSystemTypeList(); }, mounted() {}, methods: { + async initStateTypeOption() { + let list = this.$store.state.meta.stateTypeList; + !list && (list = await this.$store.dispatch('getTypeListByCode', 'stateType')); + this.stateOptions = list; + }, init(row) { this.visible = true; - this.dataForm.id = row.Id; + this.dataForm.id = row.id; this.activeName = '1' this.$nextTick(() => { this.initSystemForm(this.dataForm.id, row.companyName) }); }, handleClick(e) { - console.log(e); - switch (e.index) { case '1': // 公司信息 this.initCompanyForm(); - break; case '2': // 核查处置记录 - this.initHandingList(this.dataForm.id); - + this.initInspectionList(this.dataForm.id); break; case '3': // 网信执法记录 - this.initInspectionList(this.dataForm.id); - + this.initHandingList(this.dataForm.id); break; case '4': // 数据日志 @@ -323,11 +335,9 @@ export default { }; this.initInfoRecord(); break; - default: break; } - }, // 初始化应用信息-----------------------------------------------------------------------------0 @@ -411,11 +421,17 @@ export default { };