n20-common-lib 2.11.12 → 2.11.14

package/package.json

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

package/src/components/ApprovalButtons/index.vue

@@ -163,7 +163,7 @@
     </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="showAdvancePop">{{ '批 准' | $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>
@@ -177,7 +177,7 @@
       <el-button v-if="authList.includes('refuse')" plain @click="rejectFn">{{ '拒 绝' | $lc }}</el-button>
       <el-button v-if="authList.includes('takeOff')" plain @click="qjFn">{{ '请 假' | $lc }}</el-button>
       <!-- END -->
-      <el-button v-if="authList.includes('approval')" type="primary" @click="checkFlowFn">{{
+      <el-button v-if="authList.includes('approval')" type="primary" @click="showAdvancePop">{{
         '批 准' | $lc
       }}</el-button>
       <el-button v-if="authList.includes('approval') && nextApproval && nextBtn" type="primary" @click="approvalNext">{{
@@ -300,10 +300,22 @@
         </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'
@@ -329,6 +341,7 @@ if (!window._approvalExtend['addtask.chdUserInfo.extend']) {
 export default {
   name: 'ApprovalButtons',
   components: {
+    selectSpr,
     ClDialog,
     ClUpload,
     CarboncopyProp,
@@ -417,6 +430,10 @@ export default {
   data() {
     this.msgisSync = !!this.$listeners['update:message']
     return {
+      nextEgwOutgoingNodeId: undefined,
+      nextNodeApproveUnos: undefined,
+      selectSprList: undefined,
+      setSpr: false,
       requiredC: false,
       prefixCls,
       messageIn: '',
@@ -494,6 +511,32 @@ export default {
     this.getIsShowUploadWidget()
   },
   methods: {
+    // 查询选择审批人
+    async showAdvancePop() {
+      try {
+        const res = await this.$axios.post('/bems/activiti/admin/todo/showAdvancePop', {
+          isAgentcy: this.$route.query.isAgentcy,
+          taskId: this.$route.query.taskId
+        })
+        // 如果返回正常 且有返回值 且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.checkFlowFn()
+    },
     async getIsShowUploadWidget() {
       const { processInstanceId: procInstId, taskId } = this.$route.query
       const { code, data } = await this.$axios.get(
@@ -548,7 +591,6 @@ export default {
           }
         })
     },
-
     // 换回到发起页
     goFrom() {
       let pathname = location.pathname
@@ -562,7 +604,6 @@ export default {
         closeTagsForBackPage(pathname)
       })
     },
-
     // 动态获取按钮
     getBtns() {
       if (!this.taskId || !this.showBtn) return false
@@ -653,6 +694,8 @@ export default {
       }
       return [
         {
+          nextNodeApproveUnos: this.nextNodeApproveUnos,
+          nextEgwOutgoingNodeId: this.nextEgwOutgoingNodeId,
           isTakeOff: this.isTakeOff,
           typeCode,
           taskId,
@@ -810,6 +853,7 @@ export default {
       this.isTakeOff = '1'
       this.checkFlowFn()
     },
+
     async checkFlowFn() {
       this.isTakeOff = undefined
       if (this.requiredC && !this.messageC) {
@@ -829,6 +873,8 @@ export default {
           auditAdvanceDtos: [
             {
               isTakeOff: this.isTakeOff,
+              nextNodeApproveUnos: this.nextNodeApproveUnos,
+              nextEgwOutgoingNodeId: this.nextEgwOutgoingNodeId,
               appNo,
               taskId,
               groupNo,

package/src/components/ApprovalButtons/selectSpr.vue

@@ -0,0 +1,128 @@
+<template>
+  <cl-page style="height: 75vh; --table-w: 650px">
+    <div class="flex-box" style="height: 100%">
+      <el-table
+        ref="elTable"
+        :data="selectSprList.actNextNodeAssigneeVos"
+        row-key="nodeId"
+        border
+        height="100%"
+        style="width: 30%; flex: none"
+        @select="sltChange"
+        @select-all="sltChange"
+      >
+        <el-table-column header-align="center" align="center" :label="'节点名称' | $lc">
+          <template slot-scope="scope">
+            <el-radio v-model="nextEgwOutgoingNodeId" :label="scope.row.nodeId" @change="sltChange(scope.row)">{{
+              scope.row.nodeName
+            }}</el-radio>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="flex-column flex-c p-l p-r">
+        <i class="el-icon-d-arrow-left m-b"></i>
+        <i class="el-icon-d-arrow-right"></i>
+      </div>
+      <el-table
+        ref="personTable"
+        :data="nodeTable"
+        row-key="uno"
+        border
+        height="100%"
+        style="width: var(--table-w); flex: none"
+        @select="personChange"
+        @select-all="personChange"
+      >
+        <el-table-column
+          :selectable="handleSelectable"
+          :reserve-selection="true"
+          type="selection"
+          width="46"
+          header-align="center"
+          align="center"
+        />
+        <el-table-column prop="uno" :label="'审批人员编号' | $lc" header-align="center" align="center" />
+        <el-table-column prop="uname" :label="'审批人员名称' | $lc" header-align="center" align="center" />
+        <el-table-column prop="deptName" :label="'审批人员所属部门' | $lc" header-align="center" align="center" />
+      </el-table>
+    </div>
+    <template slot="footer">
+      <div class="flex-box m-t m-b" style="margin-left: calc(30% + 50px)">
+        <cl-statis-item type="已选合计" :list="[{ label: '笔数', value: personList.length }]" show-w />
+      </div>
+      <div class="text-c">
+        <el-button type="primary" @click="confirmFn">{{ '确定' | $lc }}</el-button>
+        <el-button @click="$emit('close')">{{ '取消' | $lc }}</el-button>
+      </div>
+    </template>
+  </cl-page>
+</template>
+
+<script>
+import { $lc } from '../../utils/i18n/index'
+import ClPage from '../PageLayout/page.vue'
+import ClStatisItem from '../Statis/statisItem.vue'
+export default {
+  components: {
+    ClPage,
+    ClStatisItem
+  },
+  props: {
+    selectSprList: {
+      type: Array,
+      default: () => {
+        return {
+          actNextNodeAssigneeVos: []
+        }
+      }
+    },
+    type: {
+      type: String,
+      default: undefined
+    }
+  },
+  data() {
+    return {
+      nextEgwOutgoingNodeId: '',
+      nodeTable: [],
+      selectCheck: true,
+      personList: []
+    }
+  },
+  mounted() {
+    this.$refs.elTable.clearSelection()
+    this.carbonCopyList.forEach((item) => {
+      this.$refs.elTable.toggleRowSelection(item, true)
+    })
+  },
+  methods: {
+    handleSelectable(row) {
+      // 返回 false 禁止选择该行
+      return this.selectCheck
+    },
+    sltChange(row) {
+      this.nodeTable = row.actAssigneeVoList
+      this.$refs.personTable.clearSelection()
+      this.selectCheck = this.selectSprList?.showNextNodeAssignee || false
+    },
+    personChange(list) {
+      this.personList = list
+    },
+    closeFn(item) {
+      this.selectSprList = {
+        actNextNodeAssigneeVos: []
+      }
+    },
+    confirmFn() {
+      this.$emit('confirm', {
+        nextEgwOutgoingNodeId: this.selectSprList?.showNextEgwOutgoingNodeName ? this.nextEgwOutgoingNodeId : undefined,
+        nextNodeApproveUnos: this.selectSprList?.showNextNodeAssignee
+          ? this.personList.map((item) => item.uno)
+          : undefined
+      })
+    }
+  }
+}
+</script>
+
+<style></style>

package/src/components/ApprovalCard/index.vue

@@ -434,6 +434,7 @@ export default {
       let approvalData = []
       data?.forEach((item) => {
         let _item = {
+          isShow: item.isShow, //是否显示
           endTime: item.endTime || '',
           assignee: item.assignee,
           suggestion: item.suggestion,
@@ -477,7 +478,11 @@ export default {
 
         approvalData.push(_item)
       })
-      return approvalData
+      return (
+        approvalData?.filter((item) => {
+          return item.isShow !== '0'
+        }) || []
+      )
     },
     // 获取数据字典加签备注
     async getMdmDataDoc() {

package/src/components/ApprovalRecord/approvalImgPro/index.vue

@@ -34,9 +34,12 @@
       }}</span>
       <el-button type="text" icon="el-icon-full-screen" style="font-size: 16px" @click="scaleReset" />
     </div>
-    <el-popover ref="title-pop" v-model="msgV" trigger="manual" placement="top">
+    <el-popover ref="title-pop" v-model="msgV" trigger="hover" placement="top">
       <div class="activiti-msg">
         <div v-if="assigneeEnd" class="m-t-ss m-b-ss">
+          <div class="flex-box flex-r">
+            <el-button type="text" @click="uploadList(assigneeEnd)">{{ '导出' | $lc }}</el-button>
+          </div>
           <table cellspacing="0" style="border-collapse: collapse; min-width: 460px">
             <tr>
               <td class="text-c">{{ '已审批人' | $lc }}</td>
@@ -128,10 +131,10 @@
       </div>
     </el-popover>
 
-    <el-popover ref="child-pop" popper-class="n20-approval-child" v-model="childV" trigger="manual" placement="bottom">
-      <div v-click-outside="clickOut" v-if="childV">
+    <el-popover ref="child-pop" v-model="childV" popper-class="n20-approval-child" trigger="manual" placement="bottom">
+      <div v-if="childV" v-click-outside="clickOut">
         <div>{{ childTitle }}</div>
-        <child :data-pro="childDataPro"></child>
+        <child :data-pro="childDataPro" />
       </div>
     </el-popover>
   </div>
@@ -279,6 +282,31 @@ export default {
     document.body.removeEventListener('click', this.addTaskFn)
   },
   methods: {
+    // 导出
+    uploadList(assigneeEnd) {
+      axios
+        .post(
+          '/bems/activiti/sample/importTaskFlowHistory',
+          {
+            taskName: '',
+            detailList: assigneeEnd.map((item) => {
+              return {
+                assignee: item.assignee,
+                optResult: item.optResult,
+                suggestion: item.suggestion,
+                endTime: item.endTime
+              }
+            })
+          },
+          {
+            responseType: 'blob',
+            timeout: 600000 // 针对单个请求设置超时时间
+          }
+        )
+        .then((res) => {
+          this.$downloadBlob(res, res.name)
+        })
+    },
     addTaskFn() {
       this.addTaskV = false
     },
@@ -547,6 +575,9 @@ export default {
       } else if (this.dataPro.taskDefIdMap[id] /*已审批*/) {
         this.assigneeEnd = this.dataPro.taskDefIdMap[id]
         this.$nextTick(() => {
+          this.assigneeEnd = this.assigneeEnd?.filter((item) => {
+            return item.isShow !== '0'
+          })
           this.$refs['title-pop'].doDestroy()
           this.$refs['title-pop'].referenceElm = ev.currentTarget
           this.msgV = true
@@ -568,6 +599,9 @@ export default {
           this.assigneeEnd = list
         }
         this.$nextTick(() => {
+          this.assigneeEnd = this.assigneeEnd?.filter((item) => {
+            return item.isShow !== '0'
+          })
           this.$refs['title-pop'].doDestroy()
           this.$refs['title-pop'].referenceElm = task
           this.msgV = true