diff --git a/src/api/basic/invWarehouse.js b/src/api/basic/invWarehouse.js index 5def803..29a7e8b 100644 --- a/src/api/basic/invWarehouse.js +++ b/src/api/basic/invWarehouse.js @@ -107,8 +107,8 @@ export function exportJson(query) { export function warehouseUserList(query) { return axios({ url: '/warehouse/inout/warehouseUserList', - method: 'get', - params: query + method: 'post', + data: query }); } @@ -116,8 +116,8 @@ export function warehouseUserList(query) { export function warehouseBussinessTypeList(query) { return axios({ url: '/warehouse/inout/warehouseBussniessTypeList', - method: 'get', - params: query + method: 'post', + data: query }); } diff --git a/src/views/basic/BasicEntrutsReceModify.vue b/src/views/basic/BasicEntrutsReceModify.vue index c94e5cc..b684c6a 100644 --- a/src/views/basic/BasicEntrutsReceModify.vue +++ b/src/views/basic/BasicEntrutsReceModify.vue @@ -332,14 +332,14 @@ export default { //加载用户数据 warehouseUserList(query).then((res) => { this.entrustUserArray = []; - this.entrustUserArray = res.data; + this.entrustUserArray = res.data.list; }).catch((error) => { this.$message.error("用户数据加载失败") }); //加载单据类型数据 warehouseBussinessTypeList(query).then((res) => { - this.entrustBusArray = res.data; + this.entrustBusArray = res.data.list; }).catch((error) => { this.$message.error("单据类型数据加载失败") diff --git a/src/views/basic/invWarehouse.vue b/src/views/basic/invWarehouse.vue index d26b1ce..7179cb2 100644 --- a/src/views/basic/invWarehouse.vue +++ b/src/views/basic/invWarehouse.vue @@ -236,6 +236,14 @@ + + @@ -273,6 +281,15 @@ + + + @@ -831,6 +848,18 @@ export default { configParms: {}, subData: {}, subFromName: "add", + userQuery: { + code: null, + page: 1, + limit: 10 + }, + userTotal: 0, + busQuery: { + code: null, + page: 1, + limit: 10 + }, + busTotal: 0, }; }, methods: { @@ -842,6 +871,8 @@ export default { name: "", status: "", }; + this.userQuery.page = 1; + this.busQuery.page = 1; this.getList(); }, onSubmit() { @@ -1222,19 +1253,36 @@ export default { }, loadLinkData(row) { - let query = { - code: row.code + this.userQuery.page = 1; + this.busQuery.page = 1; + this.userQuery.code = row.code; + this.busQuery.code = row.code; + //加载用户数据 + this.loadUserList(); + + //加载单据类型数据 + this.loadBusList(); + }, + loadUserList(val) { + if (val != null) { + this.userQuery.page = val; } //加载用户数据 - warehouseUserList(query).then((res) => { - this.userData = res.data; + warehouseUserList(this.userQuery).then((res) => { + this.userData = res.data.list; + this.userTotal = res.data.total; }).catch((error) => { this.$message.error("用户数据加载失败") }); - + }, + loadBusList(val) { + if (val != null) { + this.busQuery.page = val; + } //加载单据类型数据 - warehouseBussinessTypeList(query).then((res) => { - this.bussinessTypeData = res.data; + warehouseBussinessTypeList(this.busQuery).then((res) => { + this.bussinessTypeData = res.data.list; + this.busTotal = res.data.total; }).catch((error) => { this.$message.error("单据类型数据加载失败") });