合并更改项

src/api/base/activityInfo.js

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

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/api/base/checkinInfo.js

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

src/api/base/ehome.js

@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+import constant from '@/constant'
+
+
+function getXMLConfig(deviceNo,url){
+  var encUrl = encodeURIComponent(url);
+
+  return request.get(constant.serverUrl + `/ehome/getXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`);
+}
+
+function putXMLConfig(deviceNo,url,jsonData){  
+  var encUrl = encodeURIComponent(url);
+
+  return request.put(constant.serverUrl + `/ehome/setXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`, jsonData,{
+    headers: {
+      "Content-Type": "application/json"
+    }
+  });
+}
+
+function postXMLConfig(deviceNo,url,jsonData){
+    var encUrl = encodeURIComponent(url);
+
+    return request.post(constant.serverUrl + `/ehome/setXMLConfig?deviceNo=${deviceNo}&url=${encUrl}`, jsonData,{
+      headers: {
+        "Content-Type": "application/json"
+      }
+    });
+}
+
+export default {
+    getXMLConfig,putXMLConfig,postXMLConfig
+}

src/api/sys/permission.js

@@ -53,6 +53,14 @@ function batchRemove(idList){
   });
 }
 
+function hasPermission(method,path){
+  var formData = new FormData();
+  formData.append("method", method);
+  formData.append("path", path);
+
+  return request.post(constant.serverUrl + "/sys/permission/hasPermission",formData);
+}
+
 export default {
-  pageList,create,edit,add,update,remove,batchRemove,selectAll,batchImport
+  pageList,create,edit,add,update,remove,batchRemove,selectAll,batchImport,hasPermission
 }

src/main.js

@@ -6,7 +6,7 @@ import echarts from 'echarts'
 import './plugins/element.js'
 import AxiosPlugin from './plugins/AxiosPlugin'
 import './assets/iconfont/iconfont.css'
-
+import { Message } from 'element-ui'
 import AMap from "vue-amap"
 
 Vue.config.productionTip = false
