问题整改

zrch-risk-client-39/src/views/project/problemCheck/StProblemCheckList.vue

@@ -27,7 +27,7 @@
       </template>
     </BasicTable>
     <!-- 表单区域 -->
-    <StProblemCheckModal @register="registerModal" @success="handleSuccess" :bmpNodeId="1" />
+    <StProblemCheckModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
 
@@ -38,9 +38,23 @@
   import { useListPage } from '/@/hooks/system/useListPage';
   import StProblemCheckModal from './components/StProblemCheckModal.vue';
   import { columns, searchFormSchema } from './StProblemCheck.data';
-  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './StProblemCheck.api';
-  
-  
+  import { list, deleteOne, batchDelete, getImportUrl, getExportUrl,saveOrUpdate } from './StProblemCheck.api';
+
+  const props = defineProps({
+    beforeFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    currentFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    nextFlowNode: {
+      type: Object,
+      default: () => ({})
+    }
+  })
+
   //注册model
   const [registerModal, { openModal }] = useModal();
   const [registerPlanModal, { openModal: openPlanModal }] = useModal();
@@ -52,7 +66,6 @@
       columns,
       canResize: false,
       formConfig: {
-        //labelWidth: 120,
         schemas: searchFormSchema,
         autoSubmitOnEnter: true,
         showAdvancedButton: true,
@@ -60,7 +73,7 @@
         fieldMapToTime: [],
       },
       beforeFetch(params) {
-          params['id'] ="" //route.query.id
+          params['bmpNodeId'] = props.currentFlowNode.id
       },
       actionColumn: {
         width: 400,
@@ -86,7 +99,11 @@
     openModal(true, {
       isUpdate: false,
       showFooter: true,
-      bmpNodeId: route.query.bmpNodeId
+      record: {
+        bmpNodeId: props.currentFlowNode.id,
+        deployId: props.currentFlowNode.deployId,
+        bpmStatus: 1,
+      }
     });
   }
   /**
@@ -147,23 +164,10 @@
       {
         label: '启动流程',
         onClick: handleFlow.bind(null, record),
-        // ifShow: ()=> { 
-        //     if(record['bpmStatus']==null||record['bpmStatus']=='')
-        //     return  true
-        //     else return false
-        // }
+        
       },
-
-      // {
-      //   label: '整改计划',
-      //   onClick: handlePlan.bind(null, record),
-      // },
-
     ];
   }
-  /**
-   * 下拉操作栏
-   */
   function getDropDownAction(record) {
     return [
       {
@@ -180,15 +184,18 @@
     ];
   }
   
-  const formData = ref<any>({}) // 填写的表单数据
-  const refStProblemCheckFlow = ref();
-  function handleFlow(record: Recordable) {
-    formData.dataId=record.id;
-    formData.dataName='id';
-    definitionStartByDeployId(record.deployId, formData).then(res => {
-      handleSuccess();   
-    })
+  async function handleFlow(record: Recordable) {
+    //alert(JSON.stringify(props.currentFlowNode))
+    //alert(JSON.stringify(props.nextFlowNode))
+    ///alert(JSON.stringify(props.beforeFlowNode))
 
+    record['deployId'] =  props.nextFlowNode.deployId
+    record['bmpNodeId'] = props.nextFlowNode.id
+    record['bpmStatus'] = 2
+    
+    await saveOrUpdate(record,true).then(res => {
+        handleSuccess()
+    })
   }
 
 

zrch-risk-client-39/src/views/project/problemCheck/StProblemExecApprovalList.vue

@@ -25,10 +25,21 @@
   import { list} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  import { useRoute } from 'vue-router';
-  const route = useRoute();
   
-
+  const props = defineProps({
+    beforeFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    currentFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    nextFlowNode: {
+      type: Object,
+      default: () => ({})
+    }
+  })
 
   //注册model
   const [registerExecuteModal, { openModal: openExecuteModal }] = useModal();

zrch-risk-client-39/src/views/project/problemCheck/StProblemExecList.vue

@@ -25,10 +25,20 @@
   import { list} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  import { useRoute } from 'vue-router';
-  const route = useRoute();
-  
-
+  const props = defineProps({
+    beforeFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    currentFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    nextFlowNode: {
+      type: Object,
+      default: () => ({})
+    }
+  })
 
   //注册model
   const [registerExecuteModal, { openModal: openExecuteModal }] = useModal();

zrch-risk-client-39/src/views/project/problemCheck/StProblemIndex.vue

@@ -3,7 +3,8 @@
     <a-tabs v-model:activeKey="activeTab" @change="handleTabChange" style="margin-left: 16px">
       <a-tab-pane v-for="(node, index) in workflowNodes" :key="index + 1" :tab="node.name">
         <div v-if="node.formListUrl" class="tab-content">
-          <component :is="loadComponent(node.formListUrl)" />
+          <component :is="loadComponent(node.formListUrl)" 
+          :beforeFlowNode="workflowNodes[index-1]" :currentFlowNode="node" :nextFlowNode="workflowNodes[index+1]" />
         </div>
         <div v-else class="no-form">
           该节点未配置表单

zrch-risk-client-39/src/views/project/problemCheck/StProblemPlanApprovalList.vue

@@ -25,9 +25,20 @@
   import { list} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  import { useRoute } from 'vue-router';
-  const route = useRoute();
-  
+    const props = defineProps({
+    beforeFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    currentFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    nextFlowNode: {
+      type: Object,
+      default: () => ({})
+    }
+  })
 
 
   //注册model

zrch-risk-client-39/src/views/project/problemCheck/StProblemPlanList.vue

@@ -25,8 +25,22 @@
   import { list} from './StProblemCheck.api';
   import StProblemCheckExecuteModal from './components/StProblemCheckExecuteModal.vue';
 
-  import { useRoute } from 'vue-router';
-  const route = useRoute();
+
+  const props = defineProps({
+    beforeFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    currentFlowNode: {
+      type: Object,
+      default: () => ({})
+    },
+    nextFlowNode: {
+      type: Object,
+      default: () => ({})
+    }
+  })
+
   
   const [registerExecuteModal, { openModal: openExecuteModal }] = useModal();
 
@@ -45,7 +59,7 @@
         fieldMapToTime: [],
       },
       beforeFetch(params) {
-          params['id'] = route.query.id
+          params['bmpNodeId'] = props.currentFlowNode.id
       },
       actionColumn: {
         width: 200,
@@ -61,6 +75,7 @@
       record,
       isUpdate: true,
       showFooter: true,
+      nextFlowNode: props.nextFlowNode,
     });
   }
  

