n20-common-lib 2.11.1 → 2.11.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.11.1",
+  "version": "2.11.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/ApprovalButtons/index.vue

@@ -7,25 +7,12 @@
       title="自定义项"
       :default-expand="false"
     >
-      <el-form
-        ref="approveBtnGroup"
-        label-position="right"
-        :label-width="_lang === 'zh' ? '12em' : '12em'"
-      >
+      <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;
-          "
+          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"
-          />
+          <show-other-att-new ref="showOtherAttNew" :task-id="taskId" :form="customizationDtos" />
         </div>
       </el-form>
     </ExpandablePane>
@@ -40,17 +27,9 @@
       </div>
     </div>
     <!-- 抄送加签 -->
-    <el-form
-      ref="approveBtnGroup"
-      label-position="right"
-      :label-width="_lang === 'zh' ? '6em' : '12em'"
-    >
+    <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-form-item v-if="authList.includes('isCarboncopy')" :label="'抄送' | $lc" class="flex-1 m-b-s">
           <el-input
             :value="carbonCopyList.map((c) => c.uname).join(', ')"
             type="textarea"
@@ -59,11 +38,7 @@
           />
         </el-form-item>
         <el-form-item
-          v-if="
-            authList.includes('isAddtask') ||
-            authList.includes('isAddForwardTask') ||
-            preAddTask
-          "
+          v-if="authList.includes('isAddtask') || authList.includes('isAddForwardTask') || preAddTask"
           :label="'加签' | $lc"
           :error="addMsg"
           class="flex-1 m-b-s"
@@ -80,11 +55,7 @@
           </label>
           <div class="flex-box">
             <el-select
-              v-if="
-                authList.includes('isAddtask') ||
-                authList.includes('isAddForwardTask') ||
-                preAddTask
-              "
+              v-if="authList.includes('isAddtask') || authList.includes('isAddForwardTask') || preAddTask"
               v-model="addTaskWay"
               class="m-r-ss"
               clearable
@@ -98,11 +69,7 @@
                   value="2"
                 />
                 <el-option
-                  v-if="
-                    addTaskMode === '1' ||
-                    authList.includes('isAddtask') ||
-                    preAddTask
-                  "
+                  v-if="addTaskMode === '1' || authList.includes('isAddtask') || preAddTask"
                   :label="'向后加签' | $lc"
                   value="1"
                 />
@@ -119,13 +86,7 @@
             >
               <el-option :label="'普通节点' | $lc" value="1" />
             </el-select>
-            <el-select
-              v-else
-              v-model="addTaskType"
-              clearable
-              :placeholder="'请选择审批方式' | $lc"
-              style="width: 10em"
-            >
+            <el-select v-else v-model="addTaskType" clearable :placeholder="'请选择审批方式' | $lc" style="width: 10em">
               <el-option :label="'普通节点' | $lc" value="1" />
               <el-option :label="'会签并行' | $lc" value="2" />
               <el-option :label="'普通串行' | $lc" value="3" />
@@ -140,22 +101,13 @@
               @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-option v-for="item in remarkOpt" :key="item.code" :label="item.name" :value="item.code" />
             </el-select>
           </div>
         </el-form-item>
       </div>
 
-      <el-form-item
-        :label="'审批意见' | $lc"
-        :error="errMsg"
-        :required="requiredC"
-      >
+      <el-form-item :label="'审批意见' | $lc" :error="errMsg" :required="requiredC">
         <template v-if="taskId && showBtn">
           <show-app-opi
             v-if="opiAndUser || authList.includes('showAppOpi')"
@@ -197,98 +149,50 @@
           :on-remove="onRemove"
           show-file-list
           :action="