@@ -23,6 +23,19 @@ AMap.initAMapApiLoader({
 
 Vue.prototype.$echarts = echarts
 
+
+var MY_MESSAGE_DEFAULT = {
+  showClose: true
+}
+ 
+Vue.prototype.$message = function (options) {
+  if (typeof (options) === 'object') {
+    options = Object.assign({}, MY_MESSAGE_DEFAULT, options)
+  }
+
+  Message(options)
+}
+
 new Vue({
   router,
   store,

src/routers/modules/base.js

@@ -523,6 +523,7 @@ var routers = [
                 }
         },
         {
+
                 path: '/base/payService/list',
                 name: 'basePayServiceList',
                 component: () => import('@/views/base/payService-list.vue'),
@@ -530,6 +531,33 @@ var routers = [
                         roles: ["admin"],
                         title: '收费项目管理'
                 }
+        },
+        {
+
+                path: '/base/activityInfo/list',
+                name: 'baseActivityInfo',
+                component: () => import('@/views/base/activityInfo-list.vue'),
+                meta: {
+                        roles: ["admin"],
+                        title: '活动管理'
+                }
+        },
+        {
+                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'),
+                meta: {
+                        roles: ["admin"],
+                        title: '租户管理'
+                }
         }
 ]
 

src/views/base/activityInfo-detail.vue

@@ -0,0 +1,257 @@
+
+<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="标题" prop="title">
+          <el-input
+            v-model="formModel.title"
+            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="封面" prop="frontCover">
+          <el-input
+            v-model="formModel.frontCover"
+            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="endTime">
+          <el-input
+            v-model="formModel.endTime"
+            placeholder="请输入截止时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请人" prop="applicant">
+          <el-input
+            v-model="formModel.applicant"
+            placeholder="请输入申请人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房号" prop="roomNumber">
+          <el-input
+            v-model="formModel.roomNumber"
+            placeholder="请输入房号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="申请时间" prop="applicationTime">
+          <el-input
+            v-model="formModel.applicationTime"
+            placeholder="请输入申请时间"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item
+          label="审核是否通过(0-待审核,1-已批准,2-未批准)"
+          prop="verify"
+        >
+          <el-input
+            v-model="formModel.verify"
+            placeholder="请输入审核是否通过(0-待审核,1-已批准,2-未批准)"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="是否删除" prop="delFlag">
+          <el-input
+            v-model="formModel.delFlag"
+            placeholder="请输入是否删除"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="createBy">
+          <el-input
+            v-model="formModel.createBy"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="createTime">
+          <el-input
+            v-model="formModel.createTime"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="updateBy">
+          <el-input
+            v-model="formModel.updateBy"
+            placeholder="请输入"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="" prop="updateTime">
+          <el-input
+            v-model="formModel.updateTime"
+            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 activityInfoApi from "@/api/base/activityInfo";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "内容不能为空", trigger: "blur" }],
+        frontCover: [
+          { required: true, message: "封面不能为空", trigger: "blur" },
+        ],
+        startTime: [
+          { required: true, message: "起始时间不能为空", trigger: "blur" },
+        ],
+        endTime: [
+          { required: true, message: "截止时间不能为空", trigger: "blur" },
+        ],
+        applicant: [
+          { required: true, message: "申请人不能为空", trigger: "blur" },
+        ],
+        roomNumber: [
+          { required: true, message: "房号不能为空", trigger: "blur" },
+        ],
+        applicationTime: [
+          { required: true, message: "申请时间不能为空", trigger: "blur" },
+        ],
+        verify: [
+          {
+            required: true,
+            message: "审核是否通过(0-待审核,1-已批准,2-未批准)不能为空",
+            trigger: "blur",
+          },
+        ],
+        delFlag: [
+          { required: true, message: "是否删除不能为空", trigger: "blur" },
+        ],
+        createBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        createTime: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateBy: [{ required: true, message: "不能为空", trigger: "blur" }],
+        updateTime: [{ 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 activityInfoApi.add(self.formModel);
+            } else {
+              return activityInfoApi.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 activityInfoApi.create();
+      } else {
+        return activityInfoApi.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/activityInfo-list.vue

@@ -0,0 +1,346 @@
+<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="/base/activityInfo">活动管理</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="title">
+        <el-input type="text" size="mini" v-model="queryModel.title"></el-input>
+      </el-form-item>
+      <el-form-item label="申请人" prop="applicant">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.applicant"
+        ></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-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 prop="title" label="标题" width="180"></el-table-column>
+      <el-table-column
+        prop="applicationTime"
+        label="申请时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="applicant"
+        label="申请人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="roomNumber"
+        label="房号"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="startTime"
+        label="起始时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="endTime"
+        label="截止时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="verify"
+        label="审核状态"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="200">
+        <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>
+    <activityInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></activityInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import ActivityInfoDetail from "./activityInfo-detail";
+import activityInfoApi from "@/api/base/activityInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        title: "",
+        content: "",
+        frontCover: "",
+        startTime: "",
+        endTime: "",
+        applicant: "",
+        roomNumber: "",
+        applicationTime: "",
+        verify: "",
+        delFlag: "",
+        createBy: "",
+        createTime: "",
+        updateBy: "",
+        updateTime: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    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("id", self.queryModel.id);
+      formData.append("title", self.queryModel.title);
+      formData.append("content", self.queryModel.content);
+      formData.append("frontCover", self.queryModel.frontCover);
+      formData.append("startTime", self.queryModel.startTime);
+      formData.append("endTime", self.queryModel.endTime);
+      formData.append("applicant", self.queryModel.applicant);
+      formData.append("roomNumber", self.queryModel.roomNumber);
+      formData.append("applicationTime", self.queryModel.applicationTime);
+      formData.append("verify", self.queryModel.verify);
+      formData.append("delFlag", self.queryModel.delFlag);
+      formData.append("createBy", self.queryModel.createBy);
+      formData.append("createTime", self.queryModel.createTime);
+      formData.append("updateBy", self.queryModel.updateBy);
+      formData.append("updateTime", self.queryModel.updateTime);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      activityInfoApi
+        .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(() => {
+          activityInfoApi.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(() => {
+        activityInfoApi.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: {
+    "activityInfo-detail": ActivityInfoDetail,
+  },
+};
+</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/applicationExamine-detail.vue

@@ -20,7 +20,7 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-      <el-form-item label="申请者公司" prop="applicationCompanyId">
+        <el-form-item label="申请者公司" prop="applicationCompanyId">
           <el-select-tree
             :props="props"
             :options="companyResult"
@@ -30,20 +30,20 @@
           ></el-select-tree>
         </el-form-item>
         <el-form-item label="申请者角色" prop="applicationRoleId">
-        <el-select
-          v-model="formModel.applicationRoleId"
-          filterable
-          placeholder="请选择"
-          style="width: 280px"
-        >
-          <el-option
-            v-for="role in applicationRoleResult"
-            :key="role.id"
-            :label="role.personRoleName"
-            :value="role.id"
-          ></el-option>
-        </el-select>
-      </el-form-item>
+          <el-select
+            v-model="formModel.applicationRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <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="examineCompanyId">
           <el-select-tree
             :props="props"
@@ -55,18 +55,48 @@
         </el-form-item>
         <el-form-item label="审核人角色" prop="examineRoleId">
           <el-select
-          v-model="formModel.examineRoleId"
-          filterable
-          placeholder="请选择"
-          style="width: 280px"
-        >
-          <el-option
-            v-for="role in examineRoleResult"
-            :key="role.id"
-            :label="role.personRoleName"
-            :value="role.id"
-          ></el-option>
-        </el-select>
+            v-model="formModel.examineRoleId"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="role in examineRoleResult"
+              :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="formModel.type"
+            filterable
+            placeholder="请选择"
+            style="width: 280px"
+          >
+            <el-option
+              v-for="result in examineTypeResult"
+              :key="result.value"
+              :label="result.name"
+              :value="result.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批等级" prop="level">
+          <el-input-number
+            v-model="formModel.level"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+            min="1"
+          ></el-input-number>
+        </el-form-item>
+        <el-form-item label="请假天数" prop="days">
+          <el-input-number
+            v-model="formModel.days"
+            placeholder="请输入备注信息"
+            style="width: 300px"
+          ></el-input-number>
         </el-form-item>
         <el-form-item label="备注信息" prop="remark">
           <el-input
@@ -89,12 +119,12 @@
 import Constant from "@/constant";
 import applicationExamineApi from "@/api/base/applicationExamine";
 import companyInfoApi from "@/api/base/companyInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
 import personRoleInfoApi from "@/api/base/personRoleInfo";
 
 import SelectTree from "@/components/SelectTree";
 
 export default {
-  
   components: {
     "el-select-tree": SelectTree,
   },
@@ -115,6 +145,9 @@ export default {
         examineCompanyId: [
           { required: true, message: "审核人公司不能为空", trigger: "blur" },
         ],
+        type: [
+          { required: true, message: "请选择审批类型", trigger: "blur" },
+        ]
       },
       showDialog: true,
       loading: false,
@@ -126,9 +159,10 @@ export default {
         label: "name",
         children: "children",
       },
-      applicationRoleResult:[],
-      examineRoleResult:[],
+      applicationRoleResult: [],
+      examineRoleResult: [],
       companyResult: [],
+      examineTypeResult: [],
     };
   },
   created() {
@@ -141,7 +175,15 @@ export default {
         }
       }
     });
-  },watch: {
+
+    var formData = new FormData();
+    formData.append("catalogName", "审批类型");
+    dataDictionaryApi.findByCatalogName(formData).then((response) => {
+      var jsonData = response.data;
+      this.examineTypeResult = jsonData.data;
+    });
+  },
+  watch: {
     "formModel.applicationCompanyId": function (val, oldval) {
       if (val != null && val != "") {
         var self = this;
@@ -160,7 +202,6 @@ export default {
             }
           }
         });
-
       }
     },
     "formModel.examineCompanyId": function (val, oldval) {
@@ -181,9 +222,8 @@ export default {
             }
           }
         });
