Merge branch 'V2' of http://47.92.161.104:10080/zq/jp-housekeeper-portal into V2

src/api/base/approvalConfig.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/approvalConfig/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/approvalConfig/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/approvalConfig/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/approvalConfig/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/approvalConfig/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/approvalConfig/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/approvalConfig/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/api/base/workOver.js

@@ -0,0 +1,46 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+function pageList(formData){
+  return request.post(constant.serverUrl + "/base/workOver/pageList", formData);
+}
+
+function create(){
+  return request.get(constant.serverUrl + "/base/workOver/create");
+}
+
+function edit(id){
+  return request.get(constant.serverUrl + "/base/workOver/edit/" + id);
+}
+
+function add(formModel){
+  return request.post(constant.serverUrl + "/base/workOver/add", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function update(formModel){  
+  return request.post(constant.serverUrl + "/base/workOver/update", formModel,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function remove(id){
+  return request.post(constant.serverUrl + "/base/workOver/delete/" + id);
+}
+
+function batchRemove(idList){
+  return request.post(constant.serverUrl + "/base/workOver/batchDelete",idList,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+export default {
+  pageList,create,edit,add,update,remove,batchRemove
+}

src/routers/modules/base.js

@@ -569,6 +569,24 @@ var routers = [
                         title: '收款账户管理'
                 }
         }, 
+        {
+                path: '/base/approvalConfig/list',
+                name: 'baseApprovalConfigList',
+                component: () => import('@/views/base/approvalConfig-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '审核层级管理'
+                }
+        },  
+        {
+                path: '/base/workOver/list',
+                name: 'baseWorkOverList',
+                component: () => import('@/views/base/workOver-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '加班申请记录'
+                }
+        }, 
 ]
 
 export default routers;

src/views/base/approvalConfig-detail.vue

@@ -0,0 +1,224 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="false"
+    style="text-align: left"
+    @close="closeDialog"
+    :close-on-click-modal="false"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'150px'"
+      >
+        <el-form-item label="公司" prop="companyId">
+          <el-select-tree
+          :props="props"
+          :options="companyResult"
+          v-model="formModel.companyId"
+          size=""
+          height="200"
+        ></el-select-tree>
+        </el-form-item>
+        <el-form-item
+          label="类型"
+          prop="type"
+        >
+          <el-select
+          v-model="formModel.type"
+          filterable
+          placeholder="请选择"
+          style="width: 200px"
+        >
+          <el-option
+            v-for="type in typeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+        </el-form-item>
+        <el-form-item label="审批层级" prop="level">
+          <el-input-number
+            v-model="formModel.level"
+            placeholder="请输入审批需要的层级"
+            style="width: 200px"
+            :min="0" :max="99"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="申请对应天数" prop="days">
+          <el-input-number
+            v-model="formModel.days"
+            placeholder="请输入申请时对应的天数"
+            style="width: 200px"
+            :min="0" :max="99"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注信息" prop="remark">
+          <el-input
+            v-model="formModel.remark"
+            placeholder="请输入备注信息"
+            style="width: 400px"
+          ></el-input>
+        </el-form-item>
+      </el-form>
+    </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="closeDialog">取 消</el-button>
+      <el-button type="primary" @click="handleSubmit" :loading="submitting"
+        >确 定</el-button
+      >
+    </span>
+  </el-dialog>
+</template>
+<script>
+import Constant from "@/constant";
+import approvalConfigApi from "@/api/base/approvalConfig";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  components: {
+    "el-select-tree": SelectTree
+  },
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        companyId: [
+          { required: true, message: "请选择单位", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message:
+              "请选择类型",
+            trigger: "blur",
+          },
+        ],
+        level: [
+          {
+            required: true,
+            message: "审批需要的层级不能为空",
+            trigger: "blur",
+          },
+        ],
+        days: [
+          {
+            required: true,
+            message: "申请时对应的天数不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      typeResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "审批层级类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = jsonData.data;
+      });
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          (function () {
+            var id = self.formModel.id;
+
+            if (id == null || id.length == 0) {
+              return approvalConfigApi.add(self.formModel);
+            } else {
+              return approvalConfigApi.update(self.formModel);
+            }
+          })().then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              self.$message({
+                message: "保存成功!",
+                type: "success",
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning",
+              });
+
+              self.$emit("close", false);
+            }
+          });
+        }
+      });
+    },
+  },
+  mounted: function () {
+    var self = this;
+
+    (function () {
+      if (self.businessKey.length == 0) {
+        return approvalConfigApi.create();
+      } else {
+        return approvalConfigApi.edit(self.businessKey);
+      }
+    })()
+      .then((response) => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.result) {
+          self.formModel = jsonData.data;
+        } else {
+          self.$message.error(jsonData.message + "");
+        }
+      })
+      .catch((error) => {
+        self.$message.error(error + "");
+      });
+  },
+};
+</script>