-            apiPrefix
-              ? apiPrefix + `/neams/eamsbaserecord/batchSavejson`
-              : `/neams/eamsbaserecord/batchSavejson`
+            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 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>
+    <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 type="danger" plain @click="discardFn">{{
-        '作 废' | $lc
-      }}</el-button>
+      <el-button type="danger" plain @click="discardFn">{{ '作 废' | $lc }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
 
     <div v-else-if="!authList.includes('byAddTask')" class="text-c">
       <!-- 特殊会签按钮 START -->
-      <el-button
-        v-if="authList.includes('pass')"
-        type="primary"
-        @click="checkFlowFn"
-        >{{ '通 过' | $lc }}</el-button
-      >
-      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{
-        '拒 绝' | $lc
-      }}</el-button>
+      <el-button v-if="authList.includes('pass')" type="primary" @click="checkFlowFn">{{ '通 过' | $lc }}</el-button>
+      <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ '拒 绝' | $lc }}</el-button>
+      <el-button v-if="authList.includes('takeOff')" plain @click="checkFlowFn('1')">{{ '请 假' | $lc }}</el-button>
       <!-- END -->
-      <el-button
-        v-if="authList.includes('approval')"
-        type="primary"
-        @click="checkFlowFn"
-        >{{ '批 准' | $lc }}</el-button
-      >
-      <el-button
-        v-if="authList.includes('approval') && nextApproval && nextBtn"
-        type="primary"
-        @click="approvalNext"
-        >{{ '批准并审批下一条' | $lc }}</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 v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
+        '批 准' | $lc
+      }}</el-button>
+      <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">{{
+        '批准并审批下一条' | $lc
+      }}</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('rejectPre')" plain @click="rejectPreFn">{{
+        '驳回至上一节点' | $lc
       }}</el-button>
-      <el-button
-        v-if="authList.includes('rejectPre')"
-        plain
-        @click="rejectPreFn"
-        >{{ '驳回至上一节点' | $lc }}</el-button
-      >
 
-      <el-button
-        v-if="authList.includes('discard')"
-        type="danger"
-        plain
-        @click="discardFn"
-        >{{ '作 废' | $lc }}</el-button
-      >
+      <el-button v-if="authList.includes('discard')" type="danger" plain @click="discardFn">{{
+        '作 废' | $lc
+      }}</el-button>
       <el-button plain @click="goFrom">{{ '返 回' | $lc }}</el-button>
     </div>
     <!-- 设置抄送用户 -->
@@ -300,11 +204,7 @@
       append-to-body
       top="7.5vh"
     >
-      <carboncopy-prop
-        :carbon-copy-list="carbonCopyList"
-        @close="setCarboncopyV = false"
-        @confirm="setCarboncopyOk"
-      />
+      <carboncopy-prop :carbon-copy-list="carbonCopyList" @close="setCarboncopyV = false" @confirm="setCarboncopyOk" />
     </cl-dialog>
     <!-- 设置加签用户 -->
     <cl-dialog
@@ -323,14 +223,7 @@
       />
     </cl-dialog>
     <!-- 驳回至节点 -->
-    <cl-dialog
-      v-drag
-      :visible.sync="rejectToV"
-      :title="'驳回至节点' | $lc"
-      width="960px"
-      append-to-body
-      top="7.5vh"
-    >
+    <cl-dialog v-drag :visible.sync="rejectToV" :title="'驳回至节点' | $lc" width="960px" append-to-body top="7.5vh">
       <reject-to-prop
         :task-id="taskId"
         :show-retrace-flow="isShowRetrace"
@@ -339,20 +232,8 @@
       />
     </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 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
@@ -367,79 +248,36 @@
         <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
+          <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>
+        <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="'校验结果' | $lc"
-      width="960px"
-      append-to-body
-      top="7.5vh"
-    >
+    <cl-dialog v-drag :visible.sync="verifyV" :title="'校验结果' | $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
+        >{{ '条，其中通过' | $lc }}<span class="color-success">{{ verifyMsg.checkSum - verifyMsg.errorCount }}</span
+        >{{ '条，未通过' | $lc }}<span class="color-danger">{{ verifyMsg.errorCount }}</span
         >{{ '条，未通过详情如下：' | $lc }}
       </div>
       <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"
