diff --git a/src/views/basicdata/team/basicdataTeamStaff.vue b/src/views/basicdata/team/basicdataTeamStaff.vue index aaefc5a3..9d554477 100644 --- a/src/views/basicdata/team/basicdataTeamStaff.vue +++ b/src/views/basicdata/team/basicdataTeamStaff.vue @@ -220,15 +220,18 @@ export default { this.form.id = !!id ? id : null; } let a = this.warehouseList.find(i => i.id == row); + // console.log("aaa",a.department); if(!!a){ this.form.warehouseName = a.name; this.form.warehouseId = a.id; this.warehouId = a.id; //查询班组 let sd = await getTeamGroupList(this.page.currentPage,this.page.pageSize,{belongTo: a.id}); + // console.log("sdsd班组",sd); this.teamGroupList = sd.data.data.records; //查询人员 - let user = await getListOwn({deptId:this.deptId}); + let user = await getListOwn({deptId:a.department}); + // console.log("查询人员》》》",user); this.staffList = user.data.data; } }, @@ -302,8 +305,10 @@ export default { let userDept = await getListUser(); this.deptId = userDept.data.data.deptId; let sole = await getUserDetail(userDept.data.data.userId); + // console.log("名称11",sole.data.data.roleName); if(sole.data.data.roleName == '管理员'){ - let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId}); + let deptW = await getDeptWarehouse({tenantId: userDept.data.data.tenantId }); + // console.log("全部仓库",deptW); this.warehouseList = deptW.data.data; }else{ //有部门 diff --git a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue index 24b8f3de..40dd2e40 100644 --- a/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue +++ b/src/views/warehouse/warehousingentry/warehouseWarehouseingAddReceipt.vue @@ -673,7 +673,7 @@ export default { if (query) { // this.loading = true; let cl = await getListCopy(this.page.currentPage, this.page.pageSize,{name:query}); - // console.log(">>>>",cl.data.data.records); + // console.log("仓库查询>>>>",cl.data.data.records); this.store = []; cl.data.data.records.forEach(i =>{ let st= { @@ -689,7 +689,9 @@ export default { // }) // }, 200) } else { - this.store = [] + if(this.store.length === 0){ + this.store = [] + } } }, //客户查询