diff --git a/src/components/Table/src/Table.vue b/src/components/Table/src/Table.vue index 10f19206b..811321e7d 100644 --- a/src/components/Table/src/Table.vue +++ b/src/components/Table/src/Table.vue @@ -200,7 +200,7 @@ export default defineComponent({ const { selection, reserveSelection, align, headerAlign,border } = unref(getProps) // 渲染多选 return selection ? ( - ([ width: 150 }, }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '到包装号', field: 'toPackingNumber', diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue index 5a6e71b0a..a78524fba 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/index.vue @@ -141,12 +141,12 @@ RelegateRequestDetail.allSchemas.tableFormColumns.map(item => { key: 'available', value: 'TRUE', isMainValue: false - },{ - message: '请选择从仓库代码!', - key: 'warehouseCode', - value: 'fromWarehouseCode', - isMainValue: true - } + },{ + message: '请选择从仓库代码!', + key: 'warehouseCode', + value: 'fromWarehouseCode', + isMainValue: true + } ] item.form.componentProps.searchCondition = [ { @@ -255,12 +255,12 @@ const butttondata = (row, $index) => { return [] } return [ - defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 - defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 - defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 - defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 - defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 - defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 + defaultButtons.mainListCloseBtn({hide:isShowMainButton(row,['2','3','4']),hasPermi:'wms:relegate-request-main:close'}), // 关闭 + defaultButtons.mainListReAddBtn({hide:isShowMainButton(row,['4','5']),hasPermi:'wms:relegate-request-main:reAdd'}), //重新添加 + defaultButtons.mainListSubmitBtn({hide:isShowMainButton(row,['1']),hasPermi:'wms:relegate-request-main:submit'}), // 提交审批 + defaultButtons.mainListTurnDownBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:refused'}), // 驳回 + defaultButtons.mainListApproveBtn({hide:isShowMainButton(row,['2']),hasPermi:'wms:relegate-request-main:agree'}), // 审批通过 + defaultButtons.mainListHandleBtn({hide:isShowMainButton(row,['3']),hasPermi:'wms:relegate-request-main:handle'}), // 处理 defaultButtons.mainListEditBtn({ hide: isShowMainButton(row, ['1']), hasPermi: 'wms:relegate-request-main:update' }), // 编辑 // defaultButtons.mainListDeleteBtn({ hasPermi: 'wms:relegate-request-main:delete' }), // 删除 ] diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts index 8c6bda653..31dbe345f 100644 --- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts +++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts @@ -13,6 +13,10 @@ import { Balance } from '@/views/wms/inventoryManage/balance/balance.data' import * as LocationApi from '@/api/wms/location' import { Location } from '@/views/wms/basicDataManage/factoryModeling/location/location.data' + +import * as ItempackageApi from '@/api/wms/itempackage' +import { Itempackaging } from '@/views/wms/basicDataManage/itemManage/itempackage/itempackage.data' + import * as confgiApi from '@/api/infra/config' // 获取自动提交自动通过自动执行,跳过任务直接删生成记录的默认值 const queryParams = { @@ -293,6 +297,7 @@ export const RelegateRequestDetailRules = reactive({ available: [required], departmentCode: [required], concurrencyStamp: [required], + packUnit: [required], }) export const RelegateRequestDetail = useCrudSchemas(reactive([ @@ -531,6 +536,60 @@ export const RelegateRequestDetail = useCrudSchemas(reactive([ width: 120 }, }, + { + label: '到库位代码', + field: 'toLocationCode', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择到库位代码', + searchField: 'code', + searchTitle: '库位信息', + searchAllSchemas: Location.allSchemas, + searchPage: LocationApi.selectBusinessTypeToLocation, + } + }, + table: { + width: 120 + }, + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm:{ + isInpuFocusShow: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + }, + form: { + // labelMessage: '信息提示说明!!!', + componentProps: { + isSearchList: true, // 开启查询弹窗 + searchListPlaceholder: '请选择包装规格', + searchField: 'packUnit', + searchTitle: '包装规格', + searchAllSchemas: Itempackaging.allSchemas, + searchPage: ItempackageApi.getItempackagingPage, + } + }, + table: { + width: 120 + }, + }, { label: '到库区类型', field: 'toAreaTypes', diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts index 1f74cfd45..865b0b2a8 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueJobMain/unplannedissueJobMain.data.ts @@ -28,6 +28,24 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '领用代码', + field: 'usageCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable:false, + }, + { + label: '领用描述', + field: 'usageDescription', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '申请单号', field: 'requestNumber', @@ -172,6 +190,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', } @@ -183,6 +202,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', } @@ -194,6 +214,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '部门', @@ -202,11 +223,13 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable:false, }, { label: '备注', field: 'remark', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -216,7 +239,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'autoComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -235,7 +258,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowModifyLocation', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -254,7 +277,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowModifyQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -273,7 +296,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowBiggerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -292,7 +315,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowSmallerQty', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -311,7 +334,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowModifyInventoryStatus', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -330,7 +353,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowContinuousScanning', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -349,7 +372,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowPartialComplete', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -368,7 +391,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowModifyBatch', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -387,7 +410,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ field: 'allowModifyPackingNumber', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isTable: true, + isTable: false, sort: 'custom', table: { width: 150 @@ -404,6 +427,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ { label: '承接时间', field: 'acceptTime', + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -425,6 +449,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ label: '承接人', field: 'acceptUserId', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -437,6 +462,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', + isTable:false, table: { width: 180 }, @@ -453,6 +479,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ label: '完成人', field: 'completeUserId', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -468,6 +495,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -481,6 +509,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ label: '创建者', field: 'creator', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -493,6 +522,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ dateFormat: 'YYYY-MM-DD HH:mm:ss' }, sort: 'custom', + isTable:false, table: { width: 180 }, @@ -509,6 +539,7 @@ export const UnplannedissueJobMain = useCrudSchemas(reactive([ label: '最后更新者', field: 'updater', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -585,6 +616,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ label: '单据号', field: 'number', sort: 'custom', + hiddenInMain:true, table: { width: 180 }, @@ -686,10 +718,27 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '成本中心代码', + field: 'costcentreCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '科目代码', + field: 'qadProjectCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '货主代码', field: 'ownerCode', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -698,6 +747,7 @@ export const UnplannedissueJobDetail = useCrudSchemas(reactive([ label: '项目代码', field: 'projectCode', sort: 'custom', + isTable:false, table: { width: 150 }, diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts index a88a5c412..89167df18 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRecordMain/unplannedissueRecordMain.data.ts @@ -171,6 +171,24 @@ export const UnplannedissueRecordMain = useCrudSchemas(reactive([ width: 150 }, }, + { + label: '领用代码', + field: 'usageCode', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + isTable:false, + }, + { + label: '领用描述', + field: 'usageDescription', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '出库事务类型', field: 'outTransactionType', @@ -460,6 +478,22 @@ export const UnplannedissueRecordDetail = useCrudSchemas(reactive( width: 150 }, }, + { + label: '成本中心代码', + field: 'costcentreCode', + sort: 'custom', + table: { + width: 150 + }, + }, + { + label: '科目代码', + field: 'qadProjectCode', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '货主代码', field: 'ownerCode', diff --git a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue index f08755651..620c58274 100644 --- a/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue +++ b/src/views/wms/purchasereceiptManage/putaway/putawayJobMain/index.vue @@ -17,7 +17,8 @@ -