修改

.env.dev

@@ -5,7 +5,7 @@ ENV = 'development'
 VUE_APP_TITLE = 爱思系统
 
 # 爱思系统/开发环境
-VUE_APP_BASE_API = 'http://192.168.100.213:48080'
+VUE_APP_BASE_API = 'http://192.168.100.249:48080'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

src/api/oa/entry.js

@@ -0,0 +1,51 @@
+import request from '@/utils/request'
+
+// 创建流程
+export function create(data) {
+  return request({
+    url: '/bpm/oa-entry/start',
+    method: 'post',
+    data: data
+  })
+}
+// 暂存数据删除
+export function deleteById(id) {
+  return request({
+    url: 'bpm/oa-entry/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得详情
+export function getDetail(id) {
+  return request({
+    url: '/bpm/oa-entry/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得列表
+export function getListData(query) {
+  return request({
+    url: '/bpm/oa-entry/page',
+    method: 'get',
+    params: query
+  })
+}
+// 导出列表
+export function exportList(query) {
+  return request({
+    url: '/bpm/oa-entry/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+//审批
+export function completeTask(data) {
+  return request({
+    url: '/bpm/oa-entry/complete',
+    method: 'post',
+    data: data
+  })
+}

src/components/FileUpload/index.vue

@@ -73,7 +73,7 @@ export default {
       number: 0,
       uploadList: [],
       baseUrl: process.env.VUE_APP_BASE_API,
-      uploadFileUrl: process.env.VUE_APP_BASE_API + "/admin-api/infra/file/upload", // 请求地址
+      uploadFileUrl: 'http://192.168.100.249:48080' + "/admin-api/infra/file/uploaData", // 请求地址
       headers: { Authorization: "Bearer " + getAccessToken() }, // 设置上传的请求头部
       fileList: [],
     };

src/components/PeopleSelect/index.vue

@@ -275,7 +275,7 @@
           console.log(this.allUserMap);
           uns.forEach(item => {
             if (this.allUserMap.has(item)) {
-              result.push(this.allUserMap.get(item).userId || '')
+              result.push(this.allUserMap.get(item).id || '')
             }
           })
   

src/utils/dict.js

@@ -11,6 +11,7 @@ export const DICT_TYPE = {
   TERMINAL: 'terminal',
 
   // ========== SYSTEM 模块 ==========
+  SYSTEM_USER_TYPE: 'system_user_type',
   SYSTEM_USER_SEX: 'system_user_sex',
   SYSTEM_MENU_TYPE: 'system_menu_type',
   SYSTEM_ROLE_TYPE: 'system_role_type',

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

@@ -4,7 +4,10 @@
 
     <!-- 搜索工作栏 -->
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="流程名" prop="name">
+      <el-form-item label="流程名成" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="流程状态" prop="name">
         <el-input v-model="queryParams.name" placeholder="请输入流程名" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -18,45 +21,62 @@
     </el-form>
 
     <!-- 列表 -->
-    <el-table v-loading="loading" :data="list">
-      <el-table-column label="任务编号" align="center" prop="id" width="320" />
-      <el-table-column label="任务名称" align="center" prop="name" />
-      <el-table-column label="所属流程" align="center" prop="processInstance.name" />
-      <el-table-column label="流程发起人" align="center" prop="processInstance.startUserNickname" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+    <el-table v-loading="loading" :data="list" @row-click="handleAudit">
+      <el-table-column label="流程编号" align="center" prop="id" width="320" />
+      <!-- <el-table-column label="流程名称" align="center" prop="name" /> -->
+      <el-table-column label="流程名称" align="center" prop="processInstance.name" />
+      <el-table-column label="申请人" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="部门" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="职位" align="center" prop="processInstance.startUserNickname" />
+      <el-table-column label="申请时间" align="center" prop="createTime" width="180">
         <template v-slot="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="状态" align="center" prop="version" width="80">
+      <el-table-column label="流程状态" align="center" prop="version" width="80">
+        <template v-slot="scope">
+          <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
+          <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
+        </template>
+      </el-table-column>
+      <el-table-column label="当前节点" align="center" prop="version" width="80">
         <template v-slot="scope">
           <el-tag type="success" v-if="scope.row.suspensionState === 1">激活</el-tag>
           <el-tag type="warning" v-if="scope.row.suspensionState === 2">挂起</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleAudit(scope.row)"
                      v-hasPermi="['bpm:task:update']">审批</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
     <!-- 分页组件 -->
     <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
                 @pagination="getList"/>
 
+     <el-dialog title="入职审批(修改)" :visible.sync="openEdit" width="800px" append-to-body>
+      <async-biz-form-component :id="id"></async-biz-form-component>
+    </el-dialog>
+
   </div>
 </template>
 
 <script>
 import {getTodoTaskPage} from '@/api/bpm/task'
-
+import {getProcessInstance} from "@/api/bpm/processInstance";
+import Vue from "vue";
 export default {
   name: "BpmTodoTask",
   components: {
   },
   data() {
     return {
+    id: undefined, // 流程实例的编号
+    //详情页面id
+    businessKey:'',
+    openEdit: false,
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -100,7 +120,33 @@ export default {
     },
     /** 处理审批按钮 */
     handleAudit(row) {
-      this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.processInstance.id}});
+      //将业务表单，注册为动态组件
+      const path = '/oa/entry/detail';
+        console.log("path:" + path)
+        Vue.component("async-biz-form-component", function (resolve) {
+          require([`@/views${path}`], resolve);
+        });
+        this.openEdit = true;
+      // this.$router.push({ name: "BpmProcessInstanceDetail", query: { id: row.processInstance.id}});
+    },
+      /** 获得流程实例 */
+      getDetail() {
+      // 获得流程实例相关
+      getProcessInstance(this.id).then(response => {
+        if (!response.data) {
+          this.$message.error('查询不到流程信息！');
+          return;
+        }
+        // 设置流程信息
+        this.processInstance = response.data;
+
+        //将业务表单，注册为动态组件
+        const path = this.processInstance.processDefinition.formCustomViewPath;
+        console.log("path:" + path)
+        Vue.component("async-biz-form-component", function (resolve) {
+          require([`@/views${path}`], resolve);
+        });
+      });
     },
   }
 };

src/views/oa/entry/DataList.vue

@@ -9,18 +9,20 @@
         <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-select v-model="queryParams.position" filterable allow-create default-first-option 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-select v-model="queryParams.employeeType" 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.SYSTEM_USER_TYPE)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item label="性别">
         <el-select v-model="queryParams.gender" 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.SYSTEM_USER_SEX)" :key="parseInt(dict.value)" :label="dict.label" :value="parseInt(dict.value)"/>
         </el-select>
       </el-form-item>
       <el-form-item label="联系电话">
@@ -33,7 +35,7 @@
       </el-form-item>
       <el-form-item label="审批状态">
         <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="创建时间">
@@ -59,7 +61,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="id" min-width="120" />
       <el-table-column label="部门" prop="name" min-width="150" />
       <el-table-column label="职位" prop="code" min-width="150" />
@@ -90,16 +92,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/entry"
 import detail from "./detail.vue";
 import edit from "./edit.vue";
 import Treeselect from "@riophae/vue-treeselect";
@@ -115,23 +108,7 @@ export default {
   },
   data() {
     return {
-        // 部门树选项
-        posOptions: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+        posOptions: [],
       id:'',
       // 遮罩层
       loading: true,
@@ -142,53 +119,16 @@ 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,
       },
-      // 表单参数
-      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() {
@@ -232,44 +172,14 @@ export default {
     /** 查询角色列表 */
     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;
@@ -283,26 +193,7 @@ 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();
-            });
-          }
-        }
-      });
-    },
+ 
 
 
 
@@ -311,7 +202,7 @@ export default {
       const queryParams = this.queryParams;
       this.$modal.confirm('是否确认导出所有角色数据项?').then(function() {
           this.exportLoading = true;
-          return exportRole(queryParams);
+          return exportList(queryParams);
         }).then(response => {
           this.$download.excel(response, '角色数据.xls');
           this.exportLoading = false;

src/views/oa/entry/detail.vue

@@ -7,7 +7,7 @@
           <div class="field-name">入职人</div>
         </div>
         <div class="field-component">
-          <span :title="form.loginName">{{ form.loginName }}</span>
+          <span :title="form.loginName">{{ form.entryName }}</span>
         </div>
       </div>
       <div class="fx-field x-grid-col-12">
@@ -123,7 +123,7 @@
         </div>
       </div>
 
-      <div class="fx-field x-grid-col-12">
+      <div class="fx-field x-grid-col-12" v-if="form.auditStatus==2">
         <div class="field-label">
           <span class="field-required">*</span>
           <div class="field-name">审批意见</div>
@@ -160,9 +160,9 @@
           </el-timeline-item>
         </el-timeline>
       </div>
-      <div class="fx-field x-grid-col-12">
+      <div class="fx-field x-grid-col-12" v-if="form.auditStatus==2">
         <div style="float: right;">
-          <el-button @click="handleAudit(false)">拒绝</el-button>
+          <el-button @click="handleAudit(false)">驳回</el-button>
           <el-button type="primary" @click="handleAudit(true)">同意</el-button>
         </div>
       </div>
@@ -172,11 +172,7 @@
 </template>
 
 <script>
-import { getLeave } from "@/api/bpm/leave"
-import {
-  approveTask,
-  rejectTask,
-} from "@/api/bpm/task";
+import { getDetail,completeTask } from "@/api/oa/entry"
 export default {
   props: {
     id: {
@@ -231,7 +227,7 @@ export default {
   created() {
     this.entryId = this.id || this.$route.query.id;
     console.log(this.entryId);
-    // this.getDetail();
+    this.getDetail();
   },
   methods: {
     handleEdit() {
@@ -248,14 +244,15 @@ export default {
       } else {
         const data = {
           id: '12',
-          reason: this.reason
+          reason: this.reason,
+          auditPass:pass
         }
         if (pass) {
           this.$modal.msgSuccess({
               message: '审批通过成功！',
               customClass: 'myBox'
             });
-          // approveTask(data).then(response => {
+          // completeTask(data).then(response => {
           //   this.$modal.msgSuccess({
           //     message: '审批通过成功！',
           //     customClass: 'myBox'
@@ -266,7 +263,7 @@ export default {
               message: '审批不通过成功！',
               customClass: 'myBox'
             });
-          // rejectTask(data).then(response => {
+          // completeTask(data).then(response => {
           //   this.$modal.msgSuccess({
           //     message: '审批不通过成功！',
           //     customClass: 'myBox'
@@ -316,7 +313,7 @@ export default {
     },
     /** 获得请假信息 */
     getDetail() {
-      getLeave(this.entryId).then(response => {
+      getDetail(this.entryId).then(response => {
         this.form = response.data;
       });
     },

src/views/oa/entry/edit.vue

@@ -1,96 +1,100 @@
 <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='请输入'></el-input>
-              </el-form-item>
-              <el-form-item label="部门">
-                <treeselect :default-expand-level="1" v-model="form.deptId" :options="deptOptions" :normalizer="normalizer" placeholder="选择部门" />
-              </el-form-item>
-              <el-form-item label="职位">
-                <el-select v-model="form.position" placeholder="请选择" style="width: 100%;">
-                  <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="员工类型" prop="employeeType">
-                <el-select v-model="form.employeeType" placeholder="请选择" style="width: 100%;">
-                  <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="性别" prop="gender">
-                <el-select v-model="form.gender" placeholder="请选择" style="width: 100%;">
-                  <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="出生日期" prop="birthday">
-                <el-date-picker value-format="yyyy-MM-dd" v-model="form.birthday" type="date" placeholder="选择日期" style="width: 100%;">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="联系电话" prop="contactNumber">
-                <el-input v-model="form.contactNumber" placeholder='请输入'></el-input>
-              </el-form-item>
-              <el-form-item label="电子邮箱" prop="email">
-                <el-input v-model="form.email" placeholder='请输入'></el-input>
-              </el-form-item>
-              <el-form-item label="教育背景">
-                <el-input maxlength="50" show-word-limit type="textarea" v-model="form.education" placeholder='请输入'></el-input>
-              </el-form-item>
-              <el-form-item label="工作经验">
-                <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workExperience" placeholder='请输入'></el-input>
-              </el-form-item>
-              <el-form-item label="入职日期" prop="startDate">
-                <el-date-picker value-format="yyyy-MM-dd" v-model="form.startDate" type="date" placeholder="选择日期" style="width: 100%;">
-                </el-date-picker>
-              </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="openPS">+ 添加</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>
+  <div class="container">
+    <el-form :model="form" label-position="top" :rules="rules" ref="form" label-width="80px">
+      <el-form-item label="入职人" prop="entryName">
+        <el-input v-model="form.entryName" placeholder='请输入'></el-input>
+      </el-form-item>
+      <el-form-item label="部门">
+        <treeselect :default-expand-level="1" v-model="form.deptId" :options="deptOptions" :normalizer="normalizer"
+          placeholder="选择部门" />
+      </el-form-item>
+      <el-form-item label="职位">
+        <el-select v-model="form.position" filterable allow-create default-first-option placeholder="请选择"
+          style="width: 100%;">
+          <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="员工类型" prop="employeeType">
+        <el-select v-model="form.employeeType" placeholder="请选择" style="width: 100%;">
+          <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_TYPE)" :key="item.value" :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="性别" prop="gender">
+        <el-select v-model="form.gender" placeholder="请选择" style="width: 100%;">
+          <el-option v-for="item in this.getDictDatas(DICT_TYPE.SYSTEM_USER_SEX)" :key="item.value" :label="item.label"
+            :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday">
+        <el-date-picker value-format="yyyy-MM-dd" v-model="form.birthday" type="date" placeholder="选择日期"
+          style="width: 100%;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="联系电话" prop="contactNumber">
+        <el-input v-model="form.contactNumber" placeholder='请输入'></el-input>
+      </el-form-item>
+      <el-form-item label="电子邮箱" prop="email">
+        <el-input v-model="form.email" placeholder='请输入'></el-input>
+      </el-form-item>
+      <el-form-item label="教育背景">
+        <el-input maxlength="50" show-word-limit type="textarea" v-model="form.education" placeholder='请输入'></el-input>
+      </el-form-item>
+      <el-form-item label="工作经验">
+        <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.workExperience"
+          placeholder='请输入'></el-input>
+      </el-form-item>
+      <el-form-item label="入职日期" prop="startDate">
+        <el-date-picker value-format="yyyy-MM-dd" v-model="form.startDate" type="date" placeholder="选择日期"
+          style="width: 100%;">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="附件">
+        <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="备注">
+        <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="openPS">+ 添加</el-button>
+        <span v-for="(tag,index) in peopleList" :key="index" >
+          <i class="el-icon-arrow-right"></i>
+          <el-tag type="info" closable :disable-transitions="false" @close="handleClose(index)">
+            <span class="user-avatar">{{ tag.substring(0, 1) || 'U' }}</span>
+            {{ tag }}
+          </el-tag>
+        </span>
 
-              </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="type" :isCheck="true" :open="peopleOpen" @cancel="peopleOpen = false"
-            @submit="submitPeople"></PeopleSelect>
-           
-    </div>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="onSubmit()">提交</el-button>
+        <el-button v-if="!form.auditStatus || form.auditStatus==0" @click="onSave()">暂存</el-button>
+        <el-button v-if="form.auditStatus==5" type="warning" @click="onDelete()">关闭</el-button>
+        <el-button v-if="form.auditStatus==0" type="danger" @click="onDelete()">删除</el-button>
+      </el-form-item>
+    </el-form>
+    <PeopleSelect ref="peopleSelect" :type="type" :isCheck="true" :open="peopleOpen" @cancel="peopleOpen = false"
+      @submit="submitPeople"></PeopleSelect>
+
+  </div>
 
 </template>
 
 <script>
-import { getLeave }  from "@/api/bpm/leave"
+import { getDetail, create, deteleById } from "@/api/oa/entry"
 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: {
@@ -106,28 +110,21 @@ export default {
   },
   data() {
     return {
+
+      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',
       entryId: undefined, // 编号
       // 部门树选项
-      posOptions: [{
-        value: '选项1',
-        label: '黄金糕'
-      }, {
-        value: '选项2',
-        label: '双皮奶'
-      }, {
-        value: '选项3',
-        label: '蚵仔煎'
-      }, {
-        value: '选项4',
-        label: '龙须面'
-      }, {
-        value: '选项5',
-        label: '北京烤鸭'
-      }],
+      posOptions: [],
       deptOptions: [],
       peopleList: [],
+      userIdList:[],
       form: {
-        loginName: undefined,
+        entryName: undefined,
         deptId: undefined,
         position: undefined,
         employeeType: undefined,
@@ -138,25 +135,26 @@ export default {
         education: undefined,
         workExperience: undefined,
         startDate: undefined,
-        files:undefined,
+        fileIdList: undefined,
         remarks: undefined,
         peopleList: '',
+        startUserSelectAssignees: undefined,
       },
       rules: {
-        loginName: [
-            { required: true, message: '请输入入职人姓名', trigger: 'blur' },
-            // { min: 3, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur' }
-          ],
-          employeeType: [
-            { required: true, message: '请选择', trigger: 'change' }
-          ],
-          gender: [
-            { required: true, message: '请选择', trigger: 'change' }
-          ],
-          birthday: [
-            { required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          contactNumber: [
+        entryName: [
+          { required: true, message: '请输入入职人姓名', trigger: 'blur' },
+          // { min: 3, max: 5, message: '长度在 2 到 5 个字符', trigger: 'blur' }
+        ],
+        employeeType: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        gender: [
+          { required: true, message: '请选择', trigger: 'change' }
+        ],
+        birthday: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        contactNumber: [
           { required: true, trigger: "blur", message: "联系电话不能为空" },
           {
             validator: function (rule, value, callback) {
@@ -167,8 +165,8 @@ export default {
               }
             }, trigger: "blur"
           }
-          ],
-          email: [
+        ],
+        email: [
           {
             required: true,
             type: "email",
@@ -177,12 +175,12 @@ export default {
           }
         ],
         startDate: [
-            { required: true, message: '请选择日期', trigger: 'change' }
-          ],
-          peopleList:[
-            { required: true, message: '请选择审批人', }
-          ]
-        },
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        peopleList: [
+          { required: true, message: '请选择审批人', }
+        ]
+      },
       status: true,
 
       type: 'multiple',
@@ -199,40 +197,75 @@ export default {
   created() {
     this.entryId = this.id || this.$route.query.id;
     console.log(this.entryId);
-    // this.getDetail();
-    this.getList();
+    if (this.entryId) {
+      this.getDetail();
+    }
+
+    this.getDeptList();
   },
   methods: {
-    /** 获得表单信息 */
-    getDetail() {
-      getLeave(this.entryId).then(response => {
-        this.form = response.data;
-      });
+    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.dataFormCite.fileIdList = fileIds.join(",");
+      this.form.fileIdList = fileIds;
     },
-    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')
+    beforeUploadFile(file) {
+      console.log(file);
+      const size = file.size / 1024 / 1024;
+      console.log(size);
+      if (size > 5) {
+        this.$message.error("文件大小不能超过5MB！");
+        return false;
       }
-      return isRightSize
     },
-    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);
+    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);
+        }
       }
-      readFile.readAsText(event.file);
+      // this.dataFormCite.fileIdList = fileIds.join(",");
+      this.form.fileIdList = fileIds;
+    },
+    /** 获得表单信息 */
+    getDetail() {
+      getDetail(this.entryId).then(response => {
+        this.form = response.data;
+        let files = response.data.files;
+        if (files) {
+          this.files = [];
+          for (let i in files) {
+            let url = files[i].url;
+            let name = files[i].oldName;
+            let id = files[i].id;
+
+            this.files.push({
+              name: name,
+              url: url,
+              response: { error: "0", data: { url: url, id: id } },
+            });
+          }
+        }
+      });
     },
     /** 查询部门列表 */
-    getList() {
+    getDeptList() {
       listDept(this.queryParams).then(response => {
         this.deptOptions = this.handleTree(response.data, "id");
       });
@@ -250,54 +283,79 @@ export default {
     },
     //提交
     onSubmit() {
-       this.$refs.form.validate(valid => {
-          if (valid) {
-            console.log(this.form);
-            this.$message.success('提交成功')
-          } else {
-            console.log('error submit!!');
-            return false;
-          }
-        });
+      this.$refs.form.validate(valid => {
+        if (valid) {
+          console.log(this.form);
+          this.form.startUserSelectAssignees = this.userIdList,
+          this.form.auditPass = true;
+          create(this.form).then(response => {
+            // this.$message.success('提交成功')
+            this.$modal.msgSuccess("提交成功");
+            this.$router.push({ path: '/' })
+          });
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
     },
     //暂存
     onSave() {
-
+      this.form.startUserSelectAssignees = {
+            taskKey1: this.userIdList,
+          }
+          this.form.auditPass = false;
+          create(this.form).then(response => {
+            // this.$message.success('提交成功')
+            this.$modal.msgSuccess("暂存成功");
+            this.$router.push({ path: '/' })
+          });
+    },
+    //暂存删除
+    onDelete(){
+      this.$modal.confirm('是否确认删除?').then(function() {
+          return deteleById(this.id);
+        }).then(() => {
+          this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
     },
     // 关闭标签
-    handleClose(tag) {
-      this.peopleList.splice(this.peopleList.indexOf(tag), 1);
+    handleClose(index) {
+      this.peopleList.splice(index, 1);
+      this.userIdList.splice(index, 1);
     },
     //打开选人弹窗
     openPS() {
       this.peopleOpen = true;
     },
     //选择人的确定按钮事件 submitPeople(nikeNamelist)方法传参一个默认接收用户昵称数组   submitPeople(peopleList,nikeNamelist)方法传参两个则是接收用户昵称数组和用户账号数组
-    submitPeople(peopleList,nikeNamelist) {
-      console.log(peopleList);
+    submitPeople(userNamelist, nikeNamelist,userIdList) {
+      console.log(userIdList);
       this.peopleList = nikeNamelist;
-      this.form.peopleList = nikeNamelist.join(',');
+      this.form.peopleList = userNamelist.join(",");
+      this.userIdList = userIdList;
       this.peopleOpen = false;
     },
   }
 }
 </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;
 }