营房提交1.0

src/api/barracksManagement/barracks.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询营房档案列表
+export function listBarracks(query) {
+  return request({
+    url: '/barracksManagement/barracks/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询营房档案详细
+export function getBarracks(id) {
+  return request({
+    url: '/barracksManagement/barracks/' + id,
+    method: 'get'
+  })
+}
+
+// 新增营房档案
+export function addBarracks(data) {
+  return request({
+    url: '/barracksManagement/barracks',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改营房档案
+export function updateBarracks(data) {
+  return request({
+    url: '/barracksManagement/barracks',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除营房档案
+export function delBarracks(id) {
+  return request({
+    url: '/barracksManagement/barracks/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出营房档案
+export function exportBarracks(query) {
+  return request({
+    url: '/barracksManagement/barracks/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/barracksManagement/checkin.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询临时来队列表
+export function listCheckin(query) {
+  return request({
+    url: '/barracksManagement/checkin/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询临时来队详细
+export function getCheckin(id) {
+  return request({
+    url: '/barracksManagement/checkin/' + id,
+    method: 'get'
+  })
+}
+
+// 新增临时来队
+export function addCheckin(data) {
+  return request({
+    url: '/barracksManagement/checkin',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改临时来队
+export function updateCheckin(data) {
+  return request({
+    url: '/barracksManagement/checkin',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除临时来队
+export function delCheckin(id) {
+  return request({
+    url: '/barracksManagement/checkin/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出临时来队
+export function exportCheckin(query) {
+  return request({
+    url: '/barracksManagement/checkin/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/barracksManagement/flat.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询公寓房档案列表
+export function listFlat(query) {
+  return request({
+    url: '/barracksManagement/flat/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公寓房档案详细
+export function getFlat(id) {
+  return request({
+    url: '/barracksManagement/flat/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公寓房档案
+export function addFlat(data) {
+  return request({
+    url: '/barracksManagement/flat',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公寓房档案
+export function updateFlat(data) {
+  return request({
+    url: '/barracksManagement/flat',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公寓房档案
+export function delFlat(id) {
+  return request({
+    url: '/barracksManagement/flat/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出公寓房档案
+export function exportFlat(query) {
+  return request({
+    url: '/barracksManagement/flat/export',
+    method: 'get',
+    params: query
+  })
+}

src/api/barracksManagement/flats.js

@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询公寓住房申请人员资格审查登记列表
+export function listFlats(query) {
+  return request({
+    url: '/barracksManagement/flats/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询公寓住房申请人员资格审查登记详细
+export function getFlats(id) {
+  return request({
+    url: '/barracksManagement/flats/' + id,
+    method: 'get'
+  })
+}
+
+// 新增公寓住房申请人员资格审查登记
+export function addFlats(data) {
+  return request({
+    url: '/barracksManagement/flats',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改公寓住房申请人员资格审查登记
+export function updateFlats(data) {
+  return request({
+    url: '/barracksManagement/flats',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除公寓住房申请人员资格审查登记
+export function delFlats(id) {
+  return request({
+    url: '/barracksManagement/flats/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出公寓住房申请人员资格审查登记
+export function exportFlats(query) {
+  return request({
+    url: '/barracksManagement/flats/export',
+    method: 'get',
+    params: query
+  })
+}

src/views/barracksManagement/barracks/index.vue

@@ -0,0 +1,523 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item label="坐落号" prop="number">
+        <el-input
+          v-model="queryParams.number"
+          placeholder="请输入坐落号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分栋号" prop="number1">
+        <el-input
+          v-model="queryParams.number1"
+          placeholder="请输入分栋号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="分栋名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入分栋名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营房用途" prop="behoof">
+        <el-input
+          v-model="queryParams.behoof"
+          placeholder="请输入营房用途"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="利用现状" prop="statusQuo">
+        <el-input
+          v-model="queryParams.statusQuo"
+          placeholder="请输入利用现状"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建筑年代" prop="period">
+        <el-input
+          v-model="queryParams.period"
+          placeholder="请输入建筑年代"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建筑面积" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入建筑面积"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="录入时间" prop="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入录入时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button
+          type="btr1"
+          icon="el-icon-search"
+          size="mini"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="btr2" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:barracks:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:barracks:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:barracks:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:barracks:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="barracksList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column  label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="坐落号" align="center" prop="number" width="150px"/>
+      <el-table-column label="分栋号" align="center" prop="number1" />
+      <el-table-column label="分栋名称" align="center" prop="name" />
+      <el-table-column label="营房用途" align="center" prop="behoof" />
+      <el-table-column label="利用现状" align="center" prop="statusQuo" />
+      <el-table-column label="建筑年代" align="center" prop="period" />
+      <el-table-column label="建筑面积" align="center" prop="area" />
+      <el-table-column label="录入时间" align="center" prop="createtime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createtime, "{y}-{m}-{d}") }}</span>
+          <!-- <span>{{ dateFormat('YYYY-mm-dd HH:MM:SS',scope.row.createtime) }}</span> -->
+          <!-- rTime -->
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="备注"
+        align="center"
+        prop="remark"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:barracks:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:barracks:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改营房档案对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        :inline="true"
+      >
+        <el-form-item label="坐落号" prop="number">
+          <el-input v-model="form.number" placeholder="请输入坐落号" />
+        </el-form-item>
+        <el-form-item label="分栋号" prop="number1">
+          <el-input v-model="form.number1" placeholder="请输入分栋号" />
+        </el-form-item>
+        <el-form-item label="分栋名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入分栋名称" />
+        </el-form-item>
+        <el-form-item label="营房用途" prop="behoof">
+          <el-input v-model="form.behoof" placeholder="请输入营房用途" />
+        </el-form-item>
+        <el-form-item label="利用现状" prop="statusQuo">
+          <el-input v-model="form.statusQuo" placeholder="请输入利用现状" />
+        </el-form-item>
+        <el-form-item label="建筑年代" prop="period">
+          <el-input v-model="form.period" placeholder="请输入建筑年代" />
+        </el-form-item>
+        <el-form-item label="建筑面积" prop="area">
+          <el-input v-model="form.area" placeholder="请输入建筑面积" />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <!-- <el-input v-model="form.remark" placeholder="请输入备注" /> -->
+          <el-input
+            v-model="form.remark"
+            type="textarea"
+            placeholder="请输入内容"
+          />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBarracks,
+  getBarracks,
+  delBarracks,
+  addBarracks,
+  updateBarracks,
+  exportBarracks,
+} from "@/api/barracksManagement/barracks";
+
+export default {
+  name: "Barracks",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 营房档案表格数据
+      barracksList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        createtime: null,
+        updatetime: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        number: [
+          { required: true, message: "坐落号不能为空", trigger: "blur" },
+        ],
+        number1: [
+          { required: true, message: "分栋号不能为空", trigger: "blur" },
+        ],
+        name: [
+          { required: true, message: "分栋名称不能为空", trigger: "blur" },
+        ],
+        behoof: [
+          { required: true, message: "营房用途不能为空", trigger: "blur" },
+        ],
+        statusQuo: [
+          { required: true, message: "利用现状不能为空", trigger: "blur" },
+        ],
+        period: [
+          { required: true, message: "建筑年代不能为空", trigger: "blur" },
+        ],
+        area: [
+          { required: true, message: "建筑面积不能为空", trigger: "blur" },
+        ],
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询营房档案列表 */
+    getList() {
+      this.loading = true;
+      listBarracks(this.queryParams).then((response) => {
+        this.barracksList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        remark: null,
+        createtime: null,
+        updatetime: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加营房档案";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getBarracks(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改营房档案";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateBarracks(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addBarracks(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除营房档案编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delBarracks(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有营房档案数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportBarracks(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 220px;
+  color: white;
+  margin-right: 20px;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid white;
+}
+/* 文本域 */
+::v-deep .el-textarea__inner {
+  width: 650px;
+  height: 80px;
+}
+::v-deep .el-form-item__label {
+  text-align: start;
+}
+::v-deep .el-dialog__body {
+  padding: 0px;
+  margin-left: 20px;
+  margin-top: 20px;
+}
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: rgb(0, 60, 105);
+  color: white;
+}
+/* 文字多余部分省略 */
+::v-deep .el-table__cell .cell {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.el-button--btr1 {
+  /* border-color: #20B2AA; */
+  color: #ffffff;
+  width: 76px;
+  height: 36px;
+  background-color: #1d96ff;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  /* margin-top: 1px; */
+  padding-top: 11px !important;
+}
+.el-button--btr2 {
+  /* border-color: #20B2AA; */
+  color: #ffffff;
+  width: 76px;
+  height: 36px;
+  background-color: #1d96ff;
+  border-radius: 4px;
+  font-size: 14px;
+  text-align: center;
+  /* margin-top: 1px; */
+
+  padding-top: 12px !important;
+}
+::v-deep .el-table__cell .cell{
+  text-align: center;
+}
+</style>

src/views/barracksManagement/checkin/index.vue

@@ -0,0 +1,472 @@
+<template>
+  <div class="app-container">
+    <el-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="100px"
+    >
+      <!-- <el-form-item label="单位名称" prop="unitName">
+        <el-input
+          v-model="queryParams.unitName"
+          placeholder="请输入单位名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <!-- <el-form-item label="位置" prop="position">
+        <el-input
+          v-model="queryParams.position"
+          placeholder="请输入位置"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item label="入住人姓名" prop="occupant">
+        <el-input
+          v-model="queryParams.occupant"
+          placeholder="请输入入住人姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="入住时间" prop="entryTime">
+        <el-date-picker
+          clearable
+          size="small"
+          v-model="queryParams.entryTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择入住时间"
+        >
+        </el-date-picker>
+      </el-form-item> -->
+      <!-- <el-form-item label="退房时间" prop="endTime">
+        <el-date-picker
+          clearable
+          size="small"
+          v-model="queryParams.endTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择退房时间"
+        >
+        </el-date-picker>
+      </el-form-item> -->
+      <el-form-item>
+        <el-button
+          type="primary"
+          icon="el-icon-search"
+          size="btr"
+          @click="handleQuery"
+          >搜索</el-button
+        >
+        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery"
+          >重置</el-button
+        >
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:checkin:add']"
+          >新增</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:checkin:edit']"
+          >修改</el-button
+        >
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:checkin:remove']"
+          >删除</el-button
+        >
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:checkin:export']"
+          >导出</el-button
+        >
+      </el-col> -->
+      <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-loading="loading"
+      :data="checkinList"
+      @selection-change="handleSelectionChange"
+    >
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column  label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="单位名称" align="center" prop="unitName"  width="200"/>
+      <el-table-column label="位置" align="center" prop="position"  width="200"/>
+      <el-table-column label="入住人姓名" align="center" prop="occupant"  width="200" />
+      <el-table-column label="备注" align="center" prop="remark"  width="200" />
+      <el-table-column
+        label="入住时间"
+        align="center"
+        prop="entryTime"
+         width="200"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.entryTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="退房时间"
+        align="center"
+        prop="endTime"
+        width="200"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.endTime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:checkin:edit']"
+            >修改</el-button
+          >
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:checkin:remove']"
+            >删除</el-button
+          >
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total > 0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改临时来队对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="720px" append-to-body>
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="100px"
+        :inline="true"
+      >
+        <el-form-item label="位置" prop="position">
+          <el-input v-model="form.position" placeholder="请输入位置" />
+        </el-form-item>
+        <el-form-item label="入驻单位" prop="unitName">
+          <el-input v-model="form.unitName" placeholder="请输入单位名称" />
+        </el-form-item>
+        <!-- <el-form-item label="单位id" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位id" />
+        </el-form-item> -->
+        <!-- <el-form-item label="创建人id" prop="creatId">
+          <el-input v-model="form.creatId" placeholder="请输入创建人id" />
+        </el-form-item> -->
+        <el-form-item label="入住人员" prop="occupant">
+          <el-input v-model="form.occupant" placeholder="请输入入住人员" />
+        </el-form-item>
+        <el-form-item label="入住时间" prop="entryTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.entryTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择入住时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="退房时间" prop="endTime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.endTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择退房时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listCheckin,
+  getCheckin,
+  delCheckin,
+  addCheckin,
+  updateCheckin,
+  exportCheckin,
+} from "@/api/barracksManagement/checkin";
+
+export default {
+  name: "Checkin",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 临时来队表格数据
+      checkinList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitName: null,
+        unitId: null,
+        creatTime: null,
+        creatId: null,
+        position: null,
+        occupant: null,
+        entryTime: null,
+        endTime: null,
+        creatName: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {},
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询临时来队列表 */
+    getList() {
+      this.loading = true;
+      listCheckin(this.queryParams).then((response) => {
+        this.checkinList = response.rows;
+        console.log(this.checkinList)
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unitName: null,
+        unitId: null,
+        creatTime: null,
+        creatId: null,
+        position: null,
+        occupant: null,
+        entryTime: null,
+        endTime: null,
+        creatName: null,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.queryParams={}
+      this.resetForm("queryForm");
+      this.handleQuery();
+      this.getList();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加临时来队";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids;
+      getCheckin(id).then((response) => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改临时来队";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate((valid) => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCheckin(this.form).then((response) => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCheckin(this.form).then((response) => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal
+        .confirm('是否确认删除临时来队编号为"' + ids + '"的数据项？')
+        .then(function () {
+          return delCheckin(ids);
+        })
+        .then(() => {
+          this.getList();
+          this.$modal.msgSuccess("删除成功");
+        })
+        .catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal
+        .confirm("是否确认导出所有临时来队数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportCheckin(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
+};
+</script>
+<style scoped>
+::v-deep .el-dialog {
+  background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner {
+  background-color: #004d86 !important;
+  width: 220px;
+  color: white;
+  margin-right: 20px;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title {
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid white;
+}
+/* 文本域 */
+::v-deep .el-textarea__inner {
+  width: 670px;
+  height: 80px;
+}
+::v-deep .el-form-item__label {
+  text-align: start;
+}
+::v-deep .el-dialog__body {
+  padding: 0px;
+  margin-left: 20px;
+  margin-top: 20px;
+}
+::v-deep .el-table .el-table__header-wrapper th,
+.el-table .el-table__fixed-header-wrapper th {
+  background-color: rgb(0, 60, 105);
+  color: white;
+}
+::v-deep .el-date-editor .el-input__inner{
+  height: 36px;
+}
+::v-deep .el-input--small .el-input__inner{
+  color: white;
+}
+::v-deep .el-table__cell .cell{
+  text-align: center;
+}
+</style>

src/views/barracksManagement/flat/index.vue

@@ -0,0 +1,490 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="坐落号" prop="number">
+        <el-input
+          v-model="queryParams.number"
+          placeholder="请输入坐落号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="分栋号" prop="number1">
+        <el-input
+          v-model="queryParams.number1"
+          placeholder="请输入分栋号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="分栋名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入分栋名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营房用途" prop="behoof">
+        <el-input
+          v-model="queryParams.behoof"
+          placeholder="请输入营房用途"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="利用现状" prop="statusQuo">
+        <el-input
+          v-model="queryParams.statusQuo"
+          placeholder="请输入利用现状"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建筑年代" prop="period">
+        <el-input
+          v-model="queryParams.period"
+          placeholder="请输入建筑年代"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="建筑面积" prop="area">
+        <el-input
+          v-model="queryParams.area"
+          placeholder="请输入建筑面积"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="录入时间" prop="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入录入时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="楼房层数" prop="tier">
+        <el-input
+          v-model="queryParams.tier"
+          placeholder="请输入楼房层数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="房间号" prop="roomNumber">
+        <el-input
+          v-model="queryParams.roomNumber"
+          placeholder="请输入房间号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单元号" prop="element">
+        <el-input
+          v-model="queryParams.element"
+          placeholder="请输入单元号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:flat:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:flat:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:flat:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:flat:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="flatList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column  label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="坐落号" align="center" prop="number" />
+      <el-table-column label="分栋号" align="center" prop="number1" />
+      <el-table-column label="分栋名称" align="center" prop="name" />
+      <el-table-column label="营房用途" align="center" prop="behoof" />
+      <el-table-column label="利用现状" align="center" prop="statusQuo" />
+      <el-table-column label="建筑年代" align="center" prop="period" />
+      <el-table-column label="建筑面积" align="center" prop="area" />
+      <el-table-column label="备注" align="center" prop="remark"  show-overflow-tooltip/>
+      <el-table-column label="录入时间" align="center" prop="createtime" width="150px">
+      <template slot-scope="scope">
+          <!-- <span>{{ parseTime(scope.row.arriveTime, '{y}-{m}-{d} {h}:{m}:{s}') }}</span>     -->
+          <span>{{ dateFormat('YYYY-mm-dd HH:MM:SS',scope.row.createtime) }}</span>
+          <!-- rTime -->
+        </template>
+      </el-table-column>
+      <el-table-column label="楼房层数" align="center" prop="tier" />
+      <el-table-column label="房间号" align="center" prop="roomNumber" />
+      <el-table-column label="单元号" align="center" prop="element" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:flat:edit']"
+          >修改</el-button>
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:flat:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公寓房档案对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="90px" :inline="true">
+        <el-form-item label="坐落号" prop="number">
+          <el-input v-model="form.number" placeholder="请输入坐落号" />
+        </el-form-item>
+        <el-form-item label="分栋号" prop="number1">
+          <el-input v-model="form.number1" placeholder="请输入分栋号" />
+        </el-form-item>
+        <el-form-item label="分栋名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入分栋名称" />
+        </el-form-item>
+        <el-form-item label="营房用途" prop="behoof">
+          <el-input v-model="form.behoof" placeholder="请输入营房用途" />
+        </el-form-item>
+        <el-form-item label="利用现状" prop="statusQuo">
+          <el-input v-model="form.statusQuo" placeholder="请输入利用现状" />
+        </el-form-item>
+        <el-form-item label="建筑年代" prop="period">
+          <el-input v-model="form.period" placeholder="请输入建筑年代" />
+        </el-form-item>
+        <el-form-item label="建筑面积" prop="area">
+          <el-input v-model="form.area" placeholder="请输入建筑面积" />
+        </el-form-item>
+        <el-form-item label="楼房层数" prop="tier">
+          <el-input v-model="form.tier" placeholder="请输入楼房层数" />
+        </el-form-item>
+        <el-form-item label="房间号" prop="roomNumber">
+          <el-input v-model="form.roomNumber" placeholder="请输入房间号" />
+        </el-form-item>
+        <el-form-item label="单元号" prop="element">
+          <el-input v-model="form.element" placeholder="请输入单元号" />
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFlat, getFlat, delFlat, addFlat, updateFlat, exportFlat } from "@/api/barracksManagement/flat";
+
+export default {
+  name: "Flat",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公寓房档案表格数据
+      flatList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        createtime: null,
+        updatetime: null,
+        tier: null,
+        roomNumber: null,
+        element: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        number: [{ required: true, message: "坐落号不能为空", trigger: "blur" }],
+        number1: [{ required: true, message: "分栋号不能为空", trigger: "blur" }],
+        name: [{ required: true, message: "分栋名称不能为空", trigger: "blur" }],
+        behoof: [{ required: true, message: "营房用途不能为空", trigger: "blur" }],
+        statusQuo: [{ required: true, message: "利用现状不能为空", trigger: "blur" }],
+        roomNumber: [{ required: true, message: "房间号不能为空", trigger: "blur" }],
+         element: [{ required: true, message: "单元号不能为空", trigger: "blur" }],
+        period: [{ required: true, message: "建筑年代不能为空", trigger: "blur" }],
+         area: [{ required: true, message: "建筑面积不能为空", trigger: "blur" }],
+          tier: [{ required: true, message: "楼房层数不能为空", trigger: "blur" }],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    dateFormat(fmt, date) {
+      let ret="";
+      date=new Date(date);
+      const opt = {
+        'Y+': date.getFullYear().toString(), // 年
+        'm+': (date.getMonth() + 1).toString(), // 月
+        'd+': date.getDate().toString(), // 日
+        'H+': date.getHours().toString(), // 时
+        'M+': date.getMinutes().toString(), // 分
+        'S+': date.getSeconds().toString() // 秒
+        // 有其他格式化字符需求可以继续添加，必须转化成字符串
+      }
+      for (let k in opt) {
+        ret = new RegExp('(' + k + ')').exec(fmt)
+        if (ret) {
+          fmt = fmt.replace(
+            ret[1],
+            ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+          )
+        }
+      }
+      return fmt
+    },
+    /** 查询公寓房档案列表 */
+    getList() {
+      this.loading = true;
+      listFlat(this.queryParams).then(response => {
+        this.flatList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        number: null,
+        number1: null,
+        name: null,
+        behoof: null,
+        statusQuo: null,
+        period: null,
+        area: null,
+        remark: null,
+        createtime: null,
+        updatetime: null,
+        tier: null,
+        roomNumber: null,
+        element: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公寓房档案";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFlat(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公寓房档案";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFlat(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFlat(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除公寓房档案编号为"' + ids + '"的数据项？').then(function() {
+        return delFlat(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有公寓房档案数据项？').then(() => {
+        this.exportLoading = true;
+        return exportFlat(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+<style scoped>
+::v-deep .el-dialog{
+   background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner{
+  background-color: #004d86 !important;
+  width: 220px;
+  color: white;
+  margin-right: 20px;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title{
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+/* 文本域 */
+::v-deep .el-textarea__inner{
+  width: 650px;
+  height: 80px;
+}
+::v-deep .el-form-item__label{
+  text-align: start;
+}
+::v-deep .el-dialog__body{
+  padding: 0px;
+  margin-left: 20px;
+  margin-top: 20px;
+}
+::v-deep .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
+  background-color:rgb(0, 60, 105);
+  color: white;
+}
+::v-deep .el-input--small .el-input__inner{
+  color: white;
+}
+::v-deep .el-table__cell .cell{
+  text-align: center;
+}
+</style>

src/views/barracksManagement/flats/index.vue

@@ -0,0 +1,918 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="单位" prop="unitId" label-width="50px">
+        <!-- <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        /> -->
+          <treeselect
+            v-model="queryParams.unitId"
+            :options="users"
+            placeholder="请选择到访单位"
+            class="threeselects"
+            @select="selectPeo1"
+
+          />
+      </el-form-item>
+      <el-form-item label="人员" prop="peopleId" label-width="50px">
+        <!-- <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        /> -->
+        <el-select
+                v-model="queryParams.name"
+                placeholder="请选择人员"
+                id="execute"
+                ref="peoplenames"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="peopleIds(item.id)"
+                  id="execute"
+                />
+              </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="部职别" prop="duty" label-width="110px">
+        <el-input
+          v-model="queryParams.duty"
+          placeholder="请输入部职别"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="住房待遇等级" prop="grade">
+        <el-input
+          v-model="queryParams.grade"
+          placeholder="请输入住房待遇等级"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item> -->
+       <el-form-item label="申请住房类别" prop="type">
+        <!-- <el-select v-model="queryParams.type" placeholder="请选择申请住房类别" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select> -->
+        <el-select v-model="queryParams.type" placeholder="请选择申请住房类别">
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+             <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="item.dictLabel"
+          >
+          </el-option>
+          </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="出生时间" prop="birthDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.birthDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择出生时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="入伍年月" prop="enlistDate" label-width="95px">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.enlistDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择入伍年月">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="参加工作时间" prop="jobTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.jobTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择参加工作时间">
+        </el-date-picker>
+      </el-form-item>
+     
+      <el-form-item label="任现职级时间" prop="jobsDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.jobsDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择任现职级时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="军衔" prop="rankId">
+        <el-input
+          v-model="queryParams.rankId"
+          placeholder="请输入军衔"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="军衔时间" prop="rankDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.rankDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择军衔时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="登记时间" prop="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入登记时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="登记人" prop="adminId">
+        <el-input
+          v-model="queryParams.adminId"
+          placeholder="请输入登记人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配偶姓名" prop="pName">
+        <el-input
+          v-model="queryParams.pName"
+          placeholder="请输入配偶姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配偶单位" prop="pUnit">
+        <el-input
+          v-model="queryParams.pUnit"
+          placeholder="请输入配偶单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配偶户口所在地" prop="pAccount">
+        <el-input
+          v-model="queryParams.pAccount"
+          placeholder="请输入配偶户口所在地"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="结婚时间" prop="pTime">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.pTime"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择结婚时间">
+        </el-date-picker>
+      </el-form-item>
+     
+      <el-form-item label="配偶现住房" prop="pCeace">
+        <el-input
+          v-model="queryParams.pCeace"
+          placeholder="请输入配偶现住房"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="配偶入伍或随军时间" prop="pTimeOne">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.pTimeOne"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择配偶入伍或随军时间">
+        </el-date-picker>
+      </el-form-item>
+       <el-form-item label="地方普通高等学校入学时间" prop="entranceDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.entranceDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择地方普通高等学校入学时间">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="享受相应住房待遇职级时间" prop="jobDate">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.jobDate"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择享受相应住房待遇职级时间">
+        </el-date-picker>
+      </el-form-item>
+       -->
+      
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="btr" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['barracksManagement:flats:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['barracksManagement:flats:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['barracksManagement:flats:remove']"
+        >删除</el-button>
+      </el-col>
+      <!-- <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          :loading="exportLoading"
+          @click="handleExport"
+          v-hasPermi="['barracksManagement:flats:export']"
+        >导出</el-button>
+      </el-col> -->
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="flatsList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column  label="序号" type="index" width="50"> </el-table-column>
+      <el-table-column label="单位" align="center" prop="unitId" :formatter="unit3Format"/>
+      <el-table-column label="人员" align="center" prop="peopleId" />
+      <el-table-column label="部职别" align="center" prop="duty" />
+      <el-table-column label="是否符合申请条件" align="center" prop="whether" />
+      <el-table-column label="住房待遇等级" align="center" prop="grade" />
+      <el-table-column label="申请住房户型" align="center" prop="houseType" />
+      <el-table-column label="出生时间" align="center" prop="birthDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.birthDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="入伍年月" align="center" prop="enlistDate" width="160">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.enlistDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="参加工作时间" align="center" prop="jobTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.jobTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="地方普通高等学校入学时间" align="center" prop="entranceDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.entranceDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="享受相应住房待遇职级时间" align="center" prop="jobDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.jobDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="任现职级时间" align="center" prop="jobsDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.jobsDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配偶是否军队人员" align="center" prop="whethers" />
+      <el-table-column label="军衔" align="center" prop="rankId" />
+      <el-table-column label="军衔时间" align="center" prop="rankDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.rankDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <!-- <el-table-column label="登记时间" align="center" prop="createtime" />
+      <el-table-column label="登记人" align="center" prop="adminId" /> -->
+      <el-table-column label="配偶姓名" align="center" prop="pName" />
+      <el-table-column label="配偶单位" align="center" prop="pUnit" />
+      <el-table-column label="配偶户口所在地" align="center" prop="pAccount" />
+      <el-table-column label="结婚时间" align="center" prop="pTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.pTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配偶入伍或随军时间" align="center" prop="pTimeOne" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.pTimeOne, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="配偶现住房" align="center" prop="pCeace" />
+      <el-table-column label="申请住房类别" align="center" prop="type" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150px">
+        <template slot-scope="scope">
+          <el-button
+            size="btu"
+            type="text"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['barracksManagement:flats:edit']"
+          >修改</el-button>
+          <el-button
+            size="btd"
+            type="text"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['barracksManagement:flats:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改公寓住房申请人员资格审查登记对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="1100px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" :inline="true">
+        <el-form-item label="单位" prop="unitId">
+          <!-- <el-input v-model="form.unitId" placeholder="请输入单位" /> -->
+           <treeselect
+            v-model="form.unitId"
+            :options="users"
+            placeholder="请选择单位"
+            class="threeselects"
+            @select="selectPeo"
+          />
+        </el-form-item>
+        <el-form-item label="人员" prop="peopleId" class="jiedai">
+          <!-- <el-input v-model="form.peopleId" placeholder="请输入接待人" /> -->
+          <el-select
+                v-model="form.name"
+                placeholder="请选择人员"
+                id="execute"
+                ref="peoplenames"
+              >
+                <el-option
+                  v-for="item in executor"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.name"
+                  @click.native="peopleIds(item.id,item.name)"
+                  id="execute"
+                />
+              </el-select>
+        </el-form-item>
+          <el-form-item label="出生时间" prop="birthDate">
+          <el-date-picker clearable size="small"
+            v-model="form.birthDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择出生时间">
+          </el-date-picker>
+        </el-form-item>
+        
+        <el-form-item label="军衔" prop="rankId">
+          <!-- <el-input v-model="form.rankId" placeholder="请输入军衔" /> -->
+          <el-select v-model="form.rankName" placeholder="请选择军衔">
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+             <el-option
+            v-for="(item, i) in ziDian1"
+            :key="i"
+            :label="item.dictLabel"
+            :value="item.dictLabel"
+            @click.native="junxian(item.dictSort)"
+          >
+          </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="军衔时间" prop="rankDate">
+          <el-date-picker clearable size="small"
+            v-model="form.rankDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择军衔时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="住房待遇等级" prop="grade" class="zhufnag">
+          <el-input v-model="form.grade" placeholder="请输入住房待遇等级" class="zhufnag" />
+        </el-form-item>
+        <el-form-item label="配偶现住房" prop="pCeace">
+          <el-input v-model="form.pCeace" placeholder="请输入配偶现住房" />
+        </el-form-item>
+         <el-form-item label="入伍年月" prop="enlistDate">
+          <el-date-picker clearable size="small"
+            v-model="form.enlistDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择入伍年月">
+          </el-date-picker>
+        </el-form-item>
+        
+        <el-form-item label="申请住房户型" prop="houseType" class="zhufnag">
+          <!-- <el-select v-model="form.houseType" placeholder="请选择申请住房户型" class="zhufnag">
+            <el-option label="请选择字典生成" value="" class="zhufnag" /> -->
+             <el-input v-model="form.houseType" placeholder="请输申请住房户型" class="zhufnag" />
+          <!-- </el-select> -->
+        </el-form-item>
+      <el-form-item label="部职别" prop="duty">
+          <el-input v-model="form.duty" placeholder="请输入部职别" />
+        </el-form-item>
+        <el-form-item label="参加工作时间" prop="jobTime">
+          <el-date-picker clearable size="small"
+            v-model="form.jobTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择参加工作时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="任现职级时间" prop="jobsDate" class="zhufnag">
+          <el-date-picker clearable size="small"
+            v-model="form.jobsDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择任现职级时间">
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="登记人" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入登记人" />
+        </el-form-item> -->
+        <el-form-item label="配偶姓名" prop="pName">
+          <el-input v-model="form.pName" placeholder="请输入配偶姓名" />
+        </el-form-item>
+        <el-form-item label="配偶单位" prop="pUnit">
+          <el-input v-model="form.pUnit" placeholder="请输入配偶单位" />
+        </el-form-item>
+        <el-form-item label="申请住房类别" prop="type">
+          <el-select v-model="form.type" placeholder="请选择申请住房类别">
+            <!-- <el-option label="请选择字典生成" value="" /> -->
+             <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="item.dictLabel"
+          >
+          </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="配偶户口所在地" prop="pAccount">
+          <el-input v-model="form.pAccount" placeholder="请输入配偶户口所在地" />
+        </el-form-item>
+        <el-form-item label="结婚时间" prop="pTime">
+          <el-date-picker clearable size="small"
+            v-model="form.pTime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择结婚时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="配偶入伍或随军时间" prop="pTimeOne" class="zhufnag">
+          <el-date-picker clearable size="small"
+            v-model="form.pTimeOne"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择配偶入伍或随军时间">
+          </el-date-picker>
+        </el-form-item>
+        
+        <el-form-item label="地方普通高等学校入学时间" prop="entranceDate">
+          <el-date-picker clearable size="small"
+            v-model="form.entranceDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择地方普通高等学校入学时间">
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="享受相应住房待遇职级时间" prop="jobDate" class="zhufnag">
+          <el-date-picker clearable size="small"
+            v-model="form.jobDate"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择享受相应住房待遇职级时间">
+          </el-date-picker>
+        </el-form-item>
+         <el-form-item label="是否符合申请条件" prop="whether" class="zhufnag">
+          <el-input v-model="form.whether" placeholder="请输入是否符合申请条件" />
+        </el-form-item>
+         <el-form-item label="配偶是否军队人员（含职工）" prop="whethers">
+          <el-input v-model="form.whethers" placeholder="请输入是否配偶是否是军人" />
+        </el-form-item>
+         <div class="jiben">备注</div>
+        <el-form-item prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listFlats, getFlats, delFlats, addFlats, updateFlats, exportFlats } from "@/api/barracksManagement/flats";
+import { getDicts } from "@/api/system/dict/data";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getDept2 } from "@/api/grassrootsregistration/bdglmeeting";
+import { deptUser } from "@/api/doormanManage/bdglVisit";
+import {allUser,getDeptList} from "@/api/workingArrangements/workTask";
+export default {
+  name: "Flats",
+  components:{Treeselect},
+  data() {
+    return {
+      // 执行单位列表
+      users: [],
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 公寓住房申请人员资格审查登记表格数据
+      flatsList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        unitId: null,
+        peopleId: null,
+        duty: null,
+        whether: null,
+        grade: null,
+        houseType: null,
+        birthDate: null,
+        enlistDate: null,
+        jobTime: null,
+        entranceDate: null,
+        jobDate: null,
+        jobsDate: null,
+        whethers: null,
+        rankId: null,
+        rankDate: null,
+        createtime: null,
+        updatetime: null,
+        adminId: null,
+        pName: null,
+        pUnit: null,
+        pAccount: null,
+        pTime: null,
+        pTimeOne: null,
+        pCeace: null,
+        type: null
+      },
+      // 查询字典
+      dictType: {
+        dictType: "accommodation_type",
+        // 军衔
+        dictType1:"sys_user_rank"
+      },
+      ziDian:[],
+      ziDian1:[],
+      // 单位
+      getdeptList:[],
+      // 表单参数
+      form: {},
+      rylist:[],
+      executor:[],
+      // 表单校验
+      rules: {
+        enlistDate: [
+          { required: true, message: "入伍年月不能为空", trigger: "blur" }
+        ],
+        rankId: [
+          { required: true, message: "军衔不能为空", trigger: "blur" }
+        ],
+        rankDate: [
+          { required: true, message: "军衔时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getdict();
+    allUser().then((res) => {
+      this.rylist = res.rows;
+    });
+    
+    getDeptList().then((res) => {
+      // console.log(res.data)
+      this.getdeptList = res.data;
+      // console.log(this.getdeptList);
+    });
+    this.selectPeo1()
+  },
+  methods: {
+    unit3Format(row, column) {
+      var deptName = "";
+        this.getdeptList.map((item) => {
+          if (item.id == row.deptId) {
+            deptName = item.deptName;
+          }
+        });
+      return deptName;
+    },
+    // 军衔
+    junxian(id){
+      this.form.rankId=id
+      // console.log(id)
+    },
+     peopleIds(id,name){
+      this.form.peopleId=id
+      this.form.peopleName=name
+      getDicts(this.dictType.dictType1).then((res) => {
+        this.ziDian1 = res.data;
+        this.ziDian1.map((item) => {
+          // console.log(item.dictSort)
+        if (item.dictSort == row.type) {
+          this.ziDian1 = item.dictLabel;
+        }
+      });
+      });
+    },
+     // 到访单位选中触发
+    selectPeo1(val) {
+      //  this.getDept2()
+      // this.handleAdd()
+      // 获取执行单位列表
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        // console.log(this.users);
+      });
+      // console.log(val.id)
+      this.queryParams.unitId = val.id;
+      this.queryParams.name=""
+      this.queryParams.unitName=val.label
+      // console.log(this.queryParams)
+      this.getZhuChi(this.queryParams.unitId);
+    },
+     // 获取执行人
+    getZhuChi(id) {
+      // console.log(id)
+      deptUser(id).then((res) => {
+        this.executor = res.data;
+        // console.log(this.executor)
+        // this.form.unitName=this.executor
+      });
+    },
+    // 到访单位选中触发
+    selectPeo(val) {
+      // console.log(val)
+      this.form.unitId = val.id;
+      this.form.peopleName=""
+      // this.form.name=""
+      this.form.unitName=val.label
+      // console.log(this.form.unitId)
+      this.getZhuChi(this.form.unitId);
+    },
+     // 查询计划类型
+    getdict() {
+      getDicts(this.dictType.dictType).then((res) => {
+        this.ziDian = res.data;
+      });
+      getDicts(this.dictType.dictType1).then((res) => {
+        this.ziDian1 = res.data;
+      });
+    },
+    /** 查询公寓住房申请人员资格审查登记列表 */
+    getList() {
+      this.loading = true;
+      listFlats(this.queryParams).then(response => {
+        this.flatsList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        unitId: null,
+        peopleId: null,
+        duty: null,
+        whether: null,
+        grade: null,
+        houseType: null,
+        birthDate: null,
+        enlistDate: null,
+        jobTime: null,
+        entranceDate: null,
+        jobDate: null,
+        jobsDate: null,
+        whethers: null,
+        rankId: null,
+        rankDate: null,
+        remark: null,
+        createtime: null,
+        updatetime: null,
+        adminId: null,
+        pName: null,
+        pUnit: null,
+        pAccount: null,
+        pTime: null,
+        pTimeOne: null,
+        pCeace: null,
+        type: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加公寓住房申请人员资格审查登记";
+      // 获取执行单位列表
+      getDept2().then((res) => {
+        // console.log(res,2)
+        this.users = res.data;
+        // console.log(this.users);
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getFlats(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改公寓住房申请人员资格审查登记";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      console.log(this.form)
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateFlats(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addFlats(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除公寓住房申请人员资格审查登记编号为"' + ids + '"的数据项？').then(function() {
+        return delFlats(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有公寓住房申请人员资格审查登记数据项？').then(() => {
+        this.exportLoading = true;
+        return exportFlats(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>
+<style scoped>
+::v-deep .el-dialog{
+   background-color: #004d86 !important;
+}
+/* 输入框 */
+::v-deep .el-dialog .el-input__inner{
+  background-color: #004d86 !important;
+  width: 216px;
+  color: white;
+  margin-right: 20px;
+}
+/* 标题弹框 */
+::v-deep .el-dialog__title{
+  color: white;
+  /* border-bottom: 1px solid white; */
+}
+/* 标题下划线 */
+::v-deep .el-dialog__header{
+  border-bottom: 1px solid white;
+}
+/* 文本域 */
+::v-deep .el-textarea__inner{
+  width: 1050px;
+  height: 80px;
+}
+::v-deep .el-form-item__label{
+  text-align: start;
+}
+::v-deep .el-dialog__body{
+  padding: 0px;
+  margin-left: 20px;
+  margin-top: 20px;
+}
+::v-deep .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th {
+  background-color:rgb(0, 60, 105);
+  color: white;
+}
+::v-deep .el-input__suffix{
+  right: 20px;
+}
+::v-deep .zhufnag .el-form-item__label{
+  margin-left: 16px;
+}
+/* 树形样式 */
+::v-deep .vue-treeselect__control{
+  background-color: #004d86;
+  width: 216px;
+  margin-right: 25px;
+  color: white;
+}
+.threeselects {
+  width: 216px;
+  margin-right: 22px;
+}
+::v-deep .vue-treeselect__single-value{
+  color: white;
+}
+::v-deep .el-date-editor .el-input__inner{
+  height: 36px;
+}
+::v-deep .vue-treeselect__control{
+  background-color: transparent;
+}
+::v-deep .el-table__cell .cell{
+  text-align: center;
+}
+::v-deep .el-select .el-input__inner{
+  background-color: transparent;
+  color: white;
+}
+</style>

src/views/regulations/fileinfo/index.vue

@@ -137,6 +137,18 @@
           </template>
         </el-table-column>
       </el-table>
+      <!-- <el-pagination
+      :background="background"
+      :current-page.sync="currentPage"
+      :page-size.sync="queryParams.pageSize"
+      :layout="layout"
+      :page-sizes="queryParams.pageNum"
+      :pager-count="pagerCount"
+      :total="total"
+      v-bind="$attrs"
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+    /> -->
       <pagination
         v-show="total > 0"
         :total="total"
@@ -152,8 +164,8 @@
         <div class="jichu">
           目录
           <el-button class="turnback" @click="turnback" v-if="addbtn==0">返回上级</el-button>
-          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload">上传文件</el-button
-          ><el-button class="manage" @click="mange">目录管理</el-button>
+          <el-button class="uploadfilesbtn" :class="addbtn?'margins':''" @click="upload" v-if="addbtn!=0">上传文件</el-button
+          ><el-button class="manage" @click="mange" v-if="addbtn!=0">目录管理</el-button>
         </div>
         <el-table
           v-loading="loading"
@@ -168,9 +180,12 @@
               <div
                 @click="mulus(scope.row)"
                 :class="scope.row.subclassification == 0 ? '' : 'undeline'"
+                style="position:relative;cursor:pointer"
               >
-              <img src="../../../images/文件夹.png" alt="" style="margin-right:5px">
-              <span> {{ scope.row.directory }}</span>
+              <img v-if="addbtn!=0" src="../../../images/文件夹.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
+              <!-- 分类图片 -->
+              <img v-if="addbtn==0" src="../../../images/分类icon.png" alt="" style="margin-right:5px;position:absolute;left:5px;top:2px">
+              <span style="margin-left:25px"> {{ scope.row.directory }}</span>
               </div>
             </template>
           </el-table-column>
@@ -575,6 +590,7 @@ export default {
   methods: {
     // 文件删除按钮操作
     handledels(row) {
+      console.log(row)
         this.$modal
         .confirm('是否确认删除该文件')
         .then(function () {
@@ -595,7 +611,6 @@ export default {
       this.loading = true;
       this.queryParams.common = "1";
       listDirectoryinfo(this.queryParams).then((res) => {
-        console.log(res.rows)
         this.directory = res.rows;
         this.total1 = res.rows.length;
         this.loading = false;
@@ -605,10 +620,7 @@ export default {
     // 点击目录根据子目录的数量控制他是否可以点进去进行渲染
     mulus(row) {
       this.parentId = row.id;
-      // console.log(row.id)
       this.form.directoryId=row.id
-      console.log(this.form.directoryId)
-      // this.listFileinfo({directoryId:this.form.directoryId})
       listFileinfo({directoryId:this.form.directoryId}).then(res=>{
         this.fileinfoList = res.rows;
         this.total = res.total;
@@ -628,6 +640,7 @@ export default {
     // 返回目录
     turnback() {
       this.addbtn=true
+      this.getList()
       this.ListDirectoryinfo();
     },
     // 选中父目录之后
@@ -641,11 +654,11 @@ export default {
     },
     /** 查询规章制度文件记录列表 */
     getList() {
-      // this.loading = true;
-      listFileinfo(this.form.directoryId).then((response) => {
-        console.log(response)
+      this.loading = true;
+      listFileinfo(this.queryParams).then((response) => {
         this.fileinfoList = response.rows;
         this.total = response.total;
+        this.loading=false
       });
     },
     // 取消按钮
@@ -725,10 +738,10 @@ export default {
           console.log(this.form);
           // 上传文件接口
           addFileinfo(this.form).then((response) => {
+            this.ListDirectoryinfo();
             this.$modal.msgSuccess("上传成功");
             this.open = false;
             this.getList();
-            // this.listDirectoryinfo();
           });
         }
       });
@@ -770,11 +783,16 @@ export default {
       this.$modal
         .confirm("是否确认删除？")
         .then(function () {
+          this.ListDirectoryinfo();
+            this.getList();
           return delDirectoryinfo(ids);
         })
         .then(() => {
           this.ListDirectoryinfo();
+          this.loading=false
+          this.loading1=false
           this.$modal.msgSuccess("删除成功");
+
         })
         .catch(() => {});
     },
@@ -847,6 +865,7 @@ export default {
   line-height: 40px;
   border-left: 4px solid rgba(29, 150, 255, 1);
   text-indent: 1em;
+ 
 }
 /* 文件表格 */
 .tablesfile {
@@ -1043,7 +1062,7 @@ table {
   line-height: 33px;
   margin-left: 30px;
   text-align: center;
-  margin-left: 300px;
+  margin-left: 450px;
   color: #ccc;
   background: #00365f;
 }
@@ -1059,6 +1078,13 @@ table {
   border-radius: 4px;
   margin-left: 10px;
 }
+.pagination-container {
+  background: #fff;
+  padding: 32px 16px;
+}
+.pagination-container.hidden {
+  display: none;
+}
 /* 弹框样式修改 */
 ::v-deep .el-dialog {
   background-color: #004d86 !important;
@@ -1195,4 +1221,7 @@ body,
 ::v-deep .guizhangzhidu .el-select-dropdown__list{
   background: white !important;
 }
+::v-deep .el-table_2_column_13 .cell{
+  text-align: center !important;
+}
 </style>

src/views/workingArrangements/planTask/index.vue

@@ -7,61 +7,32 @@
       v-show="showSearch"
       label-width="120px"
     >
-      <el-form-item prop="type">
-        <el-select v-model="queryParams.type" placeholder="请选择计划类型">
-          <!-- <el-option
+      <el-form-item prop="type" label="计划类型" class="plantypes">
+        <el-select v-model="queryParams.types" placeholder="请选择计划类型">
+          <el-option
             v-for="(item, i) in ziDian"
             :key="i"
             :label="item.dictLabel"
             :value="item.dictLabel"
+            @click.native="zidainType(item)"
           >
-          </el-option> -->
-          <el-option label="周计划" value="week"></el-option>
-          <el-option label="月计划" value="month"></el-option>
-          <el-option label="年计划" value="year"></el-option>
+          </el-option>
         </el-select>
       </el-form-item>
-
-      <el-form-item prop="executableUnit">
-        <el-select
-          v-model="queryParams.executableUnit"
-          placeholder="请选择执行单位"
-        >
-          <el-option label="大队" value="productionBrigade"></el-option>
-          <el-option label="发射一营" value="launch1"></el-option>
-          <el-option label="发射二营" value="launch2"></el-option>
-          <el-option label="发射三营" value="launch3"></el-option>
-          <el-option label="发射四营" value="launch4"></el-option>
-          <el-option label="技术部" value="technology"></el-option>
-          <el-option label="后勤部" value="logistics"></el-option>
-          <el-option label="后勤营一连" value="logistics1"></el-option>
-          <el-option label="后勤营二连" value="logistics2"></el-option>
-          <el-option label="后勤营三连" value="logistics3"></el-option>
-          <el-option label="参谋部" value="adviser"></el-option>
-          <el-option label="保障部" value="safeguard"></el-option>
-        </el-select>
-      </el-form-item>
-
-      <el-form-item prop="unitId">
-        <el-select v-model="queryParams.unitId" placeholder="请选择发布单位">
-          <el-option label="大队" value="productionBrigade"></el-option>
-          <el-option label="发射一营" value="launch1"></el-option>
-          <el-option label="发射二营" value="launch2"></el-option>
-          <el-option label="发射三营" value="launch3"></el-option>
-          <el-option label="发射四营" value="launch4"></el-option>
-          <el-option label="技术部" value="technology"></el-option>
-          <el-option label="后勤部" value="logistics"></el-option>
-          <el-option label="后勤营一连" value="logistics1"></el-option>
-          <el-option label="后勤营二连" value="logistics2"></el-option>
-          <el-option label="后勤营三连" value="logistics3"></el-option>
-          <el-option label="参谋部" value="adviser"></el-option>
-          <el-option label="保障部" value="safeguard"></el-option>
-        </el-select>
+      <el-form-item prop="adminId" label="发布单位" class="plantypes">
+          <treeselect
+            v-model="queryParams.adminId"
+            :options="users"
+            placeholder="请选择发布单位"
+            class="threeselects"
+            @select="selectPeo3"
+          />
       </el-form-item>
 
       <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
         <el-button
-          type="primary"
+          type="btr"
           icon="el-icon-refresh"
           size="mini"
           @click="resetQuery"
@@ -106,7 +77,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -117,7 +88,7 @@
           v-hasPermi="['workingArrangements:planTask:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -290,19 +261,26 @@
         </el-form-item>
         <el-form-item label="计划类型" prop="type" class="change_plan_type">
           <el-select
-            v-model="queryParams.type"
+            v-model="form.type"
             placeholder="请选择计划类型"
             ref="dict"
             clearable
             size="small"
           >
-            <el-option
+            <!-- <el-option
               v-for="dict in dict.type.plan_type"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
+              :key="dict"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
               @click.native="chooseplan"
-            />
+            /> -->
+            <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="parseInt(item.dictSort)"
+          >
+          </el-option>
           </el-select>
         </el-form-item>
         <div>
@@ -823,12 +801,19 @@ export default {
     allUser().then((res) => {
       this.rylist = res.rows;
     });
-    this.getdict();
-    this.chooseplan();
+     getDept2().then((res) => {
+       console.log(res)
+        this.users = res.data;
+        // console.log(this.users)
+      });
+    
+    
     getDeptList().then((res) => {
       this.getdeptList = res.data;
-      // console.log(this.getdeptList);
     });
+    this.getdict();
+    this.chooseplan();
+    this.selectPeo3()
   },
   methods: {
     comPlan() {
@@ -847,12 +832,32 @@ export default {
         // this.renYuan = res.data;
         this.executor = res.data;
       });
+    },
+     // 到访单位选中触发
+    selectPeo2(val) {
+      // 获取执行单位列表
+      getDept2().then((res) => {
+        this.users = res.data;
+      });
+      this.queryParams.unitId = val.id;
+      this.queryParams.name=""
+      this.queryParams.unitName=val.label
+      this.getZhuChi(this.queryParams.unitId);
     },
     // 发布单位选中触发
     selectPeo(val) {
       this.form.adminId = val.id;
       this.getZhuChi(this.form.adminId);
     },
+    // 发布单位选中触发
+    selectPeo3(val) {
+      getDept2().then((res) => {
+        this.users = res.data;
+        console.log(this.users)
+      });
+      this.queryParams.adminId = val.id;
+      this.getZhuChi(this.queryParams.adminId);
+    },
     // 执行单位选中触发
     selectPeo1(val) {
       this.form.unitId = val.id;
@@ -871,7 +876,7 @@ export default {
       this.loading = true;
       listPlanTask(this.queryParams).then((response) => {
         this.planTaskList = response.rows;
-        console.log(this.planTaskList);
+        // console.log(this.planTaskList);
         this.total = response.total;
         this.loading = false;
       });
@@ -921,13 +926,16 @@ export default {
     },
     /** 搜索按钮操作 */
     handleQuery() {
+      console.log(this.queryParams)
       this.queryParams.pageNum = 1;
       this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams={}
       this.resetForm("queryForm");
       this.handleQuery();
+      this.getList()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -1007,9 +1015,9 @@ export default {
       const id = row.id || this.ids;
       getPlanTask(id).then((response) => {
         this.form = response.data;
-        // this.getDept2()
+        this.form.type=parseInt(this.form.type)
         this.getZhuChi(this.form.unitId);
-        console.log(this.form)
+        // this.form.type=this.form.type+""
         this.form.peopleName = this.form.peopleName.split(",").map(Number);
         this.open = true;
         this.title = "修改工作计划";
@@ -1041,20 +1049,21 @@ export default {
     },
     unit3Format(row, column) {
       var deptName = "";
-      // console.log(this.planTaskList[0])
-      console.log(this.getdeptList)
       if (
         parseInt(this.planTaskList[0].common) == 1 ||
         this.planTaskList[0].common == 2
       ) {
         this.getdeptList.map((item) => {
           if (item.deptId == row.adminId) {
+            console.log(item.deptName)
             deptName = item.deptName;
           }
         });
       } else if (parseInt(this.planTaskList[0].common) == 0) {
         this.getdeptList.map((item) => {
+          console.log(item)
           if (item.deptId == row.adminId) {
+            
             deptName = item.deptName;
           }
         });
@@ -1070,13 +1079,18 @@ export default {
     },
     unit4Format(row, column) {
       var deptName = "";
+      // console.log(row.type)
       this.ziDian.map((item) => {
-        if (item.dictSort == row.type) {
+        if (item.dictValue == row.type) {
           deptName = item.dictLabel;
         }
       });
       return deptName;
     },
+    zidainType(item){
+      this.queryParams.type=item.dictValue
+      // console.log(item)
+    },
     /** 提交按钮 */
     submitForm() {
       console.log(this.form)
@@ -1188,8 +1202,9 @@ export default {
       this.form.adminId = id;
     },
     // 选择计划
-    chooseplan() {
-      this.form.type = this.queryParams.type;
+    chooseplan(item) {
+      console.log(item)
+      this.form.type=item.dictValue
     },
   },
 };
@@ -1446,4 +1461,19 @@ export default {
 ::v-deep .el-table th.el-table__cell{
   background-color: pink !important;
 }
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
+.vue-treeselect__control{
+  background-color: transparent !important;
+}
+.threeselects .vue-treeselect__input{
+  background-color: transparent !important;
+}
+.el-table__body-wrapper .el-table__empty-block{
+  border: none !important;
+} 
+.plantypes .el-form-item__label{
+  text-align: center;
+}
 </style>

src/views/workingArrangements/workTask/index.vue

@@ -7,7 +7,7 @@
       v-show="showSearch"
       label-width="120px"
     >
-      <el-form-item prop="type">
+      <!-- <el-form-item prop="type">
         <el-select v-model="queryParams.type">
           <el-option label="周计划" value="week"></el-option>
           <el-option label="月计划" value="month"></el-option>
@@ -50,11 +50,32 @@
           <el-option label="参谋部" value="adviser"></el-option>
           <el-option label="保障部" value="safeguard"></el-option>
         </el-select>
+      </el-form-item> -->
+ <el-form-item prop="type" label="任务类型" class="plantypes">
+        <el-select v-model="queryParams.types" placeholder="请选择任务类型">
+          <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="item.dictLabel"
+            @click.native="zidainType(item)"
+          >
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item prop="adminId" label="发布单位" class="plantypes">
+          <treeselect
+            v-model="queryParams.adminId"
+            :options="users"
+            placeholder="请选择发布单位"
+            class="threeselects"
+            @select="selectPeo3"
+          />
       </el-form-item>
-
       <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="btr" @click="handleQuery">搜索</el-button>
         <el-button
-          type="primary"
+          type="btr"
           icon="el-icon-refresh"
           size="mini"
           @click="resetQuery"
@@ -98,7 +119,7 @@
           >删除</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="warning"
           plain
@@ -109,7 +130,7 @@
           v-hasPermi="['workingArrangements:workTask:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col> -->
       <right-toolbar
         :showSearch.sync="showSearch"
         @queryTable="getList"
@@ -268,19 +289,40 @@
         </el-form-item>
         <el-form-item label="任务类型" prop="type">
           <el-select
-            v-model="queryParams.type"
+            v-model="form.type"
             placeholder="请选择任务类型"
             style="width: 200px"
             clearable
             size="small"
           >
-            <el-option
+            <!-- <el-option
               v-for="dict in dict.type.work_type"
               :key="dict.value"
               :label="dict.label"
               :value="dict.value"
               @click.native="chooseplan"
-            />
+            /> -->
+             <!-- <el-select
+            v-model="form.type"
+            placeholder="请选择计划类型"
+            ref="dict"
+            clearable
+            size="small"
+          > -->
+            <!-- <el-option
+              v-for="dict in dict.type.plan_type"
+              :key="dict"
+              :label="dict.dictLabel"
+              :value="dict.dictLabel"
+              @click.native="chooseplan"
+            /> -->
+            <el-option
+            v-for="(item, i) in ziDian"
+            :key="i"
+            :label="item.dictLabel"
+            :value="parseInt(item.dictSort)"
+          >
+          </el-option>
           </el-select>
         </el-form-item>
         <div>
@@ -721,12 +763,12 @@ export default {
     allUser().then((res) => {
       this.rylist = res.rows;
     });
-    this.getdict();
-    this.chooseplan();
     getDeptList().then((res) => {
       this.getdeptList = res.data;
     });
-    // this.handleChakan()
+    this.getdict();
+    this.chooseplan();
+    this.selectPeo3()
   },
   methods: {
     /** 进度录入按钮操作 */
@@ -769,7 +811,7 @@ export default {
       this.title = "进度查看";
       // 获取当前行的id
       moreProgress(row.id).then((res) => {
-        console.log(res)
+        // console.log(res)
         this.comstatus=0
         this.moreTable = res.data;
         console.log(this.moreTable);
@@ -779,6 +821,7 @@ export default {
         });
       });
     },
+    
     /** 查询工作任务列表 */
     getList() {
       this.loading = true;
@@ -824,6 +867,19 @@ export default {
       };
       this.resetForm("form");
     },
+    zidainType(item){
+      this.queryParams.type=item.dictValue
+      // console.log(item)
+    },
+    // 发布单位选中触发
+    selectPeo3(val) {
+      getDept2().then((res) => {
+        this.users = res.data;
+        console.log(this.users)
+      });
+      this.queryParams.adminId = val.id;
+      this.getZhuChi(this.queryParams.adminId);
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -831,8 +887,10 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams={}
       this.resetForm("queryForm");
       this.handleQuery();
+      this.getList()
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -889,6 +947,7 @@ export default {
       const id = row.id || this.ids;
       getWorkTask(id).then((response) => {
         this.form = response.data;
+        this.form.type=parseInt(this.form.type)
         // this.getDept2()
         this.getZhuChi(this.form.unitId);
         this.form.peopleName = this.form.peopleName.split(",").map(Number);
@@ -945,6 +1004,7 @@ export default {
       this.ziDian.map((item) => {
         if (item.dictSort == row.type) {
           deptName = item.dictLabel;
+          
         }
       });
       return deptName;
@@ -1343,5 +1403,16 @@ export default {
   text-overflow: ellipsis;
   white-space: nowrap;
 }
-
+.el-table__empty-block{
+  border-bottom: 1px solid white;
+}
+.vue-treeselect__control{
+  background-color: transparent !important;
+}
+.threeselects .vue-treeselect__input{
+  background-color: transparent !important;
+}
+.el-table__body-wrapper .el-table__empty-block{
+  border: none !important;
+} 
 </style>