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

权限相关bug修改

Browse Source
prod
anthonywj 2 years ago
parent 920d4d930f
commit 1c00769727
4 changed files with 60 additions and 55 deletions
Show Stats Download Patch File Download Diff File

3
.env.production
Unescape Escape View File

@ -3,7 +3,8 @@ VUE_APP_TITLE = UDI管理系统
# 生产环境配置 # 生产环境配置
ENV = 'production' ENV = 'production'
VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/' # VUE_APP_BASE_API = 'http://116.204.71.86:9150/UDI_WMS_MC/'
VUE_APP_BASE_API = 'http://192.168.0.62:9150/UDI_WMS_MC/'
# 应用访问路径 例如使用前缀 /admin/ # 应用访问路径 例如使用前缀 /admin/
VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/' VUE_APP_CONTEXT_PATH = '/UDI_WMS_NEW/'

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

@ -571,7 +571,7 @@ export default {
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {
const roleIds = row.roleId || this.ids; const roleIds = row.roleId || this.ids;
this.$modal.confirm('是否确认删除角色编号为"' + roleIds + '"的数据项？').then(function () { this.$modal.confirm('是否确认删除该角色？').then(function () {
return delRole(roleIds); return delRole(roleIds);
}).then(() => { }).then(() => {
this.getList(); this.getList();

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

@ -137,7 +137,7 @@
<el-row type="flex"> <el-row type="flex">
<el-col :span="11" type="flex"> <el-col :span="11" type="flex">
<el-form-item label="所属部门" prop="userFlag"> <el-form-item label="所属部门" prop="depts">
<el-select <el-select
v-model="selectDeptList" v-model="selectDeptList"
filterable filterable
@ -208,7 +208,6 @@
type="primary" type="primary"
size="small" size="small"
@click.native="formSubmit()" @click.native="formSubmit()"
:loading="formLoading"
>提交 >提交
</el-button </el-button
> >
@ -308,7 +307,10 @@ export default {
], ],
userFlag: [ userFlag: [
{required: true, message: "请选择状态", trigger: "change"} {required: true, message: "请选择状态", trigger: "change"}
] ],
depts: [
{required: true, message: "请选择所属部门", trigger: "change"}
],
}, },
editRules: { editRules: {
userName: [ userName: [
@ -416,6 +418,8 @@ export default {
dept: row.dept, dept: row.dept,
}; };
this.selectDeptList = row.depts; this.selectDeptList = row.depts;
}else {
this.selectDeptList = [];
} }
this.formName = "add"; this.formName = "add";
this.formRules = this.addRules; this.formRules = this.addRules;
@ -439,10 +443,10 @@ 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;
this.formData.depts = this.selectDeptList;
let data = Object.assign({}, this.formData); let data = Object.assign({}, this.formData);
authAdminSave(data, this.formName).then(response => { authAdminSave(data, this.formName).then(response => {
this.formLoading = false; this.formLoading = false;

98
src/views/thirdSys/inv/index.vue
Unescape Escape View File

@ -112,56 +112,56 @@
:limit.sync="query.limit" :limit.sync="query.limit"
@pagination="getList" @pagination="getList"
/> />
<el-table <!-- <el-table-->
:data="subList" <!-- :data="subList"-->
border <!-- border-->
highlight-current-row <!-- highlight-current-row-->
style="width: 100%;margin-top: 35px"> <!-- style="width: 100%;margin-top: 35px">-->
<el-table-column type="index" label="序号" width="50"></el-table-column> <!-- <el-table-column type="index" label="序号" width="50"></el-table-column>-->
<el-table-column <!-- <el-table-column-->
prop="code" <!-- prop="code"-->
label="分库编码" <!-- label="分库编码"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
prop="name" <!-- prop="name"-->
label="分库名称" <!-- label="分库名称"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column <!-- <el-table-column-->
prop="parentName" <!-- prop="parentName"-->
label="所属仓库" <!-- label="所属仓库"-->
> <!-- >-->
</el-table-column> <!-- </el-table-column>-->
<el-table-column label="操作"> <!-- <el-table-column label="操作">-->
<template slot-scope="scope"> <!-- <template slot-scope="scope">-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
:disabled="!configParms.basicThirdInv" <!-- :disabled="!configParms.basicThirdInv"-->
@click.native.stop="handleSubForm( scope.row, 'edit')" <!-- @click.native.stop="handleSubForm( scope.row, 'edit')"-->
>编辑 <!-- >编辑-->
</el-button <!-- </el-button-->
> <!-- >-->
<el-button <!-- <el-button-->
type="text" <!-- type="text"-->
size="small" <!-- size="small"-->
:disabled="!configParms.basicThirdInv" <!-- :disabled="!configParms.basicThirdInv"-->
@click.native.stop="handleSubDel(scope.row)" <!-- @click.native.stop="handleSubDel(scope.row)"-->
>删除 <!-- >删除-->
</el-button <!-- </el-button-->
> <!-- >-->
</template> <!-- </template>-->
</el-table-column> <!-- </el-table-column>-->
</el-table> <!-- </el-table>-->
<pagination <!-- <pagination-->
v-show="subTotal>0" <!-- v-show="subTotal>0"-->
:total="subTotal" <!-- :total="subTotal"-->
:page.sync="subQuery.page" <!-- :page.sync="subQuery.page"-->
:limit.sync="subQuery.limit" <!-- :limit.sync="subQuery.limit"-->
@pagination="getSubList" <!-- @pagination="getSubList"-->
/> <!-- />-->
</el-card> </el-card>
<!--仓库弹窗编辑页面--> <!--仓库弹窗编辑页面-->
<el-dialog <el-dialog

Write Preview
Loading…
Cancel
Save