报告作废添加报告号展示

src/views/modules/cw/reportCancellApply/ReportCancellApplyList.vue

@@ -81,6 +81,13 @@
               <span v-else>{{scope.row.documentNo}}</span>
             </template>
           </vxe-column>
+          <vxe-column min-width="160" align="center" title="报告文号" field="reportNo">
+            <template slot-scope="scope">
+              <el-link  type="primary" :underline="false" v-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)" @click="viewReport(scope.row.reportId)">{{scope.row.reportNo}}</el-link>
+              <el-link  type="primary" :underline="false" v-else-if="hasPermission('cwProjectReport:list')&&commonJS.isNotEmpty(scope.row.reportId)"  @click="viewReport(scope.row.reportId)">{{scope.row.reportNo}}</el-link>
+              <span v-else>{{scope.row.reportNo}}</span>
+            </template>
+          </vxe-column>
           <vxe-column min-width="160" align="center" title="项目编号" field="projectNumber"></vxe-column>
           <vxe-column min-width="160" align="center" title="项目名称" field="projectName"></vxe-column>
           <vxe-column min-width="160" align="center" title="报告所属部门" field="departmentName"></vxe-column>
@@ -124,7 +131,7 @@
         </vxe-pager>
       </div>
     </div>
-<!--    <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>-->
+    <ReportManagementForm ref="reportManagementForm"></ReportManagementForm>
     <ReportCancellApplyForm ref="reportCancellApplyForm"></ReportCancellApplyForm>
   </div>
 </template>
@@ -135,7 +142,7 @@
   import ReportCancellApplyService from '@/api/cw/reportCancellApply/ReportCancellApplyService'
   import TaskService from '@/api/flowable/TaskService'
   import ProcessService from '@/api/flowable/ProcessService'
-  // import ReportManagementForm from '../reportManagement/ReportManagementForm'
+  import ReportManagementForm from '../reportManagement/ReportManagementForm'
   import ReportCancellApplyForm from './ReportCancellApplyForm'
   import pick from 'lodash.pick'
   import UserService from '@/api/sys/UserService'
@@ -184,7 +191,7 @@
       this.userService = new UserService()
     },
     components: {
-      // ReportManagementForm
+      ReportManagementForm,
       ReportCancellApplyForm,
       SelectUserTree,
       UserSelect
@@ -223,6 +230,11 @@
         // this.$refs.reportManagementForm.init('view', id)
         this.$refs.reportCancellApplyForm.init('view', id)
       },
+      // 根据报告id查看报告详情
+      viewReport (id) {
+        this.$refs.reportManagementForm.init('view', id)
+        // this.$refs.reportCancellApplyForm.init('view', id)
+      },
       // 查询当前用户是否是管理员用户
       checkIsAdmin () {
         this.userService.is().then(({data}) => {