From 77cc256ef341e179f38d55b0eb267e2586b76685 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Sun, 27 Apr 2025 16:02:52 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85PC=E4=BB=A5=E5=8F=8A=E5=90=8E?= =?UTF-8?q?=E7=AB=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../packageoverRecordMain.data.ts | 22 ++--- .../packageoverRequestMain/index.vue | 16 ++-- .../packageoverRequestMain.data.ts | 80 +++++++++---------- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts index a714be3f5..2436a0a81 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -11,23 +11,23 @@ export const PackageoverMain = useCrudSchemas(reactive([ width: 180 }, }, - // { - // label: '申请单号', - // field: 'requestNumber', - // sort: 'custom', - // table: { - // width: 180 - // }, - // }, { - label: '任务单据号', - field: 'jobNumber', + label: '申请单号', + field: 'requestNumber', sort: 'custom', - isSearch: true, table: { width: 180 }, }, + // { + // label: '任务单据号', + // field: 'jobNumber', + // sort: 'custom', + // isSearch: true, + // table: { + // width: 180 + // }, + // }, { label: '仓库代码', field: 'warehouseCode', diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 708d34c38..a44ffbc1c 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -185,7 +185,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:packageover-request-main:create'}), // 新增 - defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-request-main:import'}), // 导入 + // defaultButtons.defaultImportBtn({hasPermi:'wms:packageover-request-main:import'}), // 导入 defaultButtons.defaultExportBtn({hasPermi:'wms:packageover-request-main:export'}), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 @@ -240,13 +240,13 @@ const butttondata = (row,$index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:packageover-request-main:handle'}), // 处理 - defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:update'}), // 编辑 + // defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['1','2','3','4','6']), hasPermi:'wms:packageover-request-main:close'}), // 关闭 + // defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']), hasPermi:'wms:packageover-request-main:reAdd'}), // 重新添加 + // defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:submit'}), // 提交审批 + // defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:refused'}), // 驳回 + // defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']), hasPermi:'wms:packageover-request-main:agree'}), // 审批通过 + // defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']), hasPermi:'wms:packageover-request-main:handle'}), // 处理 + // defaultButtons.mainListEditBtn({hide:isShowMainButton(row,['1']), hasPermi:'wms:packageover-request-main:update'}), // 编辑 // defaultButtons.mainListDeleteBtn({hasPermi:'wms:issue-request-main:delete'}), // 删除 ] } diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts index 92e073cff..51f6e0d7b 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/packageoverRequestMain.data.ts @@ -42,25 +42,25 @@ export const PackageoverRequestMain = useCrudSchemas( isForm: false, isSearch: true }, - { - label: '状态', - field: 'status', - dictType: DICT_TYPE.REQUEST_STATUS, - dictClass: 'string', - isSearch: true, - isTable: true, - isForm: false, - sort: 'custom', - table: { - width: 150 - }, - form: { - value: '1', - componentProps: { - disabled: true - } - } - }, + // { + // label: '状态', + // field: 'status', + // dictType: DICT_TYPE.REQUEST_STATUS, + // dictClass: 'string', + // isSearch: true, + // isTable: true, + // isForm: false, + // sort: 'custom', + // table: { + // width: 150 + // }, + // form: { + // value: '1', + // componentProps: { + // disabled: true + // } + // } + // }, { label: '申请时间', field: 'requestTime', @@ -103,7 +103,7 @@ export const PackageoverRequestMain = useCrudSchemas( valueFormat: 'x' } }, - isTable: false + isTable: true }, { @@ -129,7 +129,7 @@ export const PackageoverRequestMain = useCrudSchemas( searchCondition: [ { key: 'businessType', - value: 'HoldToOk', + value: 'OverPackage', isMainValue: false }, { @@ -482,15 +482,15 @@ export const PackageoverRequestMain = useCrudSchemas( isTable: false, isForm: false }, - { - label: '操作', - field: 'action', - isForm: false, - table: { - width: 180, - fixed: 'right' - } - } + // { + // label: '操作', + // field: 'action', + // isForm: false, + // table: { + // width: 180, + // fixed: 'right' + // } + // } ]) ) @@ -600,16 +600,16 @@ export const PackageoverRequestDetail = useCrudSchemas( isTableForm: false, isForm: false }, - { - label: '项目代码', - field: 'projectCode', - sort: 'custom', - table: { - width: 150 - }, - isTableForm: false, - isForm: false - }, + // { + // label: '项目代码', + // field: 'projectCode', + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTableForm: false, + // isForm: false + // }, { label: '数量', field: 'qty',