diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index b6f833d52..5b4eaff32 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -393,7 +393,13 @@ const props = defineProps({ fixedScrollHieght:{ type:Boolean, default:false - } + }, + // 默认不显示包装号,采购收货记录显示包装号 + isShowPackNumber:{ + type: Boolean, + required: false, + default: false + }, }) const { t } = useI18n() // 国际化 @@ -444,7 +450,7 @@ const tabSheet = ref('TableForm') routeName.value = route.name const formHeight = ref({}) -if (!wsCache.get('ShowPackingNumber')) { +if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) { if (formSchema.value) { formSchema.value = formSchema.value.filter(item => item.field != 'packingNumber' && item.field != 'fromPackingNumber') } @@ -845,7 +851,7 @@ const submitForm = async () => { // 主子表——提交请求 try { const data = unref(formRef)?.formModel - if (!wsCache.get('ShowPackingNumber') ) { + if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) { data.packingNumber='' data.fromPackingNumber='' } @@ -857,7 +863,7 @@ const submitForm = async () => { // 编辑 try { const data = unref(formRef)?.formModel - if (!wsCache.get('ShowPackingNumber') ) { + if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) { data.packingNumber='' data.fromPackingNumber='' } @@ -874,7 +880,7 @@ const submitForm = async () => { try { const data = unref(formRef)?.formModel // 清空包装号 - if (!wsCache.get('ShowPackingNumber') ) { + if (!wsCache.get('ShowPackingNumber') && !props.isShowPackNumber) { data.packingNumber='' data.fromPackingNumber='' } diff --git a/src/components/Detail/src/Detail.vue b/src/components/Detail/src/Detail.vue index ff144bc90..6392c5519 100644 --- a/src/components/Detail/src/Detail.vue +++ b/src/components/Detail/src/Detail.vue @@ -62,6 +62,8 @@ v-model:pageSize="tableObjectRef.pageSize" v-model:currentPage="tableObjectRef.currentPage" v-model:sort="tableObjectRef.sort" + :isShowPackNumber="isShowPackNumber" + > @@ -73,6 +75,7 @@ @changeTabs="changeTabs" :buttondataTable="buttondataTable" @tableFormButton="tableFormButton" + :isShowPackNumber="true" /> @@ -86,6 +89,7 @@ :isShowButton="false" :isShowReduceButton="false" :isShowFooterButtton="false" + :isShowPackNumber="true" /> @@ -99,6 +103,7 @@ :isShowButton="false" :isShowReduceButton="false" :isShowFooterButtton="false" + :isShowPackNumber="true" /> width: 150 }, sortTableDefault:15, - hiddenInMain:true + hiddenInMain: true, + isForm: false, + isTable:false }, { label: '到包装号', diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue index 760b90a1b..44b2ca51a 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRecordMain/index.vue @@ -35,6 +35,7 @@ v-model:pageSize="tableObject.pageSize" v-model:currentPage="tableObject.currentPage" v-model:sort="tableObject.sort" + :isShowPackNumber="true" >