修改

src/api/oa/turnJust.js

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

src/views/oa/turnJust/DataList.vue

@@ -1,37 +1,39 @@
 <template>
   <div class="container">
     <el-form :model="queryParams" ref="queryForm" v-show="showSearch" :inline="true" label-width="80px">
-      <el-form-item label="转正人">
+      <el-form-item label="转正人" prop="employeeName">
         <el-input v-model="queryParams.loginName" placeholder="转正人" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="员工编号">
+      <el-form-item label="员工编号" prop="employeeName">
         <el-input v-model="queryParams.loginId" placeholder="员工编号" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
-      <el-form-item label="部门">
+      <el-form-item label="部门" prop="employeeName">
         <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
       </el-form-item>
-      <el-form-item label="职位">
-        <el-select v-model="queryParams.position" placeholder="职位" clearable style="width: 250px">
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+      <el-form-item label="职位" prop="position">
+        <el-select v-model="queryParams.position" placeholder="请选择"
+        style="width: 250px">
+          <el-option v-for="item in posOptions" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="转正日期">
+      <el-form-item label="转正日期" prop="employeeName">
         <el-date-picker style="width: 250px" value-format="yyyy-MM-dd" v-model="queryParams.conversionDate" type="date" placeholder="入职日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="审批状态">
+      <el-form-item label="审批状态" prop="auditStatus">
         <el-select v-model="queryParams.auditStatus" placeholder="审批状态" clearable style="width: 250px">
-          <el-option v-for="dict in statusDictDatas" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
-      <el-form-item label="申请人">
+      <el-form-item label="申请人"prop="employeeName">
         <el-input v-model="queryParams.creator" placeholder="申请人" clearable style="width: 250px"
                   @keyup.enter.native="handleQuery"/>
       </el-form-item>
     
-      <el-form-item label="申请时间">
+      <el-form-item label="申请时间" prop="employeeName">
         <el-date-picker
       v-model="queryParams.createTime"
       style="width: 250px"
@@ -54,7 +56,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @row-click="handdle">
+    <el-table v-loading="loading" :data="dataList" @row-click="handdle">
       <el-table-column label="转正人" prop="loginName" min-width="120" />
       <el-table-column label="员工编号" prop="loginId" min-width="150" />
       <el-table-column label="部门" prop="deptId" min-width="150" />
@@ -84,16 +86,7 @@
 </template>
 
 <script>
