From 2f4a09b26aed48b0a06366238948606b35595acd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=A6=8D?= <1455167345@qq.com> Date: Sat, 15 Jun 2024 11:41:34 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=82=AC=E5=8A=9E=E9=99=90=E5=88=B6=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demo/workflow/task/myTask.vue | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/views/demo/workflow/task/myTask.vue b/src/views/demo/workflow/task/myTask.vue index 921c2f6b..2d35770f 100644 --- a/src/views/demo/workflow/task/myTask.vue +++ b/src/views/demo/workflow/task/myTask.vue @@ -138,7 +138,7 @@ var query = { id: record.id, }; - if (record.isStart == 1 && record.isCancel == 0) { + if (record.isFinished == 1 || record.isAgain == 1) { return createMessage.warning('重新提交和结束的流程不能催办'); } const data = await urge(query); @@ -154,6 +154,15 @@ taskId: record.id, id: record.processId, }; + // isFinished 1 结束 + // isAgain 1 重新提交 + // isStart 1表示开始处理过了 0 还没人处理过 + // isCancel 1 是否允许撤销 1 允许 0 不允许 + if (record.isFinished == 1 || record.isAgain == 1) { + return createMessage.warning('重新提交和结束的流程不能撤销'); + } else if (record.isStart != 0 && record.isCancel != 1) { + return createMessage.warning('不能撤销'); + } if (record.isStart == 0) { const data = await revoke({ id: record.id, From f1aa1ad40d186742fdc66fd848d3eca4187ebdc2 Mon Sep 17 00:00:00 2001 From: Zhufu <1176354795@qq.com> Date: Sat, 15 Jun 2024 14:28:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=BA=BF=E4=B8=8A=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E5=8F=91=E5=B8=83=E6=97=A0=E6=B3=95=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E4=B8=8B=E4=B8=80=E6=AD=A5=E9=97=AE=E9=A2=98,?= =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E4=B8=A4=E6=AC=A1log=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/demo/onlineform/formModule/FormModal.vue | 2 -- src/views/demo/onlineform/formModule/modalForm.vue | 11 ++++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/views/demo/onlineform/formModule/FormModal.vue b/src/views/demo/onlineform/formModule/FormModal.vue index d2f69252..517fb686 100644 --- a/src/views/demo/onlineform/formModule/FormModal.vue +++ b/src/views/demo/onlineform/formModule/FormModal.vue @@ -115,13 +115,11 @@ // 下一页 function formNextClick() { - console.log('click') isNextSteps.value = true; isSubmitClick.value = false; } // 等待下一页的回传数据 function setStepsCurrent(flag) { - console.log('setStepsCurrent',flag) if (flag) { stepsCurrent.value = 1; isNextSteps.value = true; diff --git a/src/views/demo/onlineform/formModule/modalForm.vue b/src/views/demo/onlineform/formModule/modalForm.vue index 4fc9c53f..374e6a57 100644 --- a/src/views/demo/onlineform/formModule/modalForm.vue +++ b/src/views/demo/onlineform/formModule/modalForm.vue @@ -111,7 +111,8 @@ // 表单选择声明 const [registerModal, { openModal }] = useModal(); // 表单ref - let formModuleRef: FormInstance | null = null; + // let formModuleRef: FormInstance | null = null; + const formModuleRef = ref() // 版本options const formVerisons = ref([]); // 上级options @@ -245,21 +246,17 @@ watch( () => props.isNextSteps, async () => { - console.log('props.isNextSteps',props.isNextSteps) if (props.isNextSteps) { // 判断数据表字段重复 - console.log('formModuleRef',formModuleRef) - if (formModuleRef) { + if (formModuleRef.value) { try { - const valid = await formModuleRef.validate(); - console.log('valid.errorFields',valid.errorFields,valid) + const valid = await formModuleRef.value.validate(); if (valid.errorFields) { emit('set-steps-current', false); } else { emit('set-steps-current', true); } } catch (error) { - console.log('error',error) if (error) { emit('set-steps-current', false); } From 9a98b02a44c65842ab1b34358a50d24b08dccfe7 Mon Sep 17 00:00:00 2001 From: helloxujingliang <3225043@qq.com> Date: Sat, 15 Jun 2024 14:33:23 +0800 Subject: [PATCH 3/3] merge --- src/components/FormViewer/index.vue | 7 ++++++- src/components/MapboxMaps/MapComponent.vue | 2 +- src/views/demo/form-design/core/formItemConfig.ts | 2 +- src/views/demo/onlineform/formdesign/form/DataObject.vue | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/components/FormViewer/index.vue b/src/components/FormViewer/index.vue index 7b8e2a7e..69fbfcd8 100644 --- a/src/components/FormViewer/index.vue +++ b/src/components/FormViewer/index.vue @@ -289,6 +289,10 @@ resetFields(); if (!disDetail) { if (props.flowFormData) { + if(props.flowFormData.mapGeom){ + props.flowFormData.MapGeom = props.flowFormData.mapGeom; + } + console.log("flowFormDataAfter",props.flowFormData); setFieldsValue(props.flowFormData); } } @@ -382,7 +386,8 @@ }); }); } - + + console.log(""); emit("getFormSuccess") } const groupRef = ref(); diff --git a/src/components/MapboxMaps/MapComponent.vue b/src/components/MapboxMaps/MapComponent.vue index 3ef95079..e1194605 100644 --- a/src/components/MapboxMaps/MapComponent.vue +++ b/src/components/MapboxMaps/MapComponent.vue @@ -613,7 +613,6 @@ drawing.value = false; } - // 清空详情图层 if(map.getSource("detailsSource")){ map.getSource("detailsSource").setData({ @@ -639,6 +638,7 @@ * [ * {id:"8448048304dofhaofh0af0q4",geom:""} * ] + * * */ const handlerDraw = (status:string,features = null, bool = false) => { let geo = { diff --git a/src/views/demo/form-design/core/formItemConfig.ts b/src/views/demo/form-design/core/formItemConfig.ts index ab7cd760..739fcad3 100644 --- a/src/views/demo/form-design/core/formItemConfig.ts +++ b/src/views/demo/form-design/core/formItemConfig.ts @@ -159,7 +159,7 @@ export const customComponents: IVFormComponent[] = [ component: 'MapGeom', label: '图斑', icon: 'bi:box-arrow-in-up-left', - field: 'MapGeom', + field: 'mapGeom', colProps: { span: 24 }, componentProps: {}, }, diff --git a/src/views/demo/onlineform/formdesign/form/DataObject.vue b/src/views/demo/onlineform/formdesign/form/DataObject.vue index a2803b89..1a559d93 100644 --- a/src/views/demo/onlineform/formdesign/form/DataObject.vue +++ b/src/views/demo/onlineform/formdesign/form/DataObject.vue @@ -91,7 +91,6 @@ keyWord: data.key, dbCode: receiceDbCode.value, }; - alert(receiceDbCode.value) return temp; }, });