@lambo-design/workflow-approve 1.0.0-beta.4 → 1.0.0-beta.40

package/src/portrait.vue

@@ -4,72 +4,121 @@
       {{ title }}
     </template>
     <template slot="page-extend">
-      <Button type="primary" ghost @click="pageGoBack">返回</Button>
+      <slot name="return-button"></slot>
     </template>
-    <div class="portrait-lambo-indicator-card" :style="{float: 'left', width: isExpanded ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
+    <div class="portrait-lambo-indicator-card"
+         :style="{float: 'left', width: isExpanded && showProcessInfo ? `calc(100% - ${portraitWidth+10}px)` : '99%'}">
       <slot name="business-content">
       </slot>
     </div>
 
-    <a @click="isExpanded = !isExpanded" class="arrow-button-container" :style="{right: isExpanded ? portraitWidth+10 + 'px' : '10px'}">
+    <a v-if="showProcessInfo" @click="isExpanded = !isExpanded" class="arrow-button-container"
+       :style="{right: isExpanded ? portraitWidth+10 + 'px' : '10px'}">
       <Icon class="icon-class" v-if="isExpanded" type="ios-arrow-forward"/>
       <Icon class="icon-class" v-if="!isExpanded" type="ios-arrow-back"/>
     </a>
-    <transition name="draw" @before-enter="beforeFlowInfoEnter" @enter="flowInfoEnter"
+    <transition v-if="showProcessInfo" name="draw" @before-enter="beforeFlowInfoEnter" @enter="flowInfoEnter"
                 @before-leave="beforeFlowInfoLeave" @leave="flowInfoLeave">
-      <lamboIndicatorCard  v-if="isExpanded" class="portrait-lambo-indicator-card" :style="{width: portraitWidth + 'px', float: 'right'}" :hasExtend="false">
+      <lamboIndicatorCard v-if="isExpanded" class="portrait-lambo-indicator-card"
+                          :style="{width: portraitWidth + 'px', float: 'right'}" :hasExtend="false">
         <div slot="content-title">流程信息</div>
-        <a @click="auditShow = !auditShow">
-          <Title v-if="!handleButtons || handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile')">
+        <a v-if="!isDetail" @click="auditShow = !auditShow">
+          <Title
+            v-if="handleButtons && (handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile'))">
             <a style="color: #989898">
-              <Icon v-if="auditShow" type="ios-arrow-down"/>
-              <Icon v-if="!auditShow" type="ios-arrow-up"/>
-              审批信息
+            <Icon v-if="auditShow" type="ios-arrow-down"/>
+            <Icon v-if="!auditShow" type="ios-arrow-up"/>
+            {{ handleName }}信息
             </a>
           </Title>
         </a>
-        <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
+        <transition v-if="!isDetail" name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave"
+                    @leave="leave">
           <div class="box" v-show="auditShow">
             <Form ref="auditOpinion" justify="center" :label-width="100" :model="form"
-                  v-if="!handleButtons || handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile')"
+                  v-if="handleButtons && handleButtons.includes('auditOpinion')"
                   style="margin: 10px 0 0 10px;" :rules="ruleValidate">
-              <FormItem label="审批意见：" prop="auditOpinion" >
-                <AuditOpinion v-model="form.auditOpinion" :attachmentFile="handleButtons.includes('attachmentFile')" :attachmentdata="fileList"
+              <FormItem :label="auditOpinionTitle" prop="auditOpinion">
+                <AuditOpinion v-model="form.auditOpinion" :attachment-file="handleButtons.includes('attachmentFile')"
+                              :attachmentdata="fileList" :default-audit-opinion="defaultAuditOpinion"
                               :smart-flow-server-context="smartFlowServerContext"></AuditOpinion>
               </FormItem>
             </Form>
+            <Form ref="auditOpinion" justify="center" :label-width="100"
+                  v-if="handleButtons && !handleButtons.includes('auditOpinion') && handleButtons.includes('attachmentFile')"
+                  style="margin: 10px 0 0 10px;">
+              <FormItem style="min-height: 70px">
+                <Tooltip placement="bottom" max-width="200">
+                  <div style="font-size: smaller" slot="content">支持扩展名：.pdf .doc .docx .txt .xls .xlsx .jpg .jpeg
+                    .png .gif
+                  </div>
+                  <UploadFile @upload-result="uploadFile" :multiple="true"
+                              :oss-server-context="smartFlowServerContext"
+                              :oss-file-put-url="ossFilePutUrl"></UploadFile>
+                </Tooltip>
+              </FormItem>
+            </Form>
+          </div>
+        </transition>
+        <a v-if="taskNode && isDetail && hisAuditOpinion[0].auditOpinion" @click="auditShow = !auditShow">
+          <Title
+            v-if="handleButtons && (handleButtons.includes('auditOpinion') || handleButtons.includes('attachmentFile'))">
+            <a style="color: #989898">
+            <Icon v-if="auditShow" type="ios-arrow-down"/>
+            <Icon v-if="!auditShow" type="ios-arrow-up"/>
+            {{ handleName }}信息
+            </a>
+          </Title>
+        </a>
+        <transition v-if="taskNode && isDetail && hisAuditOpinion[0].auditOpinion" name="draw" @before-enter="beforeEnter"
+                    @enter="enter" @before-leave="beforeLeave" @leave="leave">
+          <div class="box" v-show="auditShow">
+            <Form ref="auditOpinion" justify="center" :model="form"
+                  v-if="handleButtons && handleButtons.includes('auditOpinion')"
+                  style="margin: 10px 0 0 10px;" :rules="ruleValidate">
+              <FormItem style="margin-left: -60px">
+                <Card v-for="(item, index) in hisAuditOpinion" :key="index">
+                  <Row>
+                    <Col span="12" style="word-wrap: break-word">{{ item.auditOpinion }}</Col>
+                    <Col span="2"></Col>
+                    <Col span="10">{{ item.auditTime }}</Col>
+                  </Row>
+                </Card>
+              </FormItem>
+            </Form>
           </div>
         </transition>
         <a @click="historyShow = !historyShow">
-          <Title v-if="!handleButtons || handleButtons.includes('auditHistory')">
+          <Title v-if="handleButtons && handleButtons.includes('auditHistory')">
             <a style="color: #989898">
-              <Icon v-if="historyShow" type="ios-arrow-down"/>
-              <Icon v-if="!historyShow" type="ios-arrow-up"/>
-              审批记录
+            <Icon v-if="historyShow" type="ios-arrow-down"/>
+            <Icon v-if="!historyShow" type="ios-arrow-up"/>
+            {{ handleName }}记录
             </a>
           </Title>
         </a>
         <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
           <div class="box" v-show="historyShow">
-            <Card class="process-history" dis-hover :bordered="false"
-                  v-if="!handleButtons || handleButtons.includes('auditHistory')">
-              <processHistory :portrait-width="portraitWidth" :list="processHistory"
+            <Card class="process-history" :style="processHistoryHeight" dis-hover :bordered="false"
+                  v-if="handleButtons && handleButtons.includes('auditHistory')">
+              <processHistory :portrait-width="portraitWidth" :list="processHistory" :done-page="isDetail" :push-button="pushButton"
                               :smart-flow-server-context="smartFlowServerContext"></processHistory>
             </Card>
           </div>
         </transition>
 
         <a @click="attachListShow = !attachListShow">
