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

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/routers/modules/base.js

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

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>