zrch-risk-client-39/src/views/project/problemCheck/components/StProblemCheckModal.vue

 <template>
   <BasicModal v-bind="$attrs" @register="registerModal" destroyOnClose :title="title" :width="800" @ok="handleSubmit">
-    <st-problem-check-form /> 
-    <!-- <BasicForm @register="registerForm"></BasicForm> -->
+    <BasicForm @register="registerForm"></BasicForm>
   </BasicModal>
 </template>
 
@@ -11,11 +10,11 @@
   import { BasicForm, useForm } from '/@/components/Form/index';
   import { formSchema } from '../StProblemCheck.data';
   import { saveOrUpdate } from '../StProblemCheck.api';
-  import stProblemCheckForm from './StProblemCheckForm.vue';
+
   // Emits声明
   const emit = defineEmits(['register', 'success']);
   const isUpdate = ref(true);
-  const bpmStatus = ref('');
+  const bpmFlowData = ref({});
   //表单配置
   const [registerForm, { setProps, resetFields, setFieldsValue, validate }] = useForm({
     //labelWidth: 150,
@@ -28,7 +27,7 @@
 
     //重置表单
     await resetFields();
-    bpmStatus.value = data?.bpmStatus || '';
+    bpmFlowData.value = data?.record || {};
 
     setModalProps({ confirmLoading: false, showCancelBtn: !!data?.showFooter, showOkBtn: !!data?.showFooter });
     isUpdate.value = !!data?.isUpdate;
@@ -37,7 +36,7 @@
       await setFieldsValue({
         ...data.record,
       });
-    } 
+    }
     // 隐藏底部时禁用整个表单
     setProps({ disabled: !data?.showFooter });
   });
@@ -47,9 +46,9 @@
   async function handleSubmit(v) {
     try {
       let values = await validate();
-      if (!unref(isUpdate)) {
-        values.bpmStatus = bpmStatus.value;
-      }
+      values.bpmStatus = bpmFlowData.value?.bpmStatus || '';
+      values.bmpNodeId = bpmFlowData.value?.bmpNodeId || '';
+      values.deployId = bpmFlowData.value?.deployId || '';
       setModalProps({ confirmLoading: true });
       //提交表单
       await saveOrUpdate(values, isUpdate.value);