src/views/base/approvalConfig-list.vue

@@ -0,0 +1,373 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/approvalConfig">审批层级管理</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+      <el-form-item label="单位" prop="companyId">
+        <el-select-tree
+          :props="props"
+          :options="companyResult"
+          v-model="queryModel.companyId"
+          height="200"
+          size="mini"
+        ></el-select-tree>
+        &nbsp;
+        <el-checkbox v-model="queryModel.subordinate"
+          >是否包含下级单位</el-checkbox
+        >
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select
+          v-model="queryModel.type"
+          filterable
+          size="mini"
+          placeholder="请选择"
+          style="width: 180px"
+        >
+          <el-option
+            v-for="type in typeResult"
+            :key="type.value"
+            :label="type.name"
+            :value="type.value"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        @click="handleAdd"
+        >新增</el-button
+      >
+      <el-button
+        type="primary"
+        size="small"
+        plain
+        icon="el-icon-circle-plus"
+        :disabled="multipleSelection.length == 0"
+        @click="handleBatchDelete"
+        >删除选中项</el-button
+      >
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55"></el-table-column>
+      <el-table-column label="序号" fixed="left" type="index" :index="indexMethod"></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="公司"
+        width="220"
+      ></el-table-column>
+      <el-table-column prop="typeN" label="类型" width="150"></el-table-column>
+      <el-table-column
+        prop="level"
+        label="审批需要的层级"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="days"
+        label="申请时对应的天数"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="remark"
+        label="备注信息"
+        show-overflow-tooltip
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作">
+        <template slot-scope="{ row }">
+          <el-button size="mini" type="warning" @click="handleEdit(row)"
+            >编辑</el-button
+          >
+          <el-button size="mini" type="danger" @click="handleDelete(row)"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <approvalConfig-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></approvalConfig-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ApprovalConfigDetail from "./approvalConfig-detail";
+import approvalConfigApi from "@/api/base/approvalConfig";
+import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseApprovalConfigList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        companyId: "",
+        type: "",
+        subordinate:false,
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      companyResult: [],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children",
+      },
+      typeResult: [],
+    };
+  },
+  created() {
+    var self = this;
+    companyInfoApi.list().then(function (response) {
+      var jsonData = response.data;
+      if (jsonData.result) {
+        if (jsonData.data != null && jsonData.data != "") {
+          self.companyResult = jsonData.data;
+        }
+      }
+    });
+
+    dataDictionaryApi
+      .findByCatalogName({
+        catalogName: "审批层级类型",
+      })
+      .then((response) => {
+        var jsonData = response.data;
+        this.typeResult = jsonData.data;
+      });
+  },
+  methods: {
+    indexMethod(index) {
+      return (this.pageIndex - 1) * this.pageSize + (index + 1);
+    },
+    changePage(pageIndex) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+      formData.append("pageSize", self.pageSize);
+
+      formData.append("companyId", self.queryModel.companyId);
+      formData.append("type", self.queryModel.type);
+      formData.append("subordinate", self.queryModel.subordinate);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      approvalConfigApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          approvalConfigApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        approvalConfigApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "approvalConfig-detail": ApprovalConfigDetail,
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>

src/views/base/deviceInfo-list.vue

@@ -187,9 +187,9 @@
             </el-col> -->
           </el-row>
           <el-row>
-            <!-- <el-col :span="8">
+            <el-col :span="8">
               <el-link type="primary" @click="handleBindPerson(row)">用户关联</el-link>
-            </el-col> -->
+            </el-col>
             <el-col :span="8" v-if="row.manufacturer=='1'">
               <el-link type="primary" @click="handleEditRule(row)">验证规则</el-link>
             </el-col>

src/views/base/workOver-list.vue

@@ -0,0 +1,432 @@
+<template>
+  <div>
+    <el-breadcrumb separator=">">
+      <el-breadcrumb-item :to="{ path: '/' }">首页</el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="#">系统管理</a>
+      </el-breadcrumb-item>
+      <el-breadcrumb-item>
+        <a href="/workOver">加班申请记录</a>
+      </el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-divider></el-divider>
+    <!--
+      要resetFields起作用，必须配置:model和prop
+    -->
+    <el-form
+      ref="queryForm"
+      :model="queryModel"
+      inline
+      class="demo-form-inline"
+    >
+    <el-form-item label="所属单位" prop="companyId">
+        <el-select-tree
+          size="mini"
+          :props="props"
+          :options="treeData"
+          v-model="queryModel.companyId"
+          height="200"
+        ></el-select-tree>&nbsp;
+          <el-checkbox v-model="queryModel.subordinate"
+            >是否包含下级单位</el-checkbox
+          >
+      </el-form-item>
+      <el-form-item label="申请人姓名" prop="personName">
+        <el-input type="text" size="mini" v-model="queryModel.personName"></el-input>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select
+          v-model="queryModel.status"
+          size="mini"
+          filterable
+          placeholder="请选择"
+          style="width:100px"
+        >
+          <el-option v-for="item in statusList" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="申请时间" prop="requestTimeRange">
+        <el-date-picker
+            v-model="queryModel.requestTimeRange"
+            type="daterange"
+            size="mini"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
+            >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="审核时间" prop="auditTimeRange">
+        <el-date-picker
+            v-model="queryModel.auditTimeRange"
+            type="daterange"
+            size="mini"
+            range-separator="至"
+            start-placeholder="开始时间"
+            end-placeholder="结束时间"
+            placeholder="选择时间范围"
+            value-format="yyyy-MM-dd"
+            >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item>
+        <el-button
+          type="primary"
+          size="mini"
+          icon="ios-search"
+          @click="changePage(1)"
+          :loading="loading"
+          >查询</el-button
+        >&nbsp;
+        <el-button
+          type="info"
+          size="mini"
+          style="margin-left: 8px"
+          @click="handleReset('queryForm')"
+          >重置</el-button
+        >&nbsp;
+      </el-form-item>
+    </el-form>
+    <el-divider></el-divider>
+    <el-row class="button-group">
+      <!-- <el-button type="success" size="small" plain icon="el-icon-download" @click="exportXls()">批量导出</el-button> -->
+    </el-row>
+    <el-table
+      :data="tableData"
+      style="min-height: 400px"
+      v-loading="loading"
+      stripe
+      @sort-change="sortChange"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="expand">
+        <template slot-scope="{row}">
+          <el-form label-position="left" class="demo-table-expand">
+            <el-form-item label="开始时间:">
+              <span>{{row.startTime }}</span>
+            </el-form-item>
+            <el-form-item label="结束时间:">
+              <span>{{row.endTime }}</span>
+            </el-form-item>
+            <el-form-item label="加班原因:">
+              <span>{{row.reason }}</span>
+            </el-form-item>
+            <el-form-item label="审核意见:">
+              <span>{{row.approvalContent }}</span>
+            </el-form-item>
+            <el-form-item label="审核时间:">
+              <span>{{row.approvalTime }}</span>
+            </el-form-item>
+          </el-form>
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime" label="申请时间" :sortable="false" width="180"></el-table-column>
+      <el-table-column
+        prop="personName"
+        label="申请人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="companyName"
+        label="单位"
+        width="180"
+      ></el-table-column>
+      
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="statusN"
+        label="状态"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="remark" label="备注" width="180"></el-table-column>
+    </el-table>
+    <el-pagination
+      :current-page.sync="pageIndex"
+      :total="totalElements"
+      :page-sizes="pageSizeList"
+      @current-change="changePage"
+      @size-change="pageSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+    ></el-pagination>
+    <workOver-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></workOver-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import workOverApi from "@/api/base/workOver";
+import companyInfoApi from "@/api/base/companyInfo";
+import SelectTree from "@/components/SelectTree";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseWorkOverList",
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        companyId: "",
+        personName: "",
+        status:"",
+        requestTimeRange: ['',''],
+        auditTimeRange: ['',''],
+        subordinate:false
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+      statusList: [
+        {id: 0, name: "待处理"},
+        {id: 1, name: "已同意"},
+        {id: 2, name: "已拒绝"}
+      ],
+      treeData: [],
+      props: {
+        // 配置项（必选）
+        value: "id",
+        label: "name",
+        children: "children"
+      },
+      
+    };
+  },
+  created() {
+    this.loadTree();
+    this.changePage(1);
+  },
+  methods: {
+    showStatusName(status) {
+      var list = this.statusList.filter(item=>item.id == status);
+
+      if(list.length>0){
+        return list[0].name;
+      }
+      else{
+        return "";
+      }
+    },
+    loadTree() {
+      companyInfoApi.list().then(resp => {
+        var jsonData = resp.data;
+
+        if (jsonData.result) {
+          this.treeData = jsonData.data;
+        } else {
+          this.$message.error(jsonData.message + "");
+        }
+      });
+    },
+    changePage(pageIndex,exportFlag) {
+      var self = this;
+
+      self.loading = true;
+
+      self.pageIndex = pageIndex;
+      var formData = new FormData();
+
+      formData.append("pageIndex", self.pageIndex);
+
+      if(exportFlag!=null){
+        formData.append("exportFlag", exportFlag);
+        formData.append("pageSize", 10000);
+      }
+      else{
+        formData.append("pageSize", self.pageSize);
+      }
+
+      if(self.queryModel.companyId != null){
+        formData.append("companyId", self.queryModel.companyId);
+      }
+
+      formData.append("subordinate", self.queryModel.subordinate);
+      
+      formData.append("personName", self.queryModel.personName);
+      formData.append("status", self.queryModel.status);
+      if(self.queryModel.requestTimeRange[0] != null){
+        formData.append("startTime", self.queryModel.requestTimeRange[0]);
+      }
+
+      if(self.queryModel.requestTimeRange[1] != null){
+        formData.append("endTime", self.queryModel.requestTimeRange[1]);
+      }
+
+      if(self.queryModel.auditTimeRange[0] != null){
+        formData.append("auditStartTime", self.queryModel.auditTimeRange[0]);
+      }
+
+      if(self.queryModel.auditTimeRange[1] != null){
+        formData.append("auditEndTime", self.queryModel.auditTimeRange[1]);
+      }
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      workOverApi
+        .pageList(formData)
+        .then(function (response) {
+          self.loading = false;
+
+          var jsonData = response.data.data;
+
+          self.tableData = jsonData.data;
+          self.totalPages = jsonData.totalPages;
+          self.totalElements = jsonData.recordsTotal;
+        })
+        .catch((error) => {
+          self.loading = false;
+          // self.$message.error(error + "");
+        });
+    },
+    pageSizeChange(pageSize) {
+      this.pageSize = pageSize;
+
+      this.$nextTick(() => {
+        this.changePage(this.pageIndex);
+      });
+    },
+    sortChange(data) {
+      this.field = data.column.field;
+      this.direction = data.order;
+
+      this.changePage(this.pageIndex);
+    },
+    handleSelectionChange(val) {
+      this.multipleSelection = val;
+    },
+    handleReset(name) {
+      this.$refs[name].resetFields();
+    },
+    handleAdd() {
+      this.modalTitle = "新增";
+      this.businessKey = "";
+      this.showModal = true;
+    },
+    handleEdit(record) {
+      this.modalTitle = "编辑";
+      this.businessKey = record.id;
+      this.showModal = true;
+    },
+    handleDelete(record) {
+      var self = this;
+
+      self
+        .$confirm("是否确认删除?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+        .then(() => {
+          workOverApi.remove(record.id).then(function (response) {
+            var jsonData = response.data;
+
+            if (jsonData.result) {
+              // var index = self.tableData.indexOf(record);
+              // self.tableData.splice(index, 1);
+              self.changePage(self.pageIndex);
+
+              self.$message({
+                type: "success",
+                message: "删除成功!",
+              });
+            }
+          });
+        });
+    },
+    handleBatchDelete() {
+      var self = this;
+
+      var idList = this.multipleSelection.map((record) => {
+        return record.id;
+      });
+
+      this.$confirm("是否确认删除选中项？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        workOverApi.batchRemove(idList).then(function (response) {
+          var jsonData = response.data;
+
+          if (jsonData.result) {
+            self.changePage(self.pageIndex);
+
+            self.$message({
+              type: "success",
+              message: "删除成功!",
+            });
+          }
+        });
+      });
+    },
+    onDetailModalClose(refreshed) {
+      //保存成功后回调
+      this.showModal = false;
+
+      if (refreshed) {
+        this.changePage(this.pageIndex);
+      }
+    },
+    exportXls() {
+      this.changePage(1,true);
+    }
+  },
+  mounted: function () {
+    this.changePage(1);
+  },
+  components: {
+    "el-select-tree": SelectTree
+  },
+};
+</script>
+<style lang="scss" scoped>
+.el-breadcrumb {
+  margin: 10px;
+  line-height: 20px;
+}
+
+.el-divider {
+  margin: 5px 0;
+}
+
+.demo-form-inline {
+  margin-left: 10px;
+  text-align: left;
+}
+
+.button-group {
+  margin-left: 10px;
+  text-align: left;
+}
+</style>