diff --git a/src/api/system/invWarehouse.js b/src/api/system/invWarehouse.js
index 8999531..f0aa990 100644
--- a/src/api/system/invWarehouse.js
+++ b/src/api/system/invWarehouse.js
@@ -243,4 +243,13 @@ export function getInvListByUser(params) {
}
+export function selectInvById(params) {
+ return axios({
+ url: "/spms/inv/warehouse/selectInvById",
+ method: "post",
+ data: params
+ });
+}
+
+
diff --git a/src/views/myLogin.vue b/src/views/myLogin.vue
index 20b4459..320dc7f 100644
--- a/src/views/myLogin.vue
+++ b/src/views/myLogin.vue
@@ -20,7 +20,7 @@
- 供应商自助管理系统
+ 用户登录
@@ -67,17 +67,23 @@
+
+
+
+
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index ef4ae92..cb67af8 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,36 +1,39 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+ 内部角色
+
+
+
+
+
+
+
+
+
+
+
-
- 重置
- 搜索
- 新增
-
+
+ 重置
+ 搜索
+ 新增
+
-
-
-
+
+
@@ -96,12 +99,122 @@
+
+
+
+ 供应商角色
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 重置
+ 搜索
+ 新增
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ scope.row.status | statusFilterName
+ }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime) }}
+
+
+
+
+ 编辑
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -230,6 +343,7 @@ export default {
return {
// 遮罩层
loading: true,
+ Adminloading:true,
// 选中数组
ids: [],
// 非单个禁用
@@ -240,6 +354,9 @@ export default {
showSearch: true,
// 总条数
total: 0,
+ Admintotal:0,
+ //内部角色
+ AdminroleList:[],
// 角色表格数据
roleList: [],
// 弹出层标题
@@ -289,6 +406,8 @@ export default {
roleKey: undefined,
status: undefined
},
+ AdminParams:{},
+ Params:{},
// 表单参数
form: {},
defaultProps: {
@@ -330,13 +449,27 @@ export default {
created() {
this.getList();
+ this.getCustomerList();
},
methods: {
/** 查询角色列表 */
getList() {
+ this.Adminloading =true;
+ this.AdminParams=this.queryParams
+ this.AdminParams.isCustomer=0;
+ listRole(this.addDateRange(this.AdminParams, this.dateRange)).then(response => {
+ this.AdminroleList=response.data.list
+ this.Admintotal = response.data.total;
+ this.Adminloading =false;
+ }
+ );
+ },
+ getCustomerList() {
this.loading = true;
+ this.Params=this.queryParams
+ this.Params.isCustomer=1;
listRole(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
- this.roleList = response.data.list;
+ this.roleList=response.data.list
this.total = response.data.total;
this.loading = false;
}
@@ -430,6 +563,7 @@ export default {
handleQuery() {
this.queryParams.page = 1;
this.getList();
+ this.getCustomerList();
},
/** 重置按钮操作 */
resetQuery() {
diff --git a/src/views/system/user/authUser.vue b/src/views/system/user/authUser.vue
index a544c8b..f6c4731 100644
--- a/src/views/system/user/authUser.vue
+++ b/src/views/system/user/authUser.vue
@@ -150,6 +150,7 @@
placeholder="请选择"
:remote-method="findDeptMethod"
:loading="loading"
+ @change="findInv"
>
-
-
-
- 正常
- 禁用
+
+
+
+ {{ item.code }}
+ {{
+ item.name
+ }}
+
+
-
+
-
+
+
+
+
+
+ 正常
+ 禁用
+
+
+
+
@@ -230,7 +259,7 @@ import {findConfig} from "@/api/sync/spsSyncStatus";
import {isBlank} from "@/utils/strUtil";
import {listRole} from "@/api/system/role";
import {selectSysParamByKey} from "@/api/system/systemParamConfig";
-import {filterList} from "@/api/system/invWarehouse";
+import { filterList, selectInvById } from '@/api/system/invWarehouse'
const formJson = {
id: "",
@@ -287,6 +316,7 @@ export default {
formData: formJson,
selectDeptList: [],
fromDeptOptions: [],
+ fromWarehouseOptions:[],
configParms: {},
formRules: {},
addRules: {
@@ -349,6 +379,16 @@ export default {
this.query.page = 1;
this.getList();
},
+ findInv(val){
+ // 获取仓库列表
+ selectInvById(val)
+ .then((res) => {
+ if(res.code == 20000){
+ this.fromWarehouseOptions = res.data || [];
+ }
+ })
+
+ },
handleCurrentChange(val) {
this.query.page = val;
this.getList();
@@ -416,6 +456,7 @@ export default {
roles: row.roles,
depts: row.depts,
dept: row.dept,
+ warehouseName:row.warehouseName
};
}
this.formName = "add";
@@ -440,10 +481,12 @@ export default {
this.$message.error("未指定角色！")
return;
}
+ debugger
this.$refs["dataForm"].validate(valid => {
if (valid) {
this.formLoading = true;
let data = Object.assign({}, this.formData);
+ debugger
authAdminSave(data, this.formName).then(response => {
this.formLoading = false;
if (response.code !== 20000) {
