v1.9 优化物品放行bug

wuxw
1 parent 69b4c460
Showing 4 changed files with 30 additions and 10 deletions
src/views/resource/itemReleaseUndoList.vue
src/views/work/editItemReleaseViewList.vue
src/views/work/itemReleaseDetailList.vue
src/views/work/itemReleaseManageList.vue
@@ -116,7 +116,7 @@ export default {
     },
     _openDetail(item) {
       this.$router.push({
-        path: '/views/property/itemReleaseDetail',
+        path: '/views/work/itemReleaseDetail',
         query: {
           irId: item.irId,
           flowId: item.flowId
@@ -125,7 +125,7 @@ export default {
     },
     _openAuditUndoDetail(undo) {
       this.$router.push({
-        path: '/views/property/itemReleaseDetail',
+        path: '/views/work/itemReleaseDetail',
         query: {
           irId: undo.irId,
           flowId: undo.flowId,
@@ -86,7 +86,7 @@
       <el-row :gutter="20" class="margin-top">
         <el-col :span="24">
           <el-card shadow="never">
-            <div slot="header" class="clearfix">
+            <div slot="header" class="flex justify-between">
               <span>{{ $t('editItemReleaseView.releaseItems') }}</span>
               <el-button type="primary" size="small" style="float: right;" @click="addResName">
                 <i class="el-icon-plus"></i>
@@ -184,7 +184,10 @@ import SelectStaff from &#39;@/components/staff/SelectStaff&#39;
 import {
   listItemReleaseRes,
   listItemRelease,
-  auditUndoItemRelease
+  auditUndoItemRelease,
+  queryOaWorkflowUser,
+  listRunWorkflowImage,
+  queryNextDealUser
 } from '@/api/work/itemReleaseDetailApi'
 export default {
@@ -266,9 +269,17 @@ export default {
         console.error('获取放行详情失败:', error)
       }
     },
-    _loadComments() {
+   async _loadComments() {
       // TODO: 需要实现工单评论接口
       console.log('加载评论')
+      const { data } = await queryOaWorkflowUser({
+        page: 1,
+        row: 1,
+        flowId: this.itemReleaseDetailInfo.flowId,
+        id: this.itemReleaseDetailInfo.irId,
+        communityId: this.communityId
+      })
+      this.itemReleaseDetailInfo.comments = data
     },
     _goBack() {
       this.$router.go(-1)
@@ -306,13 +317,22 @@ export default {
         this.$message.error(error.message || this.$t('itemReleaseDetail.submitFailed'))
       }
     },
-    _loadNextAuditPerson() {
+    async _loadNextAuditPerson() {
       // TODO: 需要实现获取下一处理人接口
       console.log('加载下一处理人')
+      const { data } = await queryNextDealUser({
+        startUserId: this.itemReleaseDetailInfo.pools.createUserId,
+        taskId: this.itemReleaseDetailInfo.audit.taskId,
+        communityId: this.communityId
+      })
+      this.itemReleaseDetailInfo.nextAudit = data[0]
     },
-    _openNewOaWorkflowDetailImg() {
-      // TODO: 需要实现获取流程图接口
-      console.log('加载流程图')
+    async _openNewOaWorkflowDetailImg() {
+      const { data } = await listRunWorkflowImage({
+        businessKey: this.itemReleaseDetailInfo.irId,
+        communityId: this.communityId
+      })
+      this.itemReleaseDetailInfo.imgData = 'data:image/png;base64,' + data
     },
     handleStaffSelect(staff) {
       this.itemReleaseDetailInfo.audit.staffId = staff.staffId
@@ -94,7 +94,7 @@
             <el-button size="mini" @click="_openDetail(scope.row)">
               {{ $t('common.detail') }}
             </el-button>
-            <el-button size="mini" type="primary" @click="_openEditItemReleaseModel(scope.row)">
+            <el-button size="mini" type="primary" v-if="scope.row.state != 'C'" @click="_openEditItemReleaseModel(scope.row)">
               {{ $t('common.edit') }}
             </el-button>
             <el-button size="mini" type="danger" @click="_openDeleteItemReleaseModel(scope.row)">