diff --git a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts index 2fce5f7ce..b5762b7f5 100644 --- a/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts +++ b/src/views/wms/productionManage/productionplan/productionMain/productionMain.data.ts @@ -477,6 +477,16 @@ export const ProductionMain = useCrudSchemas(reactive([ isTable: false, isForm: false, }, + { + label: '备注', + field: 'remark', + sort: 'custom', + table: { + width: 350 + }, + isTable: false, + isForm: false, + }, // { // label: '开始时间', // field: 'beginTime', diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 6577c20d8..0ae88cc20 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 3cb60fdd1..61cb2eda9 100644 --- a/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/bspurchasereceipt/bsPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 - }, - sortTableDefault:11, - hiddenInMain:true + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts index d418e93e9..15014d8c3 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptJobMain/purchasereceiptJobMain.data.ts @@ -972,7 +972,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( sortTableDefault: 1008 }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -982,7 +982,7 @@ export const PurchasereceiptJobDetail = useCrudSchemas( isSearch: true }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -990,6 +990,17 @@ export const PurchasereceiptJobDetail = useCrudSchemas( }, sortTableDefault: 7 }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 7, + isTableForm: false, + isForm: false + }, { label: '物料类型', field: 'itemType', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 33bbd3263..4a9620b54 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -614,7 +614,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -668,6 +668,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, sortTableDefault:10, }, + { + label: '背番', + field: 'itemDesc1', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isTableForm: false, + isForm: false + }, { label: '物料描述1', field: 'itemDesc1', diff --git a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,14 +669,15 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, { label: '物料描述2', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive disabled: true }, }, - { - label: '物料代码', - field: 'itemCode', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:10, - isSearch: true - }, + { label: '是否已发送检验申请', field: 'inspectRequestFlag', @@ -660,7 +651,17 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品番', + field: 'itemCode', + sort: 'custom', + table: { + width: 150 + }, + sortTableDefault: 10, + isSearch: true + }, + { + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +670,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 9de876502..60d477a41 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -749,7 +749,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive }, }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -660,7 +660,7 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive }, }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', table: { @@ -669,15 +669,26 @@ export const PurchasereceiptRecordDetail = useCrudSchemas(reactive sortTableDefault:10, }, { - label: '物料描述1', + label: '背番', field: 'itemDesc1', sort: 'custom', table: { width: 150 }, - sortTableDefault:11, - hiddenInMain:true + sortTableDefault: 10, + isTableForm: false, + isForm: false }, + // { + // label: '物料描述1', + // field: 'itemDesc1', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:11, + // hiddenInMain:true + // }, { label: '物料描述2', field: 'itemDesc2', diff --git a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 4093efc95..d769fe1e8 100644 --- a/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -748,7 +748,7 @@ export const PurchasereceiptRequestDetail = useCrudSchemas(reactive isDetail: false, isTable: true, }, + { + label: '采购计量单位', + field: 'purchaseStdUom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', + sortTableDefault:6, + table: { + width: 150 + }, + isForm:false, + isTableForm:true, + isDetail: false, + isTable: true, + tableForm:{ + disabled:true + } + }, { label: '物料名称', field: 'itemName', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index a88ac0031..97663905e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -602,7 +602,7 @@ const searchTableSuccess = (formField, searchField, val, searchFormRef, type, ro newRow['invoicableQuantity'] = item['invoicableQuantity'] newRow['itemCode'] = item['itemCode'] newRow['itemName'] = item['itemName'] - + newRow['purchaseStdUom'] = item['purchaseStdUom'] newRow['deliveryDate'] = item['prhRcpDate'] newRow['arrivalQty'] = item['prhRcvd'] newRow['id'] = item['id'] diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 9bc43307c..80cf33539 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -1991,6 +1991,22 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive