merge

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();

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 = {

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: {},
   },

src/views/demo/onlineform/formModule/FormModal.vue

@@ -116,14 +116,16 @@ import { debug } from 'console';
 
   // 下一页
   function formNextClick() {
+<<<<<<< HEAD
     console.log('click')
     debugger;
+=======
+>>>>>>> 9cc74217da9f7a6781340e6a7c259a48abd78fea
     isNextSteps.value = true;
     isSubmitClick.value = false;
   }
   // 等待下一页的回传数据
   function setStepsCurrent(flag) {
-    console.log('setStepsCurrent',flag)
     if (flag) {
       stepsCurrent.value = 1;
       isNextSteps.value = true;

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);
             }

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,