From f4263df297d53392749750fd6b3915b392827d0a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Mon, 25 Nov 2024 15:58:27 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E9=87=8D=E7=BD=AE?= =?UTF-8?q?=E8=A1=A8=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ImportForm/src/ImportCustomerStatementForecastForm.vue | 2 ++ src/components/ImportForm/src/ImportCustomerStatementForm.vue | 2 ++ .../ImportForm/src/ImportCustomerStatementShareForm.vue | 2 ++ src/components/ImportForm/src/ImportSupplierMoldCostForm.vue | 2 ++ 4 files changed, 8 insertions(+) diff --git a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue index a9ca25e88..53f6a1892 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForecastForm.vue @@ -414,6 +414,8 @@ const submitFormError = (): void => { /** 重置表单 */ const resetForm = () => { // 重置上传状态和文件 + queryParams.customerCode = '' + queryParams.yearsMonthStr = '' formLoading.value = false uploadRef.value?.clearFiles() fileList.value = [] diff --git a/src/components/ImportForm/src/ImportCustomerStatementForm.vue b/src/components/ImportForm/src/ImportCustomerStatementForm.vue index 19c30616e..c841a6033 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementForm.vue @@ -414,6 +414,8 @@ const submitFormError = (): void => { /** 重置表单 */ const resetForm = () => { // 重置上传状态和文件 + queryParams.customerCode = '' + queryParams.yearsMonthStr = '' formLoading.value = false uploadRef.value?.clearFiles() fileList.value = [] diff --git a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue index 13b52a746..3ba51e2ff 100644 --- a/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue +++ b/src/components/ImportForm/src/ImportCustomerStatementShareForm.vue @@ -372,6 +372,8 @@ const submitFormError = (): void => { /** 重置表单 */ const resetForm = () => { // 重置上传状态和文件 + queryParams.customerCode = '' + queryParams.yearsMonthStr = '' formLoading.value = false uploadRef.value?.clearFiles() fileList.value = [] diff --git a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue index d916e4e2b..3ab3a9cb5 100644 --- a/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue +++ b/src/components/ImportForm/src/ImportSupplierMoldCostForm.vue @@ -412,6 +412,8 @@ const submitFormError = (): void => { /** 重置表单 */ const resetForm = () => { + queryParams.supplierCode = '' + queryParams.yearsMonthStr = '' // 重置上传状态和文件 formLoading.value = false uploadRef.value?.clearFiles() From a8def1bf32db795088cf16079e6f0f96ec8c1fc7 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Mon, 25 Nov 2024 16:01:20 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E6=94=B6=E8=B4=A7?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8C=85=E8=A3=85=E5=A5=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 16 +++++++++++----- src/components/Detail/src/Detail.vue | 12 +++++++++++- src/components/Table/src/Table.vue | 9 ++++++--- .../developPurchasereceiptRecordMain/index.vue | 5 +++++ .../purchasereceiptRecordMain.data.ts | 4 +++- .../purchasereceiptRecordMain/index.vue | 3 +++ .../purchasereceiptRecordMain.data.ts | 4 +++- .../toolPurchasereceiptRecordMain/index.vue | 5 +++++ .../purchasereceiptRecordMain.data.ts | 4 +++- 9 files changed, 50 insertions(+), 12 deletions(-) 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" >