修改

src/api/oa/turnJust.js

@@ -0,0 +1,95 @@
+import request from '@/utils/request'
+
+// 创建流程
+export function create(data) {
+  return request({
+    url: '/bpm/oa-universal/commit',
+    method: 'post',
+    data: data
+  })
+}
+//驳回或撤回后再次提交通用用事项审批流程信息
+export function reCommit(data) {
+  return request({
+    url: '/bpm/oa-universal/reCommit',
+    method: 'post',
+    data: data
+  })
+}
+// 暂存数据保存
+export function save(data) {
+  return request({
+    url: '/bpm/oa-universal/staging',
+    method: 'post',
+    data: data
+  })
+}
+// 暂存数据删除
+export function deleteById(id) {
+  return request({
+    url: 'bpm/oa-universal/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 关闭审批流程信息
+export function closeById(id) {
+  return request({
+    url: '/bpm/oa-universal/close?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得详情
+export function getDetail(id) {
+  return request({
+    url: '/bpm/oa-universal/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得列表
+export function getListData(query) {
+  return request({
+    url: '/bpm/oa-universal/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出列表
+export function exportList(query) {
+  return request({
+    url: '/bpm/oa-universal/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+
+//审批同意通用事项审批流程信息
+export function agree(data) {
+  return request({
+    url: '/bpm/oa-universal/agree',
+    method: 'post',
+    data: data
+  })
+}
+
+//驳回通用事项审批流程信息
+export function disagree(data) {
+  return request({
+    url: '/bpm/oa-universal/disagree',
+    method: 'post',
+    data: data
+  })
+}
+
+//撤回通用事项审批流程信息
+export function revocation(data) {
+  return request({
+    url: '/bpm/oa-universal/revocation',
+    method: 'post',
+    data: data
+  })
+}
+

src/views/bpm/processInstance/index.vue

@@ -35,7 +35,7 @@
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
                 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="detailLoading">
-      <async-biz-form-component :id="businessKey"></async-biz-form-component>
+      <async-biz-form-component :id="businessKey" name="my"></async-biz-form-component>
     </el-dialog>
   </div>
 </template>
@@ -78,6 +78,10 @@ export default {
     this.getList();
   },
   methods: {
+    closeEdit() {
+      this.open = false;
+      this.getList();
+    },
     /** 查询列表 */
     getList() {
       this.loading = true;

src/views/bpm/task/todo/index.vue

@@ -32,7 +32,7 @@
                 @pagination="getList"/>
 
      <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="detailLoading">
-      <async-biz-form-component :id="businessKey"></async-biz-form-component>
+      <async-biz-form-component :id="businessKey" name="todo"></async-biz-form-component>
     </el-dialog>
 
   </div>

src/views/oa/entry/detail.vue

@@ -167,11 +167,11 @@
           </el-timeline-item>
         </el-timeline>
       </div>
-      <div class="fx-field x-grid-col-12" v-if="form.auditStatus==2">
-        <div style="float: right;">
+      <div class="fx-field x-grid-col-12">
+        <div>
           <el-button v-if="form.auditStatus==1" type="primary" @click="handleRevocation()" v-loading.fullscreen.lock="fullscreenLoading">撤回</el-button>
-          <el-button @click="handleAudit(false)" v-loading.fullscreen.lock="fullscreenLoading">驳回</el-button>
-          <el-button type="primary" @click="handleAudit(true)" v-loading.fullscreen.lock="fullscreenLoading">同意</el-button>
+          <el-button v-if="form.auditStatus==2" @click="handleAudit(false)" v-loading.fullscreen.lock="fullscreenLoading">驳回</el-button>
+          <el-button v-if="form.auditStatus==2" type="primary" @click="handleAudit(true)" v-loading.fullscreen.lock="fullscreenLoading">同意</el-button>
         </div>
       </div>
 

src/views/oa/entry/edit.vue

@@ -100,7 +100,7 @@
       </el-form-item>
       <el-form-item>
         <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="primary" @click="onReCommit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
-        <el-button type="primary" @click="onSubmit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
+        <el-button v-if="form.auditStatus!=5 && form.auditStatus!=6" type="primary" @click="onSubmit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
         <el-button v-if="!form.auditStatus || form.auditStatus==0" @click="onSave()" v-loading.fullscreen.lock="fullscreenLoading">暂存</el-button>
         <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="warning" @click="onClose()" v-loading.fullscreen.lock="fullscreenLoading">关闭</el-button>
         <el-button v-if="form.auditStatus==0" type="danger" @click="onDelete()" v-loading.fullscreen.lock="fullscreenLoading">删除</el-button>

src/views/oa/turnJust/edit.vue

@@ -1,91 +1,123 @@
 <template>
-    <div class="container">
-      <el-form :model="form" label-position="top" :rules="rules" ref="form" label-width="80px">
-              <el-form-item label="转正人" prop="loginName">
-                <el-input v-model="form.loginName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
-              </el-form-item>
-              <el-form-item label="员工编号">
-                <el-input v-model="form.loginId" placeholder='员工编号' disabled></el-input>
-              </el-form-item>
-              <el-form-item label="部门">
-                <el-input v-model="form.deptId" placeholder='部门' disabled></el-input>
-              
-              </el-form-item>
-              <el-form-item label="职位">
-                <el-input v-model="form.position" placeholder='职位' disabled></el-input>
-            
-              </el-form-item>
-              <el-form-item label="入职日期" prop="startDate">
-                <el-input v-model="form.startDate" placeholder='入职日期' disabled></el-input>
-               
-              </el-form-item>
-              <el-form-item label="试用期结束日期" prop="probationEndDate">
-                <el-input v-model="form.probationEndDate" placeholder='试用期结束日期' disabled></el-input>
-          
-              </el-form-item>
-              <el-form-item label="转正日期" prop="conversionDate">
-                <el-date-picker value-format="yyyy-MM-dd" v-model="form.conversionDate" type="date" placeholder="转正日期" style="width: 100%;">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="转正申请理由" prop="conversionReason">
-                <el-input maxlength="500" rows="4" show-word-limit type="textarea" v-model="form.conversionReason" placeholder='转正申请理由'></el-input>
-              </el-form-item>
+  <div class="container">
+    <el-form :model="form" label-position="top" :rules="rules" ref="form" label-width="80px">
+      <el-form-item label="转正人" prop="loginName">
+        <el-input v-model="form.loginName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+      </el-form-item>
+      <el-form-item label="员工编号">
+        <el-input v-model="form.loginId" placeholder='员工编号' disabled></el-input>
+      </el-form-item>
+      <el-form-item label="部门">
+        <el-input v-model="form.deptId" placeholder='部门' disabled></el-input>
 
-             
-              <el-form-item label="工作总结">
-                <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workSummary" placeholder='工作总结'></el-input>
-              </el-form-item>
-            
-              <el-form-item label="附件">
-                <!-- <FileUpload v-model="form.files" :limit="1"/> -->
-            <el-upload
-              action=""
-              ref="privateKeyContentFile"
-              :limit="1"
-              :http-request="appCertUpload"
-              :before-upload="fileBeforeUpload">
-              <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
-            </el-upload>
-          </el-form-item>
-              <el-form-item label="备注">
-                <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks" placeholder="请输入备注" />
-              </el-form-item>
-              <el-form-item label="审批人" prop="peopleList">
-                <el-input type="textarea" v-model="form.peopleList" style="display: none;"/>
-                <el-button class="button-new-tag" @click="openMultiple">+ 添加</el-button>
-                <span :key="tag" v-for="tag in peopleList">
-                  <i class="el-icon-arrow-right"></i>
-                  <el-tag type="info" closable :disable-transitions="false"
-                  @close="handleClose(tag)">
-                  <span class="user-avatar">{{ tag.substring(0,1) || 'U' }}</span>
-                 {{ tag }}
-                </el-tag>
-                </span>
+      </el-form-item>
+      <el-form-item label="职位">
+        <el-input v-model="form.position" placeholder='职位' disabled></el-input>
 
-              </el-form-item>
-              <el-form-item>
-                <el-button type="primary" @click="onSubmit()">提交</el-button>
-                <el-button @click="onSave()">暂存</el-button>
-              </el-form-item>
-            </el-form>
-            <PeopleSelect ref="peopleSelect" type="multiple" :isCheck="true" :open="multiplePeopleOpen" @cancel="multiplePeopleOpen = false"
-          @submit="submitMultiple"></PeopleSelect>
-          <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen" @cancel="singlePeopleOpen = false"
-            @submit="submitSingle"></PeopleSelect>
-           
-    </div>
+      </el-form-item>
+      <el-form-item label="入职日期" prop="startDate">
+        <el-input v-model="form.startDate" placeholder='入职日期' disabled></el-input>
+
+      </el-form-item>
+      <el-form-item label="试用期结束日期" prop="probationEndDate">
+        <el-input v-model="form.probationEndDate" placeholder='试用期结束日期' disabled></el-input>
+
+      </el-form-item>
+      <el-form-item label="转正日期" prop="conversionDate">
+        <el-date-picker value-format="yyyy-MM-dd" v-model="form.conversionDate" type="date" placeholder="转正日期"
+          style="width: 100%;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="转正申请理由" prop="conversionReason">
+        <el-input maxlength="500" rows="4" show-word-limit type="textarea" v-model="form.conversionReason"
+          placeholder='转正申请理由'></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="工作总结">
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workSummary"
+          placeholder='工作总结'></el-input>
+      </el-form-item>
+
+      <el-form-item label="附件">
+        <!-- <FileUpload v-model="form.files" :limit="1"/> -->
+        <el-upload action="" ref="privateKeyContentFile" :limit="1" :http-request="appCertUpload"
+          :before-upload="fileBeforeUpload">
+          <el-button size="small" type="primary" icon="el-icon-upload">点击上传</el-button>
+        </el-upload>
+      </el-form-item>
+      <el-form-item label="备注">
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks" placeholder="请输入备注" />
+      </el-form-item>
+      <el-form-item label="审批人" prop="peopleList">
+        <el-input type="textarea" v-model="form.peopleList" style="display: none;" />
+        <el-button class="button-new-tag" @click="openMultiple">+ 添加</el-button>
+        <span :key="tag" v-for="tag in nikeNamelist">
+          <i class="el-icon-arrow-right"></i>
+          <el-tag type="info" closable :disable-transitions="false" @close="handleClose(tag)">
+            <span class="user-avatar">{{ tag.substring(0, 1) || 'U' }}</span>
+            {{ tag }}
+          </el-tag>
+        </span>
+
+      </el-form-item>
+      <el-form-item label="流程动态" v-if="tasks.length > 0">
+        <el-timeline>
+          <el-timeline-item v-for="(item, index) in tasks" :key="index" :icon="getTimelineItemIcon(item)"
+            :type="getTimelineItemType(item)">
+            <p style="font-weight: 700">任务：{{ item.name }}</p>
+            <el-card :body-style="{ padding: '10px' }">
+              <label v-if="item.assigneeUser" style="font-weight: normal; margin-right: 30px;">
+                审批人：{{ item.assigneeUser.nickname }}
+                <el-tag type="info" size="mini">{{ item.assigneeUser.deptName }}</el-tag>
+              </label>
+              <label style="font-weight: normal" v-if="item.createTime">创建时间：</label>
+              <label style="color:#8a909c; font-weight: normal">{{ parseTime(item.createTime) }}</label>
+              <label v-if="item.endTime" style="margin-left: 30px;font-weight: normal">审批时间：</label>
+              <label v-if="item.endTime" style="color:#8a909c;font-weight: normal"> {{
+                parseTime(item.endTime)
+                }}</label>
+              <!-- <label v-if="item.durationInMillis" style="margin-left: 30px;font-weight: normal">耗时：</label>
+              <label v-if="item.durationInMillis" style="color:#8a909c;font-weight: normal">
+                {{ getDateStar(item.durationInMillis) }} </label> -->
+              <p v-if="item.reason">
+                <el-tag :type="getTimelineItemType(item)">{{ item.reason }}</el-tag>
+              </p>
+            </el-card>
+          </el-timeline-item>
+        </el-timeline>
+      </el-form-item>
+      <el-form-item>
+        <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="primary" @click="onReCommit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
+        <el-button type="primary" @click="onSubmit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
+        <el-button v-if="!form.auditStatus || form.auditStatus==0" @click="onSave()" v-loading.fullscreen.lock="fullscreenLoading">暂存</el-button>
+        <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="warning" @click="onClose()" v-loading.fullscreen.lock="fullscreenLoading">关闭</el-button>
+        <el-button v-if="form.auditStatus==0" type="danger" @click="onDelete()" v-loading.fullscreen.lock="fullscreenLoading">删除</el-button>
+      </el-form-item>
+    </el-form>
+    <PeopleSelect ref="peopleSelect" type="multiple" :isCheck="true" :open="multiplePeopleOpen"
+      @cancel="multiplePeopleOpen = false" @submit="submitMultiple"></PeopleSelect>
+    <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen"
+      @cancel="singlePeopleOpen = false" @submit="submitSingle"></PeopleSelect>
+
+  </div>
 
 </template>
 
 <script>
-import { getLeave }  from "@/api/bpm/leave"
+import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/universal"
+import {getDate} from "@/utils/dateUtils";
+import { getUserProfile } from "@/api/system/user";
+import { listDept } from "@/api/system/dept";
 import PeopleSelect from "@/components/PeopleSelect/index.vue";
-import FileUpload from "@/components/FileUpload";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBaseHeader } from "@/utils/request";
 export default {
   name: 'Index',
   components: {
     PeopleSelect,
-    FileUpload,
+    Treeselect,
   },
   props: {
     id: {
@@ -95,26 +127,19 @@ export default {
   },
   data() {
     return {
-      entryId: undefined, // 编号
+      fullscreenLoading:false,
+      tasks:[],
+      loading:false,
+      files: [],
+      // 设置上传的请求头部
+      headers: getBaseHeader(),
+      // 上传的地址
+      fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+      // fileUrl: 'http://192.168.100.249:48080/admin-api/infra/file/uploaData',
       // 部门树选项
-      posOptions: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+      posOptions: [],
       deptOptions: [],
-      peopleList: [],
+      nikeNamelist: [],
       form: {
         loginName: undefined,
         loginId: undefined,
@@ -126,39 +151,37 @@ export default {
         conversionDate: undefined,
         conversionReason: undefined,
         workSummary: undefined,
-        files:undefined,
+        files: undefined,
 
         remarks: undefined,
         peopleList: '',
       },
-   
-        
+
+
       rules: {
         loginName: [
-            { required: true, message: '请选择', trigger: 'change' },
-          ],
-          startDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          probationEndDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          conversionDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          conversionReason: [
-            { required: true, trigger: "blur", message: "请输入转正申请理由"  }
-          ],
-          peopleList:[
-            { required: true, message: '请选择审批人', }
-          ]
-        },
+          { required: true, message: '请选择', trigger: 'change' },
+        ],
+        startDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        probationEndDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        conversionDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        conversionReason: [
+          { required: true, trigger: "blur", message: "请输入转正申请理由" }
+        ],
+        peopleList: [
+          { required: true, message: '请选择审批人', }
+        ]
+      },
       status: true,
-
-     //是否打开选人组件，默认不打开
-     multiplePeopleOpen: false,
+      //是否打开选人组件，默认不打开
+      multiplePeopleOpen: false,
       singlePeopleOpen: false,
-      fileAccept: ".crt",
       queryParams: {
         name: undefined,
         status: undefined
@@ -167,103 +190,301 @@ export default {
   },
 
   created() {
-    this.entryId = this.id || this.$route.query.id;
-    console.log(this.entryId);
-    // this.getDetail();
+    this.getDeptList();
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        if(val){
+          this.getDetail(val);
+        }else{
+          this.getUser();
+        }
+      }
+    }
   },
   methods: {
+    getDateStar(ms) {
+      return getDate(ms);
+    },
+    getUser() {
+      getUserProfile().then(response => {
+        let userInfo = response.data;
+        this.form.employeeName = userInfo.nickname;
+        this.form.deptName = userInfo.dept.name;
+        this.form.position = userInfo.posts[0].name;
+        this.form.employeePhone = userInfo.mobile;
+      });
+    },
+    handleRemove(file, fileList) {
+      console.log(file, fileList);
+      let fileIds = [];
+      for (let i in fileList) {
+        let id = fileList[i].response.data.id;
+        fileIds.push(id);
+      }
+      this.form.fileIdList = fileIds;
+    },
+    beforeUploadFile(file) {
+      console.log(file);
+      const size = file.size / 1024 / 1024;
+      console.log(size);
+      if (size > 5) {
+        this.$message.error("文件大小不能超过5MB！");
+        return false;
+      }
+    },
+    handleFileSuccessCite(res, file, fileList) {
+      console.log(file, fileList);
+      console.log("------", "==========");
+      console.log("res = ", res);
+
+      let fileIds = [];
+      for (let i in fileList) {
+        let response = fileList[i].response;
+        if (response.errno && response.errno != "0") {
+          this.$message.error("该文件上传失败,已被移除,请重新上传!");
+          // 上传失败移除该 file 对象
+          fileList.splice(i, 1);
+        } else {
+          let id = fileList[i].response.data.id;
+          fileIds.push(id);
+        }
+      }
+      this.form.fileIdList = fileIds;
+    },
     /** 获得表单信息 */
-    getDetail() {
-      getLeave(this.entryId).then(response => {
+    getDetail(val) {
+      this.$parent.$parent.detailLoading = true;
+      getDetail(val).then(response => {
+        this.$parent.$parent.detailLoading = false;
         this.form = response.data;
+        let files = response.data.fileList;
+        if (files) {
+          this.files = [];
+          for (let i in files) {
+            let url = files[i].url;
+            let name = files[i].name;
+            let id = files[i].id;
+
+            this.files.push({
+              name: name,
+              url: url,
+              response: { error: "0", data: { url: url, id: id } },
+            });
+          }
+        }
+       
+        if(response.data.auditUserList){
+          let auditUserList = response.data.auditUserList;
+          let peopleList = [];
+          let nikeNamelist = [];
+          auditUserList.map(item => {
+            peopleList.push(item.id);
+            nikeNamelist.push(item.nickname)
+          });
+          this.$set(this.form, 'peopleList', peopleList.join(','));
+          this.nikeNamelist = nikeNamelist;
+        } else{
+          this.$set(this.form, 'peopleList', '');
+          this.nikeNamelist = [];
+        }
+        this.tasks = response.data.auditRecordList?response.data.auditRecordList:[];
+        
       });
     },
-    fileBeforeUpload(file) {
-      // let format = '.' + file.name.split(".")[1];
-      // if (format !== this.fileAccept) {
-      //   this.$message.error('请上传指定格式"' + this.fileAccept + '"文件');
-      //   return false;
-      // }
-      let isRightSize = file.size / 1024 / 1024 < 5
-      if (!isRightSize) {
-        this.$message.error('文件大小超过 5MB')
-      }
-      return isRightSize
+    /** 查询部门列表 */
+    getDeptList() {
+      listDept(this.queryParams).then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
     },
-    appCertUpload(event) {
-      console.log(event);
-      // const file = event.file;
-      const readFile = new FileReader()
-      readFile.onload = (e) => {
-        this.form.files = e.target.result
-        console.log(this.form.files);
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
       }
-      readFile.readAsText(event.file);
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
     },
     //提交
     onSubmit() {
-       this.$refs.form.validate(valid => {
-          if (valid) {
-            console.log(this.form);
-            this.$message.success('提交成功')
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
+      console.log(this.form);
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          console.log(this.form);
+          this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+          this.form.auditPass = true;
+          this.fullscreenLoading = true;
+          create(this.form).then(response => {
+            this.fullscreenLoading = false;
+            this.$modal.msgSuccess("提交成功");
+            if(this.id){
+              this.$parent.$parent.closeEdit();
+            }else{
+              this.$parent.$parent.setStatus(2);
+            }
+          });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+     //驳回或撤回后再次提交通用用事项审批流程信息
+     onReCommit() {
+      console.log(this.form);
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          console.log(this.form);
+          this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+          this.form.auditPass = true;
+          this.fullscreenLoading = true;
+          reCommit(this.form).then(response => {
+            this.fullscreenLoading = false;
+            this.$modal.msgSuccess("提交成功");
+            if(this.id){
+              this.$parent.$parent.closeEdit();
+            }else{
+              this.$parent.$parent.setStatus(2);
+            }
+          });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
     //暂存
     onSave() {
-
+          if(this.form.peopleList){
+            this.form.startUserSelectAssignees = this.form.peopleList.split(',');
+          }
+          this.form.auditPass = false;
+          this.fullscreenLoading = true;
+          save(this.form).then(response => {
+            this.fullscreenLoading = false;
+            this.$modal.msgSuccess("暂存成功");
+            if(this.id){
+              this.$parent.$parent.closeEdit();
+            }else{
+              this.$parent.$parent.setStatus(2);
+            }
+          });
+    },
+    //暂存删除
+    async onDelete() {
+      this.$modal.confirm('是否确认删除?').then(() => {
+        this.fullscreenLoading = true;
+        deleteById(this.id).then(response => {
+          this.fullscreenLoading = false;
+          this.$modal.msgSuccess("删除成功");
+          this.$parent.$parent.closeEdit();
+        })
+      }).catch(() => { });
     },
-    // 关闭标签
-    handleClose(tag) {
-      this.peopleList.splice(this.peopleList.indexOf(tag), 1);
+     //暂存删除
+     async onClose() {
+      this.$modal.confirm('是否确认关闭?').then(() => {
+        this.fullscreenLoading = true;
+        closeById(this.id).then(response => {
+          this.fullscreenLoading = false;
+          this.$modal.msgSuccess("流程已关闭");
+          this.$parent.$parent.closeEdit();
+        })
+      }).catch(() => { });
     },
-   //打开选人弹窗
-   openSingle() {
+
+     // 关闭标签
+     handleClose(index) {
+      this.nikeNamelist.splice(index, 1);
+      let peopleList = this.form.peopleList.split(',');
+      peopleList.splice(index, 1);
+      this.form.peopleList = peopleList.join(',');
+    },
+    //打开选人弹窗
+    openSingle() {
       this.singlePeopleOpen = true;
     },
     openMultiple() {
       this.multiplePeopleOpen = true;
     },
     //选择人的确定按钮事件 submitPeople(nikeNamelist)方法传参一个默认接收用户昵称数组   submitPeople(peopleList,nikeNamelist)方法传参两个则是接收用户昵称数组和用户账号数组
-    submitMultiple(peopleList,nikeNamelist) {
-      console.log(peopleList);
-      console.log(nikeNamelist);
-      this.peopleList = nikeNamelist;
-      this.form.peopleList = nikeNamelist.join(',');
+    submitMultiple(userNamelist, nikeNamelist,userIdList) {
+      console.log(userNamelist);
+      this.nikeNamelist = nikeNamelist;
+      this.form.peopleList = userIdList.join(',');
       this.multiplePeopleOpen = false;
     },
-    submitSingle(peopleList,nikeNamelist) {
-      console.log(peopleList);
+    submitSingle(userNamelist, nikeNamelist,userIdList) {
+      console.log(userNamelist);
       console.log(nikeNamelist);
-      this.form.loginName = nikeNamelist.join();
+      this.form.loginName = userIdList.join();
       this.singlePeopleOpen = false;
     },
-    //获取状态
-    setStatus(status) {
-      this.status = status
+    getTimelineItemIcon(item) {
+      if (item.result === 1) {
+        return 'el-icon-time';
+      }
+      if (item.result === 2) {
+        return 'el-icon-check';
+      }
+      if (item.result === 3) {
+        return 'el-icon-close';
+      }
+      if (item.result === 4) {
+        return 'el-icon-remove-outline';
+      }
+      if (item.result === 5) {
+        return 'el-icon-back'
+      }
+      return '';
+    },
+    getTimelineItemType(item) {
+      if (item.result === 1) {
+        return 'primary';
+      }
+      if (item.result === 2) {
+        return 'success';
+      }
+      if (item.result === 3) {
+        return 'danger';
+      }
+      if (item.result === 4) {
+        return 'info';
+      }
+      if (item.result === 5) {
+        return 'warning';
+      }
+      if (item.result === 6) {
+        return 'default'
+      }
+      return '';
     },
   }
 }
 </script>
 <style lang="scss" scoped>
-.user-avatar{
+.user-avatar {
   width: 22px;
-    height: 22px;
-    line-height: 19px;
-    font-size: 12px;
-    background: #46c26f;
-    border: 1px solid transparent;
-    border-radius: 50%;
-    color: #fff;
-    display: inline-block;
-    overflow: hidden;
-    text-align: center;
-    vertical-align: middle;
-    margin-bottom: 2px;
+  height: 22px;
+  line-height: 19px;
+  font-size: 12px;
+  background: #46c26f;
+  border: 1px solid transparent;
+  border-radius: 50%;
+  color: #fff;
+  display: inline-block;
+  overflow: hidden;
+  text-align: center;
+  vertical-align: middle;
+  margin-bottom: 2px;
 }
+
 .el-tag+.el-tag {
   margin-left: 10px;
 }

src/views/oa/turnJust/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <div class='fixed-header'>
-      <oabar />
+      <oabar ref="oabar"/>
     </div>
     <div class="dashboard-container">
       <div v-if="status==1" class="apply-box">
-        <el-card class="box-card" style="min-height: 800px;border-radius: 10px">
+        <el-card class="box-card" style="min-height: 800px;border-radius: 10px" v-loading="editLoading">
           <div class="from-box">
             <div class="title">转正申请</div>
             <el-divider></el-divider>
@@ -42,6 +42,7 @@ export default {
   },
   data() {
     return {
+      editLoading:false,
       status: 1,
     }
   },
@@ -53,6 +54,7 @@ export default {
     //获取状态
     setStatus(status) {
       this.status = status
+      this.$refs.oabar.status = status;
     },
   }
 }

src/views/oa/universal/detail.vue

@@ -81,7 +81,7 @@
       </div>
     </div>
     <div class="widget-list" v-loading="loading">
-      <div class="fx-field x-grid-col-12" v-if="form.auditStatus==2">
+      <div class="fx-field x-grid-col-12" v-if="(form.auditStatus==2 || form.auditStatus==1) && name=='todo' ">
         <div class="field-label">
           <span class="field-required">*</span>
           <div class="field-name">审批意见</div>
@@ -118,12 +118,14 @@
           </el-timeline-item>
         </el-timeline>
       </div>
-      <div class="fx-field x-grid-col-12" v-if="form.auditStatus==2">
-        <div style="float: right;">
-          <el-button v-if="form.auditStatus==1" type="primary" @click="handleRevocation()" v-loading.fullscreen.lock="fullscreenLoading">撤回</el-button>
-          <el-button @click="handleAudit(false)" v-loading.fullscreen.lock="fullscreenLoading">驳回</el-button>
+      <div class="fx-field x-grid-col-12" >
+        <div v-if="name=='todo'">
           <el-button type="primary" @click="handleAudit(true)" v-loading.fullscreen.lock="fullscreenLoading">同意</el-button>
-        </div>
+            <el-button @click="handleAudit(false)" v-loading.fullscreen.lock="fullscreenLoading">驳回</el-button>
+          </div>
+          <div v-if="name=='my'">
+            <el-button v-if="form.auditStatus==1" type="warning" @click="handleRevocation()" v-loading.fullscreen.lock="fullscreenLoading">撤回</el-button>
+          </div>
       </div>
 
     </div>
@@ -139,6 +141,10 @@ export default {
       type: [String, Number],
       default: undefined
     },
+    name: {
+      type: String,
+      default: undefined
+    },
   },
   data() {
     return {
@@ -169,9 +175,10 @@ export default {
       return getDate(ms);
     },
     handleRevocation(){
+      console.log(this.form.taskId);
       this.$modal.confirm('是否确认撤回?').then(() => {
         this.fullscreenLoading = true;
-        revocation(this.form.taskId).then(response => {
+        revocation({id:this.form.taskId}).then(response => {
           this.fullscreenLoading = false;
           this.$modal.msgSuccess("撤回成功");
           this.$parent.$parent.closeEdit();

src/views/oa/universal/edit.vue

@@ -68,11 +68,16 @@
         </el-timeline>
       </el-form-item>
       <el-form-item>
-        <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="primary" @click="onReCommit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
+        <div v-if="name=='todo'">
+          <el-button type="primary" @click="onReCommit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
+          <el-button type="warning" @click="onClose()" v-loading.fullscreen.lock="fullscreenLoading">关闭</el-button>
+        </div>
+       <div v-else>
         <el-button type="primary" @click="onSubmit()" v-loading.fullscreen.lock="fullscreenLoading">提交</el-button>
-        <el-button v-if="!form.auditStatus || form.auditStatus==0" @click="onSave()" v-loading.fullscreen.lock="fullscreenLoading">暂存</el-button>
-        <el-button v-if="form.auditStatus==5 || form.auditStatus==6" type="warning" @click="onClose()" v-loading.fullscreen.lock="fullscreenLoading">关闭</el-button>
+        <el-button @click="onSave()" v-loading.fullscreen.lock="fullscreenLoading">暂存</el-button>
         <el-button v-if="form.auditStatus==0" type="danger" @click="onDelete()" v-loading.fullscreen.lock="fullscreenLoading">删除</el-button>
+       </div>
+       
       </el-form-item>
     </el-form>
     <PeopleSelect ref="peopleSelect" :type="type" :isCheck="true" :open="peopleOpen" @cancel="peopleOpen = false"
@@ -102,6 +107,10 @@ export default {
       type: [String, Number],
       default: undefined
     },
+    name: {
+      type: String,
+      default: undefined
+    },
   },
   data() {
     return {