-          <Title v-if="(!handleButtons || handleButtons.includes('attachmentFile')) && attachmentList.length > 0">
+          <Title v-if="handleButtons && handleButtons.includes('attachmentFile') && attachmentList.length > 0">
             <a style="color: #989898">
-              <Icon v-if="attachListShow" type="ios-arrow-down"/>
-              <Icon v-if="!attachListShow" type="ios-arrow-up"/>
-              查看附件
+            <Icon v-if="attachListShow" type="ios-arrow-down"/>
+            <Icon v-if="!attachListShow" type="ios-arrow-up"/>
+            查看附件
             </a>
           </Title>
         </a>
         <transition name="draw" @before-enter="beforeEnter" @enter="enter" @before-leave="beforeLeave" @leave="leave">
-          <div class="box" v-show="(!handleButtons || handleButtons.includes('attachmentFile')) && attachmentList.length > 0 && attachListShow">
+          <div class="box"
+               v-show="handleButtons && handleButtons.includes('auditHistory') && attachmentList.length > 0 && attachListShow">
             <div v-for="(item, index) in attachmentList" :key="index">
               <Card dis-hover class="attach-card">
                 <List item-layout="vertical">
@@ -77,16 +126,25 @@
                     <Row style="display: flex; align-items: center;">
                       <!-- 左边：图片 -->
                       <Col span="4" style="margin-top: -25px">
-                        <avatar v-if="item.fileType === 'image'" icon="ios-image-outline" class="attach-avatar" style="background-color: #005aff" :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
+                        <avatar v-if="item.fileType === 'image'" icon="ios-image-outline" class="attach-avatar"
+                                style="background-color: #005aff"
+                                :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
                                 :size="portraitWidth >= 600 ? 'middle' : 'small'"></avatar>
-                        <avatar v-else-if="item.fileType === 'doc'" icon="ios-document-outline" class="attach-avatar" style="background-color: #005aff" :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
+                        <avatar v-else-if="item.fileType === 'doc'" icon="ios-document-outline" class="attach-avatar"
+                                style="background-color: #005aff"
+                                :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
                                 :size="portraitWidth >= 600 ? 'middle' : 'small'">
                         </avatar>
-                        <avatar v-else-if="item.fileType === 'xlsx'" icon="ios-document-outline" class="attach-avatar" style="background-color: #19be6b" :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
+                        <avatar v-else-if="item.fileType === 'xlsx'" icon="ios-document-outline" class="attach-avatar"
+                                style="background-color: #19be6b"
+                                :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
                                 :size="portraitWidth >= 600 ? 'middle' : 'small'"></avatar>
-                        <avatar v-else-if="item.fileType === 'pdf'" icon="ios-document-outline" class="attach-avatar" style="background-color: #ed4014" :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
+                        <avatar v-else-if="item.fileType === 'pdf'" icon="ios-document-outline" class="attach-avatar"
+                                style="background-color: #ed4014"
+                                :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
                                 :size="portraitWidth >= 600 ? 'middle' : 'small'"></avatar>
-                        <avatar v-else icon="ios-document-outline" class="attach-avatar" :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
+                        <avatar v-else icon="ios-document-outline" class="attach-avatar"
+                                :style="portraitWidth >= 600 ? 'margin-left: 10px' : ''"
                                 :size="portraitWidth >= 600 ? 'middle' : 'small'"></avatar>
                       </Col>
                       <!-- 右边：附件信息 -->
@@ -122,59 +180,145 @@
           </div>
         </transition>
         <Modal title="查看附件" v-model="modalVisible" fullscreen scrollable :mask="false">
-          <img :src="imageUrl" v-if="modalVisible"  alt="" style="width: 100%">
+          <img :src="imageUrl" v-if="modalVisible" alt="" style="width: 100%">
           <div slot="footer">
             <Button type="primary" @click="modalVisible = false">关闭</Button>
           </div>
         </Modal>
         <Modal title="查看附件" v-model="modalDocx" fullscreen scrollable :mask="false">
-          <div ref="file" ></div>
-        </Modal>
-        <Modal v-model="modal1" title="选择节点"
-               @on-cancel="cancel"
-               @on-ok="ok">
-          <Table border
-                 :data="allNode"
-                 :columns="nodeColumn"
-                 highlight-row
-                 @on-current-change="selectNode">
-          </Table>
-        </Modal>
-        <assigneeBox ref="assigneeHelpBox" :executionCompleted="executionCompleted" @update-selected="handleSelectedUser"
-                     :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext" :upms-server-context="upmsServerContext"/>
-        <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
-          <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
-                          :procId="process.procId"
-                          :tableData="process.tableData" :hisAudit="hisAudit"
-                          :smart-flow-server-context="smartFlowServerContext">
-          </Workflow_Diagram>
+          <div ref="file"></div>
         </Modal>
       </lamboIndicatorCard>
     </transition>
