diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index efa872f7e..6c05afbc7 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -255,12 +255,32 @@ const props = defineProps({ default: ()=>({ hidden:false, label: '附件', + prop:'File', showDownload:false, showPreview:false, hiddenDelete:false }) }, - + //展示备注组件的tab标签 + remarksAlias: { + type: Object, + required: false, + default: ()=>({ + hidden:false, + label: '备注', + prop:'Remarks' + }) + }, + //展示变更记录组件的tab标签 + changeRecordAlias: { + type: Object, + required: false, + default: ()=>({ + hidden:false, + label: '变更记录', + prop:'ChangeRecord' + }) + }, // 是否是基础数据 展现详情顶部表单 isBasic: { type: Boolean, @@ -517,25 +537,17 @@ if(props.slotDetailTabList){ } -let otherList = [...filterPermissionAnnexTable(),{ - label:props.annexAlias.label, - prop:'Annex' - },{ - label:'备注', - prop:'Remarks' - },{ - label:'变更记录', - prop:'ChangeRecord' -}] -if(props.annexAlias.hidden){ - otherList = [...filterPermissionAnnexTable(),{ - label:'备注', - prop:'Remarks' - },{ - label:'变更记录', - prop:'ChangeRecord' - }] +let otherList = [...filterPermissionAnnexTable()] +if (!props.annexAlias.hidden) { + otherList.push(props.annexAlias) +} +if (!props.remarksAlias.hidden) { + otherList.push(props.remarksAlias) } +if (!props.changeRecordAlias.hidden) { + otherList.push(props.changeRecordAlias) +} + tabsList.value = [...tabsList?.value,...otherList] if (!tabsList.value || tabsList.value && tabsList.value.length == otherList.length) { diff --git a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue index 7f96ca3aa..531ead548 100644 --- a/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/areabasic/index.vue @@ -53,7 +53,7 @@ /> - + @@ -82,6 +82,33 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(Area.allSchemas.tableColumns) +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} + //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue index b61d793c0..99fd42e3b 100644 --- a/src/views/wms/basicDataManage/factoryModeling/dock/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/dock/index.vue @@ -52,7 +52,7 @@ /> - + @@ -82,7 +82,32 @@ const route = useRoute() //路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Dock.allSchemas.tableColumns) - +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/factoryModeling/location/index.vue b/src/views/wms/basicDataManage/factoryModeling/location/index.vue index 16020175b..664be1170 100644 --- a/src/views/wms/basicDataManage/factoryModeling/location/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/location/index.vue @@ -51,7 +51,7 @@ /> - + @@ -80,7 +80,32 @@ const route = useRoute() //路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Location.allSchemas.tableColumns) - +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue index c79b4177e..1366d6bab 100644 --- a/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/locationgroup/index.vue @@ -51,7 +51,7 @@ /> - + @@ -79,7 +79,32 @@ const route = useRoute() //路由信息 const routeName = ref() routeName.value = route.name const tableColumns = ref(Locationgroup.allSchemas.tableColumns) - +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue index 43f193711..32af2cdf2 100644 --- a/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue +++ b/src/views/wms/basicDataManage/factoryModeling/warehouse/index.vue @@ -50,7 +50,7 @@ /> - + @@ -79,6 +79,33 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(Warehouse.allSchemas.tableColumns) +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias = ref({}) +console.log(99,routeName.value) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue index 9e815585c..6037ec1dc 100644 --- a/src/views/wms/basicDataManage/itemManage/itempackage/index.vue +++ b/src/views/wms/basicDataManage/itemManage/itempackage/index.vue @@ -57,7 +57,7 @@ /> - + item.field!='action') + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } } // 字段设置 更新主列表字段 const updataTableColumns = (val) => { diff --git a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue index e9d244170..1976de2c4 100644 --- a/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/purchaseprice/index.vue @@ -51,7 +51,7 @@ /> - + { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue index 2a1e44627..39522d698 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplier/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplier/index.vue @@ -50,7 +50,7 @@ /> - + @@ -79,6 +79,32 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(Supplier.allSchemas.tableColumns) +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} //字段设置 更新主列表字段 const updataTableColumns = (val) => { tableColumns.value = val diff --git a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue index 819c3db83..951cc7519 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplierCycle/index.vue @@ -66,7 +66,7 @@ :isBusiness="false" /> - + @@ -94,6 +94,20 @@ const routeName = ref() routeName.value = route.name const tableColumns = ref(SupplierCycle.allSchemas.tableColumns) +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', +} +remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' +} + // 查询页面返回 const searchTableSuccess = (formField, searchField, val, formRef) => { nextTick(() => { diff --git a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue index 4e5861a98..9dc9b43fb 100644 --- a/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue +++ b/src/views/wms/basicDataManage/supplierManage/supplieritem/index.vue @@ -51,7 +51,7 @@ /> - + @@ -82,6 +82,33 @@ const tableColumns = ref(Supplieritem.allSchemas.tableColumns) // if(routeName.value.includes('SCP')){ // tableColumns.value = tableColumns.value.filter(item=>item.field!='action') // } +// 隐藏备注和附件 +const annexAlias =ref({}) +const remarksAlias =ref({}) +if (routeName.value.includes('SCP')) { + annexAlias.value = { + hidden:true, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:true, + label: '备注', + prop:'Remarks' + } +} else { + annexAlias.value = { + hidden:false, + label: '附件', + prop:'File', + } + remarksAlias.value = { + hidden:false, + label: '备注', + prop:'Remarks' + } +} + //字段设置 更新主列表字段 const updataTableColumns = (val) => { // if(routeName.value.includes('SCP')){