diff --git a/src/components/InfoForm/index.vue b/src/components/InfoForm/index.vue index 1aa5ed3..a588356 100644 --- a/src/components/InfoForm/index.vue +++ b/src/components/InfoForm/index.vue @@ -324,22 +324,22 @@ export default { systemClass: { required: true, message: "请输入系统分类", - trigger: "change", + trigger: "blur", }, systemType: { required: true, message: "请输入系统类型", - trigger: "change", + trigger: "blur", }, companyId: { required: true, message: "请输入主体企业", - trigger: "change", + trigger: "blur", }, areaId: { required: true, message: "请输入所属区县", - trigger: "change", + trigger: "blur", }, pincipalPhone: { pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, diff --git a/src/utils/request.js b/src/utils/request.js index 2e890e3..b1c8356 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -11,7 +11,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 - baseURL: process.env.VUE_APP_BASE_API + '/api', + baseURL: '/api', withCredentials: false, // 超时 // timeout: define.timeout diff --git a/src/views/DisposalSuggestions/Form.vue b/src/views/DisposalSuggestions/Form.vue index 8be1462..492b85f 100644 --- a/src/views/DisposalSuggestions/Form.vue +++ b/src/views/DisposalSuggestions/Form.vue @@ -261,7 +261,11 @@ export default { dataFormSubmit() { this.$refs["suggestionForm"].validate(async (valid) => { if (valid) { - let res = await disposalSuggestions(this.suggestionForm); + let obj = { + ...this.suggestionForm, + id: this.dataForm.id, + }; + let res = await disposalSuggestions(obj); this.$message({ message: res.msg, type: "success", diff --git a/src/views/DisposalSuggestions/index.vue b/src/views/DisposalSuggestions/index.vue index 50e255b..681cb12 100644 --- a/src/views/DisposalSuggestions/index.vue +++ b/src/views/DisposalSuggestions/index.vue @@ -37,7 +37,7 @@
- + diff --git a/src/views/baseComapnyInfo/index.vue b/src/views/baseComapnyInfo/index.vue index e56a72e..147f8a0 100644 --- a/src/views/baseComapnyInfo/index.vue +++ b/src/views/baseComapnyInfo/index.vue @@ -45,27 +45,11 @@
- 导出 + 新增 + 导出
-
-
- 新增 -
-
- + diff --git a/src/views/baseListHazardousSamples/index.vue b/src/views/baseListHazardousSamples/index.vue index 43112d7..e2fd9b6 100644 --- a/src/views/baseListHazardousSamples/index.vue +++ b/src/views/baseListHazardousSamples/index.vue @@ -19,14 +19,14 @@ --> - + + - + - + - + - + - - - - - + + + + + diff --git a/src/views/baseSpecialAction/index.vue b/src/views/baseSpecialAction/index.vue index 7df11e8..6c714cd 100644 --- a/src/views/baseSpecialAction/index.vue +++ b/src/views/baseSpecialAction/index.vue @@ -57,7 +57,7 @@ diff --git a/src/views/baseSpecialhandle/index.vue b/src/views/baseSpecialhandle/index.vue index f34e774..34af9e9 100644 --- a/src/views/baseSpecialhandle/index.vue +++ b/src/views/baseSpecialhandle/index.vue @@ -39,9 +39,9 @@ {{ scope.row.state }} - + diff --git a/src/views/baseSystemInfo/index.vue b/src/views/baseSystemInfo/index.vue index 7733923..dbdabb3 100644 --- a/src/views/baseSystemInfo/index.vue +++ b/src/views/baseSystemInfo/index.vue @@ -78,10 +78,8 @@
- 导入 - 导出 + +
@@ -122,33 +120,13 @@ @@ -413,9 +391,27 @@ export default { }); }, toExport() { - this.ExportBoxVisible = true; - this.$nextTick(() => { - this.$refs.ExportBox.init(this.columnList); + 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]; + } + } + request({ + url: `/Extend/basesysteminfo/Actions/Export`, + method: "POST", + data: query, + }).then((res) => { + const url = process.env.VUE_APP_BASE_API + res.data.url; + const link = document.createElement("a"); + link.href = url; + link.download = res.data.name; + link.click(); }); }, download(data) { @@ -431,6 +427,24 @@ export default { this.ExportBoxVisible = false; }); }, + + delNew(row) { + this.$confirm('此操作将永久删除该系统, 是否继续?', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(async () => { + let res = await request({ + url: `/Extend/basesysteminfo/${row.Id}`, + method: "DELETE", + }); + this.$message({ + message: res.msg, + type: 'success' + }); + this.initList(); + }); + }, }, }; diff --git a/src/views/homePage/components/Header.vue b/src/views/homePage/components/Header.vue index 94699ce..a38262d 100644 --- a/src/views/homePage/components/Header.vue +++ b/src/views/homePage/components/Header.vue @@ -13,7 +13,7 @@ {{ userInfo.userName }}（{{ userInfo.organizeName }}）
- 修改信息 + 修改信息 修改密码 @@ -21,16 +21,20 @@
+