+
+    <Modal v-model="modal1" title="选择节点"
+           @on-cancel="cancel"
+           @on-ok="doPass">
+      <Table border
+             :data="allNode"
+             :columns="nodeColumn"
+             highlight-row
+             @on-current-change="selectNode">
+      </Table>
+    </Modal>
+    <assigneeBox ref="assigneeHelpBox" :execution-completed="executionCompleted"
+                 @update-selected="handleSelectedUser" @update-next-node-assignee="updateNextNodeAssignee"
+                 :data="assigneeBoxData" :smart-flow-server-context="smartFlowServerContext"
+                 :upms-server-context="upmsServerContext"/>
+    <Modal v-model="modalBoxShow" width="1000" title="流程跟踪图">
+      <Workflow_Diagram ref="processTrace" :instanceId="process.instanceId" :applyId="process.applyId"
+                        :procId="process.procId" :table-columns="diagramTableColumns"
+                        :tableData="process.tableData" :hisAudit="hisAudit" :approve-detail-show-way="approveDetailShowWay"
+                        :smart-flow-server-context="smartFlowServerContext">
+      </Workflow_Diagram>
+    </Modal>
+    <Modal v-model="appointBoxShow" title="下一环节设置"
+           @on-cancel="appointBoxShow = false" width="600"
+           @on-ok="appointOk">
+      <Card v-for="(item,index) of nextNodesFormList" :key="index" style="margin-bottom: 10px"
+            v-if="handleButtons && (handleButtons.includes('appointHandler') || handleButtons.includes('appointTimeoutTime'))">
+        <Form ref="appointBox" justify="center" :label-width="100" :model="item"
+              style="margin: 10px 0 0 10px;" :rules="ruleValidate">
+          <div v-if="handleButtons && handleButtons.includes('appointHandler')">
+            <FormItem label="下一环节：">
+              {{ item.name }}
+            </FormItem>
+            <FormItem label="人员类型：" v-if="!item.isMultiInstance">
+              <RadioGroup v-model="item.actionType">
+                <Radio label="ASSIGNEE">办理人</Radio>
+                <Radio label="CAND">候选人</Radio>
+              </RadioGroup>
+            </FormItem>
+            <FormItem label="办理人员：" prop="assignee" v-if="!item.isMultiInstance && item.actionType === 'ASSIGNEE'">
+              <Input v-model="item.assigneeName"
+                     placeholder="请选择办理人"
+                     style="width: 68%"
+                     icon="md-apps"
+                     @on-focus="readingRangeClick(item)"
+                     @on-click="readingRangeClick(item)"/>
+            </FormItem>
+            <FormItem label="候选人员：" prop="candidateGroups" v-if="!item.isMultiInstance && item.actionType === 'CAND'">
+              <Input v-model="item.candidateNames"
+                     placeholder="请选择候选人"
+                     style="width: 68%"
+                     icon="md-apps"
+                     @on-focus="candidateGroupsReadingRangeClick(item)"
+                     @on-click="candidateGroupsReadingRangeClick(item)"/>
+            </FormItem>
+            <FormItem label="候选人员："  v-if="item.isMultiInstance && item.actionType === 'CAND'">
+            </FormItem>
+            <countersingersBox style="margin-bottom: 10px" v-model="item.candidateNames" v-if="item.isMultiInstance && item.actionType === 'CAND'"
+                               :item="item" :permScope="permScope" @update-cand-groups="updateCandGroups"  :upms-server-context="upmsServerContext" :smart-flow-server-context="smartFlowServerContext"/>
+          </div>
+          <div v-if="handleButtons && handleButtons.includes('appointTimeoutTime')">
+            <Row>
+              <Col span="12">
+                <FormItem label="停留时间：">
+                  <Input v-model="item.remainDay" style="width: 100px" type="number" :min="0"></Input>
+                  天
+                </FormItem>
+              </Col>
+              <Col span="12">
+                <FormItem>
+                  <Input v-model="item.remainTime" style="margin-left: -140px; width: 100px" type="number"
+                         :min="0"></Input>
+                  小时 自动处理
+                </FormItem>
+              </Col>
+            </Row>
+            <Row>
+              <Col span="12">
+                <FormItem label="任务提前：">
+                  <Input v-model="item.inAdvanceDay" style="width: 100px" type="number" :min="0"></Input>
+                  天
+                </FormItem>
+              </Col>
+              <Col span="12">
+                <FormItem>
+                  <Input v-model="item.inAdvanceTime" style="margin-left: -140px;width: 100px" type="number"
+                         :min="0"></Input>
+                  小时 标红预警
+                </FormItem>
+              </Col>
+            </Row>
+            <FormItem label="处理方式：">
+              <Select v-model="item.processing" style="width:200px" placeholder="自动同意">
+                <Option v-for="item in handleTypeList" :value="item.value" :key="item.value">
+                  {{ item.label }}
+                </Option>
+              </Select>
+            </FormItem>
+          </div>
+        </Form>
+      </Card>
+    </Modal>
+    <candidateGroupsHelpBox ref="candidateGroupsHelpBox" :show="candidateGroupsHelpBoxShow" @update-cand-groups="updateCandGroups"
+                            :upms-server-context="upmsServerContext" :smart-flow-server-context="smartFlowServerContext"/>
     <template slot="page-footer">
       <div>
         <slot name="footer-button"></slot>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo70')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo70') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('70')">驳回到原点
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo40')"
-                :disabled="disable" :loading="loading" @click="audit('40')">驳回到上一级
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo40') && !isDetail"
+                :disabled="disable" :loading="loading" @click="audit('40')">驳回上一节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo90')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo90') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('90')">驳回指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo80')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo80') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('80')">跳转指定节点
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo82')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo82') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('82')">指定他人处理
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo50')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo50') && !isDetail"
                 :disabled="disable" :loading="loading" @click="audit('50')">直接结束流程
         </Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('processTrace')"
-                @click="processPrint" >流程跟踪图</Button>
-        <Button style="margin-left: 10px;" v-if="!handleButtons || handleButtons.includes('auditTo30')"
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('processTrace')"
+                @click="processPrint">流程跟踪图
+        </Button>
+        <Button style="margin-left: 10px;" v-if="handleButtons && handleButtons.includes('auditTo30') && !isDetail"
                 :disabled="disable" :loading="loading" type="primary" @click="audit('30')">通过
         </Button>
       </div>
@@ -188,14 +332,17 @@ import LamboPageContainer from '@lambo-design/page-container'
 import LamboIndicatorCard from '@lambo-design/indicator-card'
 import Workflow_Diagram from './workflow-diagram'
 import ajax from "@lambo-design/shared/utils/ajax";
-import { operateBtn } from '@lambo-design/shared/utils/assist';
 import bus from '@lambo-design/shared/utils/bus';
 import Title from "./components/title";
 import processHistory from "./components/history";
 import assigneeBox from "./components/assignee-box";
+import CandidateGroupsHelpBox from "./components/candidate-groups-box";
+import CountersingersBox from "./components/countersigners-box"
 import LamboPagingTable from "@lambo-design/paging-table";
 import AuditOpinion from "./components/opinion";
 import axios from "axios";
+import UploadFile from "@lambo-design/upload-file";
+import {timestampToTime} from "@lambo-design/shared/utils/date";
 
 // 引入docx-preview插件
 let docx = require('docx-preview');
