From 5e83f6c68db6f96873a08fe8e6cd856cdd989e5f Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Mon, 28 Apr 2025 18:28:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BF=BB=E5=8C=85bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventoryManage/package/package.data.ts | 2 +- .../packageoverRecordMain.data.ts | 2 +- .../packageoverRequestMain/index.vue | 14 +++-- .../packageoverRequestMain.data.ts | 58 +++++++++---------- 4 files changed, 39 insertions(+), 37 deletions(-) diff --git a/src/views/wms/inventoryManage/package/package.data.ts b/src/views/wms/inventoryManage/package/package.data.ts index 6e0e2cfd0..38e2c4cb6 100644 --- a/src/views/wms/inventoryManage/package/package.data.ts +++ b/src/views/wms/inventoryManage/package/package.data.ts @@ -99,7 +99,7 @@ export const Package = useCrudSchemas(reactive([ }, { label: '背番', - field: 'itemDesc1', + field: 'backNumber', sort: 'custom', isSearch:true, table: { 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 474ff23b3..34bb472cf 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRecordMain/packageoverRecordMain.data.ts @@ -300,7 +300,7 @@ export const PackageoverDetail = useCrudSchemas(reactive([ }, { label: '背番', - field: 'itemDesc1', + field: 'backNumber', isSearch:true, sort: 'custom', table: { diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index a44ffbc1c..15e245805 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -118,6 +118,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) => newRow['uom'] = item['uom'] newRow['qty'] = item['qty'] newRow['batch'] = item['batch'] + newRow['backNumber'] = item['backNumber'] newRow['fromLocationCode'] = item['locationCode'] newRow['toLocationCode'] = item['locationCode'] newRow['fromLocationGroupCode'] = item['locationGroupCode'] @@ -156,6 +157,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef ) => { setV['uom'] = val[0]['uom'] setV['qty'] = val[0]['qty'] setV['batch'] = val[0]['batch'] + setV['backNumber'] = val[0]['backNumber'] setV['fromLocationCode'] = val[0]['locationCode'] setV['toLocationCode'] = val[0]['locationCode'] setV['fromLocationGroupCode'] = val[0]['locationGroupCode'] @@ -240,12 +242,12 @@ 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.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 b2005865e..c6fa5cfde 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', @@ -487,15 +487,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' + } + } ]) ) @@ -589,7 +589,7 @@ export const PackageoverRequestDetail = useCrudSchemas( }, { label: '背番', - field: 'itemDesc1', + field: 'backNumber', sort: 'custom', table: { width: 150