Przeglądaj źródła

体系运行记录盒过滤不归档流程,报表及附件增加判空处理

cfort 2 lat temu
rodzic
commit
db165435f5

+ 11 - 0
src/api/platform/bpmn/bpmInstHis.js

@@ -11,6 +11,17 @@ export function queryPageList(params) {
     data: params
   })
 }
+/**
+ * 查询列表数据过滤不归档流程
+ * @param {*} params
+ */
+ export function queryClassify(params) {
+    return request({
+      url: BPMN_URL() + '/bpm/instance/history/queryClassify',
+      method: 'post',
+      data: params
+    })
+  }
 /**
  * 获取流程实例信息
  * @param {*} params

+ 4 - 4
src/views/platform/bpmn/bpmInstHis/list.vue

@@ -102,7 +102,7 @@
                     <div class="div_operation el-icon-s-order" slot="reference">查阅记录</div>
                     <div class="div_content">
                         <!-- 获取所有输出报告-->
-                        <template v-if="record.report.length">
+                        <template v-if="record.report.length && record.report[0]">
                             <div v-for="item in record.report" class="content_item">
                                 <span style="cursor: pointer;" @click="openReport(item, record.bizKey)">
                                     <i class="el-icon-tickets" style="font-size: 18px;"/>
@@ -127,7 +127,7 @@
                                 style="width: 100%;"
                             />
                         </div>
-                        <div v-if="!record.report.length && !record.file.length">无报表及附件数据</div>
+                        <div v-if="(!record.report.length || !record.report[0]) && (!record.file.length || !fileId)">无报表及附件数据</div>
                     </div>
                 </el-popover>
             </template>
@@ -159,7 +159,7 @@
 </template>
 
 <script>
-    import { queryPageList } from '@/api/platform/bpmn/bpmInstHis'
+    import { queryPageList, queryClassify } from '@/api/platform/bpmn/bpmInstHis'
     import ActionUtils from '@/utils/action'
     import IbpsTypeTree from '@/business/platform/cat/type/tree'
     import FixHeight from '@/mixins/height'
@@ -281,7 +281,7 @@
             // 加载数据
             loadData() {
                 this.loading = true
-                queryPageList(this.getSearcFormData()).then((response) => {
+                queryClassify(this.getSearcFormData()).then((response) => {
                     let data = response.data && response.data.dataResult
                     data.forEach(item => {
                         let temp = this.getParenthesesStr(item.subject)