diff --git a/src/components/Annex/src/Annex.vue b/src/components/Annex/src/Annex.vue index a9f8b472b..e89826f8a 100644 --- a/src/components/Annex/src/Annex.vue +++ b/src/components/Annex/src/Annex.vue @@ -4,7 +4,9 @@
+ @update:modelValue="handleAnnexSuccess" v-if="showAddBtn"/> + +
diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts index 1411a2dcf..b6c76379b 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts +++ b/src/views/wms/inventoryjobManage/scrap/scrapRecordMain/scrapRecordMain.data.ts @@ -399,6 +399,14 @@ export const ScrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建时间', field: 'createTime', diff --git a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts index c195119cc..fc5a31ada 100644 --- a/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts +++ b/src/views/wms/productionManage/productscrap/productscrapRecordMain/productscrapRecordMain.data.ts @@ -298,6 +298,14 @@ export const ProductscrapRecordMain = useCrudSchemas( // } } }, + { + label: '关联单据号', + field: 'relateRecordNumber', + sort: 'custom', + table: { + width: 150 + }, + }, { label: '创建者', field: 'creator', diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts index 406aeb737..ee80b26df 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/demandforecastingMain.data.ts @@ -76,7 +76,7 @@ export const Supplier1 = useCrudSchemas(reactive([ export const Version = useCrudSchemas(reactive([ { label: '供应商代码', - field: 'supplerCodes', + field: 'supplierCodes', sort: 'custom', isSearch:true, }, diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts index 3a5bb522d..de8ce0f18 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts @@ -15,7 +15,7 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive { tableColumns.value = val @@ -790,6 +791,7 @@ const openDetail = (row: any, titleName: any, titleValue: any) => { .get(CACHE_KEY.DEPT) .find((account) => account.id == row.departmentCode)?.name if (departmentCode) row.departmentCode = JSON.parse(JSON.stringify(departmentCode)) + annexInspectionDetail.value.hiddenDelete = row.status==8 //HL-5838质检明细-删除按钮只有status=8隐藏,其他都展示 detailRef.value.openDetail(row, titleName, titleValue, 'requestSupplierdeliverMain') } //添加/修改操作