UDI
/
udiwms-vue-frame
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.修复系统管理和基础数据的bug

Browse Source
prod
x_z 2 years ago
parent 57ccb59237
commit 471cbc3b50
6 changed files with 66 additions and 74 deletions
Show Stats Download Patch File Download Diff File

6
src/views/basic/busType/bussinessType.vue
Unescape Escape View File

@ -217,8 +217,7 @@ export default {
orderVisibleType: null, orderVisibleType: null,
advanceType: null, advanceType: null,
preIn: null, preIn: null,
originAction: null, originAction: null
comments: null,
}, },
enableMap: { enableMap: {
true: "是", true: "是",
@ -405,8 +404,7 @@ export default {
orderVisibleType: null, orderVisibleType: null,
advanceType: null, advanceType: null,
preIn: null, preIn: null,
originAction: null, originAction: null
comments: null
} }
this.addDialogVisible = true; this.addDialogVisible = true;
}, },

4
src/views/basic/busType/bussinessTypeModify.vue
Unescape Escape View File

@ -136,9 +136,9 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="23" type="flex"> <el-col :span="23" type="flex">
<el-form-item prop="comments"> <el-form-item prop="remark">
<label slot="label">备&emsp;&emsp;注</label> <label slot="label">备&emsp;&emsp;注</label>
<el-input v-model="inputQuery.comments" size="small" style="width: 90%" type="textarea" <el-input v-model="inputQuery.remark" size="small" style="width: 90%" type="textarea"
row="3"></el-input> row="3"></el-input>
</el-form-item> </el-form-item>
</el-col> </el-col>

74
src/views/system/dept/authDept.vue
Unescape Escape View File