-        />
-        <el-table-column
-          prop="typeName"
-          :label="'交易类型' | $lc"
-          align="center"
-          width="120"
-        >
+        <el-table-column type="index" :label="'序号' | $lc" align="center" width="50" />
+        <el-table-column prop="businessId" :label="'业务流水号' | $lc" align="center" width="120" />
+        <el-table-column prop="typeName" :label="'交易类型' | $lc" align="center" width="120">
           <template slot-scope="{ row }">
             {{ row.typeName }}
           </template>
         </el-table-column>
-        <el-table-column
-          prop="status"
-          :label="'校验状态' | $lc"
-          align="center"
-          width="120"
-        >
+        <el-table-column prop="status" :label="'校验状态' | $lc" align="center" width="120">
           <template slot-scope="{ row }">
             <div
               :class="
-                row.status === 'PASS'
-                  ? 'color-success'
-                  : row.status === 'PROMPT'
-                  ? 'color-warning'
-                  : 'color-danger'
+                row.status === 'PASS' ? 'color-success' : row.status === 'PROMPT' ? 'color-warning' : 'color-danger'
               "
             >
               {{ row.statusName }}
@@ -450,22 +288,14 @@
       </el-table>
       <span slot="footer">
         <div v-if="promptType === '1'">
-          <el-button type="primary" @click="onContinue">{{
-            $l('继续审批')
-          }}</el-button>
+          <el-button type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
           <div class="m-t-s color-danger f-s-s">
-            {{
-              $l(
-                '*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。'
-              )
-            }}
+            {{ $l('*点击【继续审批】将提交校验通过和待确认数据，未通过数据需要到待审核详情页处理。') }}
           </div>
         </div>
         <div v-if="promptType === '2'">
-          <el-button v-if="!!successNum" type="primary" @click="onContinue">{{
-            $l('继续审批')
-          }}</el-button>
+          <el-button v-if="!!successNum" type="primary" @click="onContinue">{{ $l('继续审批') }}</el-button>
           <el-button plain @click="onceCancelFn">{{ $l('取消') }}</el-button>
         </div>
       </span>
