From ce08fdd98753fe2ce57808bc5a0b2665937691ba Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 28 Dec 2023 09:19:40 +0800 Subject: [PATCH 1/3] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/supplierdeliverRequestMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index a61820b33..a83bec284 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -185,7 +185,7 @@ defaultButtons.mainListPlanSubBtn({ hide: isShowMainButton(row, ['1']) }), // 提交审批 defaultButtons.mainListPlanAppBtn({ hide: isShowMainButton(row, ['2']) }), // 审批通过 defaultButtons.mainListPlanTurBtn({ hide: isShowMainButton(row, ['2']) }), // 驳回按钮 - defaultButtons.mainListEditBtn({ hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑 + defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']),hasPermi: 'wms:supplierdeliver-request-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:supplierdeliver-request-main:delete' }), // 删除 { label: '生成标签', From d5623df1ac68bf1fc34206e008be72fd61ef0662 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 28 Dec 2023 09:55:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=99=A8=E5=85=B7=E8=A7=A3=E7=BB=91?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerBindRecordMain.data.ts | 6 ++++++ .../containerUnbindRecordMain.data.ts | 6 ++++++ .../containerinit/containerUnbindRecord/index.vue | 10 +++++----- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts index a2ed3a301..6c1a81f56 100644 --- a/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerBindRecord/containerBindRecordMain.data.ts @@ -64,6 +64,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '内容物类型', field: 'containerContentType', + dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -103,6 +105,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '库存状态', field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' @@ -114,6 +118,8 @@ export const ContainerBindRecordDetail = useCrudSchemas(reactive([ { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts index 1f06c3998..5fa429d89 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/containerUnbindRecordMain.data.ts @@ -63,6 +63,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '内容物类型', field: 'containerContentType', + dictType: DICT_TYPE.CONTAINER_CONTENT_TYPE, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -102,6 +104,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '库存状态', field: 'inventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', sort: 'custom', form: { component: 'Radio' @@ -113,6 +117,8 @@ export const ContainerUnbindRecordDetail = useCrudSchemas(reactive { label: '计量单位', field: 'uom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', sort: 'custom', table: { width: 150 diff --git a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue index bdc81db93..c26c2e311 100644 --- a/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerUnbindRecord/index.vue @@ -120,9 +120,9 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ - defaultButtons.defaultAddBtn({hasPermi:'wms:containerUnbindRecordMain:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:containerUnbindRecordMain:import'}), // 导入 - defaultButtons.defaultExportBtn({hasPermi:'wms:containerUnbindRecordMain:export'}), // 导出 + // defaultButtons.defaultAddBtn({hasPermi:'wms:container-unbind-record-main:create'}), // 新增 + defaultButtons.defaultImportBtn({hasPermi:'wms:container-unbind-record-main:import'}), // 导入 + defaultButtons.defaultExportBtn({hasPermi:'wms:container-unbind-record-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 defaultButtons.defaultSetBtn(null), // 设置 @@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:containerUnbindRecordMain:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:containerUnbindRecordMain:delete'}), // 删除 + //defaultButtons.mainListEditBtn({hasPermi:'wms:container-unbind-record-main:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-unbind-record-main:delete'}), // 删除 ] // 列表-操作按钮事件 From 526c458c73baa903cf82b45298f0be7663f2c3ce Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Thu, 28 Dec 2023 09:59:12 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=99=A8=E5=85=B7=E7=BB=B4=E4=BF=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../containerRepair/containerRepairRecordMain.data.ts | 10 ++++++++++ .../containerinit/containerRepair/index.vue | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts index 9eeddeb76..60e1154c4 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/containerRepairRecordMain.data.ts @@ -80,6 +80,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive { label: '从状态', field: 'fromContainerStatus', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -92,6 +94,8 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive { label: '到状态', field: 'toContainerStatus', + dictType: DICT_TYPE.CONTAINER_STATUS, + dictClass: 'string', sort: 'custom', isSearch: true, form: { @@ -115,6 +119,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive defaultTime: [new Date('1 00:00:00'), new Date('1 23:59:59')] } }, + table: { + width: 150 + }, isForm: false, }, { @@ -122,6 +129,9 @@ export const ContainerRepairRecordDetail = useCrudSchemas(reactive field: 'remark', sort: 'custom', isSearch: true, + table: { + width: 150 + }, }, { label: '操作', diff --git a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue index e2453b8e8..e397950d3 100644 --- a/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue +++ b/src/views/wms/inventoryManage/containerinit/containerRepair/index.vue @@ -154,8 +154,8 @@ const buttonBaseClick = (val, item) => { // 列表-操作按钮 const butttondata = [ - defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑 - defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除 + //defaultButtons.mainListEditBtn({hasPermi:'wms:container-repair-record-main:update'}), // 编辑 + //defaultButtons.mainListDeleteBtn({hasPermi:'wms:container-repair-record-main:delete'}), // 删除 ] // 列表-操作按钮事件