完成了军车管理

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -1,7 +1,13 @@
 <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-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="privateCarId">
         <el-input
           v-model="queryParams.privateCarId"
           placeholder="请输入车牌号"
@@ -10,7 +16,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车牌号" prop="vehiclenumber">
+      <!-- <el-form-item label="车牌号" prop="vehiclenumber">
         <el-input
           v-model="queryParams.vehiclenumber"
           placeholder="请输入车牌号"
@@ -99,10 +105,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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-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>
 
@@ -115,7 +129,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -126,7 +141,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -137,7 +153,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -148,16 +165,24 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['militaryvehicleManagement:privateAccessLog:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="privateAccessLogList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="privateAccessLogList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="离开时间" align="center" prop="id" />
+      <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" />
@@ -165,10 +190,11 @@
       <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">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -176,20 +202,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['militaryvehicleManagement:privateAccessLog:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:privateAccessLog:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -198,16 +226,22 @@
 
     <!-- 添加或修改私家车进出查询对话框 -->
     <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
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
         <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="vehiclecolor">
           <el-input v-model="form.vehiclecolor" placeholder="请输入车辆颜色" />
         </el-form-item>
@@ -223,9 +257,6 @@
         <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>
@@ -236,7 +267,14 @@
 </template>
 
 <script>
-import { listPrivateAccessLog, getPrivateAccessLog, delPrivateAccessLog, addPrivateAccessLog, updatePrivateAccessLog, exportPrivateAccessLog } from "@/api/militaryvehicleManagement/privateAccessLog";
+import {
+  listPrivateAccessLog,
+  getPrivateAccessLog,
+  delPrivateAccessLog,
+  addPrivateAccessLog,
+  updatePrivateAccessLog,
+  exportPrivateAccessLog,
+} from "@/api/militaryvehicleManagement/privateAccessLog";
 
 export default {
   name: "PrivateAccessLog",
@@ -277,16 +315,16 @@ export default {
         time2: null,
         adminId: null,
         createtime: null,
-        updatetime: null
+        updatetime: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         privateCarId: [
-          { required: true, message: "车牌号不能为空", trigger: "blur" }
+          { required: true, message: "车牌号不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -296,7 +334,7 @@ export default {
     /** 查询私家车进出查询列表 */
     getList() {
       this.loading = true;
-      listPrivateAccessLog(this.queryParams).then(response => {
+      listPrivateAccessLog(this.queryParams).then((response) => {
         this.privateAccessLogList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -322,7 +360,7 @@ export default {
         time2: null,
         adminId: null,
         createtime: null,
-        updatetime: null
+        updatetime: null,
       };
       this.resetForm("form");
     },
@@ -338,9 +376,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -351,8 +389,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getPrivateAccessLog(id).then(response => {
+      const id = row.id || this.ids;
+      getPrivateAccessLog(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改私家车进出查询";
@@ -360,16 +398,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePrivateAccessLog(this.form).then(response => {
+            updatePrivateAccessLog(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPrivateAccessLog(this.form).then(response => {
+            addPrivateAccessLog(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -381,24 +419,170 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除私家车进出查询编号为"' + ids + '"的数据项？').then(function() {
-        return delPrivateAccessLog(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      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(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有私家车进出查询数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportPrivateAccessLog(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 820px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 610px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 60px;
+}
+::v-deep .el-dialog__body {
+  margin: 22px 28px -14px 28px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 76px;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 60px;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+</style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -1,7 +1,13 @@
 <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-form
+      :model="queryParams"
+      ref="queryForm"
+      :inline="true"
+      v-show="showSearch"
+      label-width="68px"
+    >
+      <el-form-item prop="vehiclenumber">
         <el-input
           v-model="queryParams.vehiclenumber"
           placeholder="请输入车牌号"
@@ -10,7 +16,8 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="车辆型号" prop="vehiclemodel">
+
+      <!--<el-form-item label="车辆型号" prop="vehiclemodel">
         <el-input
           v-model="queryParams.vehiclemodel"
           placeholder="请输入车辆型号"
@@ -56,7 +63,12 @@
         />
       </el-form-item>
       <el-form-item label="证件类型" prop="documenttype">
-        <el-select v-model="queryParams.documenttype" placeholder="请选择证件类型" clearable size="small">
+        <el-select
+          v-model="queryParams.documenttype"
+          placeholder="请选择证件类型"
+          clearable
+          size="small"
+        >
           <el-option label="请选择字典生成" value="" />
         </el-select>
       </el-form-item>
@@ -113,10 +125,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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-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>
 
@@ -129,7 +149,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['militaryvehicleManagement:privateCar:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -140,7 +161,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['militaryvehicleManagement:privateCar:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -151,7 +173,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['militaryvehicleManagement:privateCar:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -162,30 +185,48 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['militaryvehicleManagement:privateCar:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar
+        :showSearch.sync="showSearch"
+        @queryTable="getList"
+      ></right-toolbar> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="privateCarList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="privateCarList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <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="id" />
+      <el-table-column label="车辆所有人" align="center" prop="peopleId" />
       <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="peopleName"
+      />
       <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">
+      <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"
@@ -193,20 +234,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['militaryvehicleManagement:privateCar:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:privateCar:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -215,21 +258,27 @@
 
     <!-- 添加或修改私家车管理对话框 -->
     <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
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="车辆类型" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" 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="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 label="车辆型号" prop="vehiclemodel">
+          <el-input v-model="form.vehiclemodel" placeholder="请输入车辆型号" />
         </el-form-item>
         <el-form-item label="联系方式" prop="contactnumber">
           <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
@@ -240,13 +289,10 @@
           </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-input
+            v-model="form.certificatenumber"
+            placeholder="请输入证件号"
+          />
         </el-form-item>
         <el-form-item label="授权开始时间" prop="authStime">
           <el-input v-model="form.authStime" placeholder="请输入授权开始时间" />
@@ -254,6 +300,31 @@
         <el-form-item label="授权结束时间" prop="authEtime">
           <el-input v-model="form.authEtime" placeholder="请输入授权结束时间" />
         </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remarks">
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            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="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>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -264,7 +335,14 @@
 </template>
 
 <script>
-import { listPrivateCar, getPrivateCar, delPrivateCar, addPrivateCar, updatePrivateCar, exportPrivateCar } from "@/api/militaryvehicleManagement/privateCar";
+import {
+  listPrivateCar,
+  getPrivateCar,
+  delPrivateCar,
+  addPrivateCar,
+  updatePrivateCar,
+  exportPrivateCar,
+} from "@/api/militaryvehicleManagement/privateCar";
 
 export default {
   name: "PrivateCar",
@@ -308,16 +386,16 @@ export default {
         createtime: null,
         updatetime: null,
         authStime: null,
-        authEtime: null
+        authEtime: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         adminId: [
-          { required: true, message: "创建人不能为空", trigger: "blur" }
+          { required: true, message: "创建人不能为空", trigger: "blur" },
         ],
-      }
+      },
     };
   },
   created() {
@@ -327,7 +405,7 @@ export default {
     /** 查询私家车管理列表 */
     getList() {
       this.loading = true;
-      listPrivateCar(this.queryParams).then(response => {
+      listPrivateCar(this.queryParams).then((response) => {
         this.privateCarList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -356,7 +434,7 @@ export default {
         createtime: null,
         updatetime: null,
         authStime: null,
-        authEtime: null
+        authEtime: null,
       };
       this.resetForm("form");
     },
@@ -372,9 +450,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -385,8 +463,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getPrivateCar(id).then(response => {
+      const id = row.id || this.ids;
+      getPrivateCar(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改私家车管理";
@@ -394,16 +472,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updatePrivateCar(this.form).then(response => {
+            updatePrivateCar(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addPrivateCar(this.form).then(response => {
+            addPrivateCar(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -415,24 +493,171 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除私家车管理编号为"' + ids + '"的数据项？').then(function() {
-        return delPrivateCar(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      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(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有私家车管理数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportPrivateCar(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 800px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 610px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 24px 20px 30px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  margin-right: 48px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 42px;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 63px;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+</style>

src/views/militaryvehicleManagement/thebus/index.vue

@@ -1,7 +1,13 @@
 <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-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="请输入车牌号"
@@ -175,19 +181,27 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="所属单位名称" prop="unitName">
+      </el-form-item> -->
+      <el-form-item prop="unitName">
         <el-input
           v-model="queryParams.unitName"
-          placeholder="请输入所属单位名称"
+          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-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>
 
@@ -200,7 +214,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['militaryvehicleManagement:thebus:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -211,7 +226,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['militaryvehicleManagement:thebus:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -222,7 +238,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['militaryvehicleManagement:thebus:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -233,62 +250,101 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['militaryvehicleManagement:thebus:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="thebusList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="thebusList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <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="vehiclemodel"
+        :formatter="vehicleModel"
+      />
+      <el-table-column label="车辆负责人" align="center" prop="peopleName" />
+      <el-table-column label="所属单位" align="center" prop="unitName" />
+      <el-table-column
+        label="联系方式"
+        align="center"
+        prop="contactnumber"
+        width="120"
+      />
       <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">
+      <el-table-column label="车辆颜色" align="center" prop="vehiclecolor" />
+      <el-table-column label="出厂日期" align="center" prop="date1" width="100">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.date1, '{y}-{m}-{d}') }}</span>
+          <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" />
+      <!-- 车辆在位情况1：在位，2：值班，3：出车，4待修 -->
+      <el-table-column
+        label="车辆在位情况"
+        align="center"
+        prop="status"
+        width="100"
+        :formatter="vehiclePresence"
+      />
       <el-table-column label="所在位置" align="center" prop="position" />
-      <el-table-column label="是否上牌" align="center" prop="isListing" />
+      <el-table-column
+        label="是否上牌"
+        align="center"
+        prop="isListing"
+        :formatter="licensePlate"
+      />
       <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">
+      <!-- <el-table-column label="创建时间" align="center" prop="createtime" /> -->
+      <!-- <el-table-column
+        label="车位号"
+        align="center"
+        prop="parkingspacenumber"
+      />
+      <el-table-column label="备注" align="center" prop="remarks" />
+      <el-table-column label="创建人ID" align="center" prop="adminId" />
+   
+      <el-table-column label="修改时间" align="center" prop="updatetime" />
+      <el-table-column label="所属单位" align="center" prop="unitId" />
+
+      <el-table-column label="ETC品牌" align="center" prop="etcBrand" />
+      <el-table-column label="ETC编码" align="center" prop="etcNumber" /> -->
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="150"
+      >
         <template slot-scope="scope">
           <el-button
-            size="mini"
+            size="btu"
             type="text"
-            icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebus:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
-            size="mini"
+            size="btd"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebus:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -297,38 +353,63 @@
 
     <!-- 添加或修改军车管理对话框 -->
     <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
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <el-form-item label="车属单位" prop="unitId">
+          <treeselect
+            v-model="form.unitId"
+            :options="treeList"
+            placeholder="选择单位"
+            @select="selectPeo"
+          />
         </el-form-item>
-        <el-form-item label="车位号" prop="parkingspacenumber">
-          <el-input v-model="form.parkingspacenumber" placeholder="请输入车位号" />
+        <el-form-item label="车辆负责人" prop="peopleId">
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入负责人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in renYuan"
+              :key="i"
+              :label="item.name"
+              :value="item.id"
+              @click.native="cheRen(item)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="联系方式" prop="contactnumber">
-          <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
+          <el-input
+            v-model="form.contactnumber"
+            placeholder="请输入联系方式"
+            readonly
+          />
         </el-form-item>
-        <el-form-item label="备注" prop="remarks">
-          <el-input v-model="form.remarks" type="textarea" placeholder="请输入内容" />
+        <el-form-item label="车牌型号" prop="vehiclemodel">
+          <el-select v-model="form.vehiclemodel" placeholder="请输入是否上牌">
+            <el-option
+              v-for="(item, i) in brand"
+              :key="i"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
         </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 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 label="车位号" prop="parkingspacenumber">
+          <el-input
+            v-model="form.parkingspacenumber"
+            placeholder="请输入车位号"
+          />
         </el-form-item>
         <el-form-item label="发动机号" prop="engineNumber">
           <el-input v-model="form.engineNumber" placeholder="请输入发动机号" />
@@ -340,11 +421,14 @@
           <el-input v-model="form.source" placeholder="请输入车辆来源" />
         </el-form-item>
         <el-form-item label="出厂日期" prop="date1">
-          <el-date-picker clearable size="small"
+          <el-date-picker
+            clearable
+            size="small"
             v-model="form.date1"
             type="date"
             value-format="yyyy-MM-dd"
-            placeholder="选择出厂日期">
+            placeholder="选择出厂日期"
+          >
           </el-date-picker>
         </el-form-item>
         <el-form-item label="ETC品牌" prop="etcBrand">
@@ -357,13 +441,50 @@
           <el-input v-model="form.position" placeholder="请输入所在位置" />
         </el-form-item>
         <el-form-item label="是否上牌" prop="isListing">
-          <el-input v-model="form.isListing" placeholder="请输入是否上牌" />
+          <el-select v-model="form.isListing" placeholder="请输入是否上牌">
+            <el-option
+              v-for="(item, i) in license"
+              :key="i"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
+          <!-- <el-input v-model="form.isListing" 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="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 label="车辆类别" prop="chelaingleibie">
+          <el-input
+            v-model="form.chelaingleibie"
+            placeholder="请输入车辆类别"
+          />
+        </el-form-item>
+        <el-form-item label="审查结果" prop="shenhejieguo">
+          <el-input v-model="form.shenhejieguo" placeholder="请输入审查结果" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-select v-model="form.status" placeholder="请输入是否在位">
+            <el-option
+              v-for="(item, i) in military"
+              :key="i"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <div class="jiben">备注</div>
+        <el-form-item prop="remarks">
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            placeholder="请输入内容"
+          />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -375,10 +496,27 @@
 </template>
 
 <script>
-import { listThebus, getThebus, delThebus, addThebus, updateThebus, exportThebus } from "@/api/militaryvehicleManagement/thebus";
+import {
+  listThebus,
+  getThebus,
+  delThebus,
+  addThebus,
+  updateThebus,
+  exportThebus,
+  getDept,
+  getZhuChiRen,
+} from "@/api/militaryvehicleManagement/thebus";
+// 导入树形结构
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+// 查询字典
+import { getDicts } from "@/api/system/dict/data";
 
 export default {
   name: "Thebus",
+  components: {
+    Treeselect,
+  },
   data() {
     return {
       // 遮罩层
@@ -426,26 +564,98 @@ export default {
         position: null,
         isListing: null,
         seatCount: null,
-        unitName: null
+        unitName: null,
       },
       // 表单参数
       form: {},
       // 表单校验
       rules: {
         adminId: [
-          { required: true, message: "创建人ID不能为空", trigger: "blur" }
+          { required: true, message: "创建人ID不能为空", trigger: "blur" },
         ],
-      }
+      },
+      // 树形列表
+      treeList: [],
+      // 人员列表
+      renYuan: [],
+      // 是否上牌
+      license: [],
+      // 车辆状态
+      military: [],
+      // 车牌型号
+      brand: [],
     };
   },
   created() {
     this.getList();
+    getDicts("license").then((response) => {
+      this.license = response.data;
+    });
+    getDicts("military").then((response) => {
+      this.military = response.data;
+    });
+    getDicts("brand").then((response) => {
+      console.log(response);
+      this.brand = response.data;
+    });
   },
   methods: {
+    // 翻译车辆型号
+    vehicleModel(row, column) {
+      var vehiclemodel = "";
+      this.brand.map((item) => {
+        if (item.dictValue == row.vehiclemodel) {
+          vehiclemodel = item.dictLabel;
+        }
+      });
+      return vehiclemodel;
+    },
+    // 翻译车辆在位情况
+    vehiclePresence(row, column) {
+      var status = "";
+      this.military.map((item) => {
+        if (item.dictValue == row.status) {
+          status = item.dictLabel;
+        }
+      });
+      return status;
+    },
+    // 翻译是否上牌
+    licensePlate(row) {
+      var isListing = "";
+      this.license.map((item) => {
+        if (item.dictValue == row.isListing) {
+          isListing = item.dictLabel;
+        }
+      });
+      return isListing;
+    },
+    // 选择车辆人员触发
+    cheRen(item) {
+      this.form.contactnumber = item.phone;
+      this.form.peopleName = item.name;
+    },
+    // 选择部门单位触发
+    selectPeo(data) {
+      this.form.unitName = data.label;
+      this.getRen(data.id);
+    },
+    // 获取人员列表
+    getRen(id) {
+      getZhuChiRen(id).then((res) => {
+        this.renYuan = res.data;
+      });
+    },
+    //  获取单位列表
+    getTreeList() {
+      getDept().then((res) => {
+        this.treeList = res.data;
+      });
+    },
     /** 查询军车管理列表 */
     getList() {
       this.loading = true;
-      listThebus(this.queryParams).then(response => {
+      listThebus(this.queryParams).then((response) => {
         this.thebusList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -469,7 +679,7 @@ export default {
         adminId: null,
         createtime: null,
         updatetime: null,
-        status: 0,
+        status: null,
         unitId: null,
         peopleId: null,
         engineNumber: null,
@@ -481,7 +691,7 @@ export default {
         position: null,
         isListing: null,
         seatCount: null,
-        unitName: null
+        unitName: null,
       };
       this.resetForm("form");
     },
@@ -497,38 +707,41 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getTreeList();
       this.open = true;
       this.title = "添加军车管理";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getThebus(id).then(response => {
+      this.getTreeList();
+      const id = row.id || this.ids;
+      getThebus(id).then((response) => {
         this.form = response.data;
+        this.getRen(this.form.unitId);
         this.open = true;
         this.title = "修改军车管理";
       });
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateThebus(this.form).then(response => {
+            updateThebus(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addThebus(this.form).then(response => {
+            addThebus(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -540,24 +753,175 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除军车管理编号为"' + ids + '"的数据项？').then(function() {
-        return delThebus(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      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(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有军车管理数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportThebus(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 800px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 24px 20px 34px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 42px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 35px;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+</style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -1,7 +1,13 @@
 <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-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="请输入车型"
@@ -9,8 +15,8 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
-      <el-form-item label="单位" prop="unitId">
+      </el-form-item> -->
+      <el-form-item prop="unitId">
         <el-input
           v-model="queryParams.unitId"
           placeholder="请输入单位"
@@ -19,7 +25,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="人员名称" prop="peopleId">
+      <!-- <el-form-item label="人员名称" prop="peopleId">
         <el-input
           v-model="queryParams.peopleId"
           placeholder="请输入人员名称"
@@ -298,10 +304,18 @@
           size="small"
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </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-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>
 
@@ -314,7 +328,8 @@
           size="mini"
           @click="handleAdd"
           v-hasPermi="['militaryvehicleManagement:thebusApply:add']"
-        >新增</el-button>
+          >新增</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -325,7 +340,8 @@
           :disabled="single"
           @click="handleUpdate"
           v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
-        >修改</el-button>
+          >修改</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -336,7 +352,8 @@
           :disabled="multiple"
           @click="handleDelete"
           v-hasPermi="['militaryvehicleManagement:thebusApply:remove']"
-        >删除</el-button>
+          >删除</el-button
+        >
       </el-col>
       <el-col :span="1.5">
         <el-button
@@ -347,49 +364,125 @@
           :loading="exportLoading"
           @click="handleExport"
           v-hasPermi="['militaryvehicleManagement:thebusApply:export']"
-        >导出</el-button>
+          >导出</el-button
+        >
       </el-col>
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
 
-    <el-table v-loading="loading" :data="thebusApplyList" @selection-change="handleSelectionChange">
+    <el-table
+      v-loading="loading"
+      :data="thebusApplyList"
+      @selection-change="handleSelectionChange"
+      :header-cell-style="{ background: '#003C69', color: 'white' }"
+    >
       <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="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="unitPeopleId" />
+      <el-table-column
+        label="营级审批状态"
+        align="center"
+        prop="unitPeopleState"
+        width="100"
+      />
+      <el-table-column label="初审状态" align="center" prop="chushenState" />
       <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="people1State"
+        width="100"
+      />
       <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="people2State"
+        width="100"
+      />
       <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="people3State"
+        width="100"
+      />
+      <el-table-column label="修改时间" align="center" prop="updatetime" />
+      <!-- <el-table-column label="人员名称" align="center" prop="thebusId" />
+      <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="people1Remark"
+      />
+      <el-table-column
+        label="一级审批时间"
+        align="center"
+        prop="people1Authtime"
+      />
+
+      <el-table-column
+        label="二级审批备注"
+        align="center"
+        prop="people2Remark"
+      />
+      <el-table-column
+        label="二级审批时间"
+        align="center"
+        prop="people2Authtime"
+      />
+
+      <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="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">
+
+      <el-table-column
+        label="营级审批备注"
+        align="center"
+        prop="unitPeopleRemark"
+      />
+
+      <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"
@@ -397,20 +490,22 @@
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
-          >修改</el-button>
+            >修改</el-button
+          >
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebusApply:remove']"
-          >删除</el-button>
+            >删除</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
-    
+
     <pagination
-      v-show="total>0"
+      v-show="total > 0"
       :total="total"
       :page.sync="queryParams.pageNum"
       :limit.sync="queryParams.pageSize"
@@ -419,19 +514,22 @@
 
     <!-- 添加或修改用车申请对话框 -->
     <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
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
         <el-form-item label="单位" prop="unitId">
           <el-input v-model="form.unitId" 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="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>
@@ -444,44 +542,98 @@
         <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 label="营级审批人" prop="unitPeopleId">
+          <el-input
+            v-model="form.unitPeopleId"
+            placeholder="请输入营级审批人"
+          />
+        </el-form-item>
+        <el-form-item label="审批模板" prop="model">
+          <el-input v-model="form.model" 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>
+        <div class="jiben">出车路线</div>
+        <el-form-item prop="remarks">
+          <el-input
+            v-model="form.remarks"
+            type="textarea"
+            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="thebusThemplateId">
+          <el-input
+            v-model="form.thebusThemplateId"
+            placeholder="请输入审批模板"
+          />
+        </el-form-item>
+
         <el-form-item label="一级审批状态" prop="people1State">
-          <el-input v-model="form.people1State" placeholder="请输入一级审批状态" />
+          <el-input
+            v-model="form.people1State"
+            placeholder="请输入一级审批状态"
+          />
         </el-form-item>
         <el-form-item label="一级审批备注" prop="people1Remark">
-          <el-input v-model="form.people1Remark" placeholder="请输入一级审批备注" />
+          <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-input
+            v-model="form.people1Authtime"
+            placeholder="请输入一级审批时间"
+          />
         </el-form-item>
+
         <el-form-item label="二级审批状态" prop="people2State">
-          <el-input v-model="form.people2State" placeholder="请输入二级审批状态" />
+          <el-input
+            v-model="form.people2State"
+            placeholder="请输入二级审批状态"
+          />
         </el-form-item>
         <el-form-item label="二级审批备注" prop="people2Remark">
-          <el-input v-model="form.people2Remark" placeholder="请输入二级审批备注" />
+          <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-input
+            v-model="form.people2Authtime"
+            placeholder="请输入二级审批时间"
+          />
         </el-form-item>
+
         <el-form-item label="三级审批状态" prop="people3State">
-          <el-input v-model="form.people3State" placeholder="请输入三级审批状态" />
+          <el-input
+            v-model="form.people3State"
+            placeholder="请输入三级审批状态"
+          />
         </el-form-item>
         <el-form-item label="三级审批备注" prop="people3Remark">
-          <el-input v-model="form.people3Remark" placeholder="请输入三级审批备注" />
+          <el-input
+            v-model="form.people3Remark"
+            placeholder="请输入三级审批备注"
+          />
         </el-form-item>
         <el-form-item label="三级审批时间" prop="people3Authtime">
-          <el-input v-model="form.people3Authtime" placeholder="请输入三级审批时间" />
+          <el-input
+            v-model="form.people3Authtime"
+            placeholder="请输入三级审批时间"
+          />
         </el-form-item>
         <el-form-item label="整体审批状态">
           <el-radio-group v-model="form.status">
@@ -500,26 +652,35 @@
           <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-input
+            v-model="form.driverContact"
+            placeholder="请输入车辆联系方式"
+          />
         </el-form-item>
         <el-form-item label="营级审批状态" prop="unitPeopleState">
-          <el-input v-model="form.unitPeopleState" placeholder="请输入营级审批状态" />
+          <el-input
+            v-model="form.unitPeopleState"
+            placeholder="请输入营级审批状态"
+          />
         </el-form-item>
         <el-form-item label="营级审批备注" prop="unitPeopleRemark">
-          <el-input v-model="form.unitPeopleRemark" placeholder="请输入营级审批备注" />
+          <el-input
+            v-model="form.unitPeopleRemark"
+            placeholder="请输入营级审批备注"
+          />
         </el-form-item>
         <el-form-item label="初审审批状态" prop="chushenState">
-          <el-input v-model="form.chushenState" placeholder="请输入初审审批状态" />
+          <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-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>
@@ -530,7 +691,14 @@
 </template>
 
 <script>
-import { listThebusApply, getThebusApply, delThebusApply, addThebusApply, updateThebusApply, exportThebusApply } from "@/api/militaryvehicleManagement/thebusApply";
+import {
+  listThebusApply,
+  getThebusApply,
+  delThebusApply,
+  addThebusApply,
+  updateThebusApply,
+  exportThebusApply,
+} from "@/api/militaryvehicleManagement/thebusApply";
 
 export default {
   name: "ThebusApply",
@@ -593,13 +761,12 @@ export default {
         unitPeopleState: null,
         unitPeopleRemark: null,
         chushenState: null,
-        chushenRemark: null
+        chushenRemark: null,
       },
       // 表单参数
       form: {},
       // 表单校验
-      rules: {
-      }
+      rules: {},
     };
   },
   created() {
@@ -609,7 +776,7 @@ export default {
     /** 查询用车申请列表 */
     getList() {
       this.loading = true;
-      listThebusApply(this.queryParams).then(response => {
+      listThebusApply(this.queryParams).then((response) => {
         this.thebusApplyList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -657,7 +824,7 @@ export default {
         unitPeopleState: null,
         unitPeopleRemark: null,
         chushenState: null,
-        chushenRemark: null
+        chushenRemark: null,
       };
       this.resetForm("form");
     },
@@ -673,9 +840,9 @@ export default {
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
-      this.multiple = !selection.length
+      this.ids = selection.map((item) => item.id);
+      this.single = selection.length !== 1;
+      this.multiple = !selection.length;
     },
     /** 新增按钮操作 */
     handleAdd() {
@@ -686,8 +853,8 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
-      const id = row.id || this.ids
-      getThebusApply(id).then(response => {
+      const id = row.id || this.ids;
+      getThebusApply(id).then((response) => {
         this.form = response.data;
         this.open = true;
         this.title = "修改用车申请";
@@ -695,16 +862,16 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate(valid => {
+      this.$refs["form"].validate((valid) => {
         if (valid) {
           if (this.form.id != null) {
-            updateThebusApply(this.form).then(response => {
+            updateThebusApply(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addThebusApply(this.form).then(response => {
+            addThebusApply(this.form).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
@@ -716,24 +883,176 @@ export default {
     /** 删除按钮操作 */
     handleDelete(row) {
       const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除用车申请编号为"' + ids + '"的数据项？').then(function() {
-        return delThebusApply(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
+      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(() => {});
-    }
-  }
+      this.$modal
+        .confirm("是否确认导出所有用车申请数据项？")
+        .then(() => {
+          this.exportLoading = true;
+          return exportThebusApply(queryParams);
+        })
+        .then((response) => {
+          this.$download.name(response.msg);
+          this.exportLoading = false;
+        })
+        .catch(() => {});
+    },
+  },
 };
 </script>
+<style scoped>
+/* 对话框背景颜色 */
+::v-deep .el-dialog {
+  background: #004d86 !important;
+  width: 800px !important;
+}
+::v-deep .el-textarea__inner {
+  width: 920px;
+  height: 104px;
+  margin: auto;
+}
+::v-deep .el-dialog__header {
+  border-bottom: 1px solid #718a9d;
+}
+::v-deep .el-dialog__title {
+  color: #fff;
+  font: 18px;
+}
+::v-deep .el-dialog__headerbtn .el-dialog__close {
+  color: #fff;
+}
+::v-deep .el-form-item__label {
+  font: 16px;
+  color: #fff;
+  width: 100px !important;
+}
+::v-deep .el-input__inner {
+  /* width: 200px !important;
+  height: 36px; */
+  background: transparent;
+  color: #fff;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+}
+/* 基本信息背景 */
+.jiben {
+  width: 920px;
+  height: 32px;
+  background-image: url(../../../images/小标题底.png);
+  margin-bottom: 25px;
+  color: #fff;
+  padding-left: 16px;
+  line-height: 32px;
+}
+/*调整表单间距 */
+::v-deep .el-form-item__content {
+  width: 200px;
+}
+::v-deep .el-input__inner {
+  cursor: pointer !important;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 30px 50px;
+}
+::v-deep .el-dialog__body {
+  margin: 10px 24px 20px 30px;
+  padding-top: 20px !important;
+  box-sizing: border-box;
+  /* padding: 30px 12px 30px 28px; */
+}
+.contents {
+  padding: 0px 40px !important;
+}
+/* 下拉菜单 */
+.el-dropdown-link {
+  cursor: pointer;
+  color: #409eff;
+}
+.el-icon-arrow-down {
+  font-size: 12px;
+}
+/* 下拉菜单字体/背景颜色 */
+.el-select-dropdown__item.hover,
+.el-select-dropdown__item:hover {
+  background-color: #004d86;
+  color: #fff;
+}
+.el-select-dropdown__item {
+  color: #fff;
+}
+/* 时间选择 */
+::v-deep .el-input--small .el-input__inner {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+.el-date-editor.el-input {
+  width: 200px;
+  height: 36px;
+  line-height: 36px;
+}
+::v-deep .el-date-editor.el-input .el-input__inner {
+  height: 36px;
+  line-height: 36px;
+}
+/* 单位框背景颜色 */
+::v-deep .vue-treeselect__control {
+  background: #004d86 !important;
+  color: #fff;
+}
+/* 单位下拉菜单选中字体颜色 */
+::v-deep .vue-treeselect__single-value {
+  color: #fff !important;
+}
+/* 分页按钮 */
+::v-deep .el-pagination.is-background .el-pager li {
+  background-color: #004d86;
+  color: #fff;
+}
+::v-deep .el-pagination.is-background .btn-next {
+  background-color: #004d86;
+  color: #fff;
+}
+/* 底部确定取消按钮 */
+::v-deep .el-dialog__footer {
+  padding: 18px 50px;
+  margin-right: 28px;
+}
+/* 增加按钮弹框 */
+::v-deep .el-dialog {
+  width: 1060px !important;
+}
+::v-deep .el-dialog__body {
+  padding: 30px 35px;
+}
+/* 小手样式 */
+::v-deep .el-table__cell {
+  cursor: pointer;
+}
+.el-button--mini {
+  width: 80px !important;
+  border: 1px solid transparent;
+  padding: 3px 8px;
+  font-size: 14px;
+  line-height: 1.5;
+  border-radius: 3px;
+  color: #fff;
+  background-color: #1890ff;
+}
+</style>
+

src/views/peopleChuRu/bdglLeave/index.vue

@@ -118,7 +118,7 @@
           <el-col v-if="scope.row.status1 == 2" :title="scope.row.reasons"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status1 == 3">特殊权限</el-col>
+          <el-col v-if="scope.row.status1 == 3">特殊审批</el-col>
         </template></el-table-column
       >
       <el-table-column
@@ -139,7 +139,7 @@
           <el-col v-if="scope.row.status2 == 2" :title="scope.row.reasons"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status2 == 3">特殊权限</el-col>
+          <el-col v-if="scope.row.status2 == 3">特殊审批</el-col>
         </template>
       </el-table-column>
       <el-table-column
@@ -160,7 +160,7 @@
           <el-col v-if="scope.row.status3 == 2" :title="scope.row.reasons"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status3 == 3">特殊权限</el-col>
+          <el-col v-if="scope.row.status3 == 3">特殊审批</el-col>
         </template>
       </el-table-column>
       <el-table-column
@@ -181,7 +181,7 @@
           <el-col v-if="scope.row.status4 == 2" :title="scope.row.reasons"
             >已驳回</el-col
           >
-          <el-col v-if="scope.row.status4 == 3">特殊权限</el-col>
+          <el-col v-if="scope.row.status4 == 3">特殊审批</el-col>
         </template>
       </el-table-column>
       <el-table-column
@@ -463,7 +463,6 @@
           />
         </el-form-item>
         <el-form-item label="请假人员" prop="peopleId">
-          <!-- <el-input v-model="form.peopleId" placeholder="请输入请假人员" /> -->
           <el-select
             v-model="form.peopleId"
             placeholder="请输入请假人员"
@@ -504,7 +503,6 @@
         </el-form-item>
         <el-form-item label="请假类型" prop="leaveType">
           <el-select v-model="form.leaveType" placeholder="请选择请假类型">
-            <!-- <el-option label="请选择字典生成" value="" /> -->
             <el-option
               v-for="item in ziDian"
               :key="item.dictCode"
@@ -612,7 +610,7 @@
           />
         </el-form-item>
         <div class="jiben">驳回原因</div>
-        <el-form-item  prop="reasons">
+        <el-form-item prop="reasons">
           <el-input
             v-model="form.reasons"
             type="textarea"
@@ -620,7 +618,7 @@
           />
         </el-form-item>
         <div class="jiben">特殊审批原因</div>
-        <el-form-item  prop="specialApproval">
+        <el-form-item prop="specialApproval">
           <el-input
             v-model="form.specialApproval"
             type="textarea"
@@ -628,9 +626,9 @@
           />
         </el-form-item>
       </el-form>
-      <div   class="dialog-footer" slot="footer">
-        <el-button type="primary" @click="CJsubmitForms">通过</el-button>
-        <el-button @click="CJboHui">驳回</el-button>
+      <div class="dialog-footer" slot="footer">
+        <el-button type="primary" @click="TSsubmitForms">通过</el-button>
+        <el-button @click="TSboHui">驳回</el-button>
       </div>
     </el-dialog>
   </div>
@@ -736,8 +734,8 @@ export default {
         ],
       },
       // 特殊审批表单验证
-      rulesform:{
-           reasons: [
+      rulesform: {
+        reasons: [
           { required: true, message: "请填写驳回原因", trigger: "blur" },
         ],
         specialApproval: [
@@ -933,54 +931,65 @@ export default {
         }
       });
     },
-   //超级审批通过按钮
-    CJsubmitForms() {
+    //超级审批通过按钮
+    TSsubmitForms() {
       this.bdglLeaveList.forEach((item) => {
         if (item.shenPiJiBie == "一级") {
-          this.form.status1 = 1;
+          this.form.status1 = 3;
+          this.form.common = "1";
           this.form.contents = "一级审批通过";
         } else if (item.shenPiJiBie == "二级") {
-          this.form.status2 = 1;
+          this.form.status2 = 3;
+          this.form.common = "2";
           this.form.contents = "二级审批通过";
         } else if (item.shenPiJiBie == "三级") {
-          this.form.status3 = 1;
+          this.form.status3 = 3;
+          this.form.common = "3";
           this.form.contents = "三级审批通过";
         } else if (item.shenPiJiBie == "四级") {
-          this.form.status4 = 1;
+          this.form.status4 = 3;
+          this.form.common = "4";
           this.form.contents = "四级审批通过";
         }
       });
-      updateBdglLeave(this.form).then((response) => {
-        this.$modal.msgSuccess("审批成功");
-        this.open = false;
-        this.getList();
-      });
+      if (this.form.id != null) {
+        updateBdglLeave(this.form).then((response) => {
+          this.$modal.msgSuccess("审批成功");
+          this.opens = false;
+          this.getList();
+        });
+      }
     },
     // 超级审批驳回按钮
-    CJboHui() {
+    TSboHui() {
       this.$refs["forms"].validate((valid) => {
         if (valid) {
           this.bdglLeaveList.forEach((item) => {
             if (item.shenPiJiBie == "一级") {
               this.form.status1 = 2;
+              this.form.common = "1";
               return (this.form.contents = "一级审批驳回");
             } else if (item.shenPiJiBie == "二级") {
               this.form.status2 = 2;
+              this.form.common = "2";
               return (this.form.contents = "二级审批驳回");
             } else if (item.shenPiJiBie == "三级") {
               this.form.status3 = 2;
+              this.form.common = "3";
               return (this.form.contents = "三级审批驳回");
             } else if (item.shenPiJiBie == "四级") {
               this.form.status4 = 2;
+              this.form.common = "4";
               return (this.form.contents = "四级审批驳回");
             }
           });
-          console.log(this.form);
-          updateBdglLeave(this.form).then((response) => {
-            this.$modal.msgSuccess("审批成功");
-            this.open = false;
-            this.getList();
-          });
+          if (this.form.id != null) {
+            updateBdglLeave(this.form).then((response) => {
+              this.$modal.msgSuccess("审批成功");
+              this.opens = false;
+              this.getList();
+            });
+          }
         }
       });
     },

src/views/pt.vue

@@ -345,13 +345,8 @@ export default {
     },
     junchefun() {
       this.$router
-        .push({
-          path: "/index",
-          query: { name: "/militaryvehicleManagement" },
-        })
-        .catch(() => {});
-      // .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
-      // .catch(() => {});
+      .push({ path: "/index", query: { name: "/militaryvehicleManagement" } })
+      .catch(() => {});
     },
     gongzuofun() {
       this.$router