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 01/19] =?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 02/19] =?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 03/19] =?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 04/19] =?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 05/19] 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 06/19] =?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 07/19] =?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', From e6818ff4c20464027710a693b3e0f73966a0b929 Mon Sep 17 00:00:00 2001 From: ljlong_2630 Date: Wed, 4 Dec 2024 11:43:19 +0800 Subject: [PATCH 08/19] =?UTF-8?q?YT-1400=EF=BC=9A=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index 326cb52b1..c4834f57b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -451,13 +451,13 @@ const isShowMainButton1 = (row, val) => { } return [ // defaultButtons.mainListPurchasePlanOpeBtn({ hide: isShowMainButton(row, ['2']) }), // 打开 - defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE') }), // 关闭 - defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) }), // 发布 + defaultButtons.mainListPurchasePlanCloBtn({ hide: !(row.status!=6&&row.status!=2&&row.type=='SCHEDULE'),hasPermi: 'wms:purchase-main:close' }), // 关闭 + defaultButtons.mainListPurchasePlanPubBtn({ hide: isShowMainButton(row, ['1']) ,hasPermi: 'wms:purchase-main:publish'}), // 发布 defaultButtons.mainListPurchasePlanAccBtn({ hide: isShowMainButton(row, ['3']) }), // 接受 defaultButtons.mainListPurchasePlanRejBtn({ hide: isShowMainButton(row, ['3']) }), // 不接受 defaultButtons.mainListPurchasePlanWitBtn({ hide: isShowMainButton(row, ['3']) }), // 下架 - defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) }), // 修改 - defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:update' }), // 编辑 + defaultButtons.mainListPurchasePlanModBtn({ hide: isShowMainButton(row, ['5']) , hasPermi: 'wms:purchase-plan-main:update'}), // 修改 + defaultButtons.mainListEditBtn({ hide: isShowMainButton1(row, ['1','3','5']), hasPermi: 'wms:purchase-plan-main:edit' }), // 编辑 // defaultButtons.mainListDeleteBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:purchase-plan-main:delete'}), // 删除 { label: t('ts.创建供应商发货申请'), From 05781ed0eb97acc71fe10b41f9fe17f5ec1c4da7 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Wed, 4 Dec 2024 13:00:36 +0800 Subject: [PATCH 09/19] =?UTF-8?q?=E5=A4=84=E7=90=86YT-1486=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 | 24 ----------- .../countadjustRecordMain.data.ts | 43 ------------------- .../countadjustRequestMain.data.ts | 42 ------------------ 3 files changed, 109 deletions(-) diff --git a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts index 867b95491..22219509a 100644 --- a/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts +++ b/src/views/wms/countManage/count/countRequestMain/countRequestMain.data.ts @@ -183,30 +183,6 @@ export const CountRequestMain = useCrudSchemas(([ width: 150 }, }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - isForm: false, - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' - } - } - } - }, { label: '备注', field: 'remark', diff --git a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts index d1f6cd14c..4d79d87fb 100644 --- a/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRecordMain/countadjustRecordMain.data.ts @@ -456,49 +456,6 @@ export const CountadjustRecordDetail = useCrudSchemas(reactive([ width: 150 }, }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, - // { - // label: '任务明细ID', - // field: 'jobDetailId', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '代码', - // field: 'code', - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, - // { - // label: '接口类型', - // field: 'interfaceType', - // dictType: DICT_TYPE.INTERFACE_TYPE, - // dictClass: 'string', - // isTable: true, - // sort: 'custom', - // table: { - // width: 150 - // }, - // }, { label: '备注', field: 'remark', diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts index bcc8c248a..d3918e677 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/countadjustRequestMain.data.ts @@ -171,30 +171,6 @@ export const CountadjustRequestMain = useCrudSchemas(([ }, isForm: false, }, - { - label: '部门', - field: 'departmentCode', - sort: 'custom', - isForm: false, - table: { - width: 150 - }, - formatter: (_: Recordable, __: TableColumn, cellValue: number) => { - return userDeptArray.find((account) => account.id == cellValue)?.name - }, - form: { - value: userDept.id, - component: 'Select', - api: () => userDeptArray, - componentProps: { - disabled: true, - optionsAlias: { - labelField: 'name', - valueField: 'id' - } - } - } - }, { label: '备注', field: 'remark', @@ -573,24 +549,6 @@ export const CountadjustRequestDetail = useCrudSchemas(reactive([ type: 'Select' } }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false, - }, - { - label: '货主代码', - field: 'ownerCode', - sort: 'custom', - table: { - width: 150 - }, - }, { label: '备注', field: 'remark', From 86c2199265a8c79fe5a274d78e06260cda59f726 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 13:12:36 +0800 Subject: [PATCH 10/19] =?UTF-8?q?YT-1496=E7=BB=B4=E4=BF=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E9=A2=86=E7=94=A8=E7=94=B3=E8=AF=B7=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=E9=80=89=E6=8B=A9=E7=9A=84=E7=89=A9=E6=96=99=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E6=89=B9=E6=AC=A1=E6=97=B6=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRequestMain.data.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts index d2b897430..7ce36142e 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/sparepartsrequisitionRequestMain.data.ts @@ -932,7 +932,7 @@ export const UnplannedissueRequestDetail = useCrudSchemas(reactive //表单校验 export const UnplannedissueRequestDetailRules = reactive({ batch: [ - { required: true, message: '请输入批次', trigger: 'blur' }, + // { required: true, message: '请输入批次', trigger: 'blur' }, { max: 50, message: '不得超过50个字符', trigger: 'blur' } ], containerNumber: [ From b4abe273a99b3c086e520c09a72bc40cf2e40851 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 13:40:47 +0800 Subject: [PATCH 11/19] =?UTF-8?q?YT-1501=E7=BB=B4=E4=BF=AE=E5=A4=87?= =?UTF-8?q?=E4=BB=B6=E9=A2=86=E7=94=A8=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E4=B8=8D=E6=AD=A3=E7=A1=AE=EF=BC=8C?= =?UTF-8?q?=E4=B8=8E=E7=B3=BB=E7=BB=9F=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sparepartsrequisitionRecordMain.data.ts | 51 +++++++++++-------- 1 file changed, 31 insertions(+), 20 deletions(-) diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts index c4b8f6f2d..fbe9c7036 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRecordMain/sparepartsrequisitionRecordMain.data.ts @@ -11,6 +11,14 @@ 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} 计划外出库记录主表 */ @@ -345,6 +353,9 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + formatter: (_: Recordable, __: TableColumn, cellValue: number) => { + return userDeptArray.find((account) => account.id == cellValue)?.name + }, }, { label: '接口类型', @@ -450,26 +461,26 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ // width: 150 // }, // }, - { - label: '是否可用', - field: 'available', - dictType: DICT_TYPE.TRUE_FALSE, - dictClass: 'string', - isSearch: false, - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - form: { - component: 'Switch', - value: 'TRUE', - componentProps: { - inactiveValue: 'FALSE', - activeValue: 'TRUE' - } - } - }, + // { + // label: '是否可用', + // field: 'available', + // dictType: DICT_TYPE.TRUE_FALSE, + // dictClass: 'string', + // isSearch: false, + // isTable: true, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // component: 'Switch', + // value: 'TRUE', + // componentProps: { + // inactiveValue: 'FALSE', + // activeValue: 'TRUE' + // } + // } + // }, ])) //表单校验 From 7696dd7a4e865369dba8ec3f176f57baa72193f2 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Wed, 4 Dec 2024 14:00:14 +0800 Subject: [PATCH 12/19] =?UTF-8?q?YT-1507=E4=BF=AE=E6=94=B9=E4=BE=9B?= =?UTF-8?q?=E5=BA=94=E5=95=86=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=E3=80=90?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E3=80=91=E6=8C=89=E9=92=AE=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E6=94=B9=E4=B8=BA=E4=B8=8E=E3=80=90=E7=94=9F?= =?UTF-8?q?=E6=88=90=E6=A0=87=E7=AD=BE=E3=80=91=E6=8C=89=E9=92=AE=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/XButton/src/ButtonBaseMore.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/XButton/src/ButtonBaseMore.vue b/src/components/XButton/src/ButtonBaseMore.vue index f1b7574d1..a2f853471 100644 --- a/src/components/XButton/src/ButtonBaseMore.vue +++ b/src/components/XButton/src/ButtonBaseMore.vue @@ -15,7 +15,7 @@ - 更多 + 更多