diff --git a/src/api/inStorage/receivingGoods.js b/src/api/inStorage/receivingGoods.js index b7d822e..0055285 100644 --- a/src/api/inStorage/receivingGoods.js +++ b/src/api/inStorage/receivingGoods.js @@ -24,14 +24,32 @@ export default { }, // 获取组织下所有的预约单 - getReservationBill: function(data) { + getReservationBill: function(params) { return request({ - url: '/wms/apiadmin/purchaseInStorage/getReservationBill/' + data, - method: 'get' + url: '/wms/apiadmin/purchaseInStorage/getReservationBill', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }); + }, + + + // 生成入库单 + createInStorageBill: function(data) { + return request({ + url: '/wms/apiadmin/purchaseInStorage/createInStorageBill', + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } }); }, + // // 查询分页列表 // listPage: function(params) { // return request({ diff --git a/src/api/system/roleAdminister/index.js b/src/api/system/roleAdminister/index.js index ed9c9a5..718ab18 100644 --- a/src/api/system/roleAdminister/index.js +++ b/src/api/system/roleAdminister/index.js @@ -125,7 +125,7 @@ export function saveRoleMenuList(data) { // 菜单授权 export function roleMenuTree(data) { return request({ - url: `/wms/apiadmin/sysmenu/listAllByRoleSid`, + url: `/wms/apiadmin/sysmenu/listAllByRoleSidG`, method: 'POST', data: data, headers: { diff --git a/src/layout/components/Sidebar/SidebarItem.vue b/src/layout/components/Sidebar/SidebarItem.vue index ebfa553..21d7f95 100644 --- a/src/layout/components/Sidebar/SidebarItem.vue +++ b/src/layout/components/Sidebar/SidebarItem.vue @@ -11,107 +11,110 @@ - + diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index 0dda17f..6348ffa 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -47,15 +47,34 @@ // return this.$router.options.routes // }, activeMenu() { + // console.log('aaaaaaaaaaa', this.$route) + // console.log("val>>>>>>>>>>>>>>>>.", this.$route.query.index); // 页面获取 + // this.$route.query.index = [{ + // sid: '11', + // name: "ssss" + // }, { + // sid: '22', + // name: "aaa" + // }, { + // sid: '33', + // name: "bbb" + // }] const route = this.$route const { meta, - path + path, + // query, } = route + + // this.$route.query = { + // index: '1' + // } + // if set path, the sidebar will highlight the path you set if (meta.activeMenu) { return meta.activeMenu } + // console.log('bbbbbbb', path) return path }, showLogo() { diff --git a/src/views/inStorage/receivingGoods/index - 副本.vue b/src/views/inStorage/receivingGoods/index - 副本.vue new file mode 100644 index 0000000..729c229 --- /dev/null +++ b/src/views/inStorage/receivingGoods/index - 副本.vue @@ -0,0 +1,1034 @@ + + + + diff --git a/src/views/inStorage/receivingGoods/index.vue b/src/views/inStorage/receivingGoods/index.vue index 11433f4..1b80cfc 100644 --- a/src/views/inStorage/receivingGoods/index.vue +++ b/src/views/inStorage/receivingGoods/index.vue @@ -169,22 +169,22 @@ style="width:150%;margin-left: -20%;"> - + - + - + - 至 - - + + - 查询 - 重置 + 查询 + 重置 联动一级表格 + subSelectAll(pIndex, selection) { + console.log("pIndex", pIndex) + console.log("selection", selection) + + let selected = selection.length != 0; + //为true时选中，为 0 时（false）未选中 + + this.$refs.main.toggleRowSelection(this.billList[pIndex], selected) + + selection.forEach((childItem) => { + this.$refs[`sub${pIndex}`].toggleRowSelection(childItem, selected); + childItem.check = selected + }) + }, + + //子table单选 + subSelect(selection, row) { + + console.log("row", row) + console.log("selection", selection) + let selected = selection.length && selection.indexOf(row) !== -1; + row.check = selected + + if (selection.length == 0) { + const selectIndex = this.billList.findIndex((choose) => choose.sid == row.billSid) + this.$refs.main.toggleRowSelection(this.billList[selectIndex], false) + this.billList[selectIndex].check = false + } + + + }, + + dosearch1() { + // console.log(" dosearch1", this.selectList); + + this.dialogParams.current = 1 + this.toAdd() + + + }, + resetQuery1() { + + this.dialogParams = { + current: 1, + size: 10, + total: 0, + params: { + "sourceBillNo": "", + "inStotageStartTime": "", + "inStotageEndTime": "", + "goodsSkuSid": "", + "supplierSid": "", + "menuUrl": "", + "orgPath": "", + "userSid": "" + } + } + this.toAdd() + + + }, + handleClose() { + this.dialogParams = { + current: 1, + size: 10, + total: 0, + params: { + "sourceBillNo": "", + "inStotageStartTime": "", + "inStotageEndTime": "", + "goodsSkuSid": "", + "supplierSid": "", + "menuUrl": "", + "orgPath": "", + "userSid": "" + } + } + + var datas = this.$refs.main.data; + this.$refs[`main`].clearSelection() + datas.forEach((item, index) => { + item.check = false + this.$refs['main'].toggleRowExpansion(item, true) + this.$nextTick(() => { + this.$refs[`sub${index}`].clearSelection() + }) + item.goodsList.forEach((childItem) => { + childItem.check = false + }) + }) + + this.dialogVisible = false + + + + }, + saveData() { + + this.subIds = [] + var datas = this.$refs.main.data; + datas.forEach((item, index) => { + item.goodsList.forEach((childItem) => { + if (childItem.check && Number(childItem.unInStorageNum) != 0) { + this.subIds.push(childItem.goodsSid) + } + + }) + }) + console.log(" dosearch1", this.subIds); + + req.createInStorageBill(this.subIds).then((resp) => { + if (resp.success) { + this.dialogVisible = false + this.loadList() + } else {} + }).catch(() => {}) + + }, + } } diff --git a/src/views/login/login.vue b/src/views/login/login.vue index a02f2d0..8fefd41 100644 --- a/src/views/login/login.vue +++ b/src/views/login/login.vue @@ -531,6 +531,8 @@ window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName) window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data .pNameAndDepartmentNameAndPostName) + } else { + loading.close() } }).catch(() => { @@ -580,8 +582,12 @@ window.sessionStorage.setItem('defaultOrgPathName', response.data.defaultOrgPathName) window.sessionStorage.setItem('pNameAndDepartmentNameAndPostName', response.data .pNameAndDepartmentNameAndPostName) + + } else { + loading.close() } + }).catch(() => { loading.close() }) diff --git a/src/views/system/menuManage/menuManage.vue b/src/views/system/menuManage/menuManage.vue index abafe00..49a9f9f 100644 --- a/src/views/system/menuManage/menuManage.vue +++ b/src/views/system/menuManage/menuManage.vue @@ -105,7 +105,7 @@ 类型分类 - + 目录 菜单 按钮 @@ -115,43 +115,49 @@ 菜单名称 - + 路由名称 - + 路由路径 - + 菜单图片 - + 组件路径 - + + + + + 按钮Key + + 权限标识 - + 是否手机端权限 - + 否 是 @@ -160,7 +166,7 @@ 是否可见 - + 否 是 @@ -169,7 +175,7 @@ 排序号 - + @@ -258,10 +264,16 @@ + + 按钮Key + + + + 权限标识 - + @@ -336,6 +348,7 @@ remarks: '', sortNo: 0, cid: '', + btnKey: "", sourceName: 'wms', phoneFunction: "0", sourceSid: 'd936f1ba-03c3-11ec-bf08-48452053aa33' @@ -414,10 +427,18 @@ menuTypeChangeRadio(val) { console.log('menuTypeChangeRadio', val) + if (val != '2') { + this.form.btnKey = "" + } this.form.menuType = val }, menuTypeChangeRadio2(val) { console.log('menuTypeChangeRadio2', val) + + if (val != '2') { + this.form.btnKey = "" + } + this.form.menuType = val }, changeRadio(val) { @@ -468,6 +489,7 @@ }, handleClick(tab, event) { if (tab.name == 'addrole') { + this.form = {} this.dialogTitle = '新增' this.form.isShow = '1' this.form.menuType = '0' @@ -482,6 +504,7 @@ } }, add(row) { + this.activeName = 'addrole' // if(row == 0){ // this.isadd = false @@ -493,8 +516,8 @@ this.form.isShow = '1' this.form.menuType = '0' // this.form.psid = row.sid || 0 - this.form.pname = '' - this.form.psid = '' + this.form.pname = row.name + this.form.psid = row.sid this.form.sourceName = row.sourceName this.form.sourceSid = row.sourceSid if (row.isSource == '1') { @@ -502,6 +525,10 @@ } else { this.form.psid = row.sid } + let arr = [] + arr = [row.sid]; + this.$refs.Tree.setCheckedKeys(arr); + }, editRow(row) { console.log("editRow", row); @@ -511,12 +538,37 @@ this.editShow = this.form.isShow this.editMenuType = this.form.menuType + let arr = [] + arr = [row.sid]; + this.$refs.Tree.setCheckedKeys(arr); // this.form.isShow = 1 this.form.pname = row.psid == '0' ? '顶级菜单' : row.pname }, save() { + + if (this.form.name == '') { + this.$message({ + message: '菜单名称不能为空', + type: 'warning' + }) + return + } + + if (this.form.menuType == '2') { + + if (this.form.btnKey == '') { + this.$message({ + message: '按钮Key不能为空', + type: 'warning' + }) + return + } + + } + if (this.form.sid) { + putMenusInfo(this.form).then(res => { this.editDialog = false this.getPageList() diff --git a/src/views/system/roleAdminister/roleAdminister.vue b/src/views/system/roleAdminister/roleAdminister.vue index 61c4474..c1b1cbc 100644 --- a/src/views/system/roleAdminister/roleAdminister.vue +++ b/src/views/system/roleAdminister/roleAdminister.vue @@ -212,14 +212,18 @@ - + @@ -227,7 +231,8 @@ @@ -235,7 +240,7 @@
角色名称 - +
+ + 父子级联动 +
+
+ :default-checked-keys="checkedId" :props="defaultProps" @check-change="checkchange" + :check-strictly="!checkStrictly">
保 存 - 关 闭 + 关 闭