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

src/api/base/businessOut.js

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

src/routers/modules/base.js

@@ -532,6 +532,14 @@ var routers = [
                 }
         },
         {
+                path: '/base/businessOut/list',
+                name: 'baseBusinessOutList',
+                component: () => import('@/views/base/businessOut-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '外出记录'
+                }
+        }, {
                 path: '/base/checkinInfo/list',
                 name: 'baseCheckinInfo',
                 component: () => import('@/views/base/checkinInfo-list.vue'),

src/views/base/applicationExamine-list.vue

@@ -19,49 +19,93 @@
       inline
       class="demo-form-inline"
     >
-      <el-form-item label="申请者公司" prop="applicationCompanyId">
-        <el-select-tree
-          :props="props"
-          :options="companyResult"
-          v-model="queryModel.applicationCompanyId"
-          size=""
-          height="200"
-        ></el-select-tree
-        >&nbsp;
-        <el-checkbox v-model="queryModel.applicationSubordinate"
-          >是否包含下级单位</el-checkbox
-        >
-      </el-form-item>
-      <el-form-item label="审核人公司" prop="examineCompanyId">
-        <el-select-tree
-          :props="props"
-          :options="companyResult"
-          v-model="queryModel.examineCompanyId"
-          size=""
-          height="200"
-        ></el-select-tree
-        >&nbsp;
-        <el-checkbox v-model="queryModel.examineSubordinate"
-          >是否包含下级单位</el-checkbox
-        >
-      </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-row>
+        <el-form-item label="申请者公司" prop="applicationCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="queryModel.applicationCompanyId"
+            size="mini"
+            height="200"
+          ></el-select-tree
+          >&nbsp;
+          <el-checkbox v-model="queryModel.applicationSubordinate"
+            >是否包含下级单位</el-checkbox
+          >
+        </el-form-item>
+        <el-form-item label="申请者角色" prop="applicationRoleId">
+          <el-select
+            v-model="queryModel.applicationRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 200"
+            size="mini"
+          >
+            <el-option
+              v-for="role in applicationRoleResult"
+              :key="role.id"
+              :label="role.personRoleName"
+              :value="role.id"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批类型" prop="type">
+          <el-select
+            v-model="queryModel.type"
+            filterable
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 200px"
+          >
+            <el-option
+              v-for="result in examineTypeResult"
+              :key="result.value"
+              :label="result.name"
+              :value="result.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-row>
+      <el-row>
+        <el-form-item label="审核人公司" prop="examineCompanyId">
+          <el-select-tree
+            :props="props"
+            :options="companyResult"
+            v-model="queryModel.examineCompanyId"
+            size="mini"
+            height="200"
+          ></el-select-tree
+          >&nbsp;
+          <el-checkbox v-model="queryModel.examineSubordinate"
+            >是否包含下级单位</el-checkbox
+          >
+        </el-form-item>
+        <el-form-item label="审批等级" prop="level">
+          <el-input
+            size="mini"
+            v-model="queryModel.level"
+            style="width: 80px"
+          ></el-input>
+        </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-row>
     </el-form>
     <el-divider></el-divider>
     <el-row class="button-group">
@@ -108,16 +152,6 @@
         label="申请者角色"
         width="150"
       ></el-table-column>
-      <el-table-column
-        prop="examineCompanyName"
-        label="审核人公司"
-        width="180"
-      ></el-table-column>
-      <el-table-column
-        prop="examineRoleName"
-        label="审核人角色"
-        width="150"
-      ></el-table-column>
       <el-table-column
         prop="typeName"
         label="审批类型"
@@ -128,11 +162,19 @@
           <span v-if="row.level != '' && row.level != null"
             >lv.{{ row.level }}</span
           >
-          <span v-else
-            >{{ row.level }}</span
-          >
+          <span v-else>{{ row.level }}</span>
         </template></el-table-column
       >
+      <el-table-column
+        prop="examineCompanyName"
+        label="审核人公司"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="examineRoleName"
+        label="审核人角色"
+        width="150"
+      ></el-table-column>
       <el-table-column
         prop="days"
         label="请假天数"
@@ -143,14 +185,16 @@
         label="备注信息"
         width="150"
       ></el-table-column>
-      <el-table-column label="操作" width="150">
+      <el-table-column label="操作" width="130" fixed="right">
         <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
-          >
+          <el-row>
+            <el-col :span="12">
+              <el-link type="primary" @click="handleEdit(row)">编辑</el-link>
+            </el-col>
+            <el-col :span="12">
+              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+            </el-col>
+          </el-row>
         </template>
       </el-table-column>
     </el-table>
@@ -174,6 +218,8 @@
 import Constant from "@/constant";
 import ApplicationExamineDetail from "./applicationExamine-detail";
 import applicationExamineApi from "@/api/base/applicationExamine";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import personRoleInfoApi from "@/api/base/personRoleInfo";
 import companyInfoApi from "@/api/base/companyInfo";
 import NProgress from "nprogress"; // progress bar
 import "nprogress/nprogress.css"; // progress bar style
@@ -193,6 +239,8 @@ export default {
         examineRoleId: "",
         examineCompanyId: "",
         examineSubordinate: false,
+        type:"",
+        level:""
       },
       loading: false,
       tableData: [],
@@ -215,8 +263,32 @@ export default {
         children: "children",
       },
       companyResult: [],
+      applicationRoleResult:[],
+      examineTypeResult:[]
     };
   },