-import {
-  addRole,
- 
-  exportRole,
-  getRole,
-  listRole,
-  updateRole
-} from "@/api/system/role";
-import {CommonStatusEnum, SystemDataScopeEnum} from "@/utils/constants";
-import {DICT_TYPE, getDictDatas} from "@/utils/dict";
+import { getListData,exportList }  from "@/api/oa/turnJust"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -109,23 +102,8 @@ export default {
   },
   data() {
     return {
-        // 部门树选项
-        posOptions: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+      detailLoading:false,
+        posOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -136,53 +114,21 @@ export default {
       // 总条数
       total: 0,
       // 角色表格数据
-      roleList: [],
+      dataList: [],
       openEdit: false,
       openDetail: false,
-      // 是否显示弹出层（数据权限）
-      openDataScope: false,
-      // 是否显示弹出层（菜单权限）
-      openMenu: false,
-      menuExpand: false,
-      menuNodeAll: false,
-      deptExpand: true,
-      deptNodeAll: false,
-      // 菜单列表
-      menuOptions: [],
       // 部门列表
       deptOptions: [], // 部门属性结构
-      depts: [], // 部门列表
       // 查询参数
       queryParams: {
         pageNo: 1,
         pageSize: 10,
+        employeeName: undefined,
+        position: undefined,
+        employeePhone: undefined,
+        auditStatus: undefined,
+        createTime: []
       },
-      // 表单参数
-      form: {},
-      defaultProps: {
-        label: "name",
-        children: "children"
-      },
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: "角色名称不能为空", trigger: "blur" }
-        ],
-        code: [
-          { required: true, message: "角色标识不能为空", trigger: "blur" }
-        ],
-        sort: [
-          { required: true, message: "角色顺序不能为空", trigger: "blur" }
-        ]
-      },
-
-      // 枚举
-      SysCommonStatusEnum: CommonStatusEnum,
-      SysDataScopeEnum: SystemDataScopeEnum,
-      // 数据字典
-      roleTypeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_ROLE_TYPE),
-      statusDictDatas: getDictDatas(DICT_TYPE.COMMON_STATUS),
-      dataScopeDictDatas: getDictDatas(DICT_TYPE.SYSTEM_DATA_SCOPE)
     };
   },
   created() {
@@ -209,61 +155,28 @@ export default {
     },
     handdle(row) {
       this.id = row.id;
-      if(row.sort==0){
+      if(row.auditStatus==0){
         this.openEdit = true;
       }else{
         this.openDetail = true;
       }
-      
-      // const id = row.id
-      // getRole(id).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "入职审批详情";
-      // });
+    },
+    closeEdit() {
+      this.openEdit = false;
+      this.getList();
     },
 
-    /** 查询角色列表 */
+    /** 查询列表 */
     getList() {
       this.loading = true;
-      listRole(this.queryParams).then(
+      getListData(this.queryParams).then(
         response => {
-          this.roleList = response.data.list;
+          this.dataList = response.data.list;
           this.total = response.data.total;
           this.loading = false;
         }
       );
     },
-
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-
-    // 表单重置
-    reset() {
-      if (this.$refs.menu !== undefined) {
-        this.$refs.menu.setCheckedKeys([]);
-      }
-      this.menuExpand = false;
-      this.menuNodeAll = false;
-      this.deptExpand = true;
-      this.deptNodeAll = false;
-      this.form = {
-        id: undefined,
-        name: undefined,
-        code: undefined,
-        sort: 0,
-        deptIds: [],
-        menuIds: [],
-        dataScope: undefined,
-        deptCheckStrictly: false,
-        menuCheckStrictly: true,
-        remark: undefined
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNo = 1;
@@ -277,37 +190,18 @@ export default {
 
 
 
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id !== undefined) {
-            updateRole(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addRole(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
+ 
 
 
 
     /** 导出按钮操作 */
     handleExport() {
       const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
+      this.$modal.confirm('是否确认导出所有数据项?').then(function() {
           this.exportLoading = true;
-          return exportRole(queryParams);
+          return exportList(queryParams);
         }).then(response => {
-          this.$download.excel(response, '角色数据.xls');
+          this.$download.excel(response, '通用审批数据.xls');
           this.exportLoading = false;
       }).catch(() => {});
     }

src/views/oa/turnJust/detail.vue

@@ -40,7 +40,7 @@
           <div class="field-name">入职日期</div>
         </div>
         <div class="field-component">
-          <span :title="form.startDate">{{ form.startDate }}</span>
+          <span :title="form.entryDate">{{ form.entryDate }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -104,7 +104,7 @@
         </div>
       </div>
 
-      <div class="fx-field x-grid-col-12">
+      <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>
@@ -131,9 +131,9 @@
               <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="margin-left: 30px;font-weight: normal">耗时：</label>
               <label v-if="item.durationInMillis" style="color:#8a909c;font-weight: normal">
-                {{ getDateStar(item.durationInMillis) }} </label>
+                {{ getDateStar(item.durationInMillis) }} </label> -->
               <p v-if="item.reason">
                 <el-tag :type="getTimelineItemType(item)">{{ item.reason }}</el-tag>
               </p>
@@ -142,10 +142,13 @@
         </el-timeline>
       </div>
       <div class="fx-field x-grid-col-12">
-        <div style="float: right;">
-          <el-button @click="handleAudit(false)">拒绝</el-button>
-          <el-button type="primary" @click="handleAudit(true)">同意</el-button>
-        </div>
+        <div v-if="name=='todo'">
+          <el-button type="primary" @click="handleAudit(true)" v-loading.fullscreen.lock="fullscreenLoading">同意</el-button>
+            <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>
@@ -153,70 +156,56 @@
 </template>
 
 <script>
-import { getLeave } from "@/api/bpm/leave"
-import {
-  approveTask,
-  rejectTask,
-} from "@/api/bpm/task";
+import { getDetail,agree,disagree,revocation } from "@/api/oa/turnJust"
+import {getDate} from "@/utils/dateUtils";
 export default {
   props: {
     id: {
       type: [String, Number],
       default: undefined
     },
+    name: {
+      type: String,
+      default: undefined
+    },
   },
   data() {
     return {
-      entryId: undefined, // 编号
+      fullscreenLoading:false,
+      loading:false,
       reason: '',
       auditRule: {
         reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }],
       },
-      tasks: [
-        {
-          "id": "f514d489-0afd-11ed-a881-427d68986255",
-          "name": "领导审批",
-          "claimTime": null,
-          "createTime": 1658632137000,
-          "suspensionState": null,
-          "processInstance": {
-            "id": "f51374f1-0afd-11ed-a881-427d68986255",
-            "name": "OA 请假",
-            "startUserId": 1,
-            "startUserNickname": "芋道源码",
-            "processDefinitionId": "oa_leave:3:f07c1280-0afd-11ed-a881-427d68986255"
-          },
-          "endTime": null,
-          "durationInMillis": null,
-          "result": 1,
-          "reason": null,
-          "definitionKey": "task-01",
-          "assigneeUser": {
-            "id": 1,
-            "nickname": "芋道源码",
-            "deptId": 103,
-            "deptName": "研发部门"
-          },
-          "parentTaskId": null,
-          "children": null
-        }
-      ],
-      peopleList: ['林动', '萧炎', '叶凡'],
+      tasks: [],
       // 表单参数
-      form: {
-        loginName: '张三',
-        dept: '软件工程院',
-      },
+      form: {},
     };
   },
   created() {
-    this.entryId = this.id || this.$route.query.id;
-    console.log(this.entryId);
-    // this.getDetail();
+  },
+  watch: {
+    id: {
+      immediate: true,
+      handler(val) {
+        this.getDetail(val);
+      }
+    }
   },
   methods: {
-    handleEdit() {
-      this.$router.push({ path: '/oa/entry/edit' })
+    getDateStar(ms) {
+      return getDate(ms);
+    },
+    handleRevocation(){
+      console.log(this.form.taskId);
+      this.$modal.confirm('是否确认撤回?').then(() => {
+        this.fullscreenLoading = true;
+        revocation({id:this.form.taskId}).then(response => {
+          this.fullscreenLoading = false;
+          this.$modal.msgSuccess("撤回成功");
+          this.$parent.$parent.closeEdit();
+        })
+      }).catch(() => { });
     },
     handleAudit(pass) {
       if (!this.reason) {
@@ -228,31 +217,29 @@ export default {
         return;
       } else {
         const data = {
-          id: '12',
-          reason: this.reason
+          id: this.form.taskId,
+          reason: this.reason,
         }
         if (pass) {
-          this.$modal.msgSuccess({
+          this.fullscreenLoading = true;
+          agree(data).then(response => {
+            this.fullscreenLoading = false;
+            this.$parent.$parent.closeEdit();
+            this.$modal.msgSuccess({
               message: '审批通过成功！',
               customClass: 'myBox'
             });
-          // approveTask(data).then(response => {
-          //   this.$modal.msgSuccess({
-          //     message: '审批通过成功！',
-          //     customClass: 'myBox'
-          //   });
-          // });
+          });
         } else {
-          this.$modal.msgSuccess({
-              message: '审批不通过成功！',
+          this.fullscreenLoading = true;
+          disagree(data).then(response => {
+            this.fullscreenLoading = false;
+            this.$parent.$parent.closeEdit();
+            this.$modal.msgSuccess({
+              message: '驳回成功！',
               customClass: 'myBox'
             });
-          // rejectTask(data).then(response => {
-          //   this.$modal.msgSuccess({
-          //     message: '审批不通过成功！',
-          //     customClass: 'myBox'
-          //   });
-          // });
+          });
         }
       }
     },
@@ -295,10 +282,13 @@ export default {
       }
       return '';
     },
-    /** 获得请假信息 */
-    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;
+        this.tasks = response.data.auditRecordList;
       });
     },
   }

src/views/oa/turnJust/edit.vue

@@ -15,8 +15,8 @@
         <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 label="入职日期" prop="entryDate">
+        <el-input v-model="form.entryDate" placeholder='入职日期' disabled></el-input>
 
       </el-form-item>
       <el-form-item label="试用期结束日期" prop="probationEndDate">
@@ -40,10 +40,9 @@
       </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 :action="fileUrl" :headers="headers" :file-list="files" :on-success="handleFileSuccessCite"
+          :before-upload="beforeUploadFile" :on-remove="handleRemove">
+          <el-button size="small" type="primary">点击上传</el-button>
         </el-upload>
       </el-form-item>
       <el-form-item label="备注">
@@ -88,11 +87,15 @@
         </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="multiple" :isCheck="true" :open="multiplePeopleOpen"
@@ -105,7 +108,7 @@
 </template>
 
 <script>
-import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/universal"
+import { getDetail, create,reCommit, save, deleteById,closeById } from "@/api/oa/turnJust"
 import {getDate} from "@/utils/dateUtils";
 import { getUserProfile } from "@/api/system/user";
 import { listDept } from "@/api/system/dept";
@@ -124,6 +127,10 @@ export default {
       type: [String, Number],
       default: undefined
     },
+    name: {
+      type: String,
+      default: undefined
+    },
   },
   data() {
     return {
@@ -145,7 +152,7 @@ export default {
         loginId: undefined,
         deptId: undefined,
         position: undefined,
-        startDate: undefined,
+        entryDate: undefined,
 
         probationEndDate: undefined,
         conversionDate: undefined,
@@ -162,7 +169,7 @@ export default {
         loginName: [
           { required: true, message: '请选择', trigger: 'change' },
         ],
-        startDate: [
+        entryDate: [
           { required: true, message: '请选择日期', trigger: 'change' }
         ],
         probationEndDate: [
@@ -496,4 +503,12 @@ export default {
   padding-top: 0;
   padding-bottom: 0;
 }
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
 </style>

src/views/oa/universal/detail.vue

@@ -80,7 +80,7 @@
         </div>
       </div>
     </div>
-    <div class="widget-list" v-loading="loading">
+    <div class="widget-list">
       <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>
@@ -155,7 +155,6 @@ export default {
         reason: [{ required: true, message: '审批建议不能为空', trigger: 'blur' }],
       },
       tasks: [],
-      peopleList: [],
       // 表单参数
       form: {},
     };