修改首页页面

src/components/files/option.vue

@@ -24,8 +24,8 @@
               <el-form-item label="档案id" prop="taskid">
                 <el-input v-model="form.taskId" placeholder="请输入档案名称" />
               </el-form-item>
-              <el-form-item label="流程名称" prop="taskName">
-                <el-input v-model="form.taskName" placeholder="请输入流程名称" />
+              <el-form-item label="流程名称" prop="processName">
+                <el-input v-model="form.processName" placeholder="请输入流程名称" />
               </el-form-item>
               <el-button type="primary" @click="submit()">归档</el-button>
             </el-form>
@@ -108,7 +108,7 @@
         this.form.archivesName = this.optiontitle;
         this.form.actkey = this.optionactkey;
         this.form.taskId = this.optionid;
-        this.form.taskName=this.optionName;
+        this.form.processName=this.optionName;
       },
 
       /** 查询文档列表 */

src/views/dashboard/LineChart.vue

@@ -5,12 +5,12 @@
       <el-button style="float: right; padding: 3px 0;color: #202020;" type="text" @click="more">更多</el-button>
     </div>
     <el-tabs v-model="activeName" @tab-click="handleClick">
-      <el-tab-pane label="待办事项" name="first">
+      <el-tab-pane label="待办工作" name="first">
         <el-table :data="toListItem" style="width: 100%;" :header-cell-style="{background:'#eee',width:'100%'}">
           <!--        <el-table-column type="index" label="序号" width="50" align="center"></el-table-column>-->
           <el-table-column prop="fwtitle" label="标题"  align="left" >
             <template slot-scope="scope">
-              <el-button type="text"  @click="openactform(scope.row)" style="color: black">{{scope.row.title}}</el-button>
+              <el-button type="text"     @click="openactform(scope.row.processInstanceId,scope.row.businessKey,scope.row.name,scope.row.title,scope.row.taskName)" style="color: black">{{scope.row.title}}</el-button>
             </template>
           </el-table-column>
           <el-table-column prop="createTime" label="接收时间" width="180" align="center">
@@ -41,6 +41,7 @@
                top="10" height="90%">
       <!-- 动态引入组件-->
       <component :is="actForm" :data="details":actOpen="actOpen" @getList="getList" ></component>
+      <Option :optiontitle="optiontitle" :optionactkey="optionactkey" :optionid="optionid" :optionName="optionName" v-show="optiontrue"></Option>
     </el-dialog>
     <el-dialog id="actform1" title="流程详情" :visible.sync="actOpen1" :before-close="cancel" append-to-body width="80%"
                top="10" height="90%">
@@ -55,7 +56,9 @@
   import moment from "moment";
   import {toDoItemListInfo} from "@/api/activiti/form/fw";
   import {getCurrentFlowFormKey,getStartFormKey } from '@/api/activiti/process/startprocess'
+  import Option from "@/components/files/option";
   export default {
+    components: {Option},
     filters: {
       timefilters(val) {
         if (val == null || val == "") {
@@ -75,6 +78,7 @@
     },
     data() {
       return {
+        optiontrue:false,
         actForm: null,
         actForm1: null,
         actOpen:false,
@@ -150,9 +154,29 @@
     created() {
       this.getList1();
       this.getList();
-
+      this.cancel();
     },
     methods: {
+      // 取消按钮
+      cancel() {
+        this.actOpen=false;
+        this.actOpen1 = false;
+      },
+      reset() {
+        this.form = {
+          mailGuid: undefined,
+          senderName: undefined,
+          senderAccount: undefined,
+          receiverName: undefined,
+          receiverAccount: undefined,
+          mailTheme: undefined,
+          mailContent: undefined,
+          createTime: undefined,
+          status: "0",
+          deleteTime: undefined
+        };
+        this.resetForm("form");
+      },
 
       getList1() {
         this.loading = true;
@@ -165,6 +189,7 @@
             console.log(this.myApplication)
           // this.loading = true
         });
+
       },
       handleClick(tab, event) {
         console.log(tab, event);
@@ -187,11 +212,23 @@
           this.toListItem = response.rows;
           this.title = response.title;
           this.loading = false;
+
         });
       },
-      openactform(row) {
-        var actkey=row.processInstanceId;
-        var id=row.businessKey
+      openactform(actkey,id,name,title,taskName) {
+        //var actkey=row.processDfinitionId;
+        alert(id)
+        //var id=row.businessKey
+        if(name == "赋文号归档分发"){
+          this.optiontrue = true;
+          this.optiontitle = title;
+          this.optionactkey = actkey;
+          this.optionid = id;
+          this.optionName=taskName;
+        }else{
+          this.optiontrue = false;
+        }
+
         let vue = this
         actkey=actkey.split(":")[0];
         this.details.getactkey = actkey//动态传参到下面的页面
@@ -199,9 +236,12 @@
         getCurrentFlowFormKey(actkey).then(response => {
           var path = response.msg
           this.actForm = () => Promise.resolve().then(() => require(`@/views/${path}`))
+          this.actOpen = true
         })
-        this.actOpen = true
+
+        this.actOpen =false
         return vue.actForm = this.actForm
+
       },
 
 
@@ -227,6 +267,7 @@
         // const form = row || this.form
         // this.$router.push({path:'/actwork/havedone/havedetails',query: {bd:form,id:actkey }})
       },
+
       more(){
         if(this.activeName=='first'){
           this.$router.replace('/meapply')

src/views/dashboard/RaddarChart.vue

@@ -1,7 +1,7 @@
 <template>
   <el-card class="box-card" style="margin-left: 0px">
     <div slot="header" class="clearfix">
-      <span>办结业务</span>
+      <span>已办工作</span>
       <el-button style="float: right; padding: 3px 0;color: #202020;" type="text" @click="more">更多</el-button>
     </div>
   <el-table class="body" :data="doneList" :header-cell-style="{background:'#eee',width:'100%'}">