@@ -493,8 +323,7 @@ const prefixCls = 'n20-approval-Button'
 // window._approvalExtend = { 'addtask.chdUserInfo.extend': {}, 'appOpi.queryAppOpiAndUser.exist': undefined, 'card.countermand.suggestion': false }
 if (!window._approvalExtend) window._approvalExtend = {}
 if (!window._approvalExtend['addtask.chdUserInfo.extend']) {
-  window._approvalExtend['addtask.chdUserInfo.extend'] =
-    window._isAddtask_get_userlist_extend_data_ || {}
+  window._approvalExtend['addtask.chdUserInfo.extend'] = window._isAddtask_get_userlist_extend_data_ || {}
 }
 
 export default {
@@ -649,9 +478,7 @@ export default {
       }
     },
     tips() {
-      return $lc(
-        `此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！`
-      )
+      return $lc(`此模式下被回退节点提交后将绕过中间已办节点，造成流程不严谨，谨慎使用！`)
     }
   },
   created() {
@@ -698,15 +525,13 @@ export default {
     getTodoList() {
       return new Promise((resolve, reject) => {
         const dto = JSON.parse(sessionStorage.getItem(`approvalDto`))
-        axios
-          .post('/bems/activiti/admin/todo/todo', dto)
-          .then(({ data, code }) => {
-            if (code === 200) {
-              const { list } = data
-              this.todoList = list || []
-              resolve({ data, code })
-            }
-          })
+        axios.post('/bems/activiti/admin/todo/todo', dto).then(({ data, code }) => {
+          if (code === 200) {
+            const { list } = data
+            this.todoList = list || []
+            resolve({ data, code })
+          }
+        })
       })
     },
     // 获取加签方式的模式
@@ -756,30 +581,16 @@ export default {
           } else {
             this.authList = this.btnList
           }
-          if (
-            !(
-              this.authList.includes('isAddtask') ||
-              this.authList.includes('isAddForwardTask')
-            )
-          ) {
+          if (!(this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask'))) {
             this.getHasPreAddTask()
           }
-          if (
-            this.authList.includes('isAddtask') ||
-            this.authList.includes('isAddForwardTask') ||
-            this.preAddTask
-          ) {
+          if (this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask') || this.preAddTask) {
             this.getMdmDataDoc()
           }
         })
         .catch(() => {
           this.authList = this.btnList
-          if (
-            !(
-              this.authList.includes('isAddtask') ||
-              this.authList.includes('isAddForwardTask')
-            )
-          ) {
+          if (!(this.authList.includes('isAddtask') || this.authList.includes('isAddForwardTask'))) {
             this.getHasPreAddTask()
           }
         })
@@ -788,13 +599,9 @@ export default {
     getShowApprovalTo() {
       if (this.showBtn && this.$route.query.state === '2') {
         axios
-          .get(
-            `/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`,
-            null,
-            {
-              noMsg: true
-            }
-          )
+          .get(`/bems/activiti/sample/getTaskMoveVos/${this.$route.query.taskId}/1`, null, {
+            noMsg: true
+          })
           .then(() => {
             this.showApprovalTo = true
           })
@@ -802,19 +609,14 @@ export default {
     },
     // 刺探是否具有向前加签功能
     getHasPreAddTask() {
-      if (
-        this.showBtn &&
-        window._approvalExtend['appOpi.addTaskWay.exist'] === undefined
-      ) {
+      if (this.showBtn && window._approvalExtend['appOpi.addTaskWay.exist'] === undefined) {
         axios
           .get('/bems/activiti/online/addTaskWay', null, {
             loading: false,
             noMsg: true
           })
           .then(() => {
-            this.preAddTask = window._approvalExtend[
-              'appOpi.addTaskWay.exist'
-            ] = true
+            this.preAddTask = window._approvalExtend['appOpi.addTaskWay.exist'] = true
           })
           .catch(() => {
             window._approvalExtend['appOpi.addTaskWay.exist'] = false
@@ -825,26 +627,20 @@ export default {
     },
     // 刺探审批意见接口是否存在
     getHasQueryAppOpiAndUser() {
-      if (
-        this.showBtn &&
-        window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined
-      ) {
+      if (this.showBtn && window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] === undefined) {
         axios
           .post('/bems/activiti/actAppOpi/queryAppOpiAndUser', null, {
             loading: false,
             noMsg: true
           })
           .then(() => {
-            this.opiAndUser = window._approvalExtend[
-              'appOpi.queryAppOpiAndUser.exist'
-            ] = true
+            this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = true
           })
           .catch(() => {
             window._approvalExtend['appOpi.queryAppOpiAndUser.exist'] = false
           })
       } else {
-        this.opiAndUser =
-          window._approvalExtend['appOpi.queryAppOpiAndUser.exist']
+        this.opiAndUser = window._approvalExtend['appOpi.queryAppOpiAndUser.exist']
       }
     },
     // 获取提交参数
@@ -953,30 +749,24 @@ export default {
     // 驳回
     async rejectFn() {
       if (!this.messageC) {
-        return this.errMsgFn(
-          this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回')
-        )
+        return this.errMsgFn(this.authList.includes('refuse') ? $lc('拒绝') : $lc('驳回'))
       }
       this.showFlowDialog = await this.getIsShowRetraceFlow()
 
       if (this.showFlowDialog) return
 
       this.beforeFn(this.beforeReject, () => {
-        axios
-          .post('/bems/activiti/admin/todo/reject', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('驳回至发起人'))
-          })
+        axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至发起人'))
+        })
       })
     },
     handleIsJumpSave() {
       this.showFlowDialog = false
       this.beforeFn(this.beforeReject, () => {
-        axios
-          .post('/bems/activiti/admin/todo/reject', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('驳回至发起人'))
-          })
+        axios.post('/bems/activiti/admin/todo/reject', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至发起人'))
+        })
       })
     },
     async rejectToB() {
@@ -994,11 +784,9 @@ export default {
         item.taskMoveVo = { taskId }
       })
       this.beforeFn(this.beforeRejectPre, () => {
-        axios
-          .post('/bems/activiti/admin/todo/rejectpre', param)
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('驳回至'))
-          })
+        axios.post('/bems/activiti/admin/todo/rejectpre', param).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至'))
+        })
       })
     },
     // 驳回到上一步
