diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue index a6b0182b8..83ca0e8fb 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/index.vue @@ -173,6 +173,7 @@ console.log('PurchaseMain.allSchemas.searchSchema',PurchaseMain.allSchemas.searc } newRow['lineNumber'] = lineNumber newRow['uom'] = item['supplierUom'] + newRow['itemDesc1'] = item['itemDesc1'] newRow['id'] = item['id'] tableData.value.push(newRow) }) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts index d58f4181d..e05519270 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchaseMain/purchaseMain.data.ts @@ -506,6 +506,23 @@ export const PurchaseDetail = useCrudSchemas(reactive([ } } }, + { + label: '物料描述1', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + isTableForm: true, + form: { + componentProps: { + disabled: true + } + }, + tableForm: { + disabled: true + } + }, { label: '计量单位', field: 'uom', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 4a4750533..1321bda66 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -203,6 +203,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => newRow['allowOverShipment'] = item['allowOverShipment'] // 是否允许超发 newRow['poNumber'] = item['poNumber'] newRow['itemCode'] = item['itemCode'] + newRow['itemDesc1'] = item['itemDesc1'] newRow['poLine'] = item['poLine'] newRow['orderQty'] = item['orderQty'] newRow['uom'] = item['uom'] @@ -287,6 +288,7 @@ const getSearchTableData = async (number,formField,searchField,isAll)=>{ newRow['allowOverShipment'] = row['allowOverShipment'] // 是否允许超发 newRow['poNumber'] = row['poNumber'] newRow['itemCode'] = row['itemCode'] + newRow['itemDesc1'] = row['itemDesc1'] newRow['poLine'] = row['poLine'] newRow['orderQty'] = row['orderQty'] newRow['uom'] = row['uom'] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index 3ed26d0d2..f4e956349 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -698,6 +698,37 @@ export const SupplierdeliverRequestDetail = useCrudSchemas(reactive