From f0eae7cdb565ab6ef5fad3359fee428a4bd0ef0d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 30 一月 2023 23:02:33 +0800
Subject: [PATCH] fix 修复 新语法 `.toList()` 返回不可变 List 类型导致序列化问题
---
ruoyi-ui/src/views/system/dept/index.vue | 71 +++++++++++++++++------------------
1 files changed, 35 insertions(+), 36 deletions(-)
diff --git a/ruoyi-ui/src/views/system/dept/index.vue b/ruoyi-ui/src/views/system/dept/index.vue
index 037c998..e502b4e 100644
--- a/ruoyi-ui/src/views/system/dept/index.vue
+++ b/ruoyi-ui/src/views/system/dept/index.vue
@@ -1,22 +1,21 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
<el-form-item label="閮ㄩ棬鍚嶇О" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="鐘舵��" prop="status">
- <el-select v-model="queryParams.status" placeholder="閮ㄩ棬鐘舵��" clearable size="small">
+ <el-select v-model="queryParams.status" placeholder="閮ㄩ棬鐘舵��" clearable>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -61,7 +60,7 @@
<el-table-column prop="orderNum" label="鎺掑簭" width="200"></el-table-column>
<el-table-column prop="status" label="鐘舵��" width="100">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_normal_disable" :value="scope.row.status"/>
</template>
</el-table-column>
<el-table-column label="鍒涘缓鏃堕棿" align="center" prop="createTime" width="200">
@@ -106,6 +105,8 @@
<treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="閫夋嫨涓婄骇閮ㄩ棬" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="閮ㄩ棬鍚嶇О" prop="deptName">
<el-input v-model="form.deptName" placeholder="璇疯緭鍏ラ儴闂ㄥ悕绉�" />
@@ -116,6 +117,8 @@
<el-input-number v-model="form.orderNum" controls-position="right" :min="0" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="璐熻矗浜�" prop="leader">
<el-input v-model="form.leader" placeholder="璇疯緭鍏ヨ礋璐ｄ汉" maxlength="20" />
@@ -126,6 +129,8 @@
<el-input v-model="form.phone" placeholder="璇疯緭鍏ヨ仈绯荤數璇�" maxlength="11" />
</el-form-item>
</el-col>
+ </el-row>
+ <el-row>
<el-col :span="12">
<el-form-item label="閭" prop="email">
<el-input v-model="form.email" placeholder="璇疯緭鍏ラ偖绠�" maxlength="50" />
@@ -135,10 +140,10 @@
<el-form-item label="閮ㄩ棬鐘舵��">
<el-radio-group v-model="form.status">
<el-radio
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictValue"
- >{{dict.dictLabel}}</el-radio>
+ v-for="dict in dict.type.sys_normal_disable"
+ :key="dict.value"
+ :label="dict.value"
+ >{{dict.label}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -159,6 +164,7 @@
export default {
name: "Dept",
+ dicts: ['sys_normal_disable'],
components: { Treeselect },
data() {
return {
@@ -178,10 +184,6 @@
isExpandAll: true,
// 閲嶆柊娓叉煋琛ㄦ牸鐘舵��
refreshTable: true,
- // 鏄惁灞曞紑
- expand: false,
- // 鐘舵�佹暟鎹瓧鍏�
- statusOptions: [],
// 鏌ヨ鍙傛暟
queryParams: {
deptName: undefined,
@@ -203,7 +205,7 @@
email: [
{
type: "email",
- message: "'璇疯緭鍏ユ纭殑閭鍦板潃",
+ message: "璇疯緭鍏ユ纭殑閭鍦板潃",
trigger: ["blur", "change"]
}
],
@@ -219,9 +221,6 @@
},
created() {
this.getList();
- this.getDicts("sys_normal_disable").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
/** 鏌ヨ閮ㄩ棬鍒楄〃 */
@@ -280,7 +279,7 @@
this.open = true;
this.title = "娣诲姞閮ㄩ棬";
listDept().then(response => {
- this.deptOptions = this.handleTree(response.data, "deptId");
+ this.deptOptions = this.handleTree(response.data, "deptId");
});
},
/** 灞曞紑/鎶樺彔鎿嶄綔 */
@@ -298,9 +297,13 @@
this.form = response.data;
this.open = true;
this.title = "淇敼閮ㄩ棬";
- });
- listDeptExcludeChild(row.deptId).then(response => {
- this.deptOptions = this.handleTree(response.data, "deptId");
+ listDeptExcludeChild(row.deptId).then(response => {
+ this.deptOptions = this.handleTree(response.data, "deptId");
+ if (this.deptOptions.length == 0) {
+ const noResultsOptions = { deptId: this.form.parentId, deptName: this.form.parentName, children: [] };
+ this.deptOptions.push(noResultsOptions);
+ }
+ });
});
},
/** 鎻愪氦鎸夐挳 */
@@ -309,13 +312,13 @@
if (valid) {
if (this.form.deptId != undefined) {
updateDept(this.form).then(response => {
- this.msgSuccess("淇敼鎴愬姛");
+ this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
this.getList();
});
} else {
addDept(this.form).then(response => {
- this.msgSuccess("鏂板鎴愬姛");
+ this.$modal.msgSuccess("鏂板鎴愬姛");
this.open = false;
this.getList();
});
@@ -325,16 +328,12 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- this.$confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.deptName + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return delDept(row.deptId);
- }).then(() => {
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎鍚嶇О涓�"' + row.deptName + '"鐨勬暟鎹」锛�').then(function() {
+ return delDept(row.deptId);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
}
}
};
--
Gitblit v1.9.3