修改

src/api/personnel/attendance/business/index.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listBusiness(query) {
+  return request({
+    url: '/personnel/relations/business/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细
+export function getBusiness(id) {
+  return request({
+    url: '/personnel/relations/business/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addBusiness(data) {
+  return request({
+    url: '/personnel/relations/business/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function updateBusiness(data) {
+  return request({
+    url: '/personnel/relations/business/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function delBusiness(id) {
+  return request({
+    url: '/personnel/relations/business/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportBusiness(query) {
+  return request({
+    url: '/personnel/relations/business/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/personnel/attendance/leave/index.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listLeave(query) {
+  return request({
+    url: '/personnel/attendance/leave/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细
+export function getLeave(id) {
+  return request({
+    url: '/personnel/attendance/leave/page?id=' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addLeave(data) {
+  return request({
+    url: '/personnel/attendance/leave/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function updateLeave(data) {
+  return request({
+    url: '/personnel/attendance/leave/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function delLeave(id) {
+  return request({
+    url: '/personnel/attendance/leave/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportLeave(query) {
+  return request({
+    url: '/personnel/attendance/leave/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/api/personnel/attendance/out/index.js

@@ -0,0 +1,54 @@
+import request from '@/utils/request'
+
+// 查询列表
+export function listOut(query) {
+  return request({
+    url: '/personnel/relations/out/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询详细
+export function getOut(id) {
+  return request({
+    url: '/personnel/relations/out/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 新增
+export function addOut(data) {
+  return request({
+    url: '/personnel/relations/out/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改
+export function updateOut(data) {
+  return request({
+    url: '/personnel/relations/out/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除
+export function delOut(id) {
+  return request({
+    url: '/personnel/relations/out/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 导出
+export function exportOut(query) {
+  return request({
+    url: '/personnel/relations/out/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}

src/views/personnel/attendance/business/index.vue

@@ -0,0 +1,688 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="出差人" prop="employeeName">
+        <el-input v-model="queryParams.employeeName" placeholder="出差人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="部门" prop="deptId">
+        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
+          :normalizer="normalizer" placeholder="选择部门" />
+      </el-form-item>
+      <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="手机号" prop="employeePhone">
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="出差地点" prop="destination">
+        <el-input v-model="queryParams.destination" placeholder="请输入出差地点" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开始日期" prop="startDate">
+        <el-date-picker v-model="queryParams.startDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="结束日期" prop="endDate">
+        <el-date-picker v-model="queryParams.endDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['relations:turnover:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['relations:turnover:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList">
+      <el-table-column label="出差人" align="center" prop="employeeName" min-width="80" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
+      <el-table-column label="职位" align="center" prop="position" min-width="100" />
+      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="出差地点" align="center" prop="destination" min-width="120" />
+      <el-table-column label="开始日期" align="center" prop="startDate" min-width="100" />
+      <el-table-column label="结束日期" align="center" prop="endDate" min-width="100" />
+      <el-table-column label="出差天数" align="center" prop="day" min-width="100" />
+      <el-table-column label="预估费用" align="center" prop="estimatedCost" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" min-width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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="handleUpdate(scope.row)"
+            v-hasPermi="['relations:turnover:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['relations:turnover:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
+        </template>
+      </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="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="出差人" prop="employeeName">
+              <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="display: none;">
+            <el-form-item label="出差人Id" style="display: none;">
+              <el-input v-model="form.employeeId" placeholder='出差人Id' disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="部门">
+              <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="职位">
+              <el-input v-model="form.position" placeholder='职位' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="手机号">
+              <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="出差地点" prop="destination">
+              <el-input maxlength="20" v-model="form.destination" placeholder='出差地点'></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="出差开始日期" prop="startDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.startDate" type="date" placeholder="请选择日期"
+                style="width: 100%;" @change="upDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="出差结束日期" prop="endDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.endDate" type="date" placeholder="请选择日期"
+                style="width: 100%;" @change="upDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+
+          <el-col :span="24">
+            <el-form-item label="出差天数">
+              <el-input v-model="form.day" placeholder='出差天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="预估费用(元)" prop="estimatedCost">
+              <el-input v-model="form.estimatedCost" placeholder='预估费用'
+                onblur="value=value.match(/\d+\.?\d{0,2}/,'')"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="出差事由" prop="reason">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"
+                placeholder='出差的主要目的或需要完成的任务'></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <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-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks"
+                placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 详情对话框 -->
+    <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
+      <div class="widget-wrapper">
+        <div class="widget-list">
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">出差人</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.employeeName">{{ form.employeeName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">部门</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.deptName">{{ form.deptName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">职位</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.position">{{ form.position }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">手机号</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.employeePhone">{{ form.employeePhone }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">出差地点</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.destination">{{ form.destination }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">出差开始日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.startDate">{{ form.startDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">出差结束日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.endDate">{{ form.endDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">出差天数</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.day">{{ form.day }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">预估费用(元)</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.estimatedCost">{{ form.estimatedCost }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">出差事由</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.reason">{{ form.reason }}</span>
+            </div>
+          </div>
+
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">附件</div>
+            </div>
+            <div class="field-component">
+              <div v-for="(item, index) in form.fileList" :key="index">
+                <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+              </div>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">备注</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.birthday">{{ form.remarks }}</span>
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </el-dialog>
+    <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen"
+      @cancel="singlePeopleOpen = false" @submit="submitSingle"></PeopleSelect>
+  </div>
+</template>
+
+<script>
+import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/relations/turnover/index";
+import PeopleSelect from "@/components/PeopleSelect/index.vue";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listDept } from "@/api/system/dept";
+import { DICT_TYPE } from '@/utils/dict'
+import { getBaseHeader } from "@/utils/request";
+export default {
+  name: "SystemDictType",
+  components: {
+    PeopleSelect,
+    Treeselect,
+  },
+  data() {
+    return {
+      files: [],
+      // 设置上传的请求头部
+      headers: getBaseHeader(),
+      // 上传的地址
+      fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+      posOptions: [],
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      singlePeopleOpen: false,
+      open: false,
+      openDetail: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        employeeName: undefined,
+        deptId: undefined,
+        position: undefined,
+        employeePhone: undefined,
+        destination: undefined,
+
+        startDate: [],
+        endDate: [],
+        creator: undefined,
+        createTime: [],
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        employeeName: [
+          { required: true, message: '请选择', trigger: 'change' },
+        ],
+        destination: [
+          { required: true, message: '请填写出差地点', trigger: 'blur' },
+        ],
+        startDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        endDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        estimatedCost: [
+          { required: true, message: "请填写预估费用", trigger: "blur" }
+        ],
+        reason: [
+          { required: true, message: "请填写出差事由", trigger: "blur" }
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getListDept();
+  },
+  methods: {
+    upDay() {
+      if (this.form.startDate && this.form.endDate) {
+        let Days = this.calLeaveDays();
+        this.form.day = Days;
+        console.log(this.form.day);
+        if (Days <= 0) {
+          this.form.startDate = "";
+          this.form.endDate = "";
+          this.form.day = "";
+          this.$message.warning("起始日期小于结束日期，请重新选择！");
+          return;
+        }
+      }
+
+    },
+    calLeaveDays() {
+      var start_date = new Date();
+      var end_date = new Date();
+      start_date = new Date(this.form.startDate + " 00:00:00");
+      end_date = new Date(this.form.endDate + " 24:00:00");
+      console.log(start_date);
+      console.log(end_date);
+      //转成毫秒数，两个日期相减
+      var days = end_date.getTime() - start_date.getTime();
+      //转换成天数
+      var day = days / (1000 * 60 * 60 * 24);
+      console.log("day = ", day);
+      return day;
+    },
+    //打开选人弹窗
+    openSingle() {
+      this.singlePeopleOpen = true;
+    },
+    submitSingle(userNamelist, nikeNamelist, userIdList) {
+      console.log(userNamelist);
+      this.form.employeeName = nikeNamelist.join();
+      this.form.employeeId = userIdList.join();
+      this.singlePeopleOpen = false;
+    },
+    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;
+    },
+    /** 查询部门列表 */
+    getListDept() {
+      listDept().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      listTurnover(this.queryParams).then(response => {
+        this.typeList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        employeeName: undefined,
+        employeeId: undefined,
+        deptName: undefined,
+        position: undefined,
+        employeePhone: undefined,
+        destination: undefined,
+
+        startDate: undefined,
+        endDate: undefined,
+        day: undefined,
+        estimatedCost: undefined,
+        reason: undefined,
+        fileIdList: undefined,
+        remarks: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id;
+      getTurnover(id).then(response => {
+        this.form = response.data;
+        this.openDetail = true;
+        this.title = "详情";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getTurnover(id).then(response => {
+        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 } },
+            });
+          }
+        }
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateTurnover(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTurnover(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+        return delTurnover(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return exportTurnover(params);
+      }).then(response => {
+        this.$download.excel(response, '.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  position: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>

src/views/personnel/attendance/leave/index.vue

@@ -0,0 +1,703 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="请假人" prop="employeeName">
+        <el-input v-model="queryParams.employeeName" placeholder="请输入请假人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="部门" prop="deptId">
+        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
+          :normalizer="normalizer" placeholder="选择部门" />
+      </el-form-item>
+      <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="手机号" prop="employeePhone">
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="请假类型" prop="leaveType">
+        <el-select v-model="queryParams.leaveType" placeholder="请选择" style="width: 250px">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value"
+            :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="开始日期" prop="startDate">
+        <el-date-picker v-model="queryParams.startDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="结束日期" prop="endDate">
+        <el-date-picker v-model="queryParams.endDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['relations:turnover:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['relations:turnover:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList">
+      <el-table-column label="请假人" align="center" prop="employeeName" min-width="100" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
+      <el-table-column label="职位" align="center" prop="position" min-width="100" />
+      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="请假类型" align="center" prop="leaveType" min-width="100" />
+      <el-table-column label="开始日期" align="center" prop="startDate" min-width="120" />
+      <el-table-column label="结束日期" align="center" prop="endDate" min-width="120" />
+      <el-table-column label="请假天数" align="center" prop="day" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" min-width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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="handleUpdate(scope.row)"
+            v-hasPermi="['relations:turnover:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['relations:turnover:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
+        </template>
+      </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="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="请假人" prop="employeeName">
+              <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24" style="display: none;">
+            <el-form-item label="请假人Id" style="display: none;">
+              <el-input v-model="form.employeeId" placeholder='请假人Id' disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="部门">
+              <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="职位">
+              <el-input v-model="form.position" placeholder='职位' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="手机号">
+              <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="请假类型" prop="leaveType">
+              <el-select v-model="form.leaveType" filterable allow-create default-first-option placeholder="请选择"
+                style="width: 100%;">
+                <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_OA_LEAVE_TYPE)" :key="dict.value"
+                  :label="dict.label" :value="dict.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="开始日期" prop="startDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.startDate" type="date" placeholder="选择日期"
+                style="width: 100%;" @change="upDay">
+              </el-date-picker>
+              <el-radio-group v-model="form.startTime" @change="upDay">
+                <el-radio label="am">上午</el-radio>
+                <el-radio label="pm">下午</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="结束日期" prop="endDate">
+              <el-date-picker value-format="yyyy-MM-dd" v-model="form.endDate" type="date" placeholder="选择日期"
+                style="width: 100%;" @change="upDay">
+              </el-date-picker>
+              <el-radio-group v-model="form.endTime" @change="upDay">
+                <el-radio label="am">上午</el-radio>
+                <el-radio label="pm">下午</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="请假天数">
+              <el-input v-model="form.day" placeholder='请假天数' onblur="value=value.match(/\d+\.?\d{0,1}/,'')"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="请假原因" prop="reason">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"
+                placeholder='请输入请假原因'></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <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-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks"
+                placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 详情对话框 -->
+    <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
+      <div class="widget-wrapper">
+        <div class="widget-list">
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required"></span>
+              <div class="field-name">请假人</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.loginName">{{ form.employeeName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">部门</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.deptName">{{ form.deptName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">职位</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.position">{{ form.position }}</span>
+            </div>
+          </div>
+
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required"></span>
+              <div class="field-name">手机号</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.employeePhone">{{ form.employeePhone }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">请假类型</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.leaveType">{{ form.leaveType }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">开始日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.startDate">{{ form.startDate }}</span>
+              &nbsp;
+              <span>{{ form.concreteDay1 == 'am' ? '上午' : '下午' }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">结束日期</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.startDate">{{ form.endDate }}</span>
+              &nbsp;
+              <span>{{ form.concreteDay2 == 'am' ? '上午' : '下午' }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">请假天数</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.day">{{ form.day }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">请假原因</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.education">{{ form.reason }}</span>
+            </div>
+          </div>
+
+
+
+
+
+
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">附件</div>
+            </div>
+            <div class="field-component">
+              <div v-for="(item, index) in form.fileList" :key="index">
+                <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+              </div>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">备注</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.remarks">{{ form.remarks }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen"
+      @cancel="singlePeopleOpen = false" @submit="submitSingle"></PeopleSelect>
+  </div>
+</template>
+
+<script>
+import { listLeave, getLeave, delLeave, addLeave, updateLeave, exportLeave } from "@/api/personnel/attendance/leave/index";
+import PeopleSelect from "@/components/PeopleSelect/index.vue";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listDept } from "@/api/system/dept";
+import { DICT_TYPE } from '@/utils/dict'
+import { getBaseHeader } from "@/utils/request";
+export default {
+  name: "SystemDictType",
+  components: {
+    PeopleSelect,
+    Treeselect,
+  },
+  data() {
+    return {
+      files: [],
+      // 设置上传的请求头部
+      headers: getBaseHeader(),
+      // 上传的地址
+      fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+      posOptions: [],
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      singlePeopleOpen: false,
+      open: false,
+      openDetail: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        employeeName: undefined,
+        deptId: undefined,
+        position: undefined,
+        employeePhone: undefined,
+        leaveType: undefined,
+        startDate: [],
+        endDate: [],
+        creator: undefined,
+        createTime: [],
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        leaveType: [
+          { required: true, message: '请选择请假类型', trigger: 'change' },
+        ],
+        startDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        endDate: [
+          { required: true, message: '请选择日期', trigger: 'change' }
+        ],
+        reason: [
+          { required: true, message: '请输入请假原因', trigger: 'blur' }
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getListDept();
+  },
+  methods: {
+    upDay() {
+      if (this.form.startDate && this.form.endDate) {
+        let leaveDays = this.calLeaveDays();
+        if (leaveDays < 0) {
+          this.form.startDate = "";
+          this.form.endDate = "";
+          this.form.day = "";
+          this.$message.warning("起始日期小于结束日期，请重新选择！");
+          return;
+        } else if (leaveDays == 0) {
+          this.form.startDate = "";
+          this.form.endDate = "";
+          this.form.day = "";
+          this.$message.warning("工作日天数为0，请重新选择！");
+          return;
+        } else {
+          this.form.day = leaveDays;
+        }
+      }
+
+    },
+    calLeaveDays() {
+      var start_date = new Date();
+      var end_date = new Date();
+      if (this.form.startTime == 'am') {
+        start_date = new Date(this.form.startDate + " 00:00:00");
+      } else {
+        start_date = new Date(this.form.startDate + " 12:00:00");
+      }
+
+      if (this.form.endTime == 'am') {
+        end_date = new Date(this.form.endDate + " 12:00:00");
+      } else {
+        end_date = new Date(this.form.endDate + " 24:00:00");
+      }
+      console.log(start_date);
+      console.log(end_date);
+      //转成毫秒数，两个日期相减
+      var days = end_date.getTime() - start_date.getTime();
+      //转换成天数
+      var day = days / (1000 * 60 * 60 * 24);
+      console.log("day = ", day);
+      return day;
+    },
+    //打开选人弹窗
+    openSingle() {
+      this.singlePeopleOpen = true;
+    },
+    submitSingle(userNamelist, nikeNamelist, userIdList) {
+      console.log(userNamelist);
+      this.form.employeeName = nikeNamelist.join();
+      this.form.employeeId = userIdList.join();
+      this.singlePeopleOpen = false;
+    },
+    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;
+    },
+    /** 查询部门列表 */
+    getListDept() {
+      listDept().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      listLeave(this.queryParams).then(response => {
+        this.typeList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        employeeName: undefined,
+        deptName: undefined,
+        position: undefined,
+        employeePhone: undefined,
+
+
+        leaveType: undefined,
+        startDate: undefined,
+        startTime: 'am',
+        endDate: undefined,
+        endTime: 'am',
+        day: undefined,
+        reason: undefined,
+        fileIdList: undefined,
+        remarks: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id;
+      getLeave(id).then(response => {
+        this.form = response.data;
+        this.openDetail = true;
+        this.title = "详情";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getLeave(id).then(response => {
+        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 } },
+            });
+          }
+        }
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateLeave(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addLeave(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+        return delLeave(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return exportLeave(params);
+      }).then(response => {
+        this.$download.excel(response, '.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  position: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>

src/views/personnel/attendance/out/index.vue

@@ -0,0 +1,642 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="外出人" prop="employeeName">
+        <el-input v-model="queryParams.employeeName" placeholder="请输入外出人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="部门" prop="deptId">
+        <treeselect style="width: 250px" :default-expand-level="1" v-model="queryParams.deptId" :options="deptOptions"
+          :normalizer="normalizer" placeholder="选择部门" />
+      </el-form-item>
+      <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="手机号" prop="employeePhone">
+        <el-input v-model="queryParams.employeePhone" placeholder="请输入手机号" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="外出地点" prop="destination">
+        <el-input v-model="queryParams.destination" placeholder="请输入外出地点" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="startDate">
+        <el-date-picker v-model="queryParams.startDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endDate">
+        <el-date-picker v-model="queryParams.endDate" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="创建人" prop="creator">
+        <el-input v-model="queryParams.creator" placeholder="创建人" clearable style="width: 250px"
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 250px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"
+          :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="审批状态" clearable style="width: 250px">
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.BPM_TASK_AUDIT_STATUS)" :key="parseInt(dict.value)"
+            :label="dict.label" :value="parseInt(dict.value)" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['relations:turnover:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+          v-hasPermi="['relations:turnover:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="typeList">
+      <el-table-column label="外出人" align="center" prop="employeeName" min-width="100" />
+      <el-table-column label="部门" align="center" prop="deptName" min-width="100" />
+      <el-table-column label="职位" align="center" prop="position" min-width="100" />
+      <el-table-column label="手机号" align="center" prop="employeePhone" min-width="100" />
+      <el-table-column label="外出地点" align="center" prop="destination" min-width="150" />
+      <el-table-column label="外出开始时间" align="center" prop="startDate" min-width="150" />
+      <el-table-column label="外出结束时间" align="center" prop="endDate" min-width="150" />
+      <el-table-column label="外出时长" align="center" prop="hour" min-width="100" />
+      <el-table-column label="创建人" align="center" prop="creator" min-width="80" />
+      <el-table-column label="创建时间" align="center" prop="createTime" min-width="150">
+        <template v-slot="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="状态" align="center" prop="status" min-width="100">
+        <template v-slot="scope">
+          <dict-tag :type="DICT_TYPE.BPM_TASK_AUDIT_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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="handleUpdate(scope.row)"
+            v-hasPermi="['relations:turnover:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['relations:turnover:delete']">删除</el-button>
+          <el-button size="mini" type="text" icon="el-icon-detail" @click="handleDetail(scope.row)">详情</el-button>
+        </template>
+      </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="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="外出人" prop="employeeName">
+              <el-input v-model="form.employeeName" placeholder='点击选择' readonly @click.native="openSingle"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12" style="display: none;">
+            <el-form-item label="外出人Id" style="display: none;">
+              <el-input v-model="form.employeeId" placeholder='外出人Id' disabled></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="部门">
+              <el-input v-model="form.deptName" placeholder='部门' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="职位">
+              <el-input v-model="form.position" placeholder='职位' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input v-model="form.employeePhone" placeholder='手机号' disabled></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外出地点" prop="destination">
+              <el-input maxlength="20" v-model="form.destination" placeholder='外出地点'></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="外出开始时间" prop="startDate">
+              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="09:00:00" v-model="form.startDate"
+                type="datetime" placeholder="选择时间" style="width: 100%;" @change="upHour">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="外出结束时间" prop="endDate">
+              <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" default-time="18:00:00" v-model="form.endDate"
+                type="datetime" placeholder="选择时间" style="width: 100%;" @change="upHour">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="外出时长">
+              <el-input v-model="form.hour" placeholder='外出时长'
+                oninput="value=value.replace(/^(0+)|[^\d]+/g,'')"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="外出事由" prop="reason">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.reason"
+                placeholder="请输入备注" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <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-col>
+          <el-col :span="24">
+            <el-form-item label="备注">
+              <el-input maxlength="200" rows="4" show-word-limit type="textarea" v-model="form.remarks"
+                placeholder="请输入" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 详情对话框 -->
+    <el-dialog :title="title" :visible.sync="openDetail" width="800px" append-to-body>
+      <div class="widget-wrapper">
+        <div class="widget-list" v-loading="loading">
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required"></span>
+              <div class="field-name">外出人</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.loginName">{{ form.employeeName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">部门</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.deptName">{{ form.deptName }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">职位</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.position">{{ form.position }}</span>
+            </div>
+          </div>
+
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required"></span>
+              <div class="field-name">手机号</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.employeePhone">{{ form.employeePhone }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">外出地点</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.destination">{{ form.destination }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">外出开始时间</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.startDate">{{ form.startDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">外出结束时间</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.endDate">{{ form.endDate }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">外出时长</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.hour">{{ form.hour }}</span>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <span class="field-required">*</span>
+              <div class="field-name">外出事由</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.reason">{{ form.reason }}</span>
+            </div>
+          </div>
+
+
+
+
+
+
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">附件</div>
+            </div>
+            <div class="field-component">
+              <div v-for="(item, index) in form.fileList" :key="index">
+                <a :href="item.url" target="_blank" :title="item.name" style="color: #5094d5;">{{ item.name }}</a>
+              </div>
+            </div>
+          </div>
+          <div class="fx-field x-grid-col-12">
+            <div class="field-label">
+              <div class="field-name">备注</div>
+            </div>
+            <div class="field-component">
+              <span :title="form.remarks">{{ form.remarks }}</span>
+            </div>
+          </div>
+        </div>
+      </div>
+    </el-dialog>
+    <PeopleSelect ref="peopleSelect" type="single" :isCheck="true" :open="singlePeopleOpen"
+      @cancel="singlePeopleOpen = false" @submit="submitSingle"></PeopleSelect>
+  </div>
+</template>
+
+<script>
+import { listTurnover, getTurnover, delTurnover, addTurnover, updateTurnover, exportTurnover } from "@/api/personnel/relations/turnover/index";
+import PeopleSelect from "@/components/PeopleSelect/index.vue";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { listDept } from "@/api/system/dept";
+import { DICT_TYPE } from '@/utils/dict'
+import { getBaseHeader } from "@/utils/request";
+export default {
+  name: "SystemDictType",
+  components: {
+    PeopleSelect,
+    Treeselect,
+  },
+  data() {
+    return {
+      files: [],
+      // 设置上传的请求头部
+      headers: getBaseHeader(),
+      // 上传的地址
+      fileUrl: process.env.VUE_APP_BASE_API + '/admin-api/infra/file/uploaData',
+      posOptions: [],
+      // 部门列表
+      deptOptions: [], // 部门属性结构
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 字典表格数据
+      typeList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      singlePeopleOpen: false,
+      open: false,
+      openDetail: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        employeeName: undefined,
+        deptId: undefined,
+        position: undefined,
+        employeePhone: undefined,
+        destination: undefined,
+        startDate: [],
+        endDate: [],
+        creator: undefined,
+        createTime: [],
+        status: undefined,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        destination: [
+          { required: true, message: '请填写外出地点', trigger: 'change' },
+        ],
+        startDate: [
+          { required: true, message: '请选择开始时间', trigger: 'change' }
+        ],
+        endDate: [
+          { required: true, message: '请选择结束时间', trigger: 'change' }
+        ],
+        reason: [
+          { required: true, message: '请输入外出原因', trigger: 'blur' }
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+    this.getListDept();
+  },
+  methods: {
+    //打开选人弹窗
+    openSingle() {
+      this.singlePeopleOpen = true;
+    },
+    submitSingle(userNamelist, nikeNamelist, userIdList) {
+      console.log(userNamelist);
+      this.form.employeeName = nikeNamelist.join();
+      this.form.employeeId = userIdList.join();
+      this.singlePeopleOpen = false;
+    },
+    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;
+    },
+    /** 查询部门列表 */
+    getListDept() {
+      listDept().then(response => {
+        this.deptOptions = this.handleTree(response.data, "id");
+      });
+    },
+    /** 转换部门数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.id,
+        label: node.name,
+        children: node.children
+      };
+    },
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      listTurnover(this.queryParams).then(response => {
+        this.typeList = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        employeeName: undefined,
+        deptName: undefined,
+        position: undefined,
+        employeePhone: undefined,
+
+
+        destination: undefined,
+        startDate: undefined,
+        endDate: undefined,
+        hour: undefined,
+        reason: undefined,
+        fileIdList: undefined,
+        remarks: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加";
+    },
+
+    /** 详情按钮操作 */
+    handleDetail(row) {
+      this.reset();
+      const id = row.id;
+      getTurnover(id).then(response => {
+        this.form = response.data;
+        this.openDetail = true;
+        this.title = "详情";
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getTurnover(id).then(response => {
+        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 } },
+            });
+          }
+        }
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改";
+      });
+    },
+    /** 提交按钮 */
+    submitForm: function () {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id !== undefined) {
+            updateTurnover(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addTurnover(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除"' + ids + '"的数据项?').then(function () {
+        return delTurnover(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = { ...this.queryParams };
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有数据项?').then(() => {
+        this.exportLoading = true;
+        return exportTurnover(params);
+      }).then(response => {
+        this.$download.excel(response, '.xls');
+        this.exportLoading = false;
+      }).catch(() => { });
+    }
+  }
+};
+</script>
+<style lang="scss" scoped>
+.widget-wrapper>.widget-list {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.x-grid-col-6 {
+  width: 50%;
+}
+
+.x-grid-col-12 {
+  width: 100%;
+}
+
+.fx-field {
+  line-height: 20px;
+  padding: 7px 12px 12px;
+  position: relative;
+}
+
+.fx-field .field-label {
+  word-wrap: break-word;
+  color: #141e31;
+  display: flex;
+  font-weight: 600;
+  line-height: 20px;
+  padding: 5px 0;
+  position: relative;
+  word-break: break-word;
+}
+
+.fx-field .field-label .field-required {
+  color: #eb5050;
+  margin-left: -6px;
+  position: relative;
+}
+
+.fx-field .field-label .field-name {
+  overflow: hidden;
+}
+
+.field-component {
+  word-wrap: break-word;
+  background: #f5f6f8;
+  border-radius: 2px;
+  color: #141e31;
+  font-size: 14px;
+  line-height: 20px;
+  min-height: 32px;
+  padding: 6px 8px;
+  white-space: pre-wrap;
+  word-break: break-word;
+}
+
+ul {
+  padding-left: 0px !important;
+}
+
+.el-tag+.el-tag {
+  margin-left: 10px;
+}
+</style>