@@ -203,6 +350,11 @@ let docx = require('docx-preview');
 
 export default {
   props: {
+    isDetail: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     width: {
       type: Number,
       required: false,
@@ -220,6 +372,39 @@ export default {
       type: String,
       required: true,
     },
+    taskId: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    auditGroup: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    defaultAuditOpinion: {
+      type: String,
+      required: false,
+      default: '',
+    },
+    //详情页催办按钮
+    pushButton: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    //流程跟踪图附件列
+    showAttachmentFile: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
+    //流程跟踪图审批详情触发方式
+    approveDetailShowWay: {
+      type: String,
+      required: false,
+      default: 'click',
+    },
     //业务表单保存方法
     businessFormSave: {
       type: Function,
@@ -229,8 +414,9 @@ export default {
     executionCompleted: {
       type: Function,
       required: false,
+      default: () => {}
     },
-    title:{
+    title: {
       type: String,
       default: "流程办理"
     },
@@ -251,11 +437,15 @@ export default {
     assigneeBox,
     LamboPagingTable,
     AuditOpinion,
-    LamboIndicatorCard
+    LamboIndicatorCard,
+    UploadFile,
+    CandidateGroupsHelpBox,
+    CountersingersBox
   },
   data() {
     return {
       isExpanded: true,
+      showProcessInfo: true,
       portraitWidth: 0,
       requestSuccessCodes: [200, "200"],
       auditShow: true,
@@ -272,10 +462,20 @@ export default {
       auditParams: {},
       modal1: false,
       modalBoxShow: false,
+      candidateGroupsHelpBoxShow: false,
+      appointBoxShow: false,
+      autoOpenNode: '0',
+      nextNodesOldSettings: [],
+      nextNodesFormList: [],
       hisNode: [],
       processHistory: [],
+      permScope: '',
+      organTreeType: '00',
+      defaultOrganTreeType: '00',
       ruleValidate: {
-        auditOpinion: [{required: true, trigger: "blur", message: "审批意见不能为空"}]
+        auditOpinion: [{required: true, trigger: "blur", message: '意见不能为空'}],
+        assignee: [{required: true, trigger: "blur", message: "办理人不能为空"}],
+        candidateGroups: [{required: true, trigger: "blur", message: "候选人不能为空"}],
       },
       form: {
         auditOpinion: '',
@@ -283,14 +483,22 @@ export default {
       loading: false,
       disable: false,
       instanceId: '',
-      taskId: '',
+      curTaskId: '',
       handleButtons: [],
+      handleName: '',
+      auditOpinionTitle: '',
       auditResult: '',
+      curAuditGroup: '',
       custChange: 'auditInfo',
       auditInfo: "auditInfo",
       auditProcess: "auditProcess",
       fileList: [],
+      ossFilePutUrl: '/manage/oss/file/put',
       hisAudit: [],
+      hisAuditOpinion: [{
+        auditOpinion: '',
+        auditTime: '',
+      }],
       datas: {
         orgName: "",
         orgId: ""
@@ -307,26 +515,58 @@ export default {
         procId: ''
       },
       handleButtonsNames: {
-        '30': '同意',
-        '70': '驳回原点',
+        '30': '通过',
+        '70': '驳回到原点',
         '40': '驳回上一节点',
         '90': '驳回指定节点',
         '80': '跳转指定节点',
-        '82': '转办',
-        '50': '人工终止'
+        '82': '指定他人处理',
+        '50': '直接结束流程'
       },
+      handleTypeList: [
+        {
+          value: '00',
+          label: '只预警不处理'
+        },
+        {
+          value: '10',
+          label: '自动同意'
+        },
+        {
+          value: '20',
+          label: '直接终止流程'
+        },
+        {
+          value: '90',
+          label: '自动驳回'
+        }
+      ],
     }
 
   },
 
   mounted() {
     this.getWidth()
-    if (this.procId){
+    if (this.procId) {
       this.initData()
     }
 
   },
   computed: {
+    processHistoryHeight() {
+      let str = '';
+      const hasAuditOpinion = this.taskNode && this.handleButtons && this.handleButtons.includes('auditOpinion')
+      const hasAttachmentFile = this.handleButtons && this.handleButtons.includes('auditHistory') && this.attachmentList.length > 0
+      const isDetail = this.isDetail && !this.hisAuditOpinion[0].auditOpinion.length > 0
+      if (hasAuditOpinion && !hasAttachmentFile && !isDetail) {
+        str += "height: 43vh"
+      } else if (hasAuditOpinion && hasAttachmentFile && !isDetail) {
+        str += "height: 40vh"
+      } else {
+        str += "height: 67vh"
+      }
+      return str;
+    },
     nodeColumn: function () {
       let column = []
       column.push({title: '序号', type: 'index', width: 70, align: 'center', fixed: 'left'});
@@ -349,7 +589,7 @@ export default {
                 props: {
                   color: '#ff9900'
                 }
-              }, '未审批')
+              }, `未${params.row.handleName ? params.row.handleName : '审批'}`)
             ])
           } else {
             if (params.row.auditResult == '30' && params.row.taskNode != this.taskNode) {
@@ -358,7 +598,7 @@ export default {
                   props: {
                     color: '#19be6b'
                   }
-                }, '已审批通过')
+                }, `已${params.row.handleName ? params.row.handleName : '审批'}通过`)
               ])
             } else if (params.row.auditResult == '40' && params.row.taskNode != this.taskNode) {
               return h('div', [
@@ -384,7 +624,7 @@ export default {
                   }
                 }, '已跳转到指定节点')
               ])
-            } else if (params.row.auditResult == '80' && params.row.taskNode != this.taskNode) {
+            } else if (params.row.auditResult == '90' && params.row.taskNode != this.taskNode) {
               return h('div', [
                 h('tag', {
                   props: {
@@ -419,7 +659,116 @@ export default {
       })
       return column
     },
+    diagramTableColumns: function () {
+      let column = []
+      column.push({title: '序号', type: 'index', width: 60});
+      column.push({title: `${this.handleName}节点`, key: 'taskName', minWidth: 130})
+      column.push({title: `${this.handleName}人`, key: 'auditName', minWidth: 150, tooltip: true})
+      column.push({
+        title: `${this.handleName}结果`, key: 'auditResult', minWidth: 150, align: 'center',
+        render: (h, {row, column, index}) => {
+          let label = "";
+          let tagColor = "";
+          if (row.auditResult == '00'){
+            label = '流程发起';
+            tagColor = 'green'; // 绿色
+          }
+          else if (row.auditResult == '30'){
+            label = '通过';
+            tagColor = 'green'; // 绿色
+          }
+          else if (row.auditResult == '40'){
+            label = '驳回到上一级';
+            tagColor = 'volcano'; // 火红色
+          }
+          else if (row.auditResult == '50'){
+            label = '驳回到原点';
+            tagColor = 'red'; // 红色
+          }
+          else if (row.auditResult == '51'){
+            label = '流程终止';
+            tagColor = 'purple'; // 紫色
+          }
+          else if (row.auditResult == '60'){
+            label = '撤回';
+            tagColor = 'blue'; // 蓝色
+          }
+          else if (row.auditResult == '80'){
+            label = '跳转到指定节点';
+            tagColor = 'cyan'; // 青色
+          }
+          else if (row.auditResult == '90'){
+            label = '驳回到指定节点';
+            tagColor = 'magenta'; // 品红色
+          }
+          else{
+            label = '待审核';
+            tagColor = 'orange'; // 默认橙色
+          }
+          return h('Tag', {
+            props: {
+              color: tagColor,
+              value: row.auditResult
+            }
+          }, label);
+        }
+      })
+      column.push({
+        title: `${this.handleName}时间`, key: 'auditTime', minWidth: 150,
+        render: (h, {row}) => {
+          const displayDate = row.startDate || row.auditDate;
+          return h('span', displayDate);
+        }
+      })
+      column.push({
+        title: `${this.handleName}意见`, key: 'auditComment', minWidth: 180, tooltip: true,
+        render: (h, {row, column, index}) => {
+          let label = "";
+          if (row.auditComment == '' || row.auditComment == null) label = '无';
+          else label = row.auditComment;
+          return h('Label', {
+            props: {
+              value: row.auditComment
+            }
+          }, label)
+        }
+      })
+      if (this.showAttachmentFile){
+        column.push({
+          title: `附件`, key: 'fileList', minWidth: 200,
+          render: (h, { row }) => {
+            if (!row.fileList || row.fileList.length === 0) {
+              return h('span', '无');  // 如果没有附件，显示“无”
+            }
+
+            //显示所有附件
+            return h('div', row.fileList.map(file => {
+              return h('a', {
+                style: {
+                  display: 'block',
+                  marginTop: '5px',
+                  marginRight:'5px',
+                  whiteSpace: 'nowrap',
+                  overflow: 'hidden',
+                  textOverflow: 'ellipsis',
+                  maxWidth: '100px',
+                },
+                attrs: {
+                  title: file.attachName  // 鼠标悬停时显示完整名称
+                },
+                on: {
+                  click: () => {
+                    this.getAttach(file);
+                  }
+                },
+              }, file.attachName);
+            }));
+          }
+        })
+      }
 
+      return column
+    },
   },
   provide() {
     return {
@@ -433,50 +782,105 @@ export default {
       }
       this.portraitWidth = this.width
     },
-    initData(){
-      this.getAttachList()
-      this.getTaskId()
+    initData() {
+      if (!this.isDetail) {
+        this.getTodoTask()
+      } else {
+        this.getDoneTask()
+      }
       this.getHandleButtons()
-      this.getHisAudit();
-      this.getProcessHistory();
     },
-    saveBusinessForm() {
-      this.businessFormSave(() => {
+    getTodoTask() {
+      const self = this
+      let param = {
+        procId: this.procId,
+        applyId: this.applyId,
+        taskNode: this.taskNode,
+        taskId: this.taskId,
+        auditGroup: this.auditGroup
+      }
+      ajax.get(self.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (resp) {
+        if (resp.data.code === '200') {
+          self.curTaskId = resp.data.data.rows[0].taskId
+          self.instanceId = resp.data.data.rows[0].procInstanceId
+          self.curAuditGroup = resp.data.data.rows[0].auditGroup
+          let procType = resp.data.data.rows[0].procType
+          ajax.get(self.smartFlowServerContext + "/manage/processType/lists?proType=" + procType)
+            .then(resp => {
+              let data = resp.data.data.rows
+              self.permScope = data[0].permScope
+              self.defaultOrganTreeType = data[0].organTreeType ? data[0].organTreeType : '00'
+              self.getNodeOrganTreeType(procType)
+            }).catch(err => {
+            console.log(err);
+          })
+          self.getAttachList(self.curTaskId)
+          self.getHisAudit(self.curTaskId);
+          self.getProcessHistory(self.curTaskId);
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch((err) => {
+        console.log(err)
       })
     },
-    getAttachList() {
+    getNodeOrganTreeType(procType){
       const self = this
-      const param = {
+      let param = {
+        procType: procType,
         procId: this.procId,
-        applyId: this.applyId
+        taskNode: this.taskNode
       }
-      ajax.get(self.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
-        self.attachmentList = resp.data.data.rows
-        self.attachmentList.forEach(item => {
-          const index = item.fileName.lastIndexOf(".")
-          const fileType = item.fileName.substr(index + 1).toLowerCase()
-          const imageList = ['jpg', 'gif', 'png', 'svg']
-          const docList = ['doc', 'docx']
-          const zipList = ['rar', 'zip']
-          const typeList = ['jpg', 'gif', 'png', 'docx']
-          item.fileType = imageList.indexOf(fileType) !== -1 ? 'image' : docList.indexOf(fileType) !== -1 ? 'doc' : zipList.indexOf(fileType) !== -1 ? 'zip' : fileType
-          item.showPreview = typeList.indexOf(fileType) !== -1
-        })
-      }).catch(err => {
-        console.log(err);
+      ajax.get(self.smartFlowServerContext + "/manage/processTodo/getNodeOrganTreeType", {params: param}).then(function (resp) {
+        if (resp.data.code === '200') {
+          self.organTreeType = resp.data.data ? resp.data.data : self.defaultOrganTreeType
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch((err) => {
+        console.log(err)
       })
     },
-    getTaskId() {
+    getDoneTask() {
       const self = this
       let param = {
         procId: this.procId,
         applyId: this.applyId,
-        taskNode:this.taskNode
+        taskNode: this.taskNode,
+        taskId: this.taskId,
+        auditGroup: this.auditGroup
       }
-      ajax.get(self.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (resp) {
+      ajax.get(self.smartFlowServerContext + "/manage/processDone/getDoneDetail", {params: param}).then(function (resp) {
         if (resp.data.code === '200') {
-          self.taskId = resp.data.data.rows[0].taskId
-          self.instanceId = resp.data.data.rows[0].procInstanceId
+          let rows = resp.data.data.rows
+          if (rows.length > 0) {
+            self.curAuditGroup = rows[0].auditGroup
+            self.hisAuditOpinion = []
+            let taskList = resp.data.data.rows
+            taskList.forEach(item => {
+              self.hisAuditOpinion.push({
+                auditOpinion: item.auditComment,
+                auditTime: timestampToTime(item.auditDate)
+              })
+            })
+            self.curTaskId = taskList[0].taskId
+            self.instanceId = taskList[0].procInstanceId
+          } else {
+            ajax.get(self.smartFlowServerContext + "/manage/processTodo/list", {params: param}).then(function (todoResp) {
+              if (todoResp.data.code === '200') {
+                self.curTaskId = todoResp.data.data.rows[0].taskId
+                self.instanceId = todoResp.data.data.rows[0].procInstanceId
+                self.curAuditGroup = todoResp.data.data.rows[0].auditGroup
+              } else {
+                self.$Message.error(todoResp.data.message)
+              }
+            }).catch((err) => {
+              console.log(err)
+            })
+          }
+          self.getAttachList(self.curTaskId)
+          self.getHisAudit(self.curTaskId);
+          self.getProcessHistory(self.curTaskId);
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -493,6 +897,11 @@ export default {
       ajax.post(self.smartFlowServerContext + '/manage/approvalCenter/getNodeData', param).then(function (resp) {
         if (resp.data.code === '200') {
           self.handleButtons = resp.data.data[0].handleButtons
+          self.handleName = resp.data.data[0].handleName ? resp.data.data[0].handleName : '审批'
+          self.auditOpinionTitle = resp.data.data[0].handleName ? resp.data.data[0].handleName + '意见' : '审批意见'
+          if (!self.handleButtons || (!self.handleButtons.includes('auditOpinion') && !self.handleButtons.includes('attachmentFile') && !self.handleButtons.includes('auditHistory'))){
+            self.showProcessInfo = false
+          }
         } else {
           self.$Message.error(resp.data.message)
         }
@@ -500,33 +909,212 @@ export default {
         console.log(err)
       })
     },
-    handleSaveResult(saveResult) {
-      if (saveResult) {
-        this.executeButtonAction((execResult, instanceId, taskId) => {
-          if (this.executionCompleted) {
-            this.executionCompleted(execResult, instanceId, taskId);
+    getNextNodes(){
+      const self = this
+      self.nextNodesFormList = []
+      self.nextNodesOldSettings = []
+      let param = {
+        procId: this.procId,
+        taskNode: this.taskNode
+      }
+      ajax.post(self.smartFlowServerContext + '/manage/processTodo/getNextNodes', param).then(function (resp) {
+        if (resp.data.code === '200') {
+          let nextNodeForm = {}
+          let nextNodeOldForm = {}
+          let data = resp.data.data
+          for (let i = 0; i < data.length; i++) {
+            nextNodeOldForm = {
+              id: data[i].id,
+              assignee: data[i].assignee ? data[i].assignee.id : '',
+              timeLimit: data[i].timeLimit,
+            }
+            nextNodeForm = {
+              id: data[i].id,
+              name: data[i].name,
+              orgTreeType: data[i].orgTreeType,
+              assignee: data[i].assignee ? data[i].assignee.id : '',
+              assigneeName: data[i].assignee ? data[i].assignee.name : '',
+              candidateGroups: '',
+              isMultiInstance: data[i].isMultiInstance,
+              actionType: 'ASSIGNEE',
+              remainDay : 0,
+              remainTime : 0,
+              inAdvanceDay : 0,
+              inAdvanceTime : 0,
+              processing : '00'
+            }
+            //显示具体候选人信息
+            if (data[i].candidateGroups){
+              nextNodeForm.actionType = 'CAND'
+              let names = [];
+              let candidates = {};
+              for (let groupName in data[i].candidateGroups) {
+                if (data[i].candidateGroups.hasOwnProperty(groupName)) {
+                  let group = data[i].candidateGroups[groupName];
+                  group.forEach(item => {
+                    names.push(item.name);
+                  });
+                  candidates[groupName] = group.map(item => item.id + ':' + item.name).join(',');
+                }
+              }
+              nextNodeForm.candidateNames = names.join(',');
+              nextNodeForm.candidates = candidates;
+              nextNodeOldForm.candidates = candidates;
+            }
+            if (data[i].timeLimit) {
+              let expireTime = data[i].timeLimit.split(";")[0].split(":")[1]
+              let warningTime = data[i].timeLimit.split(";")[1].split(":")[1]
+              let handleType = data[i].timeLimit.split(";")[2].split(":")[1]
+              let days = expireTime.slice(0, expireTime.indexOf("D")) //过期天
+              let hourOfDay = expireTime.slice(expireTime.indexOf("D") + 1, expireTime.indexOf("H")) //过期小时
+              let daysWarn = warningTime.slice(0, warningTime.indexOf("D")) //警告天
+              let hourOfDayWarn = warningTime.slice(warningTime.indexOf("D") + 1, warningTime.indexOf("H")) //警告小时
+              nextNodeForm.remainDay = parseInt(days)
+              nextNodeForm.remainTime = parseInt(hourOfDay)
+              nextNodeForm.inAdvanceDay = parseInt(daysWarn)
+              nextNodeForm.inAdvanceTime = parseInt(hourOfDayWarn)
+              nextNodeForm.processing = handleType
+            }
+            self.nextNodesFormList.push(nextNodeForm)
+            self.nextNodesOldSettings.push(nextNodeOldForm)
           }
-        });
+        } else {
+          self.$Message.error(resp.data.message)
+        }
+      }).catch((err) => {
+        console.log(err)
+      })
+    },
+    getAttachList(taskId) {
+      const self = this
+      const param = {
+        taskId: taskId,
+        procId: this.procId,
+        applyId: this.applyId
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processDone/getAttachmentList', {params: param}).then(function (resp) {
+        self.attachmentList = resp.data.data.rows
+        self.attachmentList.forEach(item => {
+          const index = item.fileName.lastIndexOf(".")
+          const fileType = item.fileName.substr(index + 1).toLowerCase()
+          const imageList = ['jpg', 'gif', 'png', 'svg']
+          const docList = ['doc', 'docx']
+          const zipList = ['rar', 'zip']
+          const typeList = ['jpg', 'gif', 'png', 'docx']
+          item.fileType = imageList.indexOf(fileType) !== -1 ? 'image' : docList.indexOf(fileType) !== -1 ? 'doc' : zipList.indexOf(fileType) !== -1 ? 'zip' : fileType
+          item.showPreview = typeList.indexOf(fileType) !== -1
+        })
+      }).catch(err => {
+        console.log(err);
+      })
+    },
+    getHisAudit(taskId) {
+      let self = this
+      let params = {
+        applyId: self.applyId,
+        instanceId: self.instanceId,
+        procId: self.procId,
+        taskId: taskId
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getHisAudit', {params: params}).then(function (resp) {
+        if (resp.data.code === '200') {
+          self.hisAudit = resp.data.data
+          let uniqueDataMap = {};
+          self.hisAudit.forEach((item) => {
+            uniqueDataMap[item["taskNode"]] = item;
+          })
+          self.hisNode = Object.values(uniqueDataMap);
+
+        }
+      })
+    },
+    getProcessHistory(taskId) {
+      let self = this
+      let params = {
+        applyId: self.applyId,
+        instanceId: self.instanceId,
+        procId: self.procId,
+        taskId: taskId
+      }
+      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
+        if (resp.data.code === '200') {
+          self.processHistory = resp.data.data
+        }
+      })
+    },
+
+    audit: function (auditResult) {
+      let self = this
+      self.auditResult = auditResult
+      self.submit()
+    },
+    submit() {
+      let self = this;
+      self.auditParams = {
+        procId: self.procId,
+        applyId: self.applyId,
+        taskId: self.curTaskId,
+        auditOpinion: self.form.auditOpinion,
+        fileListStr: JSON.stringify(self.fileList),
+        auditResult: self.auditResult,
+        params: JSON.stringify(self.datas),
+        targetTaskNode: self.targetTaskNode,
+        selectedUserId: self.selectedUserId,
+      }
+      if (self.auditResult == '' || self.auditResult == null) {
+        self.$Message.error(`请选择${self.handleName}结果！`);
+        return;
+      }
+      if (self.form.auditOpinion == '' || self.form.auditOpinion == null) {
+        if (!self.handleButtons || self.handleButtons.includes('auditOpinion')) {
+          self.$Message.error(`请输入${self.handleName}意见！`)
+          return;
+        } else {
+          self.auditParams.auditOpinion = self.handleButtonsNames[self.auditResult];
+        }
+      }
+      self.businessFormSave ? self.businessFormSave(self.handleSaveResult) : self.handleSaveResult(true)
+    },
+    handleSaveResult(saveResult, businessParams) {
+      if (saveResult) {
+        this.executeButtonAction(businessParams);
       } else {
         console.error('保存失败');
       }
     },
-    executeButtonAction(callback) {
+    executeButtonAction(businessParams) {
       const self = this;
-      if (self.auditResult == '82') {
+      if (businessParams) {
+        Object.assign(self.datas, businessParams)
+        self.auditParams.params = JSON.stringify(self.datas)
+      }
+      let auditResult = {
+        code: self.auditResult,
+        name: self.handleButtonsNames[self.auditResult]
+      }
+      if (self.auditResult === '82') {
         self.assigneeBoxData = self.auditParams
-        self.$refs.assigneeHelpBox.toggleShowHelpBox();
-      } else if (self.auditResult == '80') {
+        self.assigneeBoxData.auditResultName = self.handleButtonsNames[self.auditResult]
+        self.assigneeBoxData.instanceId = self.instanceId
+        self.$refs.assigneeHelpBox.toggleShowHelpBox(self.organTreeType, '', 'transferCurTask')
+      } else if (self.auditResult === '80') {
         self.getNodesBehind()
-      } else if (self.auditResult == '90') {
+      } else if (self.auditResult === '90') {
         self.getAllPreNodes()
-      } else if (self.auditResult == '40') {
+      } else if (self.auditResult === '40') {
         self.loading = true
         self.disable = true
         let url = self.smartFlowServerContext + '/manage/processTodo/getPreNode'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
-          if (result.code == '30010') {
+          if (result.code == '30013' || result.code == '30014') {
+            //前序节点为子流程或当前节点为子流程第一个节点不可驳回上一级节点
+            self.$Message.warning(result.message)
+            //避免未提示消息直接回调
+            setTimeout(() => {
+              self.executionCompleted(false, null, null, auditResult, self.curTaskId);
+            }, 1000)
+          } else if (result.code == '30010') {
             self.$Modal.confirm({
               title: "提示",
               content: result.message,
@@ -540,13 +1128,17 @@ export default {
                     self.disable = false
                     self.$Message.success(result.message);
                     //后端没有返回数据
-                    callback(true, null, null);
+                    setTimeout(() => {
+                      self.executionCompleted(true, null, null, auditResult, self.curTaskId);
+                    }, 1000)
                     bus.$emit('triggerTimer')
                   } else {
                     self.loading = false
                     self.disable = false
                     self.$Message.error(result.message)
-                    callback(false, null, null);
+                    setTimeout(() => {
+                      self.executionCompleted(false, null, null, auditResult, self.curTaskId);
+                    }, 1000)
                   }
                   bus.$emit('triggerTimer')
                 })
@@ -556,6 +1148,14 @@ export default {
                 self.disable = false
               }
             })
+          } else if (result.code == '10012') {
+            // 数据同步
+            self.loading = false
+            self.disable = false
+            self.$Message.warning(result.message)
+            setTimeout(() => {
+              self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+            }, 1000)
           } else {
             self.loading = true
             self.disable = true
@@ -566,51 +1166,92 @@ export default {
                 self.loading = false
                 self.disable = false
                 self.$Message.success(result.message);
-                if (result.data){
-                  callback(true, result.data.processInstanceId, result.data.id)
-                }else {
-                  callback(true, null, null)
-                }
+                setTimeout(() => {
+                  if (result.data) {
+                    let taskIds = result.data.map(item => item.id).join(',');
+                    self.executionCompleted(true, result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+                  } else {
+                    self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+                  }
+                }, 1000)
               } else {
                 self.loading = false
                 self.disable = false
                 self.$Message.error(result.message)
-                callback(false, null, null);
+                setTimeout(() => {
+                  self.executionCompleted(false, null, null, auditResult, self.curTaskId);
+                }, 1000)
               }
               bus.$emit('triggerTimer')
             })
           }
         })
+      } else {
+        if (self.auditResult === '30' && (!self.handleButtons || self.handleButtons.includes('appointHandler') || self.handleButtons.includes('appointTimeoutTime'))){
+          self.getNextNodes()
+          self.appointBoxShow = true
+        } else {
+          self.doPass()
+        }
+      }
+    },
+    doPass(){
+      let self = this;
+      this.modal = false
+      let auditResult = {
+        code: self.auditResult,
+        name: self.handleButtonsNames[self.auditResult]
+      }
+      if (self.auditResult === '82' && (self.targetTaskNode == '' || self.targetTaskNode == null)) {
+        self.auditResult = '';
+        self.$Message.error(`请选择${self.handleName}节点！`);
       } else {
         self.loading = true
         self.disable = true
+        self.auditParams.targetTaskNode = self.targetTaskNode
         let url = self.smartFlowServerContext + '/manage/processTodo/audit'
         ajax.post(url, self.auditParams).then(function (resp) {
           let result = resp.data
           if (result.code == '200') {
             self.loading = false
             self.disable = false
+            self.$Message.success(result.message ? result.message : `${self.handleName}成功`);
             if (result.data){
-              callback(true, result.data.processInstanceId, result.data.id)
-            }else {
-              callback(true, null, null)
+              let taskIds = result.data.id ? result.data.id : result.data.map(item => item.id).join(',');
+              setTimeout(() => {
+                self.executionCompleted(true, result.data.id ? result.data.processInstanceId : result.data[0].processInstanceId, taskIds, auditResult, self.curTaskId)
+              }, 1000)
+            } else {
+              setTimeout(() => {
+                self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+              }, 1000)
             }
-            self.$Message.success(result.message);
+          } else if (result.code == '10012') {
+            // 数据同步
+            self.loading = false
+            self.disable = false
+            self.$Message.warning(result.message)
+            setTimeout(() => {
+              self.executionCompleted(true, null, null, auditResult, self.curTaskId)
+            }, 1000)
           } else if (result.code == '20002') {
             // 流程结束
             self.loading = false
             self.disable = false
-            callback(true, null, null)
             self.$Message.success(result.message)
+            setTimeout(() => {
+              self.executionCompleted(true, '流程已结束', '流程已结束', auditResult, self.curTaskId)
+            }, 1000)
           } else {
             self.loading = false
             self.disable = false
-            callback(false, null, null)
-            self.$Message.error(result.message)
+            self.$Message.error(result.message ? result.message : `${self.handleName}失败`)
+            setTimeout(() => {
+              self.executionCompleted(false, null, null, auditResult, self.curTaskId)
+            }, 1000)
           }
           bus.$emit('triggerTimer')
         })
-
       }
     },
 
@@ -620,11 +1261,6 @@ export default {
     tabsChange(tab) {
       console.log(tab)
     },
-    audit: function (auditResult) {
-      let self = this
-      self.auditResult = auditResult
-      self.submit()
-    },
     getAttach(row) {
       window.open(this.smartFlowServerContext + "/manage/oss/file/get/" + row.fileId, "_blank");
     },
@@ -666,35 +1302,6 @@ export default {
       this.imageUrl = url;
       this.modalVisible = true;
     },
-    submit() {
-      let self = this;
-
-      self.auditParams = {
-        procId: self.procId,
-        applyId: self.applyId,
-        taskId: self.taskId,
-        auditOpinion: self.form.auditOpinion,
-        fileListStr: JSON.stringify(self.fileList),
-        auditResult: self.auditResult,
-        params: JSON.stringify(self.datas),
-        targetTaskNode: self.targetTaskNode,
-        selectedUserId: self.selectedUserId,
-      }
-      if (self.auditResult == '' || self.auditResult == null) {
-        self.$Message.error("请选择审批结果！");
-        return;
-      }
-      if (self.form.auditOpinion == '' || self.form.auditOpinion == null) {
-        if (!self.handleButtons || self.handleButtons.includes('auditOpinion')) {
-          self.$Message.error("请输入审批意见！")
-          return;
-        } else {
-          self.auditParams.auditOpinion = self.handleButtonsNames[self.auditResult];
-        }
-      }
-
-      self.businessFormSave ? self.businessFormSave(self.handleSaveResult) : self.handleSaveResult(true)
-    },
 
     //打印流程图信息
     processPrint() {
@@ -703,7 +1310,7 @@ export default {
         applyId: self.applyId,
         instanceId: self.instanceId,
         procId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getPrintData', {params: params}).then(function (resp) {
         let result = resp.data.data
@@ -720,31 +1327,6 @@ export default {
       })
     },
 
-    pageGoBack() {
-      bus.$emit('triggerTimer')
-      window.history.back()
-    },
-
-    getHisAudit() {
-      let self = this
-      let params = {
-        applyId: self.applyId,
-        instanceId: self.instanceId,
-        procId: self.procId,
-        taskId: self.taskId
-      }
-      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getHisAudit', {params: params}).then(function (resp) {
-        if (resp.data.code === '200') {
-          self.hisAudit = resp.data.data
-          let uniqueDataMap = {};
-          self.hisAudit.forEach((item) => {
-            uniqueDataMap[item["taskNode"]] = item;
-          })
-          self.hisNode = Object.values(uniqueDataMap);
-
-        }
-      })
-    },
     showTaskNode(taskId) {
       if (this.processHistory.length > 0) {
         let task = null
@@ -756,70 +1338,10 @@ export default {
       }
       return ''
     },
-    getProcessHistory() {
-      let self = this
-      let params = {
-        applyId: self.applyId,
-        instanceId: self.instanceId,
-        procId: self.procId,
-        taskId: self.taskId
-      }
-      ajax.get(self.smartFlowServerContext + '/manage/processTodo/getProcessHis', {params: params}).then(function (resp) {
-        if (resp.data.code === '200') {
-          self.processHistory = resp.data.data
-        }
-      })
-    },
     cancel() {
       this.modal = false
       this.auditResult = '';
     },
-    ok() {
-      this.modal = false
-      if (this.targetTaskNode == '' || this.targetTaskNode == null) {
-        this.auditResult = '';
-        this.$Message.error("请选择审批节点！");
-      } else {
-        let self = this;
-
-        self.auditParams = {
-          procId: self.procId,
-          applyId: self.applyId,
-          taskId: self.taskId,
-          auditOpinion: self.form.auditOpinion,
-          fileListStr: JSON.stringify(self.fileList),
-          auditResult: self.auditResult,
-          params: JSON.stringify(self.datas),
-          targetTaskNode: self.targetTaskNode,
-          selectedUserId: self.selectedUserId,
-        }
-        self.loading = true
-        self.disable = true
-
-        let url = self.smartFlowServerContext + '/manage/processTodo/audit'
-        ajax.post(url, self.auditParams).then(function (resp) {
-          let result = resp.data
-          if (result.code === '200') {
-            setTimeout(() => {
-              self.loading = false
-              self.disable = false
-              self.$Message.success("审批成功");
-              if (self.executionCompleted) {
-                self.executionCompleted(true, result.data.processInstanceId, result.data.id);
-              }
-              bus.$emit('triggerTimer')
-            }, 500)
-          } else {
-            self.loading = false
-            self.disable = false
-            self.$Message.error(result.message)
-            if (self.executionCompleted) {
-              self.executionCompleted(false, null, null);
-            }
-          }
-        })
-      }
-    },
     selectNode(currentRow, oldCurrentRow) {
       let self = this
       self.targetTaskNode = currentRow.taskNode
@@ -828,14 +1350,14 @@ export default {
       let self = this
       let params = {
         processDefId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getAllPreNodes', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
-          if (resp.data.data.length > 0){
+          if (resp.data.data.length > 0) {
             self.allNode = resp.data.data
             self.modal1 = true
-          }else {
+          } else {
             self.$Message.warning('当前流程无前序节点')
           }
         } else {
@@ -847,14 +1369,14 @@ export default {
       let self = this
       let params = {
         processDefId: self.procId,
-        taskId: self.taskId,
+        taskId: self.curTaskId,
       }
       ajax.get(self.smartFlowServerContext + '/manage/processTodo/getNodesBehind', {params: params}).then(function (resp) {
         if (resp.data.code === '200') {
-          if (resp.data.data.length > 0){
+          if (resp.data.data.length > 0) {
             self.allNode = resp.data.data
             self.modal1 = true
-          }else {
+          } else {
             self.$Message.warning('当前流程无后续节点')
           }
         } else {
@@ -906,6 +1428,111 @@ export default {
       el.style.transform = 'translateX(100%)';
       el.addEventListener('transitionend', done);
     },
+    uploadFile(file) {
+      const self = this;
+      self.fileList = []
+      file.forEach(item => {
+        self.fileList.push({
+          fileName: item.fileName,
+          fileId: item.fileCode,
+        });
+      })
+    },
+
+    appointOk() {
+      const self = this
+      let oldSettings
+      let params = this.nextNodesFormList.reduce((acc, item) => {
+        acc[item.id] = {
+          needUpdate: 'false',
+        }
+        item.assignee ? acc[item.id].assignee = item.assignee : ''
+        item.candidateGroups ? acc[item.id].candidateGroup = item.candidateGroups : ''
+        let timeLimit = 'expireTime:0D0H;warningTime:0D0H;handleType:00'
+        if(!(item.remainDay === 0 && item.remainTime === 0 && item.inAdvanceDay === 0 && item.inAdvanceTime === 0)) {
+          timeLimit = 'expireTime:' + parseInt(item.remainDay) + "D" + parseInt(item.remainTime) + "H" + ";warningTime:" + parseInt(item.inAdvanceDay) + "D" + parseInt(item.inAdvanceTime) + "H;" + "handleType:" + item.processing;
+          acc[item.id].timeLimit = timeLimit
+        } else {
+          acc[item.id].timeLimit = ''
+        }
+        oldSettings = self.nextNodesOldSettings.filter(oldSetting => oldSetting.id === item.id)[0]
+        if (oldSettings.assignee !== item.assignee || self.checkGroupsUpdate(oldSettings.candidates, item.candidateGroups) || self.checkTimeLimitUpdate(oldSettings.timeLimit, timeLimit)) {
+          acc[item.id].needUpdate = 'true'
+        }
+        return acc;
+      }, {});
+      self.auditParams.nodeConfigMaps = JSON.stringify(params)
+      self.doPass((execResult, instanceId, taskIds, auditResult, curTaskId) => {
+        if (this.executionCompleted) {
+          this.executionCompleted(execResult, instanceId, taskIds, auditResult, curTaskId);
+        }
+      })
+    },
+    checkGroupsUpdate(oldSetting, newSetting) {
+      if (oldSetting && newSetting) {
+        let oldIdList = []
+        for (let [key, value] of Object.entries(oldSetting)) {
+          if (value) {
+            value.split(',').forEach(part => {
+              const [id] = part.split(':');
+              if (id) {
+                oldIdList.push(id);
+              }
+            })
+          }
+        }
+        const regex = /(?:O:|U:|P:|R:|T:)([^,]+)/g;
+        let match;
+        const newIds = [];
+        while ((match = regex.exec(newSetting)) !== null) {
+          newIds.push(...match[1].split(';'))
+        }
+        const allInString = oldIdList.every(item => newIds.includes(item));
+        const hasExtra = newIds.some(item => !oldIdList.includes(item));
+        return !allInString || hasExtra
+      }
+      return false
+    },
+    checkTimeLimitUpdate(oldSetting, newSetting){
+      if (oldSetting && newSetting){
+        return oldSetting !== newSetting
+      }
+      if (!oldSetting){
+        return newSetting !== 'expireTime:0D0H;warningTime:0D0H;handleType:00'
+      }
+      return false
+    },
+    readingRangeClick(item) {
+      let permScope = item.orgTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
+      this.$refs.assigneeHelpBox.toggleShowHelpBox(orgTreeType, permScope, 'transferNextTask', item.id)
+    },
+    candidateGroupsReadingRangeClick(item) {
+      let permScope = item.orgTreeType === this.defaultOrganTreeType ? this.permScope : 'all'
+      let orgTreeType = item.orgTreeType ? item.orgTreeType : this.defaultOrganTreeType
+      this.$refs.candidateGroupsHelpBox.toggleShowHelpBox(permScope, item.candidates, orgTreeType, item.id);
+    },
+    updateCandGroups(newCandGroups, nameStr, detail, nodeId){
+      let oldSettings = this.nextNodesOldSettings.filter(item => item.id === nodeId)[0]
+      if (JSON.stringify(oldSettings.candidates) != JSON.stringify(detail)) {
+        let node = this.nextNodesFormList.filter(item => item.id === nodeId)[0]
+        node.candidateGroups = newCandGroups
+        node.candidateNames = nameStr
+        node.candidates = detail
+        node.needUpdate = true
+        this.$forceUpdate();
+      }
+    },
+    updateNextNodeAssignee(selectedAssigneeId, selectedAssigneeName, nodeId){
+      let oldSettings = this.nextNodesOldSettings.filter(item => item.id === nodeId)[0]
+      if (oldSettings.assignee != selectedAssigneeId) {
+        let node = this.nextNodesFormList.filter(item => item.id === nodeId)[0]
+        node.assignee = selectedAssigneeId
+        node.assigneeName = selectedAssigneeName
+        node.needUpdate = true
+        this.$forceUpdate();
+      }
+    }
   },
   watch: {
     auditOpinionText(label) {
@@ -921,14 +1548,17 @@ export default {
 
 <style lang="less" scoped>
 @import "./styles/css/index.less";
+
 /deep/ .ivu-table-row-highlight td {
   background-color: #50c1ff !important;
   color: #fff !important;
 }
-/deep/ .ivu-card-body{
+
+/deep/ .ivu-card-body {
   padding: 10px;
 }
-.page-info /deep/ .page-body{
+
+.page-info /deep/ .page-body {
   overflow-y: hidden;
 }
 </style>