-
       }
-    }
+    },
   },
   methods: {
     closeDialog() {

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">
@@ -106,8 +150,21 @@
       <el-table-column
         prop="applicationRoleName"
         label="申请者角色"
-        width="180"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="typeName"
+        label="审批类型"
+        width="100"
       ></el-table-column>
+      <el-table-column prop="level" label="审批等级" width="100">
+        <template slot-scope="{ row }">
+          <span v-if="row.level != '' && row.level != null"
+            >lv.{{ row.level }}</span
+          >
+          <span v-else>{{ row.level }}</span>
+        </template></el-table-column
+      >
       <el-table-column
         prop="examineCompanyName"
         label="审核人公司"
@@ -116,21 +173,28 @@
       <el-table-column
         prop="examineRoleName"
         label="审核人角色"
-        width="180"
+        width="150"
+      ></el-table-column>
+      <el-table-column
+        prop="days"
+        label="请假天数"
+        width="100"
       ></el-table-column>
       <el-table-column
         prop="remark"
         label="备注信息"
-        width="180"
+        width="150"
       ></el-table-column>
-      <el-table-column label="操作">
+      <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>
@@ -154,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
@@ -173,6 +239,8 @@ export default {
         examineRoleId: "",
         examineCompanyId: "",
         examineSubordinate: false,
+        type:"",
+        level:""
       },
       loading: false,
       tableData: [],
@@ -194,9 +262,33 @@ export default {
         label: "name",
         children: "children",
       },
-      companyResult: []
+      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) {
@@ -207,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) {
@@ -231,7 +330,10 @@ export default {
         "applicationCompanyId",
         self.queryModel.applicationCompanyId
       );
-      formData.append("applicationSubordinate", self.queryModel.applicationSubordinate);
+      formData.append(
+        "applicationSubordinate",
+        self.queryModel.applicationSubordinate
+      );
       formData.append("examineRoleId", self.queryModel.examineRoleId);
       if (self.queryModel.examineCompanyId == null) {
         self.queryModel.examineCompanyId = "";
@@ -246,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/checkinInfo-detail.vue

@@ -0,0 +1,219 @@
+
+<style scoped>
+.user-panel {
+  margin: 10px auto;
+}
+</style>
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    :title="title"
+    :modal-append-to-body="true"
+    append-to-body
+    :close-on-click-modal="false"
+    style="text-align: left"
+    width="80%"
+    @close="closeDialog"
+  >
+    <div class="user-panel" v-loading="loading">
+      <el-form
+        ref="form"
+        :model="formModel"
+        :rules="ruleValidate"
+        :label-width="'150px'"
+        inline
+      >
+        <el-form-item label="楼栋" prop="biulding">
+          <el-input
+            v-model="formModel.biulding"
+            placeholder="请输入楼栋"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="房号" prop="room">
+          <el-input
+            v-model="formModel.room"
+            placeholder="请输入房号"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="企业名称" prop="name">
+          <el-input
+            v-model="formModel.name"
+            placeholder="请输入企业名称"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="法人" prop="artificialPerson">
+          <el-input
+            v-model="formModel.artificialPerson"
+            placeholder="请输入法人"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="联系电话" prop="artificialPersonPhone">
+          <el-input
+            v-model="formModel.artificialPersonPhone"
+            placeholder="请输入联系电话"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="面积" prop="area">
+          <el-input
+            v-model="formModel.area"
+            placeholder="请输入面积"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="入驻时间" prop="checkinTime">
+          <el-date-picker v-model="formModel.checkinTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="费用到期时间" prop="feeExpirationTime">
+          <el-date-picker v-model="formModel.feeExpirationTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="合同到期时间" prop="contractExpirationTime">
+          <el-date-picker v-model="formModel.contractExpirationTime" value-format="yyyy-MM-dd" type="date" placeholder="选择日期" style="width: 300px"></el-date-picker>
+        </el-form-item>
+        <el-form-item label="租赁期限" prop="leaseTerm">
+          <el-input
+            v-model="formModel.leaseTerm"
+            placeholder="请输入租赁期限"
+            style="width: 300px"
+          ></el-input>
+      </el-form-item>
+        <el-form-item label="租金" prop="rent">
+          <el-input
+            v-model="formModel.rent"
+            placeholder="请输入租金"
+            style="width: 300px"
+          ></el-input>
+        </el-form-item>
+        <el-form-item label="缴纳方式" prop="paymentMethod">
+          <el-select v-model="formModel.paymentMethod" style="width:300px;" clearable>
+          <el-option v-for="(item,index) in paymentMethodList" 
+          :label="item.name" :value="item.value" :key="index"></el-option>
+        </el-select>
+        </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 checkinInfoApi from "@/api/base/checkinInfo";
+import dataDictionaryApi from "@/api/sys/dataDictionary";
+import SelectTree from "@/components/SelectTree";
+
+export default {
+  props: ["businessKey", "title"],
+  data() {
+    return {
+      paymentMethodList: [],
+      formModel: {},
+      ruleValidate: {
+        id: [{ required: true, message: "编号不能为空", trigger: "blur" }],
+        biulding: [
+          { required: true, message: "楼栋不能为空", trigger: "blur" },
+        ],
+        room: [{ required: true, message: "房号不能为空", trigger: "blur" }],
+        name: [
+          { required: true, message: "企业名称不能为空", trigger: "blur" },
+        ],
+        artificialPersonPhone: [
+          { required: true, message: "联系电话不能为空", trigger: "blur" },
+        ],
+        feeExpirationTime: [
+          { required: true, message: "费用到期时间不能为空", trigger: "blur" },
+        ],
+        contractExpirationTime: [
+          { required: true, message: "合同到期时间不能为空", trigger: "blur" },
+        ],
+      },
+      showDialog: true,
+      loading: false,
+      submitting: false,
+    };
+  },
+  created() {
+    dataDictionaryApi.findByCatalogName({
+      "catalogName" : "缴纳方式"
+    }).then(response => {
+      var jsonData = response.data;
+      this.paymentMethodList = 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 checkinInfoApi.add(self.formModel);
+            } else {
+              return checkinInfoApi.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 checkinInfoApi.create();
+      } else {
+        return checkinInfoApi.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 + "");
+      });
+  },
+  // components: {
+  //   "el-select-tree": SelectTree
+  // },
+};
+</script>

src/views/base/checkinInfo-list.vue

@@ -0,0 +1,353 @@
+<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="/base/checkinInfo">租户管理</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="biulding">
+        <el-input
+          type="text"
+          size="mini"
+          v-model="queryModel.biulding"
+        ></el-input>
+      </el-form-item>
+      <el-form-item label="企业名称" prop="name">
+        <el-input type="text" size="mini" v-model="queryModel.name"></el-input>
+      </el-form-item>
+      <el-form-item label="费用到期" prop="feeExpirationTime">
+        <el-date-picker v-model="queryModel.feeExpirationTime" value-format="yyyy-MM-dd" type="date" size="mini" placeholder="选择日期"></el-date-picker>
+      </el-form-item>
+      <el-form-item label="合同到期" prop="contractExpirationTime">
+        <el-date-picker v-model="queryModel.contractExpirationTime" value-format="yyyy-MM-dd" type="date" size="mini" placeholder="选择日期"></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="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
+        prop="biulding"
+        label="楼栋"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="room" label="房号" width="180"></el-table-column>
+      <el-table-column
+        prop="name"
+        label="企业名称"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="artificialPerson"
+        label="法人"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="artificialPersonPhone"
+        label="联系电话"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="area" label="面积" width="180"></el-table-column>
+      <el-table-column
+        prop="checkinTime"
+        label="入驻时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="feeExpirationTime"
+        label="费用到期时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="contractExpirationTime"
+        label="合同到期时间"
+        width="180"
+      ></el-table-column>
+      <el-table-column
+        prop="leaseTerm"
+        label="租赁期限"
+        width="180"
+      ></el-table-column>
+      <el-table-column prop="rent" label="租金" width="180"></el-table-column>
+      <el-table-column
+        prop="paymentMethod"
+        label="缴纳方式"
+        width="180"
+      ></el-table-column>
+      <el-table-column label="操作" fixed="right" width="200">
+        <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>
+    <checkinInfo-detail
+      v-if="showModal"
+      :businessKey="businessKey"
+      :title="modalTitle"
+      @close="onDetailModalClose"
+    ></checkinInfo-detail>
+  </div>
+</template>
+<script>
+import Constant from "@/constant";
+import CheckinInfoDetail from "./checkinInfo-detail";
+import checkinInfoApi from "@/api/base/checkinInfo";
+import NProgress from "nprogress"; // progress bar
+import "nprogress/nprogress.css"; // progress bar style
+
+export default {
+  data() {
+    var self = this;
+
+    return {
+      queryModel: {
+        id: "",
+        biulding: "",
+        name: "",
+        feeExpirationTime: "",
+        contractExpirationTime: "",
+      },
+      loading: false,
+      tableData: [],
+      pageIndex: 1,
+      pageSize: 10,
+      totalPages: 0,
+      totalElements: 0,
+      field: "",
+      direction: "",
+      pageSizeList: [10, 20, 30],
+      multipleSelection: [],
+      showModal: false,
+      modalTitle: "",
+      businessKey: "",
+    };
+  },
+  methods: {
+    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("id", self.queryModel.id);
+      formData.append("biulding", self.queryModel.biulding);
+      formData.append("name", self.queryModel.name);
+      formData.append("feeExpirationTime", self.queryModel.feeExpirationTime);
+      formData.append("contractExpirationTime", self.queryModel.contractExpirationTime);
+
+      if (this.field != null) {
+        formData.append("field", this.field);
+      }
+
+      if (this.direction != null) {
+        formData.append("direction", this.direction);
+      }
+
+      checkinInfoApi
+        .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 == "ascending" ? "asc" : "desc";
+
+      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(() => {
+          checkinInfoApi.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(() => {
+        checkinInfoApi.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: {
+    "checkinInfo-detail": CheckinInfoDetail,
+  },
+};
+</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/companyInfo-detail.vue

@@ -20,79 +20,50 @@
         :rules="ruleValidate"
         :label-width="'130px'"
       >
-        <el-row>
+        <el-row v-show="formModel.enableChangeParent">          
           <el-col :span="12">
-            <el-form-item label="单位名称" prop="name">
-              <el-input
-                v-model="formModel.name"
-                placeholder="请输入单位名称"
-                style="width: 80%"
-              ></el-input>
+            <el-form-item label="上级单位" prop="parentId">
+              <el-select-tree
+                :props="props"
+                :options="companyResult"
+                v-model="formModel.parentId"
+                height="200"
+                size="mediumn"
+                width="200"
+              ></el-select-tree>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="序号" prop="sortNo">
+            <el-form-item label="本级序号" prop="sortNo">
               <el-input
                 v-model="formModel.sortNo"
                 placeholder="请输入序号"
-                style="width: 50%"
+                style="width: 200px"
               ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="简称" prop="shortName">
+            <el-form-item label="单位名称" prop="name">
               <el-input
-                v-model="formModel.shortName"
+                v-model="formModel.name"
                 placeholder="请输入单位名称"
-                style="width: 80%"
+                style="width: 200px"
               ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="单位性质" prop="unitType">
-              <el-select
-                v-model="formModel.unitType"
-                filterable
-                clearable
-                placeholder="请选择"
-                style="width: 50%"
-              >
-                <el-option
-                  v-for="result in typeData"
-                  :key="result.id"
-                  :label="result.name"
-                  :value="result.value"
-                ></el-option>
-              </el-select>
+            <el-form-item label="简称" prop="shortName">
+              <el-input
+                v-model="formModel.shortName"
+                placeholder="请输入单位名称"
+                style="width: 200px"
+              ></el-input>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="上级单位" prop="parentId">
-              <!-- <el-select
-                v-model="formModel.parentId"
-                filterable
-                placeholder="请选择"
-                style="width:90%"
-              >
-                <el-option
-                  v-for="company in companyResult"
-                  :key="company.id"
-                  :label="company.name"
-                  :value="company.id"
-                ></el-option>
-              </el-select>-->
-              <el-select-tree
-                :props="props"
-                :options="companyResult"
-                v-model="formModel.parentId"
-                height="200"
-              ></el-select-tree>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="地区" prop="regionId">
               <!-- <el-select v-model="formModel.regionId" filterable placeholder="请选择" style="width:50%">
@@ -108,9 +79,29 @@
                 :options="regionData"
                 v-model="formModel.regionId"
                 height="200"
+                size="mediumn"
+                width="200"
               ></el-select-tree>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="单位性质" prop="unitType">
+              <el-select
+                v-model="formModel.unitType"
+                filterable
+                clearable
+                placeholder="请选择"
+                style="width: 200px"
+              >
+                <el-option
+                  v-for="result in typeData"
+                  :key="result.id"
+                  :label="result.name"
+                  :value="result.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="12">
@@ -120,7 +111,7 @@
                 filterable
                 clearable
                 placeholder="请选择"
-                style="width: 50%"
+                style="width: 200px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -138,7 +129,7 @@
                 filterable
                 clearable 
                 placeholder="请选择"
-                style="width: 50%"
+                style="width: 200px"
               >
                 <el-option
                   v-for="result in sceneData"
@@ -158,6 +149,7 @@
                 :options="companyResult"
                 v-model="formModel.relationCompanyId"
                 height="200"
+                width="200"
               ></el-select-tree>
             </el-form-item>
           </el-col>
@@ -175,7 +167,7 @@
                 type="textarea"
                 v-model="formModel.remark"
                 :rows="2"
-                style="width: 80%"
+                style="width: 100%"
                 placeholder="请输入备注"
               ></el-input>
             </el-form-item>
@@ -192,7 +184,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :span="12">
             <el-form-item label="一级位置" prop="position1Name">
               <el-input
@@ -242,7 +234,7 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row> -->
         <el-row>
           <el-col :span="24">
             <el-form-item label="单位logo" prop="logo">
@@ -286,7 +278,9 @@ export default {
   props: ["businessKey", "title"],
   data() {
     return {
-      formModel: {},
+      formModel: {
+        enableChangeParent: false
+      },
       ruleValidate: {
         name: [
           { required: true, message: "单位名称不能为空", trigger: "blur" },
@@ -297,6 +291,15 @@ export default {
         sceneId: [
           { required: true, message: "场景值不能为空", trigger: "blur" },
         ],
+        parentId : [
+          { required: true, message: "上级单位不能为空", trigger: "blur" },
+        ],
+        sortNo : [
+          { required: true, message: "序号不能为空", trigger: "blur" },
+        ],
+        unitType : [
+          { required: true, message: "单位性质不能为空", trigger: "blur" },
+        ]
         // type: [{ required: true, message: "性质不能为空", trigger: "blur" }]
       },
       showDialog: true,

src/views/base/companyInfo-list.vue

@@ -134,22 +134,22 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55"></el-table-column>
-      <el-table-column prop="sortNo" label="序号" width="120"></el-table-column>
+      <el-table-column
+        prop="parentName"
+        label="上级单位"
+        width="200"
+      ></el-table-column>
+      <el-table-column prop="sortNo" label="本级" width="100"></el-table-column>
       <el-table-column
         prop="name"
         label="单位名称"
-        width="230"
+        width="200"
       ></el-table-column>
       <el-table-column
         prop="shortName"
         label="简称"
         width="120"
       ></el-table-column>
-      <el-table-column
-        prop="parentName"
-        label="上级单位"
-        width="230"
-      ></el-table-column>
       <el-table-column
         prop="sceneName"
         label="场景值"
@@ -455,7 +455,7 @@ export default {
           //45为分页栏的高度
           //页面高度-列表上面的高度-分页栏高度
           self.tableHeight =
-            window.innerHeight - self.$refs.formTable.$el.offsetTop - 45;
+            window.innerHeight - self.$refs.formTable.$el.offsetTop - 100;
         })
         .catch((error) => {
           self.loading = false;

src/views/base/deviceInfo-detail.vue

@@ -192,7 +192,7 @@ export default {
   data() {
     return {
       formModel: {
-        remoteOpenRangeTime: [],
+        remoteOpenRangeTime: null,
       },
       ruleValidate: {
         aliasName: [

src/views/base/deviceInfo-ehome.vue

@@ -0,0 +1,205 @@
+
+<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-row>
+          <el-col :span="12">
+            <el-form-item label="显示抓拍图片" prop="deviceNo">
+              <el-switch
+                v-model="formModel.showCapPic"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="显示用户信息" prop="deviceNo">
+              <el-switch
+                v-model="formModel.showUserInfo"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="叠加用户信息" prop="deviceNo">
+              <el-switch
+                v-model="formModel.overlayUserInfo"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="启用语音提示" prop="deviceNo">
+              <el-switch
+                v-model="formModel.voicePrompt"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="保存抓拍图片" prop="deviceNo">
+              <el-switch
+                v-model="formModel.saveCapPic"
+                active-color="#13ce66"
+                active-text="是"
+                inactive-color="#ff4949"
+                inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="测温开关使能" prop="deviceNo">
+              <el-switch
+                v-model="formModel.thermalEnabled"
+                active-color="#13ce66"
+                active-text="开"
+                inactive-color="#ff4949"
+                inactive-text="关"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="温度阈值上限" prop="deviceNo">
+                <el-input
+                    v-model.number="formModel.highestThermalThreshold"
+                    style="width: 100px"
+                >
+                <template slot="append">度</template>
+                </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="温度阈值下限" prop="deviceNo">
+                <el-input
+                    v-model.number="formModel.lowestThermalThreshold"
+                    style="width: 100px"
+                >
+                <template slot="append">度</template>
+                </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="体温超标允许开门" prop="deviceNo">
+                <el-switch
+                    v-model="formModel.thermalDoorEnabled"
+                    active-color="#13ce66"
+                    active-text="是"
+                    inactive-color="#ff4949"
+                    inactive-text="否"
+                ></el-switch>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </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 ehomeApi from "@/api/base/ehome";
+
+export default {
+  props: ["deviceNo", "title", "companyResult"],
+  data() {
+    return {
+      formModel: {},
+      ruleValidate: {},
+      showDialog: true,
+      loading: false,
+      submitting: false,
+      cfgUrl: "/ISAPI/AccessControl/AcsCfg?format=json"
+    }
+  },
+  methods: {
+    closeDialog() {
+      this.$emit("close", false);
+    },
+    handleSubmit() {
+      var self = this;
+
+      this.$refs["form"].validate(valid => {
+        ehomeApi.putXMLConfig(
+            self.deviceNo,self.cfgUrl,{
+                "AcsCfg": self.formModel
+            },
+        ).then(function(response) {
+            self.loading = false;
+            var jsonData = response.data;
+
+            if (jsonData.success) {
+              self.$message({
+                message: "保存成功!",
+                type: "success"
+              });
+
+              self.$emit("close", true);
+            } else {
+              self.$message({
+                message: jsonData.message + "",
+                type: "warning"
+              });
+            }
+          });
+        });
+    },
+  },
+  mounted: function() {
+    var self = this;
+    
+    self.loading = true;
+
+    ehomeApi.getXMLConfig(self.deviceNo,self.cfgUrl)
+    .then(response => {
+        var jsonData = response.data;
+        self.loading = false;
+
+        if (jsonData.success) {
+            var data = eval('(' + jsonData.data + ')');
+
+            self.formModel = data.AcsCfg;
+        } else {
+            self.$message.error(jsonData.message + "");
+        }
+    })
+    .catch(error => {
+        self.$message.error(error + "");
+    });
+  }
+};
+</script>

src/views/base/deviceInfo-list.vue

@@ -193,6 +193,9 @@
             <el-col :span="8" v-if="row.manufacturer=='1'">
               <el-link type="primary" @click="handleEditRule(row)">验证规则</el-link>
             </el-col>
+            <el-col :span="8" v-if="row.manufacturer=='2'">
+              <el-link type="primary" @click="handleAcsCfg(row)">参数设置</el-link>
+            </el-col>
             <el-col :span="8">
               <el-link type="primary" @click="handleReboot(row)">重启设备</el-link>
             </el-col>
@@ -351,6 +354,12 @@
       </span>
     </el-dialog>
     <!-------------设备验证规则end------------------>
+    <deviceInfo-ehome
+      v-if="showEhomeModal"
+      :deviceNo="selectedDevice.deviceNo"
+      title="海康设备设置"
+      @close="onEhomeModalClose"
+    ></deviceInfo-ehome>
     <deviceInfo-map
       v-if="showMapModal"
       :businessKey="businessKey"
@@ -373,6 +382,7 @@
 <script>
 import Constant from "@/constant";
 import DeviceInfoDetail from "./deviceInfo-detail";
+import DeviceInfoEhome from "./deviceInfo-ehome";
 import DeviceInfoChannelList from "./deviceInfo-channelList";
 import DevicePhotoList from "./devicePhoto-list";
 import DeviceInfoMap from "./deviceInfo-amap";
@@ -447,6 +457,7 @@ export default {
       showMapModal: false,
       showChannelListModal: false,
       showPhotoListModal: false,
+      showEhomeModal: false,
       selectedDevice: {},
       columnColorList: [],
       columnHeightList: [],
@@ -927,6 +938,13 @@ export default {
     onDevicePhotoListClose (){
       this.showPhotoListModal = false;
     },
+    handleAcsCfg(device) {
+      this.selectedDevice = device;
+      this.showEhomeModal = true;
+    },
+    onEhomeModalClose() {
+      this.showEhomeModal = false;
+    },
     exportXls() {
       this.changePage(1,true);
     }
@@ -944,7 +962,8 @@ export default {
     "deviceInfo-channelList": DeviceInfoChannelList,
     "deviceInfo-map": DeviceInfoMap,
     "el-select-tree": SelectTree,
-    "devicePhoto-list": DevicePhotoList
+    "devicePhoto-list": DevicePhotoList,
+    "deviceInfo-ehome": DeviceInfoEhome
   }
 };
 </script>

src/views/base/personInfo-list.vue

@@ -112,27 +112,50 @@
           <el-select
             v-model="queryModel.isUploadPhoto"
             size="mini"
-            filterable
+            clearable
             placeholder="请选择"
-            style="width: 120px"
+            style="width: 90px"
           >
-            <el-option value label="全部"></el-option>
             <el-option value="1" label="已上传"></el-option>
             <el-option value="0" label="未上传"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="是否同步" prop="faceBound">
+        <!-- <el-form-item label="是否同步" prop="faceBound">
           <el-select
             v-model="queryModel.faceBound"
             size="mini"
-            filterable
+            clearable
             placeholder="请选择"
-            style="width: 120px"
+            style="width: 100px"
           >
             <el-option value label="全部"></el-option>
             <el-option value="1" label="已同步"></el-option>
             <el-option value="0" label="未同步"></el-option>
           </el-select>
+        </el-form-item> -->
+        <el-form-item label="是否需要考勤" prop="enableAttendance">
+          <el-select
+            v-model="queryModel.enableAttendance"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 90px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="允许审核注册用户" prop="enableRegisterExamine">
+          <el-select
+            v-model="queryModel.enableRegisterExamine"
+            size="mini"
+            clearable
+            placeholder="请选择"
+            style="width: 90px"
+          >
+            <el-option :value="true" label="是"></el-option>
+            <el-option :value="false" label="否"></el-option>
+          </el-select>
         </el-form-item>
       </div>
       <!-- <div>
@@ -764,7 +787,9 @@ export default {
         position5: "",
         derviceName: "",
         parkId: "",
-        roleId:""
+        roleId:"",
+        enableAttendance: null,
+        enableRegisterExamine: null
       },
       loading: false,
       tableData: [],
@@ -976,6 +1001,14 @@ export default {
       formData.append("faceBound", self.queryModel.faceBound);
       formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
 
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
       formData.append("position1", self.queryModel.position1);
       formData.append("position2", self.queryModel.position2);
       formData.append("position3", self.queryModel.position3);
@@ -1213,6 +1246,14 @@ export default {
       formData.append("faceBound", self.queryModel.faceBound);
       formData.append("isUploadPhoto", self.queryModel.isUploadPhoto);
 
+      if(self.queryModel.enableRegisterExamine!=null){
+        formData.append("enableRegisterExamine", self.queryModel.enableRegisterExamine);
+      }
+      
+      if(self.queryModel.enableAttendance!=null){
+        formData.append("enableAttendance", self.queryModel.enableAttendance);
+      }
+
       formData.append("position1", self.queryModel.position1);
       formData.append("position2", self.queryModel.position2);
       formData.append("position3", self.queryModel.position3);

src/views/base/personPopedom-detail.vue

@@ -29,7 +29,7 @@
             height="200"
           ></el-select-tree>
         </el-form-item>
-        <el-form-item label="机构" prop="companyStructureId">
+        <!-- <el-form-item label="机构" prop="companyStructureId">
           <el-select-tree
             :props="companyStructureProps"
             :options="companyStructureResult"
@@ -37,7 +37,7 @@
             height="200"
             size=""
           ></el-select-tree>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="关联场景" prop="sceneId">
           <el-select
             v-model="formModel.sceneId"
@@ -107,6 +107,13 @@
             style="width: 300px"
           ></el-input>
         </el-form-item>
+        <el-form-item label="是否要求考勤" prop="enableAttendance">
+            <el-switch
+              v-model="formModel.enableAttendance"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+            ></el-switch>
+        </el-form-item>
       </el-form>
     </div>
     <span slot="footer" class="dialog-footer">

src/views/base/personPopedom-list.vue

@@ -8,7 +8,7 @@
     style="text-align: left"
     @close="closeDialog"
     :close-on-click-modal="false"
-    width="970px"
+    width="1100px"
   >
     <div>
       <!--
@@ -42,18 +42,18 @@
       >
         <el-table-column
           prop="companyName"
-          label="公司"
+          label="单位"
           width="200"
         ></el-table-column>
-        <el-table-column
+        <!-- <el-table-column
           prop="companyStructureName"
           label="机构"
           width="120"
-        ></el-table-column>
+        ></el-table-column> -->
         <el-table-column
           prop="roleName"
           label="身份"
-          width="120"
+          width="100"
         ></el-table-column>
         <!-- <el-table-column
           prop="serviceCompanyName"
@@ -68,13 +68,41 @@
         <el-table-column
           prop="popularizePersonName"
           label="推广者"
-          width="120"
+          width="100"
         ></el-table-column>
         <el-table-column
           prop="remark"
           label="备注信息"
-          width="120"
+          width="100"
         ></el-table-column>
+        <el-table-column
+          prop="enableRegisterExamine"
+          label="是否允许审核注册用户"
+          width="120"
+        >
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.enableRegisterExamine"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="handleUpdate(row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="enableAttendance"
+          label="是否要求考勤"
+          width="120"
+        >
+          <template slot-scope="{ row }">
+            <el-switch
+              v-model="row.enableAttendance"
+              active-color="#13ce66"
+              inactive-color="#ff4949"
+              @change="handleUpdate(row)"
+            ></el-switch>
+          </template>
+        </el-table-column>
         <el-table-column prop="useEnable" label="默认" width="100">
           <template slot-scope="{ row }">
             <el-switch
@@ -263,6 +291,19 @@ export default {
       var self = this;
       self.changePage(self.pageIndex);
     },
+    handleUpdate(row) {
+      personPopedomApi.update(row).then(response=>{
+        var jsonData = response.data;
+        this.loading = false;
+
+        if (!jsonData.result) {
+          self.$message({
+            type: "error",
+            message: jsonData.message + ""
+          });
+        }
+      });
+    },
     changeDefault(record) {
       var self = this;
       var formData = new FormData();

src/views/business/fillAttendance-list.vue

@@ -147,11 +147,12 @@ export default {
       this.typeData = jsonData.data;
     });
 
-    companyInfoApi.list().then(function(response) {
+    companyInfoApi.list().then((response)=>{
       var jsonData = response.data;
+      
       if (jsonData.result) {
         if (jsonData.data != null && jsonData.data != "") {
-          self.companyResult = jsonData.data;
+          this.companyResult = jsonData.data;
         }
       }
     });

src/views/business/requestForLeave-list.vue

@@ -102,12 +102,6 @@
       <el-table-column type="expand">
         <template slot-scope="{row}">
           <el-form label-position="left" class="demo-table-expand">
-            <el-form-item label="申请家长:">
-              <span>{{row.parentName }}</span>
-            </el-form-item>
-            <el-form-item label="家长手机号:">
-              <span>{{row.parentPhone }}</span>
-            </el-form-item>
             <el-form-item label="请假类型:">
               <span>{{row.leaveTypeN }}</span>
             </el-form-item>
@@ -117,17 +111,11 @@
             <el-form-item label="请假事由:">
               <span>{{row.reason }}</span>
             </el-form-item>
-            <el-form-item label="上传附件:">
-              <span>{{row.imageUrl }}</span>
-            </el-form-item>
-            <el-form-item label="班主任:">
-              <span>{{row.teacherName }}</span>
-            </el-form-item>
             <el-form-item label="审核意见:">
-              <span>{{row.remark }}</span>
+              <span>{{row.approvalExplain }}</span>
             </el-form-item>
             <el-form-item label="审核时间:">
-              <span>{{row.updateTime }}</span>
+              <span>{{row.approvedTime }}</span>
             </el-form-item>
           </el-form>
         </template>
@@ -225,9 +213,7 @@ export default {
       }
     },
     loadTree() {
-      var formData = new FormData();
-
-      companyInfoApi.loadChildren(formData).then(resp => {
+      companyInfoApi.list().then(resp => {
         var jsonData = resp.data;
 
         if (jsonData.result) {

src/views/business/workAttendance-list.vue

@@ -120,6 +120,7 @@
         icon="el-icon-edit"
         :loading="loading"
         @click="handleBatchUpdate"
+        v-show="batchUpdateVisible"
       >重新生成考勤数据</el-button>
     </el-row>
     <el-table ref="formTable" stripe :data="tableData" :height="tableHeight" style="width: 100%" v-loading="loading">
@@ -167,6 +168,7 @@ import Constant from "@/constant";
 import workAttendanceApi from "@/api/business/workAttendance";
 import companyPositionApi from "@/api/base/companyPosition";
 import companyInfoApi from "@/api/base/companyInfo";
+import permissionApi from "@/api/sys/permission";
 import SelectTree from "@/components/SelectTree";
 
 import NProgress from "nprogress"; // progress bar
@@ -239,7 +241,8 @@ export default {
         value: "id",
         label: "name",
         children: "children"
-      }
+      },
+      batchUpdateVisible: false
     };
   },
   created() {
@@ -277,6 +280,11 @@ export default {
       }
     });
 
+    permissionApi.hasPermission("post","/business/workAttendance/batchUpdate")
+    .then(response=>{
+      this.batchUpdateVisible = response.data.result;
+    });
+
     this.getCurrentMonthFirst();
     this.loadTree();
   },
@@ -452,7 +460,9 @@ export default {
           if (self.queryModel.companyId == null) {
             self.queryModel.companyId = "";
           }
+          
           formData.append("companyId", self.queryModel.companyId);
+          formData.append("subordinate", self.queryModel.subordinate);
           formData.append("name", self.queryModel.name);
 
           var startDate = "";