From 521f538eb838acb711e9a9d312f63b0863bf967f Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Tue, 3 Dec 2024 16:26:52 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/system/post/index.ts | 14 ++ .../system/post/PostAreaPermissionForm.vue | 167 ++++++++++++++++++ src/views/system/post/index.vue | 13 +- 3 files changed, 192 insertions(+), 2 deletions(-) create mode 100644 src/views/system/post/PostAreaPermissionForm.vue diff --git a/src/api/system/post/index.ts b/src/api/system/post/index.ts index 405db387e..b5f99bfc0 100644 --- a/src/api/system/post/index.ts +++ b/src/api/system/post/index.ts @@ -44,3 +44,17 @@ export const deletePost = async (id: number) => { export const exportPost = async (params) => { return await request.download({ url: '/system/post/export', params }) } + +// 库位树状图 +export const getPostAreaTreeList = async () => { + return await request.get({ url: '/wms/warehouse/treeLocation' }) +} +// 根据id获取已选择节点 +export const getByPostId = async (id) => { + return await request.get({ url: '/system/post-location/getByPostId?postId=' + id }) +} +//提交选择的节点 +export const updatePostLocation = async (data) => { + return await request.post({ url: '/system/post-location/updatePostLocation',data}) +} + diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue new file mode 100644 index 000000000..7466759fe --- /dev/null +++ b/src/views/system/post/PostAreaPermissionForm.vue @@ -0,0 +1,167 @@ + + + diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue index a53b5ac4e..f8389611a 100644 --- a/src/views/system/post/index.vue +++ b/src/views/system/post/index.vue @@ -46,8 +46,12 @@ - + + + diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 326cb52b1..0034bd503 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -102,7 +102,7 @@ /> - @@ -132,7 +132,7 @@ const { loadStart, loadDone } = usePageLoading() announcements.value = ["1. The total number of data items of the quantity of goods in the template does not exceed 1000 data (row × column).","2. All data content in the template is in text format, and formula content cannot be used as import data","3. The delivery date is in YYYY-MM-DD format, no hours, minutes and seconds are required"] }else{ - announcements.value = ["1. 模板中要货数量数据项总数不超过1000个数据（行×列）","2. 模板中全部数据内容格式为文本格式，不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式，不需填写时分秒"] + //announcements.value = ["1. 模板中要货数量数据项总数不超过1000个数据（行×列）","2. 模板中全部数据内容格式为文本格式，不能使用公式内容作为导入数据","3. 要货日期为YYYY-MM-DD格式，不需填写时分秒"] } // 要货计划 defineOptions({ name: 'PurchasePlanMain' }) @@ -375,7 +375,7 @@ const getSearchTableData = async (number,formField,searchField)=>{ // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({ hasPermi: 'wms:purchase-plan-main:create' }), // 新增 - // defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 + defaultButtons.defaultImportBtn({ hasPermi: 'wms:purchase-plan-main:import' }), // 导入 // defaultButtons.defaultExportBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出 defaultButtons.defaultExportDetailsBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出明细 //defaultButtons.defaultExportTableBtn({ hasPermi: 'wms:purchase-plan-main:export' }), // 导出二维表 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 4aac3316e..ca0c6b8bd 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -268,6 +268,17 @@ export const PurchasePlanMain = useCrudSchemas( width: 150 }, }, + { + label: '便次', + field: 'deliNo', + sort: 'custom', + isTable: true, + isForm: false, + sortTableDefault: 13, + table: { + width: 150 + }, + }, { label: '收货人', field: 'contacts', From 08ba629b49008fd99f47ad3b116137d0c7fea6f9 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 08:46:33 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/post/PostAreaPermissionForm.vue | 38 +++++++++++++++---- src/views/system/role/RoleAssignMenuForm.vue | 2 + 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue index 7466759fe..9bdfc2446 100644 --- a/src/views/system/post/PostAreaPermissionForm.vue +++ b/src/views/system/post/PostAreaPermissionForm.vue @@ -63,6 +63,7 @@ const formData = reactive({ }) const formRef = ref() // 表单 Ref const areaOptions = ref([]) // 菜单树形结构 +const areaOptionsAll = ref([]) // 菜单树形结构 const menuExpand = ref(false) // 展开/折叠 const treeRef = ref() // 菜单树组件 Ref const treeNodeAll = ref(false) // 全选/全不选 @@ -73,6 +74,16 @@ const open = async (row: any) => { resetForm() // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点 areaOptions.value = await PostApi.getPostAreaTreeList() + areaOptions.value.forEach(item => { + item.children.forEach(cur => { + cur.children.forEach(i=> { + i.children.forEach(c => { + areaOptionsAll.value.push(c) + }) + }) + }) + }) + // menuOptions.value = handleTree(await MenuApi.getSimpleMenusList()) // 设置数据 formData.id = row.id @@ -108,14 +119,24 @@ const submitForm = async () => { // ...(treeRef.value.getHalfCheckedKeys() as unknown as Array) // 获得半选中的父节点 // ] // } - let array = treeRef.value.getCheckedNodes(false).filter(item => item.id).map(item => { - return { + let arr = treeRef.value.getCheckedNodes(false).filter(item => item.id) + let array = [] + if (arr && arr.length > 0) { + array = arr.map(item => { + return { + postId:formData.id, + locationId:item.id, + locationCode:item.code, + } + }) + } else { + array = [{ postId:formData.id, - locationId:item.id, - locationCode:item.code, - } - }) - console.log(888, array) + locationId:-1, + locationCode:'', + }] + } + await PostApi.updatePostLocation(array) message.success(t('common.updateSuccess')) dialogVisible.value = false @@ -144,12 +165,13 @@ const resetForm = () => { /** 全选/全不选 */ const handleCheckedTreeNodeAll = () => { - treeRef.value.setCheckedNodes(treeNodeAll.value ? menuOptions.value : []) + treeRef.value.setCheckedNodes(treeNodeAll.value ? areaOptionsAll.value : []) } /** 展开/折叠全部 */ const handleCheckedTreeExpand = () => { const nodes = treeRef.value?.store.nodesMap + console.log(nodes) for (let node in nodes) { if (nodes[node].expanded === menuExpand.value) { continue diff --git a/src/views/system/role/RoleAssignMenuForm.vue b/src/views/system/role/RoleAssignMenuForm.vue index 9304532ce..4c459f5a4 100644 --- a/src/views/system/role/RoleAssignMenuForm.vue +++ b/src/views/system/role/RoleAssignMenuForm.vue @@ -75,6 +75,7 @@ const open = async (row: RoleApi.RoleVO) => { resetForm() // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点 menuOptions.value = handleTree(await MenuApi.getSimpleMenusList()) + console.log(333,menuOptions.value) // 设置数据 formData.id = row.id formData.name = row.name @@ -143,6 +144,7 @@ const handleCheckedTreeNodeAll = () => { /** 展开/折叠全部 */ const handleCheckedTreeExpand = () => { const nodes = treeRef.value?.store.nodesMap + console.log(88,treeRef.value?.store.nodesMap) for (let node in nodes) { if (nodes[node].expanded === menuExpand.value) { continue From df59c14585a7fde43fe48db9cd51fcbdb5616faa Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 4 Dec 2024 09:43:35 +0800 Subject: [PATCH 05/10] =?UTF-8?q?WMS=20=E6=8A=A5=E5=BA=9F=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E7=9B=AE=E5=89=8D=E6=B2=A1=E6=9C=89=E6=A0=B9=E6=8D=AE?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8C=E5=BA=94=E8=AF=A5=E8=B5=B0=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=20=20YT-1391?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/warehouse/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/api/wms/warehouse/index.ts b/src/api/wms/warehouse/index.ts index d0883cda9..5a12e0f3b 100644 --- a/src/api/wms/warehouse/index.ts +++ b/src/api/wms/warehouse/index.ts @@ -22,7 +22,6 @@ export const getWarehousePage = async (params) => { } } - // 查询仓库列表 export const getWarehouseByBusinessTypeSenior = async (params) => { delete params.isSearch @@ -32,7 +31,7 @@ export const getWarehouseByBusinessTypeSenior = async (params) => { // 查询仓库列表 export const getWarehouseByBusinessTypePage = async (params) => { - return await request.get({ url: `/wms/warehouse/page`, params }) + return await request.get({ url: `/wms/warehouse/getWarehouseByBusinessTypePage`, params }) } // 校验仓库 From fb279ebb60dd4853da4af41b9cd6d14053a15493 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 09:46:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E5=B2=97=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/post/PostAreaPermissionForm.vue | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/src/views/system/post/PostAreaPermissionForm.vue b/src/views/system/post/PostAreaPermissionForm.vue index 9bdfc2446..a8138d537 100644 --- a/src/views/system/post/PostAreaPermissionForm.vue +++ b/src/views/system/post/PostAreaPermissionForm.vue @@ -63,7 +63,6 @@ const formData = reactive({ }) const formRef = ref() // 表单 Ref const areaOptions = ref([]) // 菜单树形结构 -const areaOptionsAll = ref([]) // 菜单树形结构 const menuExpand = ref(false) // 展开/折叠 const treeRef = ref() // 菜单树组件 Ref const treeNodeAll = ref(false) // 全选/全不选 @@ -73,18 +72,10 @@ const open = async (row: any) => { dialogVisible.value = true resetForm() // 加载 Menu 列表。注意，必须放在前面，不然下面 setChecked 没数据节点 - areaOptions.value = await PostApi.getPostAreaTreeList() - areaOptions.value.forEach(item => { - item.children.forEach(cur => { - cur.children.forEach(i=> { - i.children.forEach(c => { - areaOptionsAll.value.push(c) - }) - }) - }) - }) - - // menuOptions.value = handleTree(await MenuApi.getSimpleMenusList()) + let array = await PostApi.getPostAreaTreeList() + array.forEach(item=>item.name =item.code + '-' + item.name ) + areaOptions.value = handleTree(array) + // menuOptions.value = await MenuApi.getSimpleMenusList()) // 设置数据 formData.id = row.id formData.name = row.name @@ -119,7 +110,7 @@ const submitForm = async () => { // ...(treeRef.value.getHalfCheckedKeys() as unknown as Array) // 获得半选中的父节点 // ] // } - let arr = treeRef.value.getCheckedNodes(false).filter(item => item.id) + let arr = treeRef.value.getCheckedNodes(false).filter(item => item.type == 4) let array = [] if (arr && arr.length > 0) { array = arr.map(item => { @@ -165,13 +156,12 @@ const resetForm = () => { /** 全选/全不选 */ const handleCheckedTreeNodeAll = () => { - treeRef.value.setCheckedNodes(treeNodeAll.value ? areaOptionsAll.value : []) + treeRef.value.setCheckedNodes(treeNodeAll.value ? areaOptions.value : []) } /** 展开/折叠全部 */ const handleCheckedTreeExpand = () => { const nodes = treeRef.value?.store.nodesMap - console.log(nodes) for (let node in nodes) { if (nodes[node].expanded === menuExpand.value) { continue From 168f50174c661083becce17953fec482c688a4e0 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 4 Dec 2024 11:13:00 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E5=A4=84=E7=90=86YT-1481=E3=80=81YT-1482?= =?UTF-8?q?=E7=BC=BA=E9=99=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countRecordMain/countRecordMain.data.ts | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts index e8649797e..e9b2643fa 100644 --- a/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts +++ b/src/views/wms/countManage/count/countRecordMain/countRecordMain.data.ts @@ -541,23 +541,6 @@ export const CountRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', From 6b84b04465c15761208acf8cd2156330b7550d74 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 11:15:40 +0800 Subject: [PATCH 08/10] YT-1473 --- .../unplannedissueRecordMain.data.ts | 9 ++++++ .../unplannedreceiptRecordMain.data.ts | 28 +++++++++++++------ 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index c2a452855..115e2e4eb 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -10,6 +10,12 @@ import * as QadProjectApi from '@/api/wms/qadProject' import * as SubjectAccountApi from '@/api/wms/subjectAccount' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data' +import { useUserStore } from '@/store/modules/user' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] /** * @returns {Array} 计划外出库记录主表 @@ -369,6 +375,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, }, { label: '接口类型', diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts index c4871a5c3..c197baeb7 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRecordMain/unplannedreceiptRecordMain.data.ts @@ -12,6 +12,15 @@ import * as QadProjectApi from '@/api/wms/qadProject' import * as SubjectAccountApi from '@/api/wms/subjectAccount' import { SubjectAccount } from '@/views/wms/basicDataManage/subject/subjectAccount/subjectAccount.data' +// 获取当前操作人的部门 +import { useUserStore } from '@/store/modules/user' +import { TableColumn } from '@/types/table' +const userStore = useUserStore() +const userDept = userStore.userSelfInfo.dept +// id 转str 否则form回显匹配不到 +userDept.id = userDept.id.toString() +const userDeptArray: any = [userDept] + /** * @returns {Array} 计划外入库记录主表 */ @@ -338,14 +347,17 @@ export const UnplannedreceiptRecordMain = useCrudSchemas(reactive( width: 150 }, }, - // { - // label: '部门', - // field: 'departmentCode', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, + { + label: '部门', + field: 'departmentCode', + sort: 'custom', + table: { + width: 150 + }, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, + }, { label: '接口类型', field: 'interfaceType', From eda782b7df368968dfeace8383eca5f352160427 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 11:20:59 +0800 Subject: [PATCH 09/10] =?UTF-8?q?YT-1488=E7=89=A9=E6=96=99=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=EF=BC=8C=E5=8E=BB=E6=8E=89=E6=98=8E=E7=BB=86=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymove/inventorymoveRequestMainOKHOLD/index.vue | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue index 631ea87b9..85eb0367d 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMainOKHOLD/index.vue @@ -76,6 +76,9 @@ :apiDelete="InventorymoveRequestDetailApi.deleteInventorymoveRequestDetail" @searchTableSuccessDetail="searchTableSuccessDetail" @detailOpenForm="detailOpenForm" + :detailButtonIsShowEdit="false" + :detailButtonIsShowDelete="false" + :detailButtonIsShowAdd="false" /> From ec723c3bbc7b7940b6088dc73968963565dad773 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 4 Dec 2024 11:27:09 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=A4=84=E7=90=86YT-1485=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countRequestMain/countRequestMain.data.ts | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 4d5aa8a54..867b95491 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -556,24 +556,6 @@ export const CountRequestDetail = useCrudSchemas(reactive([ type: 'Select' } }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, { label: '备注', field: 'remark',