n20-common-lib 2.9.13 → 2.9.14

package/src/components/ApprovalButtons/index.vue

@@ -1,7 +1,33 @@
 /* 审批按钮组 */
 <template>
   <div :class="prefixCls">
-    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '10em'">
+    <!-- 自定义项 -->
+    <ExpandablePane
+      v-if="taskId && showBtn && authList.includes('isShowOtherAtt')"
+      title="自定义项"
+      :default-expand="false"
+    >
+      <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '12em' : '12em'">
+        <div
+          class="p-b-lg p-t-lg p-r-lg"
+          style="max-height: 150px; overflow-y: auto; border: 1px dashed var(--border-color-base); border-radius: 5px"
+        >
+          <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" :required="true" />
+        </div>
+      </el-form>
+    </ExpandablePane>
+
+    <div class="n20-form-expandable-pane">
+      <div class="n20-title flex-box flex-lr flex-v" :class="titleClass">
+        <span class="n20-tips flex-item">
+          <slot name="title">
+            <span>{{ $lc('流程处理') }}</span>
+          </slot>
+        </span>
+      </div>
+    </div>
+    <!-- 抄送加签 -->
+    <el-form ref="approveBtnGroup" label-position="right" :label-width="_lang === 'zh' ? '6em' : '12em'">
       <div v-if="taskId && showBtn" class="flex-box">
         <el-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
           <el-input
@@ -42,11 +68,7 @@
                   :label="'向前加签' | $lc"
                   value="2"
                 />
-                <el-option
-                  v-if="addTaskMode === '1' || authList.includes('isAddtask') || preAddTask"
-                  :label="'向后加签' | $lc"
-                  value="1"
-                />
+                <el-option v-if="authList.includes('isAddtask') || preAddTask" :label="'向后加签' | $lc" value="1" />
               </template>
             </el-select>
 
@@ -74,18 +96,33 @@
               clearable
               @focus="setAddtaskV = true"
             />
+            <el-select v-model="addTaskTag" class="m-l-ss" clearable>
+              <el-option v-for="item in remarkOpt" :key="item.code" :label="item.name" :value="item.code" />
+            </el-select>
           </div>
         </el-form-item>
       </div>
