Merge branch 'yinet' of yinet2020/YinetOASystemWeb into master

src/api/activiti/leave/leave.js

@@ -1,9 +1,6 @@
 import request from '@/utils/request'
 
-
-
-
-// 新增【请填写功能名称】
+// 提交请假流程
 export function addLeave(data) {
   return request({
     url: '/system/leave',

src/views/system/actform/leave/leave.vue

@@ -109,10 +109,10 @@
             <el-button type="primary" @click="submitForm" style="margin-left: -100px;">提交</el-button>
             <el-button @click="resetForm">重置</el-button>
           </el-form-item>
-         <!-- <el-form-item size="large" v-show="open4">
+          <el-form-item size="large" v-show="open4">
             <el-button type="primary" @click="submitToDo()" >同意</el-button>
             <el-button type="primary" @click="deleteToDo()" >拒绝</el-button>
-          </el-form-item>-->
+          </el-form-item>
         </el-col>
 
       </el-form>
@@ -120,7 +120,6 @@
 
     <!-- 选择人员对话框 -->
     <select-user-by-dept ref="selectUserByDept" :title="title" :open="open"  @ok="selectOK"/>
-
   </div>
 </template>
 <script>
@@ -317,7 +316,6 @@
           if (valid) {
             this.form.daterange= JSON.stringify(this.time)
             console.log(  this.form.daterange)
-            // TODO 提交表单
             addLeave(this.form).then(response => {
               if (response.code === 200) {
                 this.msgSuccess("提交成功");

src/views/system/actwork/havedone.vue

@@ -1,26 +1,7 @@
 <template>
   <div class="app-container">
     <el-row :gutter="10" class="mb8">
-      <!--<el-col :span="1.5">-->
-      <!--<el-button-->
-      <!--type="success"-->
-      <!--icon="el-icon-edit"-->
-      <!--size="small"-->
-      <!--:disabled="single"-->
-      <!--@click="handleUpdate1"-->
-      <!--v-hasPermi="['system:info:edit']"-->
-      <!--&gt;修改</el-button>-->
-      <!--</el-col>-->
-      <!--<el-col :span="1.5">-->
-      <!--<el-button-->
-      <!--type="danger"-->
-      <!--icon="el-icon-delete"-->
-      <!--size="small"-->
-      <!--:disabled="multiple"-->
-      <!--@click="handleDelete"-->
-      <!--v-hasPermi="['system:info:remove']"-->
-      <!--&gt;删除</el-button>-->
-      <!--</el-col>-->
+
       <el-col :span="1.5">
         <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="68px">
           <el-form-item label="名称" prop="mailTheme">
@@ -44,7 +25,6 @@
       <el-table-column label="序号" type="index" width="55" align="center"></el-table-column>
       <el-table-column label="流程名称" width="180" align="center" prop="taskName" >
       </el-table-column>
-
       <el-table-column label="标题" align="center" prop="title" />
       <el-table-column label="当前处理" width="180" align="center" prop="name"/>
       <el-table-column label="创建时间" width="180" align="center" prop="createTime" >
@@ -70,7 +50,7 @@
             type="text"
             icon="el-icon-share"
             @click="detail(scope.row)"
-          >审批进度</el-button>
+          >审批记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -81,7 +61,7 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-    <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>
@@ -89,32 +69,27 @@
           <img :src="picUrl">
         </el-tab-pane>
         <el-tab-pane>
-          <span slot="label"><i class="el-icon-date"></i> 审批历史</span>
-
-
+          <span slot="label"><i class="el-icon-date"></i> 审批详细</span>
           <el-table border :data="historyExamine" @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="activityName"/>
-            <el-table-column label="处理人" align="center" prop="assigneeName"/>
-            <el-table-column label="审批意见" align="center" prop="comment"/>
-
-            <el-table-column label="申请时间" width="180" align="center" prop="startTime">
+            <el-table-column label="序号" type="index" width="50" align="center"></el-table-column>
+            <el-table-column label="任务名称" width="100" align="center" prop="activityName"/>
+            <el-table-column label="审批人员" width="180"align="center" prop="assigneeName"/>
+            <el-table-column label="到达时间"  align="center" prop="startTime">
               <template slot-scope="scope">
                 <span>{{scope.row.startTime | format('yyyy-MM-dd hh:mm')}}</span>
               </template>
             </el-table-column>
-
-            <el-table-column label="结束时间" width="180" align="center" prop="endTime">
+            <el-table-column label="审批时间"  align="center" prop="endTime">
               <template slot-scope="scope">
                 <span>{{scope.row.endTime | format('yyyy-MM-dd hh:mm')}}</span>
               </template>
             </el-table-column>
-
-            <el-table-column label="耗时" width="180" align="center" prop="activityType">
+            <el-table-column label="审批耗时" width="180" align="center" prop="activityType">
               <template slot-scope="scope">
                 <span>{{scope.row.activityType }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="审批意见" width="180" align="center" prop="comment"/>
           </el-table>
           <!--          formatTotalDateSub()-->
 
@@ -124,18 +99,15 @@
            <el-button @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 { havedInfo } from "@/api/activiti/form/fw";
   import { recordImg, examineHistory } from '@/api/system/meapply/meapply'
   import {getStartFormKey } from '@/api/activiti/process/startprocess'
@@ -238,7 +210,7 @@
       },
 
 
-      /** 查询【请填写功能名称】列表 */
+      /** 查询列表 */
       getList() {
         this.loading = true;
         havedInfo(this.queryParams).then(response => {

src/views/system/actwork/meapply.vue

@@ -244,18 +244,7 @@
 
         this.dialogVisible = true
       },
-      // 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