diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts index 8bed7ab51..e83b73dd5 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/initialContainerMainRequest.data.ts @@ -465,6 +465,26 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } } }, + { + label: '库存状态', + field: 'toInventoryStatus', + dictType: DICT_TYPE.INVENTORY_STATUS, + dictClass: 'string', + isTable: true, + sort: 'custom', + table: { + width: 150 + }, + tableForm: { + disabled: true, + type: 'Select' + }, + form: { + componentProps: { + disabled: true + } + } + }, { label: '数量', field: 'toQty', @@ -503,26 +523,6 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ } } }, - { - label: '库存状态', - field: 'toInventoryStatus', - dictType: DICT_TYPE.INVENTORY_STATUS, - dictClass: 'string', - isTable: true, - sort: 'custom', - table: { - width: 150 - }, - tableForm: { - disabled: true, - type: 'Select' - }, - form: { - componentProps: { - disabled: true - } - } - }, { label: '子备注', field: 'remark', diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index ce2b89d73..c17773476 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -158,7 +158,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['uom'] = item['uom'] newRow['fromLocationCode'] = item['locationCode'] newRow['fromInventoryStatus'] = item['inventoryStatus'] - newRow['toInventoryStatus'] = 'SCRAP' + newRow['toInventoryStatus'] = item['inventoryStatus'] newRow['toQty'] = item['qty'] tableData.value.push(newRow) }) @@ -426,9 +426,9 @@ const isShowButton = ref(true) const tableFormKeys = {} ContainerDetailRequest.allSchemas.tableFormColumns.forEach(item => { tableFormKeys[item.field] = item.default ? item.default : '' - if(item.field == 'toInventoryStatus'){ - tableFormKeys[item.field] = "SCRAP" - } + // if(item.field == 'toInventoryStatus'){ + // tableFormKeys[item.field] = "SCRAP" + // } }) const tableData = ref([]) diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts index fa9c45a11..60834a2f2 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/scrapContainerMainRequest.data.ts @@ -141,7 +141,9 @@ export const ContainerMainRequest = useCrudSchemas(reactive([ sort: 'custom', dictType: DICT_TYPE.TRUE_FALSE, dictClass: 'string', - isForm: false, + isSearch: false, + isForm: true, + isTable: false, table: { width: 150 }, @@ -585,7 +587,7 @@ export const ContainerDetailRequest = useCrudSchemas(reactive([ label: '子备注', field: 'remark', sort: 'custom', - isTable: true, + isTable: false, isForm: false, isTableForm: false },