@ -164,13 +164,6 @@
<el-button @click.native="cancelDialog" size="small">取消</el-button> <el-button @click.native="cancelDialog" size="small">取消</el-button>
</div> </div>
</el-dialog> </el-dialog>
<pagination
v-show="total>0"
:total="total"
:page.sync="filterQuery.page"
:limit.sync="filterQuery.limit"
@pagination="getList"
/>
</el-card> </el-card>
<el-tabs type="border-card" style="margin: 15px"> <el-tabs type="border-card" style="margin: 15px">
@ -195,12 +188,13 @@
@click="onUserReset" @click="onUserReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" @click="onUserReset" <el-button type="primary" @click="onUserSubmit"
icon="el-icon-search" icon="el-icon-search"
>查询 >查询
</el-button </el-button
> >
<el-tooltip content="请移步至权限管理-用户管理-编辑界面选择所属部门信息" placement="top" style="margin-left: 20px"> <el-tooltip content="请移步至权限管理-用户管理-编辑界面选择所属部门信息" placement="top"
style="margin-left: 20px">
<i class="el-icon-question">帮助</i> <i class="el-icon-question">帮助</i>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
@ -219,7 +213,7 @@
label="用户账号" label="用户账号"
prop="userName" prop="userName"
></el-table-column> ></el-table-column>
<el-table-column label="备注" prop="remark"> <el-table-column label="备注" prop="comments">
</el-table-column> </el-table-column>
<el-table-column label="操作"> <el-table-column label="操作">
<template slot-scope="scope"> <template slot-scope="scope">
@ -249,7 +243,7 @@
<el-form :inline="true" :model="invQuery" class="query-form" size="mini"> <el-form :inline="true" :model="invQuery" class="query-form" size="mini">
<el-form-item class="query-form-item" label="仓库名称/编码:"> <el-form-item class="query-form-item" label="仓库名称/编码:">
<el-input <el-input
v-model="userQuery.key" v-model="invQuery.key"
placeholder="请输入仓库名称或仓库编码" placeholder="请输入仓库名称或仓库编码"
clearable clearable
></el-input> ></el-input>
@ -260,7 +254,7 @@
<el-button <el-button
type="primary" type="primary"
icon="el-icon-refresh" icon="el-icon-refresh"
@click="onUserReset" @click="onInvReset"
>重置 >重置
</el-button> </el-button>
<el-button type="primary" @click="onInvSubmit" <el-button type="primary" @click="onInvSubmit"
@ -268,7 +262,8 @@
>查询 >查询
</el-button </el-button
> >
<el-tooltip content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息" placement="top" style="margin-left: 20px"> <el-tooltip content="请移步至系统管理-组织管理-仓库信息管理界面绑定仓库信息" placement="top"
style="margin-left: 20px">
<i class="el-icon-question">帮助</i> <i class="el-icon-question">帮助</i>
</el-tooltip> </el-tooltip>
</el-button-group> </el-button-group>
@ -332,13 +327,10 @@ export default {
status: 1, status: 1,
companyName: "", companyName: "",
checkType: "", checkType: "",
page: 1,
limit: 10,
}, },
total: 0,
loading: false, loading: false,
formVisible: false, formVisible: false,
isExpandAll: true, isExpandAll: false,
refreshTable: true, refreshTable: true,
userflag: { userflag: {
0: "禁用", 0: "禁用",
@ -375,6 +367,7 @@ export default {
//部门用户 //部门用户
userQuery: { userQuery: {
key: null, key: null,
deptId: null,
page: 1, page: 1,
limit: 10, limit: 10,
}, },
@ -426,9 +419,7 @@ export default {
path: "", path: "",
}); });
this.filterQuery = { this.filterQuery = {
name: "", name: ""
page: 1,
limit: 10,
}; };
this.getList(); this.getList();
}, },
@ -488,6 +479,7 @@ export default {
this.getList(); this.getList();
}, },
addDeptDialog() { addDeptDialog() {
this.resetForm();
this.formName = "add"; this.formName = "add";
this.formVisible = true; this.formVisible = true;
this.formData = { this.formData = {
@ -513,7 +505,17 @@ export default {
this.deptOptions = this.handleTree(depList, "code", "pcode"); this.deptOptions = this.handleTree(depList, "code", "pcode");
}); });
}, },
// 刷新表单
resetForm() {
if (this.$refs["dataForm"]) {
// 清空验证信息表单
this.$refs["dataForm"].clearValidate();
// 刷新表单
this.$refs["dataForm"].resetFields();
}
},
updateDeptDialog(row) { updateDeptDialog(row) {
this.resetForm();
this.formName = "edit"; this.formName = "edit";
this.formVisible = true; this.formVisible = true;
this.formData = row; this.formData = row;
@ -530,25 +532,15 @@ export default {
this.loading = false; this.loading = false;
let depList = response.data.list || []; let depList = response.data.list || [];
this.list = this.handleTree(depList, "code", "pcode"); this.list = this.handleTree(depList, "code", "pcode");
this.total = response.data.total || 0;
}) })
.catch(() => { .catch(() => {
this.loading = false; this.loading = false;
this.list = []; this.list = [];
this.total = 0;
}); });
}, },
cancelDialog() { cancelDialog() {
this.formVisible = false; this.formVisible = false;
}, },
handleSizeChange(val) {
this.filterQuery.limit = val;
this.getList();
},
handleCurrentChange(val) {
this.filterQuery.page = val;
this.getList();
},
deleteDialog(row) { deleteDialog(row) {
this.$confirm("是否删除该部门?", "提示", { this.$confirm("是否删除该部门?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -635,19 +627,18 @@ export default {
onUserReset() { onUserReset() {
this.userQuery = { this.userQuery = {
key: null, key: null,
deptId: this.currentRow.id,
page: 1, page: 1,
limit: 10, limit: 10,
}; };
this.getUerList(); this.getUerList();
}, },
onUserSubmit() { onUserSubmit() {
this.userQuery.deptId = this.currentRow.id;
this.getUerList(); this.getUerList();
}, },
getUerList() { getUerList() {
let query = { listDeptUser(this.userQuery)
deptId: this.currentRow.id,
};
listDeptUser(query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.userlist = response.data.list || []; this.userlist = response.data.list || [];
@ -659,6 +650,15 @@ export default {
this.userTotal = 0; this.userTotal = 0;
}); });
}, },
onInvReset() {
this.invQuery = {
key: "",
parentId: this.currentRow.code,
page: 1,
limit: 20
};
this.onInvSubmit();
},
removeUserDialog(row) { removeUserDialog(row) {
this.$confirm("是否确定移除该用户?", "提示", { this.$confirm("是否确定移除该用户?", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
@ -685,10 +685,7 @@ export default {
//仓库相关 //仓库相关
getInvList() { getInvList() {
let query = { filterSubAll(this.invQuery)
parentId: this.currentRow.code,
};
filterSubAll(query)
.then((response) => { .then((response) => {
this.loading = false; this.loading = false;
this.invlist = response.data.list || []; this.invlist = response.data.list || [];
@ -700,6 +697,7 @@ export default {
}); });
}, },
onInvSubmit() { onInvSubmit() {
this.invQuery.parentId = this.currentRow.code;
this.getInvList(); this.getInvList();
}, },
}, },

8
src/views/system/dept/invWarehouse.vue
Unescape Escape View File

@ -151,6 +151,7 @@
<el-form-item label="仓库名称" prop="name" class="query-form-item"> <el-form-item label="仓库名称" prop="name" class="query-form-item">
<el-input <el-input
v-model="subData.name" style="width: 80%" v-model="subData.name" style="width: 80%"
placeholder="请输入仓库名称"
auto-complete="off" auto-complete="off"
></el-input> ></el-input>
</el-form-item> </el-form-item>
@ -159,7 +160,7 @@
<el-row class="el-row" type="flex"> <el-row class="el-row" type="flex">
<el-col class="el-col"> <el-col class="el-col">
<el-form-item label="备注" prop="name" class="query-form-item"> <el-form-item label="备注" prop="remark" class="query-form-item">
<el-input <el-input
v-model="subData.remark" v-model="subData.remark"
type="textarea" type="textarea"
@ -341,6 +342,7 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import Treeselect from "@riophae/vue-treeselect"; import Treeselect from "@riophae/vue-treeselect";
import InvRelBusType from "@/views/system/dept/invRelBusType"; import InvRelBusType from "@/views/system/dept/invRelBusType";
import InvRelUsers from "@/views/system/dept/invRelUsers"; import InvRelUsers from "@/views/system/dept/invRelUsers";
import {isBlank} from "@/utils/strUtil";
export default { export default {
data() { data() {
@ -372,7 +374,7 @@ export default {
{required: true, message: "请选择所属部门", trigger: "blur"} {required: true, message: "请选择所属部门", trigger: "blur"}
], ],
name: [ name: [
{required: true, message: "请选择仓库名称", trigger: "blur"} {required: true, message: "请输入仓库名称", trigger: "blur"}
] ]
}, },
subData: {}, subData: {},
@ -662,6 +664,7 @@ export default {
getSubThrsysDetailData() { getSubThrsysDetailData() {
if (!isBlank(this.subData.code)) {
let params = { let params = {
id: this.subData.code, id: this.subData.code,
}; };
@ -674,6 +677,7 @@ export default {
this.loading = false; this.loading = false;
this.sysSubList = []; this.sysSubList = [];
}); });
}
}, },

18
src/views/system/role/index.vue
Unescape Escape View File

@ -16,12 +16,8 @@
placeholder="请选择角色状态" placeholder="请选择角色状态"
clearable clearable
> >
<el-option <el-option label="正常" :value="0"/>
v-for="dict in dict.type.sys_normal_disable" <el-option label="禁用" :value="1"/>
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -102,8 +98,8 @@
<pagination <pagination
v-show="total>0" v-show="total>0"
:total="total" :total="total"
:page.sync="queryParams.pageNum" :page.sync="queryParams.page"
:limit.sync="queryParams.pageSize" :limit.sync="queryParams.limit"
@pagination="getList" @pagination="getList"
/> />
@ -279,8 +275,8 @@ export default {
deptOptions: [], deptOptions: [],
// 查询参数 // 查询参数
queryParams: { queryParams: {
pageNum: 1, page: 1,
pageSize: 10, limit: 10,
roleName: undefined, roleName: undefined,
roleKey: undefined, roleKey: undefined,
status: undefined status: undefined
@ -423,7 +419,7 @@ export default {
}, },
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQuery() { handleQuery() {
this.queryParams.pageNum = 1; this.queryParams.page = 1;
this.getList(); this.getList();
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */

6
src/views/system/user/authUser.vue
Unescape Escape View File

@ -139,7 +139,7 @@
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="所属部门" prop="depts"> <el-form-item label="所属部门" prop="depts">
<el-select <el-select
v-model="selectDeptList" v-model="formData.depts"
filterable filterable
remote remote
clearable="true" clearable="true"
@ -417,9 +417,6 @@ export default {
depts: row.depts, depts: row.depts,
dept: row.dept, dept: row.dept,
}; };
this.selectDeptList = row.depts;
}else {
this.selectDeptList = [];
} }
this.formName = "add"; this.formName = "add";
this.formRules = this.addRules; this.formRules = this.addRules;
@ -443,7 +440,6 @@ export default {
this.$message.error("未指定角色！") this.$message.error("未指定角色！")
return; return;
} }
this.formData.depts = this.selectDeptList;
this.$refs["dataForm"].validate(valid => { this.$refs["dataForm"].validate(valid => {
if (valid) { if (valid) {
this.formLoading = true; this.formLoading = true;

Write Preview
Loading…
Cancel
Save