-      <div class="flex-box">
+
+      <el-form-item :label="'审批意见' | $lc" :error="errMsg" :required="requiredC">
+        <el-input
+          ref="msg-input"
+          v-model="messageC"
+          type="textarea"
+          :placeholder="`${$lc('请输入操作意见（')}${messageMax}${
+            requiredC
+              ? $lc('字以内），批准该意见为必填，驳回/作废该意见为必填！')
+              : $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
+          }`"
+          :maxlength="messageMax"
+          show-word-limit
+          :autosize="{ minRows: 2 }"
+        />
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
-            class="flex-1 m-l-s"
             :task-id="taskId"
             :message.sync="messageC"
             :and-user="opiAndUser"
-            style="width: 20%"
           />
           <show-other-att
             v-if="authList.includes('showOtherAtt')"
@@ -95,23 +132,12 @@
             style="width: 18%"
           />
         </template>
-        <el-form-item class="flex-1" :label="'审批意见' | $lc" :error="errMsg" :required="requiredC" style="width: 70%">
-          <el-input
-            ref="msg-input"
-            v-model="messageC"
-            type="textarea"
-            :placeholder="`${$lc('请输入操作意见（')}${messageMax}${
-              requiredC
-                ? $lc('字以内），批准该意见为必填，驳回/作废该意见为必填！')
-                : $lc('字以内），批准该意见为非必填，驳回/作废该意见为必填！')
-            }`"
-            :maxlength="messageMax"
-            show-word-limit
-            :autosize="{ rows: 1 }"
-          />
-        </el-form-item>
-      </div>
-      <el-form-item v-if="fileKit || fileKitT" :label="$lc('附加上传')">
+      </el-form-item>
+      <el-form-item v-if="fileKitT">
+        <span slot="label">
+          <span v-if="mustUploadWidget" style="color: red">*</span>
+          {{ $lc('附件上传') }}
+        </span>
         <cl-upload
           class="upload-224"
           :file-name.sync="fileName"
@@ -120,47 +146,59 @@
           :file-url.sync="fileUrl"
           :on-success="onSuccess"
           :on-remove="onRemove"
-          action="/api/neams/eamsbaserecord/batchSavejson"
+          show-file-list
+          :action="
+            apiPrefix ? apiPrefix + `/neams/eamsbaserecord/batchSavejson` : `/neams/eamsbaserecord/batchSavejson`
+          "
           msg-type="message"
         />
       </el-form-item>
     </el-form>
+    <!-- 加签按钮 -->
     <div v-if="authList.includes('byAddTask') && addTaskList.length > 0" class="text-c">
       <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
         '加 签' | $lc
       }}</el-button>
     </div>
+    <!-- 审批按钮 -->
     <div v-if="authList.includes('byAddTask') && !addTaskList.length" class="text-c">
-      <el-button type="primary" @click="checkFlowFn">{{ '批 准' | $lc }}</el-button>
-      <el-button type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
-      <el-button plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
-      <el-button plain @click="rejectFn">{{ '驳回至发起人' | $lc }}</el-button>
-      <!-- <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        '驳回至上一节点' | $lc
-      }}</el-button> -->
-
-      <el-button type="danger" plain @click="discardFn">{{ '作 废' | $lc }}</el-button>
+      <el-button type="primary" @click="showAdvancePop">{{ btnsNames['approval'] }}</el-button>
+      <el-button type="primary" @click="approvalToV = true">{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button>
+      <el-button plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
+      <el-button plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
+      <el-button type="danger" plain @click="discardFn">{{ btnsNames['discard'] }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
+
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
-      <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
-        '批 准' | $lc
+      <!-- 特殊会签按钮 START -->
+      <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{
+        btnsNames['pass']
       }}</el-button>
-      <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">{{
-        '批准并审批下一条' | $lc
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ btnsNames['refuse'] }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ btnsNames['takeOff'] }}</el-button>
+      <!-- END -->
+      <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
+        btnsNames['approval']
       }}</el-button>
-      <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true">{{ '批准至' | $lc }}</el-button>
-      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ '驳回至' | $lc }}</el-button>
-      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ '驳回至发起人' | $lc }}</el-button>
+      <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">
+        {{ btnsNames['approval'] }}{{ '并审批下一条' | $lc }}</el-button
+      >
+      <el-button v-if="showApprovalTo" type="primary" @click="approvalToV = true"
+        >{{ btnsNames['approval'] }}{{ '至' | $lc }}</el-button
+      >
+      <el-button v-if="authList.includes('rejectTo')" plain @click="rejectToB">{{ btnsNames['rejectTo'] }}</el-button>
+      <el-button v-if="authList.includes('reject')" plain @click="rejectFn">{{ btnsNames['reject'] }}</el-button>
       <el-button v-if="authList.includes('rejectPre')" plain @click="rejectPreFn">{{
-        '驳回至上一节点' | $lc
+        btnsNames['rejectPre']
       }}</el-button>
 
       <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
-        '作 废' | $lc
+        btnsNames['discard']
       }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
+    <!-- 设置抄送用户 -->
     <cl-dialog
       v-drag
       :visible.sync="setCarboncopyV"
@@ -171,6 +209,7 @@
     >
       <carboncopy-prop :carbon-copy-list="carbonCopyList" @close="setCarboncopyV = false" @confirm="setCarboncopyOk" />
     </cl-dialog>
+    <!-- 设置加签用户 -->
     <cl-dialog
       v-drag
       :visible.sync="setAddtaskV"
@@ -186,19 +225,63 @@
         @confirm="setAddtaskOk"
       />
     </cl-dialog>
+    <!-- 驳回至节点 -->
     <cl-dialog v-drag :visible.sync="rejectToV" :title="'驳回至节点' | $lc" width="960px" append-to-body top="7.5vh">
-      <reject-to-prop :task-id="taskId" @close="rejectToV = false" @confirm="rejectToFn" />
+      <reject-to-prop
+        :task-id="taskId"
+        :show-retrace-flow="isShowRetrace"
+        @close="rejectToV = false"
+        @confirm="rejectToFn"
+      />
     </cl-dialog>
+    <!-- 批准至节点 -->
     <cl-dialog v-drag :visible.sync="approvalToV" :title="'批准至节点' | $lc" width="960px" append-to-body top="7.5vh">
       <reject-to-prop :task-id="taskId" type="approvalTo" @close="approvalToV = false" @confirm="approvalToFn" />
     </cl-dialog>
-    <cl-dialog v-drag :visible.sync="verifyV" :title="'校验结果' | $lc" width="960px" append-to-body top="7.5vh">
+    <!-- 驳回发起人是否重走流程 -->
+    <cl-dialog
+      v-drag
+      :visible.sync="showFlowDialog"
+      :title="'驳回发起人是否重走流程' | $lc"
+      width="400px"
+      append-to-body
+      center-dialog
+    >
+      <el-radio-group v-model="isJump">
+        <el-radio label="0">{{ '重走流程' | $lc }}</el-radio>
+        <el-radio label="1"
+          >{{ '不重走流程' | $lc }}
+          <i v-title="tips" class="n20-icon-xinxitishi" style="color: var(--color-warning)"></i
+        ></el-radio>
+      </el-radio-group>
+      <div slot="footer">
+        <el-button type="primary" @click="handleIsJumpSave">{{ '确定' | $lc }}</el-button>
+        <el-button @click="showFlowDialog = false">{{ '取消' | $lc }}</el-button>
+      </div>
+    </cl-dialog>
+    <!-- 校验结果 -->
+    <cl-dialog
+      v-drag
+      :visible.sync="verifyV"
+      :title="isWyfk ? '异常提醒' : '校验结果' | $lc"
+      width="960px"
+      append-to-body
+      top="7.5vh"
+    >
       <div class="m-t m-b">
-        <span class="m-r-ss">{{ '结果统计：' | $lc }}</span> {{ '共计校验' | $lc }}<span>{{ verifyMsg.checkSum }}</span
-        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.checkSum - verifyMsg.errorCount }}</span
-        >{{ '条，未通过' | $lc }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
+        <span class="m-r-ss">{{ '结果统计：' | $lc }}</span>
+        {{ '共计校验' | $lc }}<span>{{ verifyMsg.checkSum }}</span
+        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.sucessCount }}</span> {{ $l('条，待确认')
+        }}<span class="color-warning">{{ verifyMsg.tobeConfirmedCount }}</span> {{ '条，未通过' | $lc
+        }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
         >{{ '条，未通过详情如下：' | $lc }}
       </div>
+      <el-tag v-if="isWyfk && verifyMsg.tobeConfirmedCount > 0" type="warning" size="small" class="m-b-s">
+        {{ '风险指令' | $lc }}
+      </el-tag>
+      <el-tag v-if="isWyfk && verifyMsg.errorCount > 0" size="small" type="danger" class="m-b-s"
+        >{{ '异常指令' | $lc }}
+      </el-tag>
       <el-table :data="verifyMsg.checkFlowVoList" border max-height="400">
         <el-table-column type="index" :label="'序号' | $lc" align="center" width="50" />
         <el-table-column prop="businessId" :label="'业务流水号' | $lc" align="center" width="120" />
@@ -218,25 +301,45 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column prop="errorMsg" :label="'不通过原因' | $lc" />
+        <el-table-column
+          v-if="isWyfk"
+          prop="errorMsg"
+          :label="verifyMsg.tobeConfirmedCount > 0 ? '风险命中原因' : '异常原因' | $lc"
+        />
+        <el-table-column v-else prop="errorMsg" :label="'不通过原因' | $lc" />
       </el-table>
       <span slot="footer">
         <div v-if="promptType === '1'">
-          <el-button type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
+          <el-button v-if="checkSum !== errorCount" type="primary" @click="onContinue">{{
+            $l(isWyfk ? '核实无误' : '继续审批')
+          }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
-          <div class="m-t-s color-danger f-s-s">
-            {{ $l('*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。') }}
+          <div v-if="checkSum !== errorCount" class="m-t-s color-danger f-s-s">
+            <span v-if="isWyfk">
+              {{ $l('*点击【核实无误】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。') }}</span
+            >
+            <span v-else>{{
+              $l('*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。')
+            }}</span>
           </div>
         </div>
         <div v-if="promptType === '2'">
+          <el-button v-if="checkSum !== errorCount" type="primary" @click="onContinue">{{
+            $l(isWyfk ? '核实无误' : '继续审批')
+          }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
         </div>
       </span>
     </cl-dialog>
+    <!-- 选择审批人 -->
+    <cl-dialog v-drag :visible.sync="setSpr" :title="'设置下一步' | $lc" width="1100px" append-to-body top="7.5vh">
+      <selectSpr :select-spr-list="selectSprList" @close="setSpr = false" @confirm="selectSprListFn" />
+    </cl-dialog>
   </div>
 </template>
 
 <script>
+import selectSpr from './selectSpr.vue'
 import getJsonc from '../../assets/getJsonc.js'
 import { closeTagsForBackPage } from '../../plugins/CompatibleOld'
 import axios from '../../utils/axios'
@@ -249,6 +352,8 @@ import CarboncopyProp from './setCarboncopyProp.vue'
 import RejectToProp from './setRejectToProp.vue'
 import ShowAppOpi from './showAppOpi.vue'
 import ShowOtherAtt from './showOtherAttr.vue'
+import ShowOtherAttNew from './showOtherAttrNew.vue'
+import ExpandablePane from '../Expandable/main.vue'
 import { toExaminePath } from './specialHandle'
 const prefixCls = 'n20-approval-Button'
 // window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
@@ -260,14 +365,22 @@ if (!window._approvalExtend['addtask.chdUserInfo.extend']) {
 export default {
   name: 'ApprovalButtons',
   components: {
+    selectSpr,
     ClDialog,
     ClUpload,
     CarboncopyProp,
     RejectToProp,
     ShowAppOpi,
-    ShowOtherAtt
+    ShowOtherAtt,
+    ShowOtherAttNew,
+    ExpandablePane
   },
   props: {
+    // 是否需要校验
+    isCheck: {
+      type: Boolean,
+      default: true
+    },
     message: {
       type: String,
       default: ''
@@ -316,6 +429,9 @@ export default {
         }
       }
     },
+    apiPrefix: {
+      type: String
+    },
     /**
      * 是否上传审批附件
      */
@@ -343,6 +459,12 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
+      attributes: undefined,
+      isWyfk: false,
+      nextEgwOutgoingNodeId: undefined,
+      nextNodeApproveUnos: undefined,
+      selectSprList: undefined,
+      setSpr: false,
       requiredC: false,
       prefixCls,
       messageIn: '',
@@ -357,6 +479,7 @@ export default {
       setAddtaskV: false,
       addTaskList: [],
       addTaskType: '1',
+      addTaskTag: '',
       preAddTask: false,
       addTaskWay: undefined,
       rejectToV: false,
@@ -365,13 +488,36 @@ export default {
       opiAndUser: false,
       addTaskMode: '0',
       otherAtt: {},
+      customizationDtos: {},
       fileDtos: [],
       fileName: '',
       fileUrl: '',
       todoList: [],
       verifyV: false,
       verifyMsg: {},
-      promptType: '0'
+      promptType: '0',
+      remarkOpt: [],
+      isShowRetrace: undefined,
+      isJump: undefined,
+      showFlowDialog: false,
+      IsShowUploadWidget: false,
+      showCustomItem: false,
+      isTakeOff: undefined,
+      sucessCount: 0,
+      errorCount: 0,
+      tobeConfirmedCount: 0,
+      checkSum: 0,
+      mustUploadWidget: false,
+      btnsNames: {
+        pass: this.$l('通过'),
+        refuse: this.$l('拒绝'),
+        takeOff: this.$l('请假'),
+        reject: this.$l('驳回至发起人'),
+        rejectPre: this.$l('驳回至上一节点'),
+        approval: this.$l('批 准'),
+        discard: this.$l('作 废'),
+        rejectTo: this.$l('驳回至')
+      }
     }
   },
   computed: {
@@ -392,8 +538,11 @@ export default {
     },
     fileKitT: {
       get() {
-        return window.fileKit
+        return this.IsShowUploadWidget || this.fileKit || window.fileKit
       }
+    },
+    tips() {
+      return $lc(`此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！`)
     }
   },
   created() {
@@ -405,16 +554,86 @@ export default {
     this.getHasQueryAppOpiAndUser()
     this.nextApproval && this.getTodoList()
     this.getConfiguration()
+    this.getIsShowUploadWidget()
   },
   methods: {
+    // 查询选择审批人
+    async showAdvancePop() {
+      // 附件上传校验
+      if (this.mustUploadWidget && this.fileDtos.length === 0) {
+        this.$message.warning($lc(`请先上传附件`))
+        return false
+      }
+      this.beforeFn(this.beforeRatify, async () => {
+        try {
+          const res = await this.$axios.post(
+            '/bems/activiti/admin/todo/showAdvancePop',
+            {
+              isAgentcy: this.$route.query.isAgentcy,
+              taskId: this.$route.query.taskId
+            },
+            {
+              loading: false,
+              noMsg: true
+            }
+          )
+          // 如果返回正常 且有返回值 且showNextEgwOutgoingNodeName跟showNextNodeAssignee有一个为true
+          if (res.code === 200 && res.data && (res.data.showNextEgwOutgoingNodeName || res.data.showNextNodeAssignee)) {
+            this.setSpr = true
+            this.selectSprList = res.data
+          } else {
+            this.checkFlowFn()
+          }
+        } catch (error) {
+          console.log(error)
+          this.checkFlowFn()
+        }
+      })
+    },
+    // 选择审批人
+    selectSprListFn(data) {
+      console.log(data)
+      this.nextEgwOutgoingNodeId = data.nextEgwOutgoingNodeId
+      this.nextNodeApproveUnos = data.nextNodeApproveUnos
+      this.setSpr = false
+      this.checkFlowFn()
+    },
+    async getIsShowUploadWidget() {
+      const { processInstanceId: procInstId, taskId } = this.$route.query
+      let { code, data } = await this.$axios.get(
+        `/bems/activiti/admin/todo/isShowUploadWidget/${procInstId}/${taskId}`,
+        null,
+        {
+          loading: false,
+          noMsg: true
+        }
+      )
+      if (code === 200) {
+        if (Object.prototype.toString.call(data) === '[object Object]') {
+          this.IsShowUploadWidget = data.showUploadWidget
+          this.mustUploadWidget = data.mustUploadWidget
+        } else {
+          this.IsShowUploadWidget = data
+        }
+      }
+      console.log(code, data)
+    },
     // 意见是否必填
     getConfiguration() {
       getJsonc('portal/server-config.jsonc', null, true)
         .then(({ opinionRequired }) => {
           this.requiredC = opinionRequired ?? this.required
+          // 读取该工作流是否意见必填
+          if (this.$route.query.remarkIsMust !== undefined) {
+            this.requiredC = this.$route.query.remarkIsMust === '1'
+          }
         })
         .catch(() => {
           this.requiredC = this.required
+          // 读取该工作流是否意见必填
+          if (this.$route.query.remarkIsMust !== undefined) {
+            this.requiredC = this.$route.query.remarkIsMust === '1'
+          }
         })
     },
     getTodoList() {
@@ -432,14 +651,16 @@ export default {
     // 获取加签方式的模式
     getAddTaskMode() {
       axios
-        .get(`/bems/activiti/sample/getAddTaskMode`, null, { loading: false, noMsg: true })
+        .get(`/bems/activiti/sample/getAddTaskMode`, null, {
+          loading: false,
+          noMsg: true
+        })
         .then(({ data, code }) => {
           if (code === 200) {
             this.addTaskMode = data
           }
         })
     },
-
     // 换回到发起页
     goFrom() {
       let pathname = location.pathname
@@ -453,7 +674,6 @@ export default {
         closeTagsForBackPage(pathname)
       })
     },
-
     // 动态获取按钮
     getBtns() {
       if (!this.taskId || !this.showBtn) return false
@@ -464,6 +684,12 @@ export default {
           noMsg: true
         })
         .then(({ data = {} }) => {
+          // 自定义按钮
+          if (data.customBtnName && data.customBtnName.length > 0) {
+            data.customBtnName.forEach((item) => {
+              this.btnsNames[item.key] = item.optionName
+            })
+          }
           let { taskDefKey, menuAuthority } = data
 
           this.taskDefKey = taskDefKey
@@ -476,6 +702,9 @@ export default {
           if (!(this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask'))) {
             this.getHasPreAddTask()
           }
+          if (this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask') || this.preAddTask) {
+            this.getMdmDataDoc()
+          }
         })
         .catch(() => {
           this.authList = this.btnList
@@ -500,7 +729,10 @@ export default {
     getHasPreAddTask() {
       if (this.showBtn && window._approvalExtend['appOpi.addTaskWay.exist'] === undefined) {
         axios
-          .get('/bems/activiti/online/addTaskWay', null, { loading: false, noMsg: true })
+          .get('/bems/activiti/online/addTaskWay', null, {
+            loading: false,
+            noMsg: true
+          })
           .then(() => {
             this.preAddTask = window._approvalExtend['appOpi.addTaskWay.exist'] = true
           })
@@ -515,7 +747,10 @@ export default {
     getHasQueryAppOpiAndUser() {
       if (this.showBtn && window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined) {
         axios
-          .post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, { loading: false, noMsg: true })
+          .post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, {
+            loading: false,
+            noMsg: true
+          })
           .then(() => {
             this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = true
           })
@@ -529,8 +764,16 @@ export default {
     // 获取提交参数
     getParam() {
       let { typeCode, taskId, groupNo, isAgentcy, isCheck } = this.$route.query
+      let customizationDtos
+      if (this.authList.includes('isShowOtherAtt')) {
+        customizationDtos = this.$refs['showOtherAttNew']?.getOtherAttData()
+      }
       return [
         {
+          attributes: this.attributes,
+          nextNodeApproveUnos: this.nextNodeApproveUnos,
+          nextEgwOutgoingNodeId: this.nextEgwOutgoingNodeId,
+          isTakeOff: this.isTakeOff,
           typeCode,
           taskId,
           groupNo,
@@ -542,14 +785,27 @@ export default {
           signText: this.signText,
           plainText: this.plainText,
           fileDtos: this.fileDtos,
-          carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({ userNo: c.uno, userName: c.uname })),
-          addTaskList: this.addTaskList.map((c) => ({ userNo: c.uno, userName: c.uname })),
+          carbonCopyUserDtoList: this.carbonCopyList.map((c) => ({
+            userNo: c.uno,
+            userName: c.uname
+          })),
+          addTaskList: this.addTaskList.map((c) => ({
+            userNo: c.uno,
+            userName: c.uname
+          })),
           addTaskType: this.addTaskType,
+          addTaskTag: this.addTaskTag,
           addTaskWay: this.addTaskWay,
+          customizationDtos,
+          isJump: this.isJump,
           ...this.otherAtt
         }
       ]
     },
+    // 添加自定义参数
+    setParam(obj) {
+      Object.assign(this.otherAtt, obj)
+    },
     // 提交后的提示
     thenMsg(data = {}, str = $lc('操作')) {
       let { failCount, failList = {} } = data
@@ -568,6 +824,7 @@ export default {
           this.$message.error(str + $lc('失败'))
         }
       } else {
+        this.$emit('afterFn', str)
         this.$message.success(str + $lc('成功'))
         setTimeout(this.goFrom, 300)
       }
@@ -594,24 +851,56 @@ export default {
         F.then && F.then(callFn)
       }
     },
+    // 查询是否配置 允许不重走流程
+    async getIsShowRetraceFlow() {
+      try {
+        let { processInstanceId: procInstId } = this.$route.query
+        const { code, data } = await axios.get(
+          `/bems/activiti/admin/todo/isShowRetraceFlowOptions/${procInstId}/${this.taskId}`,
+          null,
+          {
+            loading: false,
+            noMsg: true
+          }
+        )
+        return code === 200 && data
+      } catch (error) {
+        console.error('查询是否配置允许不重走流程接口错误:', error)
+        return false
+      }
+    },
     // 驳回
-    rejectFn() {
+    async rejectFn() {
       if (!this.messageC) {
-        return this.errMsgFn($lc('驳回'))
+        return this.errMsgFn(this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回'))
       }
+      this.showFlowDialog = await this.getIsShowRetraceFlow()
+
+      if (!this.showFlowDialog) {
+        this.beforeFn(this.beforeReject, () => {
+          axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+            this.thenMsg(data, this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回至发起人'))
+          })
+        })
+      }
+    },
+    handleIsJumpSave() {
+      this.showFlowDialog = false
       this.beforeFn(this.beforeReject, () => {
         axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
           this.thenMsg(data, $lc('驳回至发起人'))
         })
       })
     },
-    rejectToB() {
+    async rejectToB() {
       if (!this.messageC) {
         return this.errMsgFn($lc('驳回'))
       }
+      this.isShowRetrace = await this.getIsShowRetraceFlow()
       this.rejectToV = true
     },
-    rejectToFn(taskId) {
+    rejectToFn(taskId, isJump) {
+      this.isJump = isJump
       this.rejectToV = false
       let param = this.getParam()
       param.forEach((item) => {
@@ -635,9 +924,21 @@ export default {
       })
     },
     onContinue() {
+      if (this.isWyfk) {
+        this.attributes = {
+          ebsPaymentRiskWarning: '核实无误'
+        }
+      } else {
+        this.attributes = undefined
+      }
       this.verifyV = false
       this.approvalFn()
     },
+    qjFn() {
+      this.isTakeOff = '1'
+      this.checkFlowFn()
+    },
+
     async checkFlowFn() {
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
@@ -648,13 +949,17 @@ export default {
         return this.addErrFn()
       }
       let { isCheck, taskId, appNo, groupNo, typeCode, orderId, isAgentcy } = this.$route.query
-      if (isCheck === '1') {
+      this.isWyfk = ['PUBLIC_PAYMENT', 'BATCH_PERSON_PAYMENT'].includes(typeCode)
+      if (isCheck === '1' && this.isCheck) {
         let params = {
           plainText: '',
           signText: '',
           isCheck,
           auditAdvanceDtos: [
             {
+              isTakeOff: this.isTakeOff,
+              nextNodeApproveUnos: this.nextNodeApproveUnos,
+              nextEgwOutgoingNodeId: this.nextEgwOutgoingNodeId,
               appNo,
               taskId,
               groupNo,
@@ -668,16 +973,24 @@ export default {
         const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
         if (code === 200) {
           this.promptType = data.promptType
+          // 成功 失败  待确认 提交数据
+          this.sucessCount = data.sucessCount
+          this.errorCount = data.errorCount
+          this.tobeConfirmedCount = data.tobeConfirmedCount
+          this.checkSum = data.checkSum
           switch (data.promptType) {
             case '0':
               this.approvalFn()
               break
             case '1':
-              this.verifyV = true
-              this.verifyMsg = data
-              break
             case '2':
-              this.verifyV = true
+              // 只有通过的数据
+              if (this.sucessCount === this.checkSum) {
+                this.approvalFn()
+              } else {
+                this.verifyV = true
+                this.verifyMsg = data
+              }
               break
           }
         }
@@ -698,14 +1011,11 @@ export default {
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }
-
-      this.beforeFn(this.beforeRatify, () => {
-        axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
-          this.thenMsg(
-            data,
-            this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
-          )
-        })
+      axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
+        this.thenMsg(
+          data,
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
+        )
       })
     },
     approvalNext() {
@@ -778,6 +1088,16 @@ export default {
         })
       })
     },
+    // 获取数据字典加签备注
+    async getMdmDataDoc() {
+      const { code, data } = await this.$axios.get(`/bems/1.0/mdmDataDoc`, {
+        typeCode: 'ADD_TASK_TAG'
+      })
+      if (code === 200) {
+        this.remarkOpt = data || []
+      }
+    },
+
     // 作废
     discardFn() {
       if (!this.messageC) {
@@ -815,10 +1135,12 @@ export default {
       })
     },
     onRemove(file, fileList) {
+      this.fileName = ''
       this.fileDtos = this.getFileDtos(fileList)
     },
-    onSuccess(file, row, fileList) {
+    onSuccess(response, file, fileList) {
       this.fileDtos = this.getFileDtos(fileList)
+      this.fileName = file.name || ''
     }
   }
 }