我的申请

src/api/system/meapply/meapply.js

@@ -27,12 +27,13 @@ export function recordImg(query) {
 }
 
 // 审批历史
-export function examineHistory(query) {
+export function examineHistory(query,businessKey) {
   return request({
     url: '/fw/examineHistory',
     method: 'get',
     params: {
-      'id': query
+      'id': query,
+      'businessKey': businessKey
     }
   })
 }

src/views/system/actwork/havedone.vue

@@ -213,7 +213,6 @@
           var path = response.msg
           this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
         })
-
         this.actOpen = true
         return vue.actForm = this.actForm
       },
@@ -231,7 +230,7 @@
         recordImg(formdata).then(response => {
           this.picUrl = window.URL.createObjectURL(response)
         })
-        examineHistory(row.processInstanceId).then(response => {
+        examineHistory(row.processInstanceId,row.businessKey).then(response => {
           this.historyExamine = response.rows;
           console.log(response.rows)
         })

src/views/system/actwork/meapply.vue

@@ -42,17 +42,17 @@
 
     <el-table border :data="infoList" @selection-change="handleSelectionChange">
       <el-table-column label="序号" type="index" width="130" align="center"></el-table-column>
-      <el-table-column label="流程名称" width="180" align="center" prop="createUserName"/>
-      <el-table-column label="标题" align="center" prop="fwtitle"/>
+      <el-table-column label="流程名称" width="180" align="center" prop="taskName"/>
+      <el-table-column label="标题" align="center" prop="title"/>
       <el-table-column label="申请人" align="center" prop="applyUser"/>
-      <el-table-column label="创建时间" width="180" align="center" prop="createTime">
+      <el-table-column label="创建时间" width="180" align="center" prop="create_time">
         <template slot-scope="scope">
-          <span>{{scope.row.createTime | format('yyyy-MM-dd hh:mm')}}</span>
+          <span>{{scope.row.create_time | format('yyyy-MM-dd hh:mm')}}</span>
         </template>
       </el-table-column>
-      <el-table-column label="当前处理" width="180" align="center" prop="createTime">
+      <el-table-column label="当前处理" width="180" align="center" prop="dispose">
         <template slot-scope="scope">
-          <span>{{scope.row.taskName }}</span>
+          <span>{{scope.row.dispose }}</span>
         </template>
       </el-table-column>
       <el-table-column label="操作" width="200" align="center" class-name="small-padding fixed-width">
@@ -61,20 +61,18 @@
             size="small"
             type="text"
             icon="el-icon-edit"
-            @click="planLook(scope.row.taskid)"
+            @click="planLook(scope.row.taskid,scope.row.businessKey)"
           >进度查看
           </el-button>
           <el-button
             size="small"
             type="text"
             icon="el-icon-edit"
-            @click="detern(scope.row)"
-            v-hasPermi="['system:info:remove']"
+            @click="detern(scope.row.definitionId,scope.row.businessKey)"
           >详细
           </el-button>
         </template>
 
-
       </el-table-column>
     </el-table>
     <pagination
@@ -86,8 +84,8 @@
     />
 
 
-    <el-dialog title="审批跟踪记录" :visible.sync="dialogVisible" width="1200px">
 
+    <el-dialog title="审批跟踪记录" :visible.sync="dialogVisible" width="1200px">
       <el-tabs :tab-position="tabPosition" style="min-height: 200px;">
         <el-tab-pane>
           <span slot="label"><i class="el-icon-date"></i> 审批记录</span>
@@ -130,17 +128,32 @@
 <!--          <el-button type="primary" @click="cancel">提 交</el-button>-->
       </span>
     </el-dialog>
+
+
+    <el-dialog id="actform" title="流程详情" :visible.sync="actOpen" :before-close="cancel" append-to-body width="80%"
+               top="10" height="90%">
+      <!-- 动态引入组件-->
+      <component :is="actForm" :data="details":actOpen="actOpen" @getList="getList" ></component>
+    </el-dialog>
+
   </div>
 </template>
 
 
 <script>
   import { listInfo, recordImg, examineHistory } from '@/api/system/meapply/meapply'
-
+  import {getStartFormKey } from '@/api/activiti/process/startprocess'
   export default {
     name: 'meapply',
     data() {
       return {
+        //流程遮罩层
+        actOpen: false,
+        //传入到下一页面的值
+        details:{getactkey: '',
+          formId:'',
+          flg:'2',
+        },
         picUrl: '',
         dialogVisible: false,
         tabPosition: 'left',
@@ -158,13 +171,17 @@
         // 【请填写功能名称】表格数据
         infoList: [
           {
+            title:'',
+            taskName:'',
             applyUser:'',
             createUserName :'',
             taskid: '',
             fwtitle: '',
             fwdept: '',
-            createTime: '',
-            taskName: ''
+            create_time: '',
+            dispose: '',
+            definitionId:'',
+            businessKey:''
           }
 
         ],
@@ -185,6 +202,7 @@
         title: '',
         // 是否显示弹出层
         open: false,
+        actForm: null,
         // 查询参数
         queryParams: {
           pageNum: 1,
@@ -211,7 +229,7 @@
     },
     methods: {
       /*我的申请进度查看*/
-      planLook(row) {
+      planLook(row,businessKey) {
         var formdata = new FormData
         formdata.append('pProcessInstanceId', row)
         //进度查看
@@ -221,7 +239,7 @@
 
         })
 
-        examineHistory(row).then(response => {
+        examineHistory(row,businessKey).then(response => {
 
           this.historyExamine = response.rows;
           console.log(response.rows)
@@ -229,11 +247,30 @@
 
         this.dialogVisible = true
       },
-      detern(row){
-        this.reset();
-        const actkey = row.taskid || this.ids
-        const form = row || this.form
-        this.$router.push({path:'/actwork/havedone/havedetails',query: {bd:form,id:actkey }})
+      // detern(actkey,id){
+      //   let vue = this
+      //   actkey=actkey.split(":")[0];
+      //   this.details.getactkey = actkey//动态传参到下面的页面
+      //   this.details.formId = id//动态传参到下面的页面
+      //   getStartFormKey(actkey).then(response => {
+      //     var path = response.msg
+      //     this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
+      //   })
+      //   this.actOpen = true
+      //   return vue.actForm = this.actForm
+      // },
+
+      detern(actkey,id) {
+        let vue = this
+        actkey=actkey.split(":")[0];
+        this.details.getactkey = actkey//动态传参到下面的页面
+        this.details.formId = id//动态传参到下面的页面
+        getStartFormKey(actkey).then(response => {
+          var path = response.msg
+          this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
+        })
+        this.actOpen = true
+        return vue.actForm = this.actForm
       },
       /** 查询我的申请列表 */
       getList() {
@@ -250,6 +287,7 @@
         this.open = false
         this.reset()
         this.dialogVisible = false
+        this.actOpen = false;
       },
       // 表单重置
       reset() {

src/views/system/actwork/todo.vue

@@ -160,7 +160,6 @@
           var path = response.msg
           this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
         })
-
         this.actOpen = true
         return vue.actForm = this.actForm
       },