n20-common-lib 2.11.12 → 2.11.13

package/package.json

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

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