From 61efaa758b3f4d030b90fe6eb8360d785b4d8c05 Mon Sep 17 00:00:00 2001
From: herenshan112 <hreenshan112@163.com>
Date: Mon, 12 May 2025 13:20:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=81=E7=A8=8B=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/lowCode/form/index.ts           |   2 +-
 src/components/formTable/index.vue      |   3 +-
 src/views/formTable/page/cardPage.vue   |  17 +-
 src/views/formTable/page/flowAndLog.vue |  51 +++++-
 src/views/formTable/pageInfo.vue        | 199 +++++++++++++++++++++++-
 src/views/lookCodePage/index.vue        |   2 +-
 6 files changed, 254 insertions(+), 20 deletions(-)

diff --git a/src/api/lowCode/form/index.ts b/src/api/lowCode/form/index.ts
index 3ade3fc..aae93e4 100644
--- a/src/api/lowCode/form/index.ts
+++ b/src/api/lowCode/form/index.ts
@@ -30,7 +30,7 @@ export function gainFormPageListCont(data: any) {
 	});
 }
 
-//多视图数据处理
+//多视图数据处理  gainFormPageListCont
 export function multiViewPage(data: any) {
 	return request({
 		url: '/systemapi/customer_form/multiViewPage',
diff --git a/src/components/formTable/index.vue b/src/components/formTable/index.vue
index 593d201..47c9b8a 100644
--- a/src/components/formTable/index.vue
+++ b/src/components/formTable/index.vue
@@ -31,7 +31,8 @@ const props = withDefaults(
 		afterResponse?: Function | string // 请求数据加载完成后数据处理方法，可对返回数据处理
 		beforeSubmit?: Function | string // 表单提交前数据处理，可对提交数据处理，新增和保存都会触发
 		afterSubmit?: Function // 表单提交后，默认提示提交结果，可return false阻止提示
-		btnClick?: (key: string) => boolean | void // 按钮点击事件
+		btnClick?: (key: string) => boolean | void // 按钮点击事件 
+		changeKeyVal?: Function; //监听表单值该表
 	}>(),
 	{
 		type: 1, // 1新增；2修改；3查看（表单模式） ；4查看； 5设计
diff --git a/src/views/formTable/page/cardPage.vue b/src/views/formTable/page/cardPage.vue
index 96d56df..fbd2fbe 100644
--- a/src/views/formTable/page/cardPage.vue
+++ b/src/views/formTable/page/cardPage.vue
@@ -742,31 +742,32 @@ const delTask = (val:any) => {
 @ 1:提交审批;2:重新申请;3:撤回;4:申请修改;5:修改;6:删除
 */
 const butIsShow = (val:any,type:number) => {
-    // console.log("判断是否显示",val)
+    console.log("判断是否显示--->type",type)
+    console.log("判断是否显示",val)
     switch (type) {
         case 7:
-            if(val.flowIsOpens == 1 && val.taskStatus == 1){
+            if(val.flowIsOpens == 1 && val.taskStatus*1 == 1){
                 return true;
             }else{
                 return false;
             }
             break;
         case 2:
-            if(val.flowIsOpens == 1 && val.taskStatus == 2){
+            if(val.flowIsOpens == 1 && val.taskStatus*1 == 2){
                 return true;
             }else{
                 return false;
             }
             break;
         case 3:
-            if(val.flowIsOpens == 1  && val.taskStatus == 3 && val.isRetract){
+            if(val.flowIsOpens == 1  && val.taskStatus*1 == 3 && val.isRetract){
                 return true;
             }else{
                 return false;
             }
             break;
         case 4:
-            if(val.flowIsOpens == 1 && val.taskStatus == 4){
+            if(val.flowIsOpens == 1 && val.taskStatus*1 == 4){
                 return true;
             }else{
                 return false;
@@ -780,7 +781,7 @@ const butIsShow = (val:any,type:number) => {
             }
             break;
         case 6:
-            if(val.flowIsOpens != 1 || (val.flowIsOpens == 1 && (val.taskStatus == 1 || val.taskStatus == 2))){
+            if(val.flowIsOpens != 1 || (val.flowIsOpens == 1 && (val.taskStatus*1 == 1 || val.taskStatus*1 == 2))){
                 return true;
             }else{
                 return false;
@@ -873,14 +874,14 @@ defineExpose({
         formTableStr =========> {{ props.formTableStr }} <br><br><br><br>
 
         tableDataList =========> {{ tableDataList }} <br><br><br><br> -->
-
         
             <el-checkbox-group v-model="pageIdAry">
                 <el-card v-for="(itval,itIndex) in tableDataList" :key="itIndex" class="taskCardBox" shadow="always" >
+
                     <table class="talbelBox">
                         <tbody>
                             
-                            <tr v-if="itval.flowIsOpen==1">
+                            <tr v-if="itval.flowIsOpens==1">
                                 <td class="cardInfoTitle">状态</td>
                                 <td class="cardInfoTitle" align="right">
                                     <el-tag  v-if="itval.taskStatus==1" type="warning">草稿</el-tag>
diff --git a/src/views/formTable/page/flowAndLog.vue b/src/views/formTable/page/flowAndLog.vue
index cb3e259..f00f34d 100644
--- a/src/views/formTable/page/flowAndLog.vue
+++ b/src/views/formTable/page/flowAndLog.vue
@@ -4,8 +4,11 @@
 @ 备注: 流程和历史记录
 -->
 <script lang='ts' setup>
-import { gainRunFlowStart,gainRunTaskFlow,startRunFlow,runTaskFlow,afreshRunWorkflow } from '@/api/lowCode/taskapi/management'
+import { gainRunFlowStart,gainRunTaskFlow,startRunFlow,runTaskFlow,afreshRunWorkflow,realTimeUpdateFlow } from '@/api/lowCode/taskapi/management'
 import squareUrl from '@/assets/image/1.png'
+
+
+
 const props = defineProps({
 	types:{
         type:Number,
@@ -114,9 +117,16 @@ const newAddPageData = () => {
         }
         
     }else{
-        console.log("获取流程==2=1=>",props.appPageInfo)
+        console.log("获取流程==2=1=>",props)
+
+    console.log("获取流程==2=2==1=>",props.appPageInfo)
+    console.log("获取流程==2=2==2=>",props.appPageInfo.runFlowId)
+    // console.log("获取流程==2=2==1=>",flowRunId)
+
         if(props.appPageInfo && props.appPageInfo.runFlowId && props.appPageInfo.runFlowId != "0" && props.appPageInfo.runFlowId != ""){
-            gainRunTaskFlow({id:props.appPageInfo.runFlowIdStr.toString()})
+            let  flowRunId = props.appPageInfo.runFlowId?props.appPageInfo.runFlowId:props.appPageInfo.runFlowIdStr?props.appPageInfo.runFlowIdStr:"0";
+            console.log("获取流程==2=2=>",flowRunId)
+            gainRunTaskFlow({id:flowRunId})
                 .then(({data})=>{
                     console.log("获取流程==2==>",data)
                     flowMap.value = data.flowList
@@ -219,21 +229,48 @@ const yesOrNo = (val:string,agreeOrRefuse:number) => {
             
 		})
 }
-
+/**
+@ 作者: 秦东
+@ 时间: 2025-05-12 10:15:03
+@ 功能: 刷新流程
+*/
+const refreshWorkFlow = (taskKey,flowFactor,nodelUserList) => {
+    console.log("获取工作流不进图-new--刷新>", props.types);
+    let gainFlowChart = {
+        id:props.stateForm.flowKey.toString(),
+        conditionList:flowFactor,
+        nodelPeople:nodelUserList,
+        oldFlow:flowMap.value
+    }
+    if(props.stateForm.flowIsTrue && props.types == 1){
+        realTimeUpdateFlow(gainFlowChart).then((data: any) => {
+            console.log("获取工作流不进图-new-->", data);
+            flowMap.value = data.data.flowList;
+            nextStep.value = data.data.nextStep;
+            currentProgress.value = data.data.Step;
+            nodeKey.value = data.data.nodeKey;
+            // // console.log("获取工作流不进图-1-->",flowMap.value)
+            flowLoading.value = false;
+        });
+    }
+    
+}
 
 defineExpose({
     runWorkFlow,
     reapplyWorkFlow,
-    rundraftWorkFlow
+    rundraftWorkFlow,
+    refreshWorkFlow
 })
 </script>
 <template>
-    <div>{{flowMap}}
+    <div>
         <el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
             <el-tab-pane v-if="flowMap&&flowMap.length > 0" label="审批流程" name="flow">
-                
+               
                 <el-steps direction="vertical" :active="currentProgress">
                     <el-step v-for="item in flowMap" :key="item.step">
+                    
                         <template #title>
                             {{ item.nodeName }}<span v-if="item.examinemode==1"> ● 依次审批</span><span v-if="item.examinemode==2"> ● 会签</span><span v-if="item.examinemode==3"> ● 或签</span>
                             <el-tooltip
diff --git a/src/views/formTable/pageInfo.vue b/src/views/formTable/pageInfo.vue
index 7c9aaac..11ae8c3 100644
--- a/src/views/formTable/pageInfo.vue
+++ b/src/views/formTable/pageInfo.vue
@@ -8,7 +8,9 @@ import { gainTaskFormInfo,gainEditDataLog,afreshRunWorkflow } from '@/api/lowCod
 import{ json2string,string2json,stringToObj } from '@/utils/lowCode/form'
 import { judgeSubmitCancel } from '@/api/lowCode/form/index'
 
-import { afreshSubmitButton,editFormCont,draftSubmitButton,submitButtonEs,submitButton } from '@/utils/lowCode/const'
+import { afreshSubmitButton,editFormCont,draftSubmitButton,submitButtonEs,submitButton,notAsA_BasisForJudgment, fixedValueControl,timeControl,timeEquation,asAnApprovalActionControl } from '@/utils/lowCode/const'
+
+import { conditionInfo,nodelPeoples } from "@/api/lowCode/taskapi/types"
 
 const props = defineProps({
 	isShow:{
@@ -44,6 +46,7 @@ const props = defineProps({
 		default:"",
     }
 });
+const nodelUserList = reactive<nodelPeoples[]>([]);
 const emits = defineEmits(["update:isShow","searchData"])
 const openPage =computed({
 	get() {
@@ -57,7 +60,9 @@ const formDesign = ref<any>();
 const flowLogPage = ref<any>(); //流程与历史记录
 const pageLog = ref<any[]>([]); //历史记录
 const loadPage = ref(false)
-
+const gainFlowChart = reactive<nodeFlow>({
+  id: "0",
+});
 
 
 /**
@@ -187,6 +192,195 @@ onMounted(()=>{
     console.log("挺挺挺挺下")
     console.log(props)
 })
+const flowFactor = reactive<conditionInfo[]>([]); //表单组件
+//组件解析
+const changeKeyVal = (key: any, val: any, type: any, attribute: any) => {
+    console.log("改变表单值--key--->",key)
+    console.log("改变表单值--val--->",val,Array.isArray(val))
+    console.log("改变表单值--type--->",type)
+    console.log("改变表单值--attribute--->",attribute)
+
+    let unitsVal = val;
+    let isUpdateFlowChart = false;
+
+
+    //单选，多选，下拉菜单
+    if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+        let isWrite = true;
+        flowFactor.forEach((item: any) => {
+        if (item.factorid == key) {
+            isWrite = false;
+
+            item.type = 3;
+            if (type == "checkbox") {
+            item.isCheckbox = true;
+            item.answers = val.map(String);
+            } else {
+            item.isCheckbox = false;
+            item.oneanswer = val.toString();
+            }
+            if (notAsA_BasisForJudgment.indexOf(type) === -1) {
+            isUpdateFlowChart = true;
+            }
+        }
+        });
+        if (isWrite) {
+        if (type == "checkbox") {
+            flowFactor.push({
+            factorid: key,
+            type: 3,
+            isCheckbox: true,
+            answers: val.map(String),
+            });
+        } else {
+            flowFactor.push({
+            factorid: key,
+            type: 3,
+            isCheckbox: false,
+            oneanswer: val.toString(),
+            });
+        }
+        isUpdateFlowChart = true;
+        }
+        // console.log("改变表单值--flowFactor--->",flowFactor)
+        
+    }
+    //时间类空间附加判断条件
+    if (
+        timeControl.indexOf(type) > -1 ||
+        fixedValueControl.indexOf(type) > -1 ||
+        type == "input"
+    ) {
+        // console.log("改变表单值--flowFactor--3->",unitsVal)
+        let addNewTime = true; //判断是否新增
+        flowFactor.forEach((item: any) => {
+        // console.log("改变表单值--flowFactor--5->",item.type)
+        if (item.type == 2) {
+            addNewTime = false;
+            // console.log("改变表单值--flowFactor--5====1->",item.type)
+            // console.log("改变表单值--flowFactor--5====3->",item.customFields,item.customFields.length)
+            if (item.customFields && item.customFields.length > 0) {
+            // console.log("改变表单值--flowFactor--5====2->",item.customFields)
+            let sunNewAdd = true;
+            item.customFields.forEach((sunItem: any) => {
+                // console.log("改变表单值--flowFactor-4->",sunItem.wordfield , key,sunItem.wordfield == key)
+                if (sunItem.wordfield == key) {
+                sunNewAdd = false;
+                isUpdateFlowChart = true;
+                if (timeEquation.indexOf(attribute) === -1) {
+                    //非区间性时间
+                    sunItem.leftval = val.toString();
+                } else {
+                    //区间性时间
+                    if (Array.isArray(val)) {
+                    if (val.length >= 2) {
+                        sunItem.leftval = val[0].toString();
+                        sunItem.rightval = val[val.length - 1].toString();
+                    }
+                    }
+                }
+                }
+            });
+            if (sunNewAdd) {
+                isUpdateFlowChart = true;
+                if (timeEquation.indexOf(attribute) === -1) {
+                //非区间性时间
+                let customFieldInfo = {
+                    wordfield: key,
+                    optType: "1",
+                    leftval: val.toString(),
+                };
+                item.customFields.push(customFieldInfo);
+                } else {
+                //区间性时间
+                if (Array.isArray(val)) {
+                    if (val.length >= 2) {
+                    let customFieldInfo = {
+                        wordfield: key,
+                        optType: "6",
+                        leftval: val[0].toString(),
+                        leftoptType: "3",
+                        rightoptType: "3",
+                        rightval: val[val.length - 1].toString(),
+                    };
+                    item.customFields.push(customFieldInfo);
+                    }
+                }
+                }
+            }
+            }
+        }
+        });
+
+        if (addNewTime) {
+        //新增自定义类数据判断
+        isUpdateFlowChart = true;
+        if (timeEquation.indexOf(attribute) === -1) {
+            //非区间性时间
+            let customFieldInfo = {
+            wordfield: key,
+            optType: "1",
+            leftval: val.toString(),
+            };
+            let condInfo = {
+            factorid: "customFields",
+            type: 2,
+            isCheckbox: false,
+            customFields: [customFieldInfo],
+            };
+            flowFactor.push(condInfo);
+        } else {
+            //区间性时间
+            if (Array.isArray(val)) {
+            if (val.length >= 2) {
+                let customFieldInfo = {
+                wordfield: key,
+                optType: "6",
+                leftval: val[0].toString(),
+                leftoptType: "3",
+                rightoptType: "3",
+                rightval: val[val.length - 1].toString(),
+                };
+                let condInfo = {
+                factorid: "customFields",
+                type: 2,
+                isCheckbox: false,
+                customFields: [customFieldInfo],
+                };
+                flowFactor.push(condInfo);
+            }
+            }
+        }
+        }
+    }
+    //操作人
+    if (asAnApprovalActionControl.indexOf(type) > -1) {
+        isUpdateFlowChart = true;
+        let isWriteUs = true;
+        nodelUserList.forEach((item: any) => {
+        if (item.factorid == key) {
+            isWriteUs = false;
+            item.userList = val;
+        }
+        });
+        if (isWriteUs) {
+        nodelUserList.push({
+            factorid: key,
+            userList: val,
+        });
+        }
+    }
+
+    console.log("改变表单值--flowFactor--->", isUpdateFlowChart);
+//更新工作流图
+    if (isUpdateFlowChart&&props.stateForm.taskKey&&props.stateForm.taskKey!="") {
+        // gainFlowChart.conditionList = flowFactor;
+        // gainFlowChart.nodelPeople = nodelUserList;
+        // gainFlowChart.id = flowMap;
+        console.log("获取工作流不进图--gainFlowChart--->",props.stateForm)
+        flowLogPage.value.refreshWorkFlow(props.stateForm.taskKey,flowFactor,nodelUserList)
+    }
+}
 </script>
 <template>
     <div class="newDrawerCont">
@@ -205,6 +399,7 @@ onMounted(()=>{
                     :is-work-flow="stateForm.flowIsTrue"
                     :app-info="props.appInfo"
                     :after-submit="afterSubmit"
+                    :change-key-val="changeKeyVal"
                 />
                 <FlowAndLog ref="flowLogPage" v-if="openPage" :types="props.stateForm.type" :app-flow-info="props.appFlowInfo" :app-info="props.appInfo" :log-list="pageLog" :app-page-info="props.appPageInfo" :state-form="props.stateForm" />
                 <!-- {{stateForm.flowIsTrue}}<br>
diff --git a/src/views/lookCodePage/index.vue b/src/views/lookCodePage/index.vue
index c3e715f..b4bf394 100644
--- a/src/views/lookCodePage/index.vue
+++ b/src/views/lookCodePage/index.vue
@@ -188,7 +188,7 @@ const afterSubmit = (type: string,val?:any) => {
             :is-work-flow="stateForm.flowIsTrue"
             :app-info="appContent"
             :after-submit="afterSubmit"
-        />{{appPageInfo}}
+        />
          <FlowAndLog v-if="lookIsShow" ref="flowLogPage"  :types="stateForm.type" :app-flow-info="appFlowInfo" :app-info="appContent" :log-list="pageLog" :app-page-info="appPageInfo" :state-form="stateForm" />
     </el-scrollbar>
 </template>