同步

src/views/militaryvehicleManagement/driver/index.vue

@@ -0,0 +1,488 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="人员" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入人员"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contact">
+        <el-input
+          v-model="queryParams.contact"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="驾驶证号" prop="driversLicense">
+        <el-input
+          v-model="queryParams.driversLicense"
+          placeholder="请输入驾驶证号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="生日" prop="birthDate">
+        <el-input
+          v-model="queryParams.birthDate"
+          placeholder="请输入生日"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="入伍时间" prop="enlistDate">
+        <el-input
+          v-model="queryParams.enlistDate"
+          placeholder="请输入入伍时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </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="drivingAge">
+        <el-input
+          v-model="queryParams.drivingAge"
+          placeholder="请输入驾龄"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="准驾车型" prop="drivingModel">
+        <el-input
+          v-model="queryParams.drivingModel"
+          placeholder="请输入准驾车型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="初领日期" prop="date1">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.date1"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择初领日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="核发日期" prop="date2">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.date2"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择核发日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="有效日期" prop="date3">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.date3"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择有效日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="审验结果" prop="result">
+        <el-input
+          v-model="queryParams.result"
+          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="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入职业技能"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:driver: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="['militaryvehicleManagement:driver: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="['militaryvehicleManagement:driver: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="['militaryvehicleManagement:driver:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="driverList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label=" " align="center" prop="id" />
+      <el-table-column label="人员" align="center" prop="peopleId" />
+      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="联系方式" align="center" prop="contact" />
+      <el-table-column label="驾驶证号" align="center" prop="driversLicense" />
+      <el-table-column label="生日" align="center" prop="birthDate" />
+      <el-table-column label="入伍时间" align="center" prop="enlistDate" />
+      <el-table-column label="性别" align="center" prop="sexList" />
+      <el-table-column label="军衔" align="center" prop="rankId" />
+      <el-table-column label="驾龄" align="center" prop="drivingAge" />
+      <el-table-column label="准驾车型" align="center" prop="drivingModel" />
+      <el-table-column label="初领日期" align="center" prop="date1" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date1, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="核发日期" align="center" prop="date2" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date2, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有效日期" align="center" prop="date3" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date3, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="审验结果" align="center" prop="result" />
+      <el-table-column label="职业技能" align="center" prop="vocationalSkills" />
+      <el-table-column label="职业技能" align="center" prop="createtime" />
+      <el-table-column label="职业技能" align="center" prop="updatetime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:driver:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:driver: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员" prop="peopleId">
+          <el-input v-model="form.peopleId" placeholder="请输入人员" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="驾驶证号" prop="driversLicense">
+          <el-input v-model="form.driversLicense" placeholder="请输入驾驶证号" />
+        </el-form-item>
+        <el-form-item label="生日" prop="birthDate">
+          <el-input v-model="form.birthDate" placeholder="请输入生日" />
+        </el-form-item>
+        <el-form-item label="入伍时间" prop="enlistDate">
+          <el-input v-model="form.enlistDate" placeholder="请输入入伍时间" />
+        </el-form-item>
+        <el-form-item label="军衔" prop="rankId">
+          <el-input v-model="form.rankId" placeholder="请输入军衔" />
+        </el-form-item>
+        <el-form-item label="驾龄" prop="drivingAge">
+          <el-input v-model="form.drivingAge" placeholder="请输入驾龄" />
+        </el-form-item>
+        <el-form-item label="准驾车型" prop="drivingModel">
+          <el-input v-model="form.drivingModel" placeholder="请输入准驾车型" />
+        </el-form-item>
+        <el-form-item label="初领日期" prop="date1">
+          <el-date-picker clearable size="small"
+            v-model="form.date1"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择初领日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="核发日期" prop="date2">
+          <el-date-picker clearable size="small"
+            v-model="form.date2"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择核发日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="有效日期" prop="date3">
+          <el-date-picker clearable size="small"
+            v-model="form.date3"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择有效日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="审验结果" prop="result">
+          <el-input v-model="form.result" 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 { listDriver, getDriver, delDriver, addDriver, updateDriver, exportDriver } from "@/api/militaryvehicleManagement/driver";
+
+export default {
+  name: "Driver",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军车司机设置表格数据
+      driverList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        peopleId: null,
+        unitId: null,
+        contact: null,
+        driversLicense: null,
+        birthDate: null,
+        enlistDate: null,
+        sexList: null,
+        rankId: null,
+        drivingAge: null,
+        drivingModel: null,
+        date1: null,
+        date2: null,
+        date3: null,
+        result: null,
+        vocationalSkills: null,
+        createtime: null,
+        updatetime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询军车司机设置列表 */
+    getList() {
+      this.loading = true;
+      listDriver(this.queryParams).then(response => {
+        this.driverList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        peopleId: null,
+        unitId: null,
+        contact: null,
+        driversLicense: null,
+        birthDate: null,
+        enlistDate: null,
+        sexList: null,
+        rankId: null,
+        drivingAge: null,
+        drivingModel: null,
+        date1: null,
+        date2: null,
+        date3: null,
+        result: null,
+        vocationalSkills: 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
+      getDriver(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) {
+            updateDriver(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDriver(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 delDriver(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有军车司机设置数据项？').then(() => {
+        this.exportLoading = true;
+        return exportDriver(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -0,0 +1,404 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="privateCarId">
+        <el-input
+          v-model="queryParams.privateCarId"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehiclenumber">
+        <el-input
+          v-model="queryParams.vehiclenumber"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="vehiclemodel">
+        <el-input
+          v-model="queryParams.vehiclemodel"
+          placeholder="请输入车辆型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆颜色" prop="vehiclecolor">
+        <el-input
+          v-model="queryParams.vehiclecolor"
+          placeholder="请输入车辆颜色"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆所有人" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入车辆所有人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactnumber">
+        <el-input
+          v-model="queryParams.contactnumber"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="进入时间" prop="time1">
+        <el-input
+          v-model="queryParams.time1"
+          placeholder="请输入进入时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="离开时间" prop="time2">
+        <el-input
+          v-model="queryParams.time2"
+          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="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入离开时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="离开时间" prop="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入离开时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:privateAccessLog: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="['militaryvehicleManagement:privateAccessLog: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="['militaryvehicleManagement:privateAccessLog: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="['militaryvehicleManagement:privateAccessLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="privateAccessLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="离开时间" align="center" prop="id" />
+      <el-table-column label="车牌号" align="center" prop="privateCarId" />
+      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column label="车辆类别" align="center" prop="vehiclecategory" />
+      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
+      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
+      <el-table-column label="车辆所有人" align="center" prop="peopleId" />
+      <el-table-column label="联系方式" align="center" prop="contactnumber" />
+      <el-table-column label="进入时间" align="center" prop="time1" />
+      <el-table-column label="离开时间" align="center" prop="time2" />
+      <el-table-column label="离开时间" align="center" prop="adminId" />
+      <el-table-column label="离开时间" align="center" prop="createtime" />
+      <el-table-column label="离开时间" align="center" prop="updatetime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:privateAccessLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:privateAccessLog: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="privateCarId">
+          <el-input v-model="form.privateCarId" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="vehiclenumber">
+          <el-input v-model="form.vehiclenumber" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车辆型号" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="车辆颜色" prop="vehiclecolor">
+          <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
+        </el-form-item>
+        <el-form-item label="车辆所有人" prop="peopleId">
+          <el-input v-model="form.peopleId" placeholder="请输入车辆所有人" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactnumber">
+          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="进入时间" prop="time1">
+          <el-input v-model="form.time1" placeholder="请输入进入时间" />
+        </el-form-item>
+        <el-form-item label="离开时间" prop="time2">
+          <el-input v-model="form.time2" placeholder="请输入离开时间" />
+        </el-form-item>
+        <el-form-item label="离开时间" prop="adminId">
+          <el-input v-model="form.adminId" 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 { listPrivateAccessLog, getPrivateAccessLog, delPrivateAccessLog, addPrivateAccessLog, updatePrivateAccessLog, exportPrivateAccessLog } from "@/api/militaryvehicleManagement/privateAccessLog";
+
+export default {
+  name: "PrivateAccessLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 私家车进出查询表格数据
+      privateAccessLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        privateCarId: null,
+        vehiclenumber: null,
+        vehiclecategory: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        peopleId: null,
+        contactnumber: null,
+        time1: null,
+        time2: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        privateCarId: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询私家车进出查询列表 */
+    getList() {
+      this.loading = true;
+      listPrivateAccessLog(this.queryParams).then(response => {
+        this.privateAccessLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        privateCarId: null,
+        vehiclenumber: null,
+        vehiclecategory: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        peopleId: null,
+        contactnumber: null,
+        time1: null,
+        time2: null,
+        adminId: 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
+      getPrivateAccessLog(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) {
+            updatePrivateAccessLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPrivateAccessLog(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 delPrivateAccessLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有私家车进出查询数据项？').then(() => {
+        this.exportLoading = true;
+        return exportPrivateAccessLog(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -0,0 +1,438 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="vehiclenumber">
+        <el-input
+          v-model="queryParams.vehiclenumber"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="vehiclemodel">
+        <el-input
+          v-model="queryParams.vehiclemodel"
+          placeholder="请输入车辆型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆颜色" prop="vehiclecolor">
+        <el-input
+          v-model="queryParams.vehiclecolor"
+          placeholder="请输入车辆颜色"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆所有人" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入车辆所有人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="临时车辆所有人" prop="peopleName">
+        <el-input
+          v-model="queryParams.peopleName"
+          placeholder="请输入临时车辆所有人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactnumber">
+        <el-input
+          v-model="queryParams.contactnumber"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="证件类型" prop="documenttype">
+        <el-select v-model="queryParams.documenttype" placeholder="请选择证件类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="证件号" prop="certificatenumber">
+        <el-input
+          v-model="queryParams.certificatenumber"
+          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="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入创建时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入修改时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="授权开始时间" prop="authStime">
+        <el-input
+          v-model="queryParams.authStime"
+          placeholder="请输入授权开始时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="授权结束时间" prop="authEtime">
+        <el-input
+          v-model="queryParams.authEtime"
+          placeholder="请输入授权结束时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:privateCar: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="['militaryvehicleManagement:privateCar: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="['militaryvehicleManagement:privateCar: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="['militaryvehicleManagement:privateCar:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="privateCarList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
+      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
+      <el-table-column label="车辆类别" align="center" prop="vehiclecategory" />
+      <el-table-column label="车辆所有人" align="center" prop="peopleId" />
+      <el-table-column label="临时车辆所有人" align="center" prop="peopleName" />
+      <el-table-column label="联系方式" align="center" prop="contactnumber" />
+      <el-table-column label="证件类型" align="center" prop="documenttype" />
+      <el-table-column label="证件号" align="center" prop="certificatenumber" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="创建人" align="center" prop="adminId" />
+      <el-table-column label="创建时间" align="center" prop="createtime" />
+      <el-table-column label="修改时间" align="center" prop="updatetime" />
+      <el-table-column label="授权开始时间" align="center" prop="authStime" />
+      <el-table-column label="授权结束时间" align="center" prop="authEtime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:privateCar:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:privateCar: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="vehiclenumber">
+          <el-input v-model="form.vehiclenumber" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车辆型号" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="车辆颜色" prop="vehiclecolor">
+          <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
+        </el-form-item>
+        <el-form-item label="车辆所有人" prop="peopleId">
+          <el-input v-model="form.peopleId" placeholder="请输入车辆所有人" />
+        </el-form-item>
+        <el-form-item label="临时车辆所有人" prop="peopleName">
+          <el-input v-model="form.peopleName" placeholder="请输入临时车辆所有人" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactnumber">
+          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="证件类型" prop="documenttype">
+          <el-select v-model="form.documenttype" placeholder="请选择证件类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="证件号" prop="certificatenumber">
+          <el-input v-model="form.certificatenumber" placeholder="请输入证件号" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建人" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入创建人" />
+        </el-form-item>
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-input v-model="form.authStime" placeholder="请输入授权开始时间" />
+        </el-form-item>
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-input v-model="form.authEtime" 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 { listPrivateCar, getPrivateCar, delPrivateCar, addPrivateCar, updatePrivateCar, exportPrivateCar } from "@/api/militaryvehicleManagement/privateCar";
+
+export default {
+  name: "PrivateCar",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 私家车管理表格数据
+      privateCarList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        vehiclecategory: null,
+        peopleId: null,
+        peopleName: null,
+        contactnumber: null,
+        documenttype: null,
+        certificatenumber: null,
+        remarks: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        authStime: null,
+        authEtime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        adminId: [
+          { required: true, message: "创建人不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询私家车管理列表 */
+    getList() {
+      this.loading = true;
+      listPrivateCar(this.queryParams).then(response => {
+        this.privateCarList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        vehiclecategory: null,
+        peopleId: null,
+        peopleName: null,
+        contactnumber: null,
+        documenttype: null,
+        certificatenumber: null,
+        remarks: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        authStime: null,
+        authEtime: 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
+      getPrivateCar(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) {
+            updatePrivateCar(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addPrivateCar(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 delPrivateCar(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有私家车管理数据项？').then(() => {
+        this.exportLoading = true;
+        return exportPrivateCar(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -0,0 +1,563 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="vehiclenumber">
+        <el-input
+          v-model="queryParams.vehiclenumber"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="vehiclemodel">
+        <el-input
+          v-model="queryParams.vehiclemodel"
+          placeholder="请输入车辆型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆颜色" prop="vehiclecolor">
+        <el-input
+          v-model="queryParams.vehiclecolor"
+          placeholder="请输入车辆颜色"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车位号" prop="parkingspacenumber">
+        <el-input
+          v-model="queryParams.parkingspacenumber"
+          placeholder="请输入车位号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactnumber">
+        <el-input
+          v-model="queryParams.contactnumber"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="创建人ID" prop="adminId">
+        <el-input
+          v-model="queryParams.adminId"
+          placeholder="请输入创建人ID"
+          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="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入修改时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆在位情况1：在位，2：值班，3：出车，4待修" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择车辆在位情况1：在位，2：值班，3：出车，4待修" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所属单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入所属单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆负责人" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入车辆负责人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="发动机号" prop="engineNumber">
+        <el-input
+          v-model="queryParams.engineNumber"
+          placeholder="请输入发动机号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车架号" prop="frameNumber">
+        <el-input
+          v-model="queryParams.frameNumber"
+          placeholder="请输入车架号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入车辆来源"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="出厂日期" prop="date1">
+        <el-date-picker clearable size="small"
+          v-model="queryParams.date1"
+          type="date"
+          value-format="yyyy-MM-dd"
+          placeholder="选择出厂日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="ETC品牌" prop="etcBrand">
+        <el-input
+          v-model="queryParams.etcBrand"
+          placeholder="请输入ETC品牌"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="ETC编码" prop="etcNumber">
+        <el-input
+          v-model="queryParams.etcNumber"
+          placeholder="请输入ETC编码"
+          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="isListing">
+        <el-input
+          v-model="queryParams.isListing"
+          placeholder="请输入是否上牌"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="固定座位数" prop="seatCount">
+        <el-input
+          v-model="queryParams.seatCount"
+          placeholder="请输入固定座位数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <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>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:thebus: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="['militaryvehicleManagement:thebus: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="['militaryvehicleManagement:thebus: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="['militaryvehicleManagement:thebus:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="thebusList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="主键ID" align="center" prop="id" />
+      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
+      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
+      <el-table-column label="车位号" align="center" prop="parkingspacenumber" />
+      <el-table-column label="联系方式" align="center" prop="contactnumber" />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="创建人ID" align="center" prop="adminId" />
+      <el-table-column label="创建时间" align="center" prop="createtime" />
+      <el-table-column label="修改时间" align="center" prop="updatetime" />
+      <el-table-column label="车辆在位情况1：在位，2：值班，3：出车，4待修" align="center" prop="status" />
+      <el-table-column label="所属单位" align="center" prop="unitId" />
+      <el-table-column label="车辆负责人" align="center" prop="peopleId" />
+      <el-table-column label="发动机号" align="center" prop="engineNumber" />
+      <el-table-column label="车架号" align="center" prop="frameNumber" />
+      <el-table-column label="车辆来源" align="center" prop="source" />
+      <el-table-column label="出厂日期" align="center" prop="date1" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.date1, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="ETC品牌" align="center" prop="etcBrand" />
+      <el-table-column label="ETC编码" align="center" prop="etcNumber" />
+      <el-table-column label="所在位置" align="center" prop="position" />
+      <el-table-column label="是否上牌" align="center" prop="isListing" />
+      <el-table-column label="固定座位数" align="center" prop="seatCount" />
+      <el-table-column label="所属单位名称" align="center" prop="unitName" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebus:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebus: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="vehiclenumber">
+          <el-input v-model="form.vehiclenumber" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车辆型号" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="车辆颜色" prop="vehiclecolor">
+          <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
+        </el-form-item>
+        <el-form-item label="车位号" prop="parkingspacenumber">
+          <el-input v-model="form.parkingspacenumber" placeholder="请输入车位号" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactnumber">
+          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remarks">
+          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        <el-form-item label="创建人ID" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入创建人ID" />
+        </el-form-item>
+        <el-form-item label="车辆在位情况1：在位，2：值班，3：出车，4待修">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="所属单位" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入所属单位" />
+        </el-form-item>
+        <el-form-item label="车辆负责人" prop="peopleId">
+          <el-input v-model="form.peopleId" placeholder="请输入车辆负责人" />
+        </el-form-item>
+        <el-form-item label="发动机号" prop="engineNumber">
+          <el-input v-model="form.engineNumber" placeholder="请输入发动机号" />
+        </el-form-item>
+        <el-form-item label="车架号" prop="frameNumber">
+          <el-input v-model="form.frameNumber" placeholder="请输入车架号" />
+        </el-form-item>
+        <el-form-item label="车辆来源" prop="source">
+          <el-input v-model="form.source" placeholder="请输入车辆来源" />
+        </el-form-item>
+        <el-form-item label="出厂日期" prop="date1">
+          <el-date-picker clearable size="small"
+            v-model="form.date1"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="选择出厂日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="ETC品牌" prop="etcBrand">
+          <el-input v-model="form.etcBrand" placeholder="请输入ETC品牌" />
+        </el-form-item>
+        <el-form-item label="ETC编码" prop="etcNumber">
+          <el-input v-model="form.etcNumber" placeholder="请输入ETC编码" />
+        </el-form-item>
+        <el-form-item label="所在位置" prop="position">
+          <el-input v-model="form.position" placeholder="请输入所在位置" />
+        </el-form-item>
+        <el-form-item label="是否上牌" prop="isListing">
+          <el-input v-model="form.isListing" placeholder="请输入是否上牌" />
+        </el-form-item>
+        <el-form-item label="固定座位数" prop="seatCount">
+          <el-input v-model="form.seatCount" placeholder="请输入固定座位数" />
+        </el-form-item>
+        <el-form-item label="所属单位名称" prop="unitName">
+          <el-input v-model="form.unitName" 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 { listThebus, getThebus, delThebus, addThebus, updateThebus, exportThebus } from "@/api/militaryvehicleManagement/thebus";
+
+export default {
+  name: "Thebus",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军车管理表格数据
+      thebusList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        parkingspacenumber: null,
+        contactnumber: null,
+        remarks: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        status: null,
+        unitId: null,
+        peopleId: null,
+        engineNumber: null,
+        frameNumber: null,
+        source: null,
+        date1: null,
+        etcBrand: null,
+        etcNumber: null,
+        position: null,
+        isListing: null,
+        seatCount: null,
+        unitName: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        adminId: [
+          { required: true, message: "创建人ID不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询军车管理列表 */
+    getList() {
+      this.loading = true;
+      listThebus(this.queryParams).then(response => {
+        this.thebusList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        vehiclecolor: null,
+        parkingspacenumber: null,
+        contactnumber: null,
+        remarks: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        status: 0,
+        unitId: null,
+        peopleId: null,
+        engineNumber: null,
+        frameNumber: null,
+        source: null,
+        date1: null,
+        etcBrand: null,
+        etcNumber: null,
+        position: null,
+        isListing: null,
+        seatCount: null,
+        unitName: 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
+      getThebus(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) {
+            updateThebus(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThebus(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 delThebus(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有军车管理数据项？').then(() => {
+        this.exportLoading = true;
+        return exportThebus(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -0,0 +1,431 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车牌号" prop="thebusId">
+        <el-input
+          v-model="queryParams.thebusId"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车牌号" prop="vehiclenumber">
+        <el-input
+          v-model="queryParams.vehiclenumber"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆型号" prop="vehiclemodel">
+        <el-input
+          v-model="queryParams.vehiclemodel"
+          placeholder="请输入车辆型号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车位号" prop="parkingspacenumber">
+        <el-input
+          v-model="queryParams.parkingspacenumber"
+          placeholder="请输入车位号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆颜色" prop="vehiclecolor">
+        <el-input
+          v-model="queryParams.vehiclecolor"
+          placeholder="请输入车辆颜色"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入人员单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员姓名" prop="driverId">
+        <el-input
+          v-model="queryParams.driverId"
+          placeholder="请输入人员姓名"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contactnumber">
+        <el-input
+          v-model="queryParams.contactnumber"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外出时间" prop="time1">
+        <el-input
+          v-model="queryParams.time1"
+          placeholder="请输入外出时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="返回时间" prop="time2">
+        <el-input
+          v-model="queryParams.time2"
+          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="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入返回时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="返回时间" prop="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入返回时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:thebusAccessLog: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="['militaryvehicleManagement:thebusAccessLog: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="['militaryvehicleManagement:thebusAccessLog: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="['militaryvehicleManagement:thebusAccessLog:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="thebusAccessLogList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="返回时间" align="center" prop="id" />
+      <el-table-column label="车牌号" align="center" prop="thebusId" />
+      <el-table-column label="车牌号" align="center" prop="vehiclenumber" />
+      <el-table-column label="车辆型号" align="center" prop="vehiclemodel" />
+      <el-table-column label="车位号" align="center" prop="parkingspacenumber" />
+      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
+      <el-table-column label="人员单位" align="center" prop="unitId" />
+      <el-table-column label="人员姓名" align="center" prop="driverId" />
+      <el-table-column label="联系方式" align="center" prop="contactnumber" />
+      <el-table-column label="外出时间" align="center" prop="time1" />
+      <el-table-column label="返回时间" align="center" prop="time2" />
+      <el-table-column label="返回时间" align="center" prop="adminId" />
+      <el-table-column label="返回时间" align="center" prop="createtime" />
+      <el-table-column label="返回时间" align="center" prop="updatetime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusAccessLog:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusAccessLog: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车牌号" prop="thebusId">
+          <el-input v-model="form.thebusId" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车牌号" prop="vehiclenumber">
+          <el-input v-model="form.vehiclenumber" placeholder="请输入车牌号" />
+        </el-form-item>
+        <el-form-item label="车辆型号" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
+        </el-form-item>
+        <el-form-item label="车位号" prop="parkingspacenumber">
+          <el-input v-model="form.parkingspacenumber" placeholder="请输入车位号" />
+        </el-form-item>
+        <el-form-item label="车辆颜色" prop="vehiclecolor">
+          <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
+        </el-form-item>
+        <el-form-item label="人员单位" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入人员单位" />
+        </el-form-item>
+        <el-form-item label="人员姓名" prop="driverId">
+          <el-input v-model="form.driverId" placeholder="请输入人员姓名" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contactnumber">
+          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="外出时间" prop="time1">
+          <el-input v-model="form.time1" placeholder="请输入外出时间" />
+        </el-form-item>
+        <el-form-item label="返回时间" prop="time2">
+          <el-input v-model="form.time2" placeholder="请输入返回时间" />
+        </el-form-item>
+        <el-form-item label="返回时间" prop="adminId">
+          <el-input v-model="form.adminId" 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 { listThebusAccessLog, getThebusAccessLog, delThebusAccessLog, addThebusAccessLog, updateThebusAccessLog, exportThebusAccessLog } from "@/api/militaryvehicleManagement/thebusAccessLog";
+
+export default {
+  name: "ThebusAccessLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军车进出查询表格数据
+      thebusAccessLogList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        thebusId: null,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        parkingspacenumber: null,
+        vehiclecolor: null,
+        unitId: null,
+        driverId: null,
+        contactnumber: null,
+        time1: null,
+        time2: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        thebusId: [
+          { required: true, message: "车牌号不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询军车进出查询列表 */
+    getList() {
+      this.loading = true;
+      listThebusAccessLog(this.queryParams).then(response => {
+        this.thebusAccessLogList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        thebusId: null,
+        vehiclenumber: null,
+        vehiclemodel: null,
+        parkingspacenumber: null,
+        vehiclecolor: null,
+        unitId: null,
+        driverId: null,
+        contactnumber: null,
+        time1: null,
+        time2: null,
+        adminId: 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
+      getThebusAccessLog(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) {
+            updateThebusAccessLog(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThebusAccessLog(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 delThebusAccessLog(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有军车进出查询数据项？').then(() => {
+        this.exportLoading = true;
+        return exportThebusAccessLog(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -0,0 +1,739 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="车型" prop="model">
+        <el-input
+          v-model="queryParams.model"
+          placeholder="请输入车型"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="单位" prop="unitId">
+        <el-input
+          v-model="queryParams.unitId"
+          placeholder="请输入单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员名称" prop="peopleId">
+        <el-input
+          v-model="queryParams.peopleId"
+          placeholder="请输入人员名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人员名称" prop="thebusId">
+        <el-input
+          v-model="queryParams.thebusId"
+          placeholder="请输入人员名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联系方式" prop="contact">
+        <el-input
+          v-model="queryParams.contact"
+          placeholder="请输入联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="外出事由" prop="cause">
+        <el-input
+          v-model="queryParams.cause"
+          placeholder="请输入外出事由"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="授权开始时间" prop="authStime">
+        <el-input
+          v-model="queryParams.authStime"
+          placeholder="请输入授权开始时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="授权结束时间" prop="authEtime">
+        <el-input
+          v-model="queryParams.authEtime"
+          placeholder="请输入授权结束时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审批模板" prop="thebusThemplateId">
+        <el-input
+          v-model="queryParams.thebusThemplateId"
+          placeholder="请输入审批模板"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="一级审批人" prop="people1Id">
+        <el-input
+          v-model="queryParams.people1Id"
+          placeholder="请输入一级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="一级审批状态" prop="people1State">
+        <el-input
+          v-model="queryParams.people1State"
+          placeholder="请输入一级审批状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="一级审批备注" prop="people1Remark">
+        <el-input
+          v-model="queryParams.people1Remark"
+          placeholder="请输入一级审批备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="一级审批时间" prop="people1Authtime">
+        <el-input
+          v-model="queryParams.people1Authtime"
+          placeholder="请输入一级审批时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="二级审批人" prop="people2Id">
+        <el-input
+          v-model="queryParams.people2Id"
+          placeholder="请输入二级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="二级审批状态" prop="people2State">
+        <el-input
+          v-model="queryParams.people2State"
+          placeholder="请输入二级审批状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="二级审批备注" prop="people2Remark">
+        <el-input
+          v-model="queryParams.people2Remark"
+          placeholder="请输入二级审批备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="二级审批时间" prop="people2Authtime">
+        <el-input
+          v-model="queryParams.people2Authtime"
+          placeholder="请输入二级审批时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="三级审批人" prop="people3Id">
+        <el-input
+          v-model="queryParams.people3Id"
+          placeholder="请输入三级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="三级审批状态" prop="people3State">
+        <el-input
+          v-model="queryParams.people3State"
+          placeholder="请输入三级审批状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="三级审批备注" prop="people3Remark">
+        <el-input
+          v-model="queryParams.people3Remark"
+          placeholder="请输入三级审批备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="三级审批时间" prop="people3Authtime">
+        <el-input
+          v-model="queryParams.people3Authtime"
+          placeholder="请输入三级审批时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="整体审批状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择整体审批状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="出车状态" prop="outstatus">
+        <el-select v-model="queryParams.outstatus" placeholder="请选择出车状态" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </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="createtime">
+        <el-input
+          v-model="queryParams.createtime"
+          placeholder="请输入创建时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="修改时间" prop="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入修改时间"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆司机" prop="driver">
+        <el-input
+          v-model="queryParams.driver"
+          placeholder="请输入车辆司机"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆联系方式" prop="driverContact">
+        <el-input
+          v-model="queryParams.driverContact"
+          placeholder="请输入车辆联系方式"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="人数" prop="peopleCount">
+        <el-input
+          v-model="queryParams.peopleCount"
+          placeholder="请输入人数"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营级审批人" prop="unitPeopleId">
+        <el-input
+          v-model="queryParams.unitPeopleId"
+          placeholder="请输入营级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营级审批状态" prop="unitPeopleState">
+        <el-input
+          v-model="queryParams.unitPeopleState"
+          placeholder="请输入营级审批状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="营级审批备注" prop="unitPeopleRemark">
+        <el-input
+          v-model="queryParams.unitPeopleRemark"
+          placeholder="请输入营级审批备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="初审审批状态" prop="chushenState">
+        <el-input
+          v-model="queryParams.chushenState"
+          placeholder="请输入初审审批状态"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="初审审批备注" prop="chushenRemark">
+        <el-input
+          v-model="queryParams.chushenRemark"
+          placeholder="请输入初审审批备注"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:thebusApply: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="['militaryvehicleManagement:thebusApply: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="['militaryvehicleManagement:thebusApply: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="['militaryvehicleManagement:thebusApply:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="thebusApplyList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="初审审批备注" align="center" prop="id" />
+      <el-table-column label="车型" align="center" prop="model" />
+      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="人员名称" align="center" prop="peopleId" />
+      <el-table-column label="人员名称" align="center" prop="thebusId" />
+      <el-table-column label="联系方式" align="center" prop="contact" />
+      <el-table-column label="外出事由" align="center" prop="cause" />
+      <el-table-column label="授权开始时间" align="center" prop="authStime" />
+      <el-table-column label="授权结束时间" align="center" prop="authEtime" />
+      <el-table-column label="审批模板" align="center" prop="thebusThemplateId" />
+      <el-table-column label="一级审批人" align="center" prop="people1Id" />
+      <el-table-column label="一级审批状态" align="center" prop="people1State" />
+      <el-table-column label="一级审批备注" align="center" prop="people1Remark" />
+      <el-table-column label="一级审批时间" align="center" prop="people1Authtime" />
+      <el-table-column label="二级审批人" align="center" prop="people2Id" />
+      <el-table-column label="二级审批状态" align="center" prop="people2State" />
+      <el-table-column label="二级审批备注" align="center" prop="people2Remark" />
+      <el-table-column label="二级审批时间" align="center" prop="people2Authtime" />
+      <el-table-column label="三级审批人" align="center" prop="people3Id" />
+      <el-table-column label="三级审批状态" align="center" prop="people3State" />
+      <el-table-column label="三级审批备注" align="center" prop="people3Remark" />
+      <el-table-column label="三级审批时间" align="center" prop="people3Authtime" />
+      <el-table-column label="整体审批状态" align="center" prop="status" />
+      <el-table-column label="出车状态" align="center" prop="outstatus" />
+      <el-table-column label="操作人" align="center" prop="adminId" />
+      <el-table-column label="创建时间" align="center" prop="createtime" />
+      <el-table-column label="修改时间" align="center" prop="updatetime" />
+      <el-table-column label="车辆司机" align="center" prop="driver" />
+      <el-table-column label="车辆联系方式" align="center" prop="driverContact" />
+      <el-table-column label="人数" align="center" prop="peopleCount" />
+      <el-table-column label="营级审批人" align="center" prop="unitPeopleId" />
+      <el-table-column label="营级审批状态" align="center" prop="unitPeopleState" />
+      <el-table-column label="营级审批备注" align="center" prop="unitPeopleRemark" />
+      <el-table-column label="初审审批状态" align="center" prop="chushenState" />
+      <el-table-column label="初审审批备注" align="center" prop="chushenRemark" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusApply: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="车型" prop="model">
+          <el-input v-model="form.model" placeholder="请输入车型" />
+        </el-form-item>
+        <el-form-item label="单位" prop="unitId">
+          <el-input v-model="form.unitId" placeholder="请输入单位" />
+        </el-form-item>
+        <el-form-item label="人员名称" prop="peopleId">
+          <el-input v-model="form.peopleId" placeholder="请输入人员名称" />
+        </el-form-item>
+        <el-form-item label="人员名称" prop="thebusId">
+          <el-input v-model="form.thebusId" placeholder="请输入人员名称" />
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="外出事由" prop="cause">
+          <el-input v-model="form.cause" placeholder="请输入外出事由" />
+        </el-form-item>
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-input v-model="form.authStime" placeholder="请输入授权开始时间" />
+        </el-form-item>
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-input v-model="form.authEtime" placeholder="请输入授权结束时间" />
+        </el-form-item>
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-input v-model="form.thebusThemplateId" placeholder="请输入审批模板" />
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
+          <el-input v-model="form.people1Id" placeholder="请输入一级审批人" />
+        </el-form-item>
+        <el-form-item label="一级审批状态" prop="people1State">
+          <el-input v-model="form.people1State" placeholder="请输入一级审批状态" />
+        </el-form-item>
+        <el-form-item label="一级审批备注" prop="people1Remark">
+          <el-input v-model="form.people1Remark" placeholder="请输入一级审批备注" />
+        </el-form-item>
+        <el-form-item label="一级审批时间" prop="people1Authtime">
+          <el-input v-model="form.people1Authtime" placeholder="请输入一级审批时间" />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="people2Id">
+          <el-input v-model="form.people2Id" placeholder="请输入二级审批人" />
+        </el-form-item>
+        <el-form-item label="二级审批状态" prop="people2State">
+          <el-input v-model="form.people2State" placeholder="请输入二级审批状态" />
+        </el-form-item>
+        <el-form-item label="二级审批备注" prop="people2Remark">
+          <el-input v-model="form.people2Remark" placeholder="请输入二级审批备注" />
+        </el-form-item>
+        <el-form-item label="二级审批时间" prop="people2Authtime">
+          <el-input v-model="form.people2Authtime" placeholder="请输入二级审批时间" />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="people3Id">
+          <el-input v-model="form.people3Id" placeholder="请输入三级审批人" />
+        </el-form-item>
+        <el-form-item label="三级审批状态" prop="people3State">
+          <el-input v-model="form.people3State" placeholder="请输入三级审批状态" />
+        </el-form-item>
+        <el-form-item label="三级审批备注" prop="people3Remark">
+          <el-input v-model="form.people3Remark" placeholder="请输入三级审批备注" />
+        </el-form-item>
+        <el-form-item label="三级审批时间" prop="people3Authtime">
+          <el-input v-model="form.people3Authtime" placeholder="请输入三级审批时间" />
+        </el-form-item>
+        <el-form-item label="整体审批状态">
+          <el-radio-group v-model="form.status">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="出车状态">
+          <el-radio-group v-model="form.outstatus">
+            <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="操作人" prop="adminId">
+          <el-input v-model="form.adminId" placeholder="请输入操作人" />
+        </el-form-item>
+        <el-form-item label="车辆司机" prop="driver">
+          <el-input v-model="form.driver" placeholder="请输入车辆司机" />
+        </el-form-item>
+        <el-form-item label="车辆联系方式" prop="driverContact">
+          <el-input v-model="form.driverContact" placeholder="请输入车辆联系方式" />
+        </el-form-item>
+        <el-form-item label="人数" prop="peopleCount">
+          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+        </el-form-item>
+        <el-form-item label="营级审批人" prop="unitPeopleId">
+          <el-input v-model="form.unitPeopleId" placeholder="请输入营级审批人" />
+        </el-form-item>
+        <el-form-item label="营级审批状态" prop="unitPeopleState">
+          <el-input v-model="form.unitPeopleState" placeholder="请输入营级审批状态" />
+        </el-form-item>
+        <el-form-item label="营级审批备注" prop="unitPeopleRemark">
+          <el-input v-model="form.unitPeopleRemark" placeholder="请输入营级审批备注" />
+        </el-form-item>
+        <el-form-item label="初审审批状态" prop="chushenState">
+          <el-input v-model="form.chushenState" placeholder="请输入初审审批状态" />
+        </el-form-item>
+        <el-form-item label="初审审批备注" prop="chushenRemark">
+          <el-input v-model="form.chushenRemark" 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 { listThebusApply, getThebusApply, delThebusApply, addThebusApply, updateThebusApply, exportThebusApply } from "@/api/militaryvehicleManagement/thebusApply";
+
+export default {
+  name: "ThebusApply",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 用车申请表格数据
+      thebusApplyList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        model: null,
+        unitId: null,
+        peopleId: null,
+        thebusId: null,
+        contact: null,
+        cause: null,
+        authStime: null,
+        authEtime: null,
+        thebusThemplateId: null,
+        people1Id: null,
+        people1State: null,
+        people1Remark: null,
+        people1Authtime: null,
+        people2Id: null,
+        people2State: null,
+        people2Remark: null,
+        people2Authtime: null,
+        people3Id: null,
+        people3State: null,
+        people3Remark: null,
+        people3Authtime: null,
+        status: null,
+        outstatus: null,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        driver: null,
+        driverContact: null,
+        peopleCount: null,
+        unitPeopleId: null,
+        unitPeopleState: null,
+        unitPeopleRemark: null,
+        chushenState: null,
+        chushenRemark: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询用车申请列表 */
+    getList() {
+      this.loading = true;
+      listThebusApply(this.queryParams).then(response => {
+        this.thebusApplyList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        model: null,
+        unitId: null,
+        peopleId: null,
+        thebusId: null,
+        contact: null,
+        cause: null,
+        authStime: null,
+        authEtime: null,
+        thebusThemplateId: null,
+        people1Id: null,
+        people1State: null,
+        people1Remark: null,
+        people1Authtime: null,
+        people2Id: null,
+        people2State: null,
+        people2Remark: null,
+        people2Authtime: null,
+        people3Id: null,
+        people3State: null,
+        people3Remark: null,
+        people3Authtime: null,
+        status: 0,
+        outstatus: 0,
+        adminId: null,
+        createtime: null,
+        updatetime: null,
+        driver: null,
+        driverContact: null,
+        peopleCount: null,
+        unitPeopleId: null,
+        unitPeopleState: null,
+        unitPeopleRemark: null,
+        chushenState: null,
+        chushenRemark: 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
+      getThebusApply(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) {
+            updateThebusApply(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThebusApply(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 delThebusApply(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有用车申请数据项？').then(() => {
+        this.exportLoading = true;
+        return exportThebusApply(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -0,0 +1,357 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="人员类型" prop="peopleType">
+        <el-select v-model="queryParams.peopleType" placeholder="请选择人员类型" clearable size="small">
+          <el-option label="请选择字典生成" value="" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="外出授权大门是否自动开启" prop="authAutoOpen">
+        <el-input
+          v-model="queryParams.authAutoOpen"
+          placeholder="请输入外出授权大门是否自动开启"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆回营是否组队设置回场" prop="carAutoBack">
+        <el-input
+          v-model="queryParams.carAutoBack"
+          placeholder="请输入车辆回营是否组队设置回场"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="未授权车辆进营区是否开门" prop="noauthOpen">
+        <el-input
+          v-model="queryParams.noauthOpen"
+          placeholder="请输入未授权车辆进营区是否开门"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="同一车辆通过同一门禁多长时间内不记录" prop="time1">
+        <el-input
+          v-model="queryParams.time1"
+          placeholder="请输入同一车辆通过同一门禁多长时间内不记录"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="同一车辆通过同一门禁多长时间后再次记录" prop="time2">
+        <el-input
+          v-model="queryParams.time2"
+          placeholder="请输入同一车辆通过同一门禁多长时间后再次记录"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="默认审批人单位" prop="defaultUnitId">
+        <el-input
+          v-model="queryParams.defaultUnitId"
+          placeholder="请输入默认审批人单位"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="默认审批人" prop="defaultPeopleId">
+        <el-input
+          v-model="queryParams.defaultPeopleId"
+          placeholder="请输入默认审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:thebusConfig: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="['militaryvehicleManagement:thebusConfig: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="['militaryvehicleManagement:thebusConfig: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="['militaryvehicleManagement:thebusConfig:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="thebusConfigList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="默认审批人" align="center" prop="id" />
+      <el-table-column label="人员类型" align="center" prop="peopleType" />
+      <el-table-column label="外出授权大门是否自动开启" align="center" prop="authAutoOpen" />
+      <el-table-column label="车辆回营是否组队设置回场" align="center" prop="carAutoBack" />
+      <el-table-column label="未授权车辆进营区是否开门" align="center" prop="noauthOpen" />
+      <el-table-column label="同一车辆通过同一门禁多长时间内不记录" align="center" prop="time1" />
+      <el-table-column label="同一车辆通过同一门禁多长时间后再次记录" align="center" prop="time2" />
+      <el-table-column label="默认审批人单位" align="center" prop="defaultUnitId" />
+      <el-table-column label="默认审批人" align="center" prop="defaultPeopleId" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusConfig:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusConfig: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="人员类型" prop="peopleType">
+          <el-select v-model="form.peopleType" placeholder="请选择人员类型">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="外出授权大门是否自动开启" prop="authAutoOpen">
+          <el-input v-model="form.authAutoOpen" placeholder="请输入外出授权大门是否自动开启" />
+        </el-form-item>
+        <el-form-item label="车辆回营是否组队设置回场" prop="carAutoBack">
+          <el-input v-model="form.carAutoBack" placeholder="请输入车辆回营是否组队设置回场" />
+        </el-form-item>
+        <el-form-item label="未授权车辆进营区是否开门" prop="noauthOpen">
+          <el-input v-model="form.noauthOpen" placeholder="请输入未授权车辆进营区是否开门" />
+        </el-form-item>
+        <el-form-item label="同一车辆通过同一门禁多长时间内不记录" prop="time1">
+          <el-input v-model="form.time1" placeholder="请输入同一车辆通过同一门禁多长时间内不记录" />
+        </el-form-item>
+        <el-form-item label="同一车辆通过同一门禁多长时间后再次记录" prop="time2">
+          <el-input v-model="form.time2" placeholder="请输入同一车辆通过同一门禁多长时间后再次记录" />
+        </el-form-item>
+        <el-form-item label="默认审批人单位" prop="defaultUnitId">
+          <el-input v-model="form.defaultUnitId" placeholder="请输入默认审批人单位" />
+        </el-form-item>
+        <el-form-item label="默认审批人" prop="defaultPeopleId">
+          <el-input v-model="form.defaultPeopleId" 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 { listThebusConfig, getThebusConfig, delThebusConfig, addThebusConfig, updateThebusConfig, exportThebusConfig } from "@/api/militaryvehicleManagement/thebusConfig";
+
+export default {
+  name: "ThebusConfig",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军车管理设置表格数据
+      thebusConfigList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        peopleType: null,
+        authAutoOpen: null,
+        carAutoBack: null,
+        noauthOpen: null,
+        time1: null,
+        time2: null,
+        defaultUnitId: null,
+        defaultPeopleId: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询军车管理设置列表 */
+    getList() {
+      this.loading = true;
+      listThebusConfig(this.queryParams).then(response => {
+        this.thebusConfigList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        peopleType: null,
+        authAutoOpen: null,
+        carAutoBack: null,
+        noauthOpen: null,
+        time1: null,
+        time2: null,
+        defaultUnitId: null,
+        defaultPeopleId: 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
+      getThebusConfig(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) {
+            updateThebusConfig(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThebusConfig(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 delThebusConfig(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有军车管理设置数据项？').then(() => {
+        this.exportLoading = true;
+        return exportThebusConfig(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/militaryvehicleManagement/thebusThemplate/index.vue

@@ -0,0 +1,323 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <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="people1Id">
+        <el-input
+          v-model="queryParams.people1Id"
+          placeholder="请输入一级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="二级审批人" prop="people2Id">
+        <el-input
+          v-model="queryParams.people2Id"
+          placeholder="请输入二级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="三级审批人" prop="people3Id">
+        <el-input
+          v-model="queryParams.people3Id"
+          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="updatetime">
+        <el-input
+          v-model="queryParams.updatetime"
+          placeholder="请输入三级审批人"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @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="['militaryvehicleManagement:thebusThemplate: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="['militaryvehicleManagement:thebusThemplate: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="['militaryvehicleManagement:thebusThemplate: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="['militaryvehicleManagement:thebusThemplate:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="thebusThemplateList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="三级审批人" align="center" prop="id" />
+      <el-table-column label="审批模板名称" align="center" prop="name" />
+      <el-table-column label="一级审批人" align="center" prop="people1Id" />
+      <el-table-column label="二级审批人" align="center" prop="people2Id" />
+      <el-table-column label="三级审批人" align="center" prop="people3Id" />
+      <el-table-column label="三级审批人" align="center" prop="createtime" />
+      <el-table-column label="三级审批人" align="center" prop="updatetime" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusThemplate:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusThemplate: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="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="审批模板名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入审批模板名称" />
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
+          <el-input v-model="form.people1Id" placeholder="请输入一级审批人" />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="people2Id">
+          <el-input v-model="form.people2Id" placeholder="请输入二级审批人" />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="people3Id">
+          <el-input v-model="form.people3Id" 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 { listThebusThemplate, getThebusThemplate, delThebusThemplate, addThebusThemplate, updateThebusThemplate, exportThebusThemplate } from "@/api/militaryvehicleManagement/thebusThemplate";
+
+export default {
+  name: "ThebusThemplate",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 军车审批模板表格数据
+      thebusThemplateList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        people1Id: null,
+        people2Id: null,
+        people3Id: null,
+        createtime: null,
+        updatetime: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询军车审批模板列表 */
+    getList() {
+      this.loading = true;
+      listThebusThemplate(this.queryParams).then(response => {
+        this.thebusThemplateList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        name: null,
+        people1Id: null,
+        people2Id: null,
+        people3Id: 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
+      getThebusThemplate(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) {
+            updateThebusThemplate(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addThebusThemplate(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 delThebusThemplate(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$modal.confirm('是否确认导出所有军车审批模板数据项？').then(() => {
+        this.exportLoading = true;
+        return exportThebusThemplate(queryParams);
+      }).then(response => {
+        this.$download.name(response.msg);
+        this.exportLoading = false;
+      }).catch(() => {});
+    }
+  }
+};
+</script>

src/views/peopleChuRu/peopleBorrow/index.vue

@@ -167,11 +167,8 @@
             @open="blurSelect"
           />
         </el-form-item>
+        <el-form-item/>
         <el-form-item label="借调人姓名" prop="transferPeople">
-          <!-- <el-input
-            v-model="form.transferPeople"
-            placeholder="请输入借调人姓名"
-          /> -->
           <el-select
             v-model="form.transferPeopleId"
             placeholder="请输入借调人姓名"
@@ -498,7 +495,7 @@ export default {
   background: #004d86 !important;
 }
 ::v-deep .el-textarea__inner {
-  width: 920px;
+  width:700px;
   height: 104px;
   margin: auto;
 }
@@ -624,9 +621,9 @@ export default {
   margin-right: 42px;
 }
 /* 增加按钮弹框 */
-::v-deep .el-dialog {
+/* ::v-deep .el-dialog {
   width: 1060px !important;
-}
+} */
 ::v-deep .el-dialog__body {
   padding: none !important;
 }

src/views/pt.vue

@@ -26,21 +26,33 @@
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="gongzuofun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="gongzuofun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/gz.png" alt />
                 <br />
                 <a href="#" class="a">工 作 安 排</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="guizhangfun"  data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="guizhangfun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/zd.png" alt />
                 <br />
                 <a href="#" class="a">规 章 制 度</a>
               </div>
             </li>
             <li>
-              <div class="demo active"  v-on:click="taishifun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="taishifun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/fx.png" alt />
                 <br />
                 <a href="#" class="a">态 势 分 析</a>
@@ -50,21 +62,33 @@
           <hr />
           <ul class="ul">
             <li>
-              <div class="demo active" v-on:click="zhanbeifun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="zhanbeifun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/zb.png" alt />
                 <br />
                 <a href="#" class="a">战备值班</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="jianchafun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="jianchafun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/jc.png" alt />
                 <br />
                 <a href="#" class="a">检查督导</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="renyuanfun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="renyuanfun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/ry.png" alt />
                 <br />
                 <a href="#" class="a">人员进出</a>
@@ -102,21 +126,33 @@
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="renlifun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="renlifun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/rl.png" alt />
                 <br />
                 <a href="#" class="a">人力资源</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="xitongfun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="xitongfun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/xt.png" alt />
                 <br />
                 <a href="#" class="a">系统管理</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="gongju" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="gongju"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/xt.png" alt />
                 <br />
                 <a href="#" class="a">系统工具</a>
@@ -126,28 +162,45 @@
           <hr />
           <ul class="ul">
             <li>
-              <div class="demo active" id="a3" v-on:click="junchefun">
+              <div
+                class="demo active"
+                id="a3"
+                v-on:click="junchefun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/cart.png" alt />
                 <br />
                 <a href="#" class="a">车辆管理</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="yingfangfun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="yingfangfun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/git.png" alt />
                 <br />
                 <a href="#" class="a">营房管理</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="yingjufun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="yingjufun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/gl.png" alt />
                 <br />
                 <a href="#" class="a">营具管理</a>
               </div>
             </li>
             <li>
-              <div class="demo active" v-on:click="yiliaofun" data-url="/diary?ref=addtabs">
+              <div
+                class="demo active"
+                v-on:click="yiliaofun"
+                data-url="/diary?ref=addtabs"
+              >
                 <img src="../images/yl.png" alt />
                 <br />
                 <a href="#" class="a">医疗卫生管理</a>
@@ -292,15 +345,20 @@ export default {
     },
     junchefun() {
       this.$router
-        .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
+        .push({
+          path: "/index",
+          query: { name: "/militaryvehicleManagement" },
+        })
         .catch(() => {});
+      // .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
+      // .catch(() => {});
     },
     gongzuofun() {
       this.$router
         .push({ path: "/index", query: { name: "/workingArrangements" } })
         .catch(() => {});
     },
-    guizhangfun(){
+    guizhangfun() {
       this.$router
         .push({ path: "/index", query: { name: "/regulations" } })
         .catch(() => {});
@@ -336,7 +394,7 @@ export default {
       //   .catch(() => {});
       window.open(`/taishi.html`);
     },
-  }
+  },
 };
 </script>