@@ -1007,30 +795,25 @@ export default {
         return this.errMsgFn($lc('驳回'))
       }
       this.beforeFn(this.beforeRejectPre, () => {
-        axios
-          .post('/bems/activiti/admin/todo/rejectpre', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('驳回至上一节'))
-          })
+        axios.post('/bems/activiti/admin/todo/rejectpre', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, $lc('驳回至上一节'))
+        })
       })
     },
     onContinue() {
       this.verifyV = false
       this.approvalFn()
     },
-    async checkFlowFn() {
+    async checkFlowFn(isTakeOff = undefined) {
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0
-            ? $lc('加签')
-            : $lc('批准')
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
         )
       }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
         return this.addErrFn()
       }
-      let { isCheck, taskId, appNo, groupNo, typeCode, orderId, isAgentcy } =
-        this.$route.query
+      let { isCheck, taskId, appNo, groupNo, typeCode, orderId, isAgentcy } = this.$route.query
       if (isCheck === '1') {
         let params = {
           plainText: '',
@@ -1038,6 +821,7 @@ export default {
           isCheck,
           auditAdvanceDtos: [
             {
+              isTakeOff,
               appNo,
               taskId,
               groupNo,
@@ -1048,10 +832,7 @@ export default {
             }
           ]
         }
-        const { code, data } = await this.$axios.post(
-          `/bems/activiti/admin/todo/checkFlowNew`,
-          params
-        )
+        const { code, data } = await this.$axios.post(`/bems/activiti/admin/todo/checkFlowNew`, params)
         if (code === 200) {
           this.promptType = data.promptType
           switch (data.promptType) {
@@ -1079,9 +860,7 @@ export default {
     approvalFn() {
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0
-            ? $lc('加签')
-            : $lc('批准')
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
         )
       }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
@@ -1089,24 +868,18 @@ export default {
       }
 
       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() {
       if (this.requiredC && !this.messageC) {
         return this.errMsgFn(
-          this.authList.includes('byAddTask') && this.addTaskList.length > 0
-            ? $lc('加签')
-            : $lc('批准')
+          this.authList.includes('byAddTask') && this.addTaskList.length > 0 ? $lc('加签') : $lc('批准')
         )
       }
       if (this.addTaskList.length > 0 && !this.addTaskType) {
@@ -1114,44 +887,36 @@ export default {
       }
 
       this.beforeFn(this.beforeRatify, () => {
-        axios
-          .post('/bems/activiti/admin/todo/advance', this.getParam())
-          .then(({ data }) => {
-            let { failCount, failList = {} } = data
-            if (failCount > 0) {
-              if (Array.isArray(failList)) {
-                let _failList = {}
-                failList.forEach((f = {}) => {
-                  Object.assign(_failList, f)
-                })
-                failList = _failList
-              }
-              let errArr = Object.values(failList)
-              if (errArr.length > 0) {
-                this.$message.error(errArr.join('、'))
-              } else {
-                this.$message.error($lc('审批失败'))
-              }
-            } else {
-              this.$message.success($lc('审批成功'))
-              closeTagsForBackPage()
-              this.getTodoList().finally(() => {
-                this.goApproval(this.todoList[0])
+        axios.post('/bems/activiti/admin/todo/advance', this.getParam()).then(({ data }) => {
+          let { failCount, failList = {} } = data
+          if (failCount > 0) {
+            if (Array.isArray(failList)) {
+              let _failList = {}
+              failList.forEach((f = {}) => {
+                Object.assign(_failList, f)
               })
+              failList = _failList
             }
-          })
+            let errArr = Object.values(failList)
+            if (errArr.length > 0) {
+              this.$message.error(errArr.join('、'))
+            } else {
+              this.$message.error($lc('审批失败'))
+            }
+          } else {
+            this.$message.success($lc('审批成功'))
+            closeTagsForBackPage()
+            this.getTodoList().finally(() => {
+              this.goApproval(this.todoList[0])
+            })
+          }
+        })
       })
     },
     async goApproval(row) {
-      const { appUrl = {} } = await getJsonc(
-        'activiti/server-config.jsonc',
-        null,
-        true
-      )
+      const { appUrl = {} } = await getJsonc('activiti/server-config.jsonc', null, true)
       if (appUrl[row.appNo]) {
-        let path =
-          toExaminePath(row, appUrl) ||
-          appUrl[row.appNo] + $lc('/') + row.typeCode
+        let path = toExaminePath(row, appUrl) || appUrl[row.appNo] + $lc('/') + row.typeCode
         linkPush(path, {
           orderId: row.businessId,
           taskId: row.taskId,
@@ -1166,9 +931,7 @@ export default {
           ...dCloumn(row)
         })
       } else {
-        this.$message.warning(
-          $lc('该业务跳转路径没有配置，请联系工作流相关前端人员配置')
-        )
+        this.$message.warning($lc('该业务跳转路径没有配置，请联系工作流相关前端人员配置'))
       }
     },
     approvalToFn(taskId) {
@@ -1178,11 +941,9 @@ export default {
         item.taskMoveVo = { taskId }
       })
       this.beforeFn(this.beforeRatify, () => {
-        axios
-          .post('/bems/activiti/admin/todo/advance', param)
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('批准至'))
-          })
+        axios.post('/bems/activiti/admin/todo/advance', param).then(({ data }) => {
+          this.thenMsg(data, $lc('批准至'))
+        })
       })
     },
     // 获取数据字典加签备注
@@ -1201,11 +962,9 @@ export default {
         return this.errMsgFn($lc('作废'))
       }
       this.beforeFn(this.beforeDiscard, () => {
-        axios
-          .post('/bems/activiti/admin/todo/cancle', this.getParam())
-          .then(({ data }) => {
-            this.thenMsg(data, $lc('作废'))
-          })
+        axios.post('/bems/activiti/admin/todo/cancle', this.getParam()).then(({ data }) => {
+          this.thenMsg(data, $lc('作废'))
+        })
       })
     },
     setCarboncopyOk(list) {

package/src/components/HandlingAdvice/index.vue

@@ -24,7 +24,12 @@
             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" :form="customizationList" :otherAttDataA="otherAttDataA" />
+            <show-other-att-new
+              ref="showOtherAttNew"
+              :form="customizationList"
+              :other-att-data-a="otherAttDataA"
+              :task-id="processInstanceId || this.$route.query.processInstanceId"
+            />
           </div>
         </el-form>
       </ExpandablePane>
@@ -42,6 +47,7 @@ import ShowOtherAttNew from '../ApprovalButtons/showOtherAttrNew.vue'
 import ExpandablePane from '../Expandable/main.vue'
 export default {
   name: 'HandlingAdvice',
+  components: { ShowOtherAttNew, ExpandablePane },
   props: {
     afterGetConf: {
       type: Function,
@@ -62,9 +68,12 @@ export default {
     rows: {
       type: Number,
       default: 5
+    },
+    processInstanceId: {
+      type: String,
+      default: ''
     }
   },
-  components: { ShowOtherAttNew, ExpandablePane },
   data() {
     return {
       customizationList: {},