From 9917e97580a9c43b88aba553776a54f33a11c9d2 Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期一, 28 十月 2024 18:12:03 +0800
Subject: [PATCH] 修改bug
---
Source/plt-web/plt-web-ui/src/views/system/department/option.js | 4 +
Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue | 130 ++++++++++++++++++++-----------------------
Source/plt-web/plt-web-ui/src/views/system/department/index.vue | 5 +
Source/plt-web/plt-web-ui/src/api/systemModel/systemConfig/api.js | 8 ++
4 files changed, 75 insertions(+), 72 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/api/systemModel/systemConfig/api.js b/Source/plt-web/plt-web-ui/src/api/systemModel/systemConfig/api.js
index e96a110..3af0926 100644
--- a/Source/plt-web/plt-web-ui/src/api/systemModel/systemConfig/api.js
+++ b/Source/plt-web/plt-web-ui/src/api/systemModel/systemConfig/api.js
@@ -43,6 +43,14 @@
data: params
});
}
+// 鍒犻櫎閰嶇疆
+export function delAppConf(params) {
+ return request({
+ url: "/api/hmSysModConfigController/delAppConf",
+ method: "delete",
+ params: params
+ });
+}
// 瀵煎嚭
export function exportSysConf(params) {
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
index 82e6fcc..bcc41bd 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/index.vue
@@ -95,6 +95,7 @@
...basicOption,
rowKey: 'oid',
rowParentKey: 'parentId',
+ expandRowKeys:[],
selection: false,
addBtn: false,
editBtn: false,
@@ -156,6 +157,7 @@
getTableList() {
refTree({queryAllLevel: true, 'extandParamsMap[showAllDepartmentNode]': true}).then(res => {
this.tableData = this.departDtaFormAtter(res.data.treeData);
+ this.option.expandRowKeys=[res.data.treeData[0].oid];
})
},
@@ -164,6 +166,7 @@
return items.map(item => {
// 杞崲褰撳墠鑺傜偣鐨勫睘鎬�
const formList = {
+ expanded:item.expanded,
oid: item.oid,
id: item.attributes.id,
name: item.attributes.name,
@@ -207,7 +210,6 @@
done();
}
}).catch(err => {
- console.log(err);
loading();
})
@@ -235,7 +237,6 @@
done();
}
}).catch(err => {
- console.log(err);
loading();
})
},
diff --git a/Source/plt-web/plt-web-ui/src/views/system/department/option.js b/Source/plt-web/plt-web-ui/src/views/system/department/option.js
index 2063461..f55e5b1 100644
--- a/Source/plt-web/plt-web-ui/src/views/system/department/option.js
+++ b/Source/plt-web/plt-web-ui/src/views/system/department/option.js
@@ -14,10 +14,12 @@
{
label: '缂栧彿',
prop: 'id',
+ width:200,
},
{
label: '浠ｅ彿',
- prop: 'code'
+ prop: 'code',
+ width:200
},
{
label:'涓撲笟',
diff --git a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
index 3971d0f..8b2b4e9 100644
--- a/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/systemModel/systemConfig/index.vue
@@ -2,7 +2,7 @@
<el-container>
<el-aside>
<basic-container>
- <div style="max-height: calc(100vh - 170px);overflow: auto">
+ <div style="max-height: calc(100vh - 150px);overflow: auto">
<avue-tree :key="refresh" ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick">
<span slot-scope="{ node, data }" class="el-tree-node__label">
<span style="font-size: 15px">
@@ -16,7 +16,6 @@
</el-aside>
<el-main>
<basic-container>
-
<avue-crud
ref="crud"
:data="configData"
@@ -47,20 +46,20 @@
:visible.sync="addVisible"
append-to-body="true"
class="avue-dialog"
- width="50%"
+ width="600px"
@close="addVisibleClose">
- <el-form ref="form" :model="form" label-width="80px">
- <el-form-item label="鍚嶇О锛�">
- <el-input v-model="form.name"></el-input>
+ <el-form ref="form" :model="form" :rules="rules" label-width="80px" size="small">
+ <el-form-item label="鍚嶇О锛�" prop="name">
+ <el-input v-model="form.name" ></el-input>
</el-form-item>
- <el-form-item v-if="nodeRow.id !== 'firstNode'" label="key锛�">
+ <el-form-item v-if="nodeRow.id !== 'firstNode'" label="key锛�" prop="key">
<el-input v-model="form.key"></el-input>
</el-form-item>
- <el-form-item v-if="nodeRow.id !== 'firstNode'" label="value锛�">
+ <el-form-item v-if="nodeRow.id !== 'firstNode'" label="鍊硷細" prop="value">
<el-input v-model="form.value"></el-input>
</el-form-item>
<el-form-item label="鎻忚堪锛�">
- <el-input v-model="form.desc" type="textarea"></el-input>
+ <el-input v-model="form.desc" type="textarea" prop="desc"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -83,6 +82,7 @@
getAppConfigDetailsByID,
addAppConf,
updateAppConf,
+ delAppConf,
exportSysConf
} from "@/api/systemModel/systemConfig/api"
import basicOption from "@/util/basic-option";
@@ -103,7 +103,16 @@
editStatus: false,
form: {
name: "",
+ key:"",
+ value:"",
desc: ""
+ },
+ rules: {
+ name: [
+ {required: true, message: '璇疯緭鍏ュ悕绉�', trigger: 'blur'}
+ ],
+ key: [{required: true, message: '璇疯緭鍏ey', trigger: 'blur'}],
+ value: [{required: true, message: '璇疯緭鍏ュ��', trigger: 'blur'}]
},
addVisible: false,
nodeRow: {},
@@ -127,7 +136,7 @@
sortable: true
},
{
- label: 'value',
+ label: '鍊�',
prop: 'value',
overHidden: true,
sortable: true
@@ -231,67 +240,52 @@
this.form[key] = "";
})
this.addVisible = false;
+ this.$refs.form.clearValidate();
},
// 淇濆瓨
addSaveClickHandler() {
- if (this.nodeRow.id === 'firstNode') {
- if (!this.form.name) {
- this.$message.error('鍚嶇О涓嶈兘涓虹┖锛�');
- return;
- }
- } else {
- if (!this.form.name) {
- this.$message.error('鍚嶇О涓嶈兘涓虹┖锛�');
- return;
- }
- if (!this.form.key) {
- this.$message.error('key鍊间笉鑳戒负绌猴紒');
- return;
- }
- if (!this.form.value) {
- this.$message.error('value鍊间笉鑳戒负绌猴紒');
- return;
- }
- }
-
- const params = this.nodeRow.id === 'firstNode' ? {
- appConfigDetailInfo: {
- name: this.form.name,
- desc: this.form.desc,
- id: this.editStatus ? this.form.id : null
- },
- isConfCategorys: true //true琛ㄧず缁欓《灞傛坊鍔犻厤缃」鍒嗙被
- } : {
- appConfigDetailInfo: {
- categoryId: this.nodeRow.id,
- name: this.form.name,
- desc: this.form.desc,
- key: this.form.key,
- value: this.form.value,
- id: this.editStatus ? this.form.id : null
- },
- isConfCategorys: false //true琛ㄧず缁欓《灞傛坊鍔犻厤缃」鍒嗙被
- }
- const saveApi = this.editStatus ? updateAppConf : addAppConf;
- saveApi(params).then(res => {
- if (res.data.code === 200) {
- this.$message.success(res.data.obj);
- this.addVisibleClose();
- if (this.nodeRow.id === 'firstNode') {
- this.getTreeList('save');
- } else {
- this.configLoading = true;
- getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
- if (res.data.code === 200) {
- const data = res.data.data;
- this.configData = data;
- this.configLoading = false;
- }
- })
+ this.$refs.form.validate((valid) => {
+ if (valid) {
+ const params = this.nodeRow.id === 'firstNode' ? {
+ appConfigDetailInfo: {
+ name: this.form.name,
+ desc: this.form.desc,
+ id: this.editStatus ? this.form.id : null
+ },
+ isConfCategorys: true //true琛ㄧず缁欓《灞傛坊鍔犻厤缃」鍒嗙被
+ } : {
+ appConfigDetailInfo: {
+ categoryId: this.nodeRow.id,
+ name: this.form.name,
+ desc: this.form.desc,
+ key: this.form.key,
+ value: this.form.value,
+ id: this.editStatus ? this.form.id : null
+ },
+ isConfCategorys: false //true琛ㄧず缁欓《灞傛坊鍔犻厤缃」鍒嗙被
}
+ const saveApi = this.editStatus ? updateAppConf : addAppConf;
+ saveApi(params).then(res => {
+ if (res.data.code === 200) {
+ this.$message.success(res.data.obj);
+ this.addVisibleClose();
+ if (this.nodeRow.id === 'firstNode') {
+ this.getTreeList('save');
+ } else {
+ this.configLoading = true;
+ getAppConfigDetailsByID({clsId: this.nodeRow.id}).then(res => {
+ if (res.data.code === 200) {
+ const data = res.data.data;
+ this.configData = data;
+ this.configLoading = false;
+ }
+ })
+ }
+ }
+ })
}
- })
+ });
},
// 缂栬緫鎸夐挳
@@ -312,8 +306,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- getAppConfigCategoryInfo(params).then(res => {
- console.log(res)
+ delAppConf(params).then(res => {
if (res.data.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛');
if (this.nodeRow.id === 'firstNode') {
@@ -377,8 +370,7 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- getAppConfigCategoryInfo(params).then(res => {
- console.log(res)
+ delAppConf(params).then(res => {
if (res.data.code === 200) {
this.$message.success('鍒犻櫎鎴愬姛');
if (this.nodeRow.id === 'firstNode') {
--
Gitblit v1.9.3