+  watch: {
+    "queryModel.applicationCompanyId": function (val, oldval) {
+      if (val != null && val != "") {
+        var self = this;
+        var formData = new FormData();
+        formData.append("companyId", val);
+        personRoleInfoApi.listByCompanyId(formData).then(function (response) {
+          var jsonData = response.data;
+          if (jsonData.result) {
+            if (jsonData.data != null && jsonData.data != "") {
+              self.applicationRoleResult = jsonData.data;
+
+              // applicationCompanyId
+              // applicationRoleId
+              // examineCompanyId
+              // examineRoleId
+            }
+          }
+        });
+      }
+    }
+  },
   created() {
     var self = this;
     companyInfoApi.list().then(function (response) {
@@ -227,6 +299,13 @@ export default {
         }
       }
     });
+
+    var formData = new FormData();
+    formData.append("catalogName", "审批类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.examineTypeResult = jsonData.data;
+    });
   },
   methods: {
     indexMethod(index) {
@@ -269,6 +348,14 @@ export default {
         formData.append("direction", this.direction);
       }
 
+      if (self.queryModel.type != null) {
+        formData.append("type", self.queryModel.type);
+      }
+      if (self.queryModel.level != null) {
+        formData.append("level",self.queryModel.level);
+      }
+      
+
       applicationExamineApi
         .pageList(formData)
         .then(function (response) {

src/views/base/businessOut-detail.vue

@@ -0,0 +1,303 @@
+
+<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="'100px'"
+      >
+        <el-form-item label="" prop="id">
+          <el-input
+            v-model="formModel.id"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="人员id" prop="personPopedomId">
+          <el-input
+            v-model="formModel.personPopedomId"
+            placeholder="请输入人员id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="类型（1：外出，3：出差）" prop="type">
+          <el-input
+            v-model="formModel.type"
+            placeholder="请输入类型（1：外出，3：出差）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="目的地" prop="destination">
+          <el-input
+            v-model="formModel.destination"
+            placeholder="请输入目的地"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="开始时间" prop="startTime">
+          <el-input
+            v-model="formModel.startTime"
+            placeholder="请输入开始时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="预估天数" prop="estimatedTime">
+          <el-input
+            v-model="formModel.estimatedTime"
+            placeholder="请输入预估天数"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <el-input
+            v-model="formModel.content"
+            placeholder="请输入内容"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批人id" prop="approvalPersonId">
+          <el-input
+            v-model="formModel.approvalPersonId"
+            placeholder="请输入审批人id"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审批状态: 0：待处理，1：同意，2：拒绝"
+          prop="status"
+        >
+          <el-input
+            v-model="formModel.status"
+            placeholder="请输入审批状态: 0：待处理，1：同意，2：拒绝"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批编号" prop="approvalNo">
+          <el-input
+            v-model="formModel.approvalNo"
+            placeholder="请输入审批编号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核时间" prop="approvalTime">
+          <el-input
+            v-model="formModel.approvalTime"
+            placeholder="请输入审核时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核意见" prop="approvalContent">
+          <el-input
+            v-model="formModel.approvalContent"
+            placeholder="请输入审核意见"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审批人id（包含历史记录）"
+          prop="approvalPersonIdStr"
+        >
+          <el-input
+            v-model="formModel.approvalPersonIdStr"
+            placeholder="请输入审批人id（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审批编号（包含历史记录）" prop="approvalNoStr">
+          <el-input
+            v-model="formModel.approvalNoStr"
+            placeholder="请输入审批编号（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="审核时间（包含历史记录）" prop="approvalTimeStr">
+          <el-input
+            v-model="formModel.approvalTimeStr"
+            placeholder="请输入审核时间（包含历史记录）"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审核意见（包含历史记录）"
+          prop="approvalContentStr"
+        >
+          <el-input
+            v-model="formModel.approvalContentStr"
+            placeholder="请输入审核意见（包含历史记录）"
+            style="width: 300px"
+          ></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 businessOutApi from "@/api/base/businessOut";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "不能为空", trigger: "blur" }],
+        personPopedomId: [
+          { required: true, message: "人员id不能为空", trigger: "blur" },
+        ],
+        type: [
+          {
+            required: true,
+            message: "类型（1：外出，3：出差）不能为空",
+            trigger: "blur",
+          },
+        ],
+        destination: [
+          { required: true, message: "目的地不能为空", trigger: "blur" },
+        ],
+        startTime: [
+          { required: true, message: "开始时间不能为空", trigger: "blur" },
+        ],
+        estimatedTime: [
+          { required: true, message: "预估天数不能为空", trigger: "blur" },
+        ],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        approvalPersonId: [
+          { required: true, message: "审批人id不能为空", trigger: "blur" },
+        ],
+        status: [
+          {
+            required: true,
+            message: "审批状态: 0：待处理，1：同意，2：拒绝不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalNo: [
+          { required: true, message: "审批编号不能为空", trigger: "blur" },
+        ],
+        approvalTime: [
+          { required: true, message: "审核时间不能为空", trigger: "blur" },
+        ],
+        approvalContent: [
+          { required: true, message: "审核意见不能为空", trigger: "blur" },
+        ],
+        approvalPersonIdStr: [
+          {
+            required: true,
+            message: "审批人id（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalNoStr: [
+          {
+            required: true,
+            message: "审批编号（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalTimeStr: [
+          {
+            required: true,
+            message: "审核时间（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+        approvalContentStr: [
+          {
+            required: true,
+            message: "审核意见（包含历史记录）不能为空",
+            trigger: "blur",
+          },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  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 businessOutApi.add(self.formModel);
+            } else {
+              return businessOutApi.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 businessOutApi.create();
+      } else {
+        return businessOutApi.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/businessOut-list.vue

@@ -0,0 +1,412 @@
+<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="/businessOut">外出记录</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="personName">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.personName"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="审批编号" prop="approvalNo">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.approvalNo"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select size="mini" v-model="queryModel.type">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="外出" value="1"></el-option>
+          <el-option label="出差" value="3"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select size="mini" v-model="queryModel.status">
+          <el-option label="全部" value=""></el-option>
+          <el-option label="未审批" value="0"></el-option>
+          <el-option label="同意" value="1"></el-option>
+          <el-option label="拒绝" value="2"></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"
+        :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
+        type="index"
+        label="序号"
+        :index="indexMethod"
+        width="50"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalNo"
+        label="审批编号"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="type" label="类型" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.type == 1">外出</span>
+          <span v-else-if="row.type == 3">出差</span>
+          <span v-else>1</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="status" label="状态" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.status == 1" style="color: green">同意</span>
+          <span v-else-if="row.status == 2" style="color: red">拒绝</span>
+          <span v-else>待处理</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="personName"
+        label="申请人员"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="personRoleName"
+        label="申请人员角色"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="destination"
+        label="目的地"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="开始时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="estimatedTime"
+        label="预估天数"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="content"
+        label="内容"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonName"
+        label="审批人"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalPersonRoleName"
+        label="审批人角色"
+        width="100"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalTime"
+        label="审核时间"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="approvalContent"
+        label="审核意见"
+        width="150"
+        show-overflow-tooltip
+      ></el-table-column>
+      <el-table-column label="操作" width="100">
+        <template slot-scope="{ row }">
+          <el-row>
+            <el-col :span="12">
+              <el-link v-if="row.type == 3" type="primary" @click="createWord(row)">下载</el-link>
+            </el-col>
+            <!-- <el-col :span="12">
+              <el-link type="danger" @click="handleDelete(row)">删除</el-link>
+            </el-col> -->
+          </el-row>
+        </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>
+    <businessOut-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></businessOut-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import BusinessOutDetail from "./businessOut-detail";
+import businessOutApi from "@/api/base/businessOut";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  name: "baseBusinessOutList",
+  data() {
+    var self = this;
+    return {
+      queryModel: {
+        personName: "",
+        type: "",
+        status: "",
+        approvalNo: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    createWord(record) {
+      var self = this;
+      self.loading = true;
+      var formData = new FormData();
+      formData.append("id", record.id);
+      businessOutApi.createWord(formData).then(function (response) {
+        var jsonData = response.data;
+        self.loading = false;
+        if (jsonData.result) {
+          if (jsonData.data != null) {
+            self.$message({
+              showClose: true,
+              type: "success",
+              dangerouslyUseHTMLString: true,
+              message: `<a href="${jsonData.data}" target="_blank">点击下载</a>&nbsp;`,
+              duration: 30000,
+            });
+          }
+        }
+      });
+    },
+    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("personName", self.queryModel.personName);
+      formData.append("type", self.queryModel.type);
+      formData.append("status", self.queryModel.status);
+      formData.append("approvalNo", self.queryModel.approvalNo);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      businessOutApi
+        .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(() => {
+          businessOutApi.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(() => {
+        businessOutApi.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: {
+    "businessOut-detail": BusinessOutDetail,
+  },
+};
+</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/personPopedom-list.vue

@@ -103,7 +103,7 @@
             ></el-switch>
           </template>
         </el-table-column>
-        <el-table-column prop="useEnable" label="当前身份" width="100">
+        <el-table-column prop="useEnable" label="默认" width="100">
           <template slot-scope="{ row }">
             <el-switch
               v-model="row.isDefault"