From 967e797a3d31877ba8197cbf00dbfa1772552c09 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 29 Aug 2024 08:55:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=80=E8=BF=91=E6=94=B9=E7=9A=84?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=86=B3=E7=AD=96=E5=92=8C=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=88=B0=E4=B9=8B=E5=89=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=B8=A4=E5=A4=A9=E7=9A=84=E6=9B=B4=E6=94=B9?= =?UTF-8?q?0828=E7=9A=84=E4=B8=BA=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/qms/inspectionRecord/index.vue | 6 ++---- src/views/qms/inspectionRecord/useAddForm.vue | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/qms/inspectionRecord/index.vue b/src/views/qms/inspectionRecord/index.vue index a5b9daf2c..1c810b044 100644 --- a/src/views/qms/inspectionRecord/index.vue +++ b/src/views/qms/inspectionRecord/index.vue @@ -281,13 +281,13 @@ const buttonTableClick = async (val, row) => { // 编辑 // 评估代码值是1，接收时候，使用决策下拉列表是全部合格 if (row.estimateCode == 1) { - InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value == 1) } }) } else if (row.estimateCode == 2) { - InspectionRecordUser.allSchemas.formSchema.forEach((itemColumn) => { + InspectionRecordMain.allSchemas.formSchema.forEach((itemColumn) => { if (itemColumn.field == 'useDecision') { itemColumn.componentProps.options = useDecisionList?.filter((item) => item.value != 1) } @@ -430,9 +430,7 @@ const submitForm = async (formType, data) => { message.success(t('common.updateSuccess')) } formRef.value.dialogVisible = false - if (!data.isPublished) { handleOrderPub(rowData.value) - } // 刷新当前列表 getList() } finally { diff --git a/src/views/qms/inspectionRecord/useAddForm.vue b/src/views/qms/inspectionRecord/useAddForm.vue index b533dfcf7..c430495c8 100644 --- a/src/views/qms/inspectionRecord/useAddForm.vue +++ b/src/views/qms/inspectionRecord/useAddForm.vue @@ -140,7 +140,7 @@ const open = async (type: string, row?: any, masterParmas?: any, titleName?: any if(row.estimateCode == 1){ data.value.useDecision = '1' }else{ - data.value.useDecision =row.useDecision||'' + data.value.useDecision ='' } // 全部合格时合格数量==数量 if(data.value.useDecision == 1){ From f58e70255238a9e8f8d5367ae6548c66a1eafb7b Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Thu, 29 Aug 2024 09:40:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?HL-4981SCP=20=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E8=B4=A7=E7=94=B3=E8=AF=B7=EF=BC=8C=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=8E=E7=BB=86=E4=B8=AD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E5=A4=9A=E6=9D=A1=E6=98=8E=E7=BB=86=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E5=90=8C=E6=97=B6=E6=9F=A5=E7=9C=8B=E4=B8=8B=E9=9D=A2=E7=9A=84?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=92=8C=E8=A1=A8=E5=A4=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BasicForm/src/BasicForm.vue | 73 ++++++++++++------- .../CollectionTable/src/CollectionTable.vue | 12 ++- src/components/TableForm/src/TableForm.vue | 12 ++- src/directives/permission/clientTable.ts | 5 +- .../supplierdeliverBasicForm.vue | 1 + 5 files changed, 73 insertions(+), 30 deletions(-) diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 101d2fb3d..5c772061e 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -89,6 +89,8 @@
@@ -381,6 +384,11 @@ const props = defineProps({ type:Boolean, default:false }, + //滚动高度 + fixedScrollHieght:{ + type:Boolean, + default:false + } }) const { t } = useI18n() // 国际化 @@ -394,13 +402,24 @@ if (props.basicFormWidth) { const collectionRef = ref() const updateFullscreen = (isFullscreen) => { - formHeight.value.height = isFullscreen ? 'auto' : '60vh' - nextTick(()=>{ - tableFormRef.value?.reloadFullscreen(isFullscreen) - collectionRef.value?.reloadFullscreen(isFullscreen) + if(props.fixedScrollHieght){ + formHeight.value.height = isFullscreen ? 'auto' : '60vh' + nextTick(()=>{ + tableFormRef.value?.reloadFullscreen(isFullscreen) + collectionRef.value?.reloadFullscreen(isFullscreen) + }) + }else{ + if(isFullscreen){ + formHeight.value = { + 'max-height':'100%', + } + }else{ + formHeight.value = { + 'max-height': '60vh' + } + } - }) - + } } const dialogVisible = ref(false) // 弹窗的是否展示 @@ -417,23 +436,14 @@ const routeName = ref('') const sureDisabled = ref(false) const tabSheet = ref('TableForm') routeName.value = route.name -const formHeight = ref({ - 'max-height': '60vh' -}) +const formHeight = ref({}) + const tabChange = (item) => { tabSheet.value = item.prop } -// if(!props.tableAllSchemas||formType.value!='create'){ -// formHeight.value = { -// height:'auto' -// } -// }else{ -// formHeight.value = { -// height:'60vh' -// } -// } + // 列表-按钮 // const buttondata = [ // defaultButtons.mainListEditBtn(null), // 编辑 @@ -683,15 +693,24 @@ const open = async ( dialogTitle.value = t('action.' + type) } formType.value = type - // if(!props.tableAllSchemas||formType.value!='create'){ - // formHeight.value = { - // height:'auto' - // } - // }else{ - // formHeight.value = { - // height:'60vh' - // } - // } + + if(props.fixedScrollHieght){ + if(!props.tableAllSchemas||formType.value!='create'){ + formHeight.value = { + height:'auto' + } + }else{ + formHeight.value = { + height:'70vh' + } + } + }else{ + formHeight.value = { + 'max-height': '60vh' + } + } + + resetForm() count.value = 0 // 修改时，设置数据 diff --git a/src/components/CollectionTable/src/CollectionTable.vue b/src/components/CollectionTable/src/CollectionTable.vue index cc5a849fb..81c4c8b0d 100644 --- a/src/components/CollectionTable/src/CollectionTable.vue +++ b/src/components/CollectionTable/src/CollectionTable.vue @@ -7,7 +7,12 @@ isShowButton: false, isFullscreen:isFullscreen }" --> - + { return [] } + }, + //滚动高度 + fixedScrollHieght:{ + type:Boolean, + default:false } }) diff --git a/src/components/TableForm/src/TableForm.vue b/src/components/TableForm/src/TableForm.vue index 57dd2ceae..7f95c9ddd 100644 --- a/src/components/TableForm/src/TableForm.vue +++ b/src/components/TableForm/src/TableForm.vue @@ -7,7 +7,12 @@ isShowButton: isShowButton || isShowReduceButtonSelection, isFullscreen:isFullscreen }" --> - ) { }) app.directive('clientTableForm', (el, binding) => { nextTick(() => { - let {isShowPagination,isShowButton,isFullscreen} = binding.value + let {isShowPagination,isShowButton,isFullscreen,fixedScrollHieght} = binding.value + if(!fixedScrollHieght&&!isFullscreen){ + return + } let footerHeight = 0 let headerHeight = 0 el.offsetParent?.children?.forEach(element => { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue index 28fe2369e..5dfddba79 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverBasicForm.vue @@ -3,6 +3,7 @@