更改表格样式，更改清空选择，

src/api/grassrootsregistration/bdglmeeting.js

@@ -77,7 +77,7 @@ export function getZhuChiRen(data) {
   })
 }
 // 查询所在单位首长(用户，不包含自己)
-export function getUser(data) {
+export function getUsers(data) {
   return request({
     url: '/grassrootsregistration/common/getUsers',
     method: 'get',
@@ -85,7 +85,7 @@ export function getUser(data) {
   })
 }
 // 查询所有人员首长(用户)
-export function getUsers(data) {
+export function getUser(data) {
   return request({
     url: '/grassrootsregistration/common/getUser',
     method: 'get',
@@ -153,7 +153,6 @@ export function getQuanBu(data, reign) {
   })
 }
 
-
 // 获取人员名册
 export function getRenYuan() {
   return request({
@@ -173,7 +172,6 @@ export function getBuMen() {
 }
 
 // 获取外面部门数据
-
 export function getShouBu(query) {
   return request({
     url: '/system/dept/list',
@@ -184,7 +182,7 @@ export function getShouBu(query) {
 // 获取所有人员列表
 export function getAll(query) {
   return request({
-    url: '/peopleManage/people/list',
+    url: '/grassrootsregistration/common/list',
     method: 'get',
   })
 }

src/api/militaryvehicleManagement/privateCar.js

@@ -54,7 +54,7 @@ export function exportPrivateCar(query) {
 // 查询所有人员
 export function getRenYuanCar() {
   return request({
-    url: '/peopleManage/people/list',
+    url: '/grassrootsregistration/common/list',
     method: 'get',
   })
 }

src/assets/styles/global.css

@@ -85,7 +85,7 @@
 /* 设置表格颜色 */
 .el-table tr {
   background: #00365F;
-  color: white;
+  /* color: white; */
 }
 
 .pagination-container {

src/layout/components/Navbar.vue

@@ -1,17 +1,9 @@
 <template>
   <div class="navbar">
-    <hamburger
-      id="hamburger-container"
-      :is-active="sidebar.opened"
-      class="hamburger-container"
-      @toggleClick="toggleSideBar"
-    />
+    <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+      @toggleClick="toggleSideBar" />
 
-    <breadcrumb
-      id="breadcrumb-container"
-      class="breadcrumb-container"
-      v-if="!topNav"
-    />
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
     <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
 
     <div class="right-menu">
@@ -21,7 +13,7 @@
         <router-link to="/user/profile">
           <span style="color: #00f6ff">用户名 :</span>
           <span style="padding-left: 4px; color: #00f6ff; margin-right: 15px">{{
-            yongHu
+          yongHu
           }}</span>
           <!-- <el-dropdown-item>个人中心</el-dropdown-item> -->
         </router-link>
@@ -128,7 +120,7 @@ export default {
             location.href = "/index";
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     },
     getUser() {
       getUserProfile().then((response) => {
@@ -228,14 +220,17 @@ export default {
     }
   }
 }
+
 .yong_hu {
   display: inline-block;
   vertical-align: top;
   font-size: 15px;
 }
+
 .span {
   margin-right: 21px;
 }
+
 /* 退出登录 btl */
 .el-button--btl.is-active,
 .el-button--btl:active {
@@ -272,6 +267,7 @@ export default {
   vertical-align: text-bottom;
   margin-right: 20px;
 }
+
 .iconfont {
   color: #fff;
   font-size: 27px;

src/views/grassrootsregistration/bdglarmament/index.vue

@@ -273,9 +273,9 @@
         <el-form-item label="缺陷配套" prop="flaw">
           <el-input v-model="form.flaw" placeholder="请输入缺陷配套" />
         </el-form-item>
-        <el-form-item label="登记人" prop="peopleId">
+        <el-form-item label="登记人" prop="peopleId" >
           <!-- <el-input v-model="form.peopleId" placeholder="请输入登记人" /> -->
-          <el-select v-model="form.peopleId" placeholder="请选择人员">
+          <el-select v-model="form.peopleId" placeholder="请选择人员"  clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -288,7 +288,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="核对人" prop="peopleId1">
-          <el-select v-model="form.peopleId1" placeholder="请选择人员">
+          <el-select v-model="form.peopleId1" placeholder="请选择人员"  clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"

src/views/grassrootsregistration/bdglcookbook/index.vue

@@ -231,7 +231,7 @@
           </el-form-item>
           <el-form-item label="司务长" prop="messOfficer">
             <!-- <el-input v-model="form.messOfficer" placeholder="请输入司务长" /> -->
-            <el-select v-model="form.messOfficer" placeholder="请选择单位">
+            <el-select v-model="form.messOfficer" placeholder="请选择单位"   clearable>
               <el-option
                 v-for="item in renYuan"
                 :key="item.id"
@@ -245,7 +245,7 @@
           </el-form-item>
           <el-form-item label="班长" prop="peopleId">
             <!-- <el-input v-model="form.peopleId" placeholder="请输入班长" /> -->
-            <el-select v-model="form.peopleId" placeholder="请选择单位">
+            <el-select v-model="form.peopleId" placeholder="请选择单位"   clearable>
               <el-option
                 v-for="item in renYuan"
                 :key="item.id"

src/views/grassrootsregistration/bdglequip/index.vue

@@ -265,7 +265,7 @@
           ></el-input-number>
         </el-form-item>
         <el-form-item label="入库经手人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择入库经手人">
+          <el-select v-model="form.peopleId" placeholder="请选择入库经手人"  clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -299,7 +299,7 @@
           ></el-input-number>
         </el-form-item>
         <el-form-item label="出库经手人" prop="peopleId1">
-          <el-select v-model="form.peopleId1" placeholder="请选择出库经手人">
+          <el-select v-model="form.peopleId1" placeholder="请选择出库经手人"  clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"

src/views/grassrootsregistration/bdglfilemanagement/index.vue

@@ -225,6 +225,7 @@
             ref="aa"
             v-model="form.peopleId"
             placeholder="请选择签收人"
+            clearable
           >
             <el-option
               v-for="item in renYuan"
@@ -238,7 +239,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="借阅人" prop="borrowId">
-          <el-select v-model="form.borrowId" placeholder="请选择借阅人">
+          <el-select v-model="form.borrowId" placeholder="请选择借阅人"             clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"
@@ -276,7 +277,7 @@
         </el-form-item>
         <el-form-item label="注销人" prop="logoutId">
           <!-- <el-input v-model="form.logoutId" placeholder="请输入注销人" /> -->
-          <el-select v-model="form.logoutId" placeholder="请选择注销人">
+          <el-select v-model="form.logoutId" placeholder="请选择注销人"  clearable>
             <el-option
               v-for="item in renYuan"
               :key="item.id"

src/views/grassrootsregistration/bdglfood/index.vue

@@ -1528,7 +1528,7 @@ export default {
         updatetime: null,
       };
       // 一日三餐
-      (this.meal = {
+      this.meal = {
         stapleFood: null,
         menu: null,
         type1: 1,
@@ -1546,9 +1546,9 @@ export default {
         tang: null,
         ranliao: null,
         tiaoliao: null,
-      }),
+      };
         // 中
-        (this.zhongCan = {
+        this.zhongCan = {
           stapleFood: null,
           menu: null,
           type1: 2,
@@ -1566,9 +1566,9 @@ export default {
           tang: null,
           ranliao: null,
           tiaoliao: null,
-        }),
+        };
         // 晚
-        (this.wanCan = {
+        this.wanCan = {
           stapleFood: null,
           menu: null,
           type1: 3,
@@ -1586,8 +1586,8 @@ export default {
           tang: null,
           ranliao: null,
           tiaoliao: null,
-        }),
-        (this.acceptance = [
+        };
+        this.acceptance = [
           {
             distinctions: null,
             name: null,
@@ -1596,9 +1596,9 @@ export default {
             types: null,
             time: null,
           },
-        ]),
+        ];
         // 交退伙食费
-        (this.expenses = [
+        this.expenses = [
           {
             peopleId: null,
             type: null,
@@ -1606,9 +1606,9 @@ export default {
             standard: null,
             money: null,
           },
-        ]),
+        ];
         // 在食堂购物
-        (this.canteen = [
+        this.canteen = [
           {
             peopleId: null,
             zName: null,
@@ -1622,8 +1622,8 @@ export default {
             qWeight: null,
             qMoney: null,
           },
-        ]),
-        (this.caiGou = [
+        ];
+        this.caiGou = [
           {
             distinction: null,
             time: null,
@@ -1632,7 +1632,7 @@ export default {
             price: null,
             consumption: null,
           },
-        ]),
+        ];
         this.resetForm("form");
     },
     /** 搜索按钮操作 */

src/views/grassrootsregistration/bdglpublicproperty/index.vue

@@ -238,7 +238,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="保管人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请选择保管人">
+          <el-select v-model="form.peopleId" placeholder="请选择保管人"   clearable>
             <el-option
               v-for="item in roleOptions"
               :key="item.id"

src/views/militaryvehicleManagement/driver/index.vue

@@ -187,6 +187,7 @@
         align="center"
         class-name="small-padding fixed-width"
         width="150"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -243,6 +244,7 @@
             v-model="form.peopleId"
             placeholder="请输入人员姓名"
             filterable
+            clearable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -295,7 +297,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="军衔" prop="rankId">
-          <el-select v-model="form.rankId" placeholder="请输入军衔" filterable>
+          <el-select v-model="form.rankId" placeholder="请输入军衔" filterable clearable>
             <el-option
               v-for="(item, i) in rank"
               :key="i"
@@ -318,6 +320,7 @@
             v-model="form.drivingModel"
             placeholder="请选择准驾车型"
             filterable
+            clearable
           >
             <el-option
               v-for="(item, i) in quasiDrivingList"
@@ -371,6 +374,7 @@
             v-model="form.vocationalSkills"
             placeholder="请输入职业技能"
             filterable
+            clearable
           >
             <el-option
               v-for="(item, i) in vocational"

src/views/militaryvehicleManagement/privateAccessLog/index.vue

@@ -715,4 +715,7 @@ export default {
 .box {
   background-color: #ffba00 !important;
 }
+
+
+
 </style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -200,6 +200,7 @@
           <el-select
             v-model="form.vehiclecategory"
             placeholder="请输入车辆型号"
+            clearable
           >
             <el-option
               v-for="(item, i) in privateCar"
@@ -216,6 +217,7 @@
             v-model="form.peopleId"
             placeholder="请输入车辆所有人"
             filterable
+            clearable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -241,7 +243,7 @@
           <el-input v-model="form.contactnumber" placeholder="请输入联系方式" />
         </el-form-item>
         <el-form-item label="证件类型" prop="documenttype">
-          <el-select v-model="form.documenttype" placeholder="请选择证件类型">
+          <el-select v-model="form.documenttype" placeholder="请选择证件类型"  clearable>
             <el-option
               v-for="(item, i) in documentType"
               :key="i"
@@ -388,7 +390,7 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.renYuans = res.rows;
+        this.renYuans = res.data;
       });
     },
     // 证件类型翻译
@@ -418,7 +420,7 @@ export default {
     // 人员列表
     getRen() {
       getRenYuanCar().then((response) => {
-        this.renYuan = response.rows;
+        this.renYuan = response.data;
       });
     },
     /** 查询私家车管理列表 */

src/views/militaryvehicleManagement/thebus/index.vue

@@ -4,6 +4,9 @@
       <el-form-item prop="unitName">
         <el-input v-model="queryParams.unitName" placeholder="请输入所属单位" clearable size="small" @input="handleQuery" />
       </el-form-item>
+      <el-form-item prop="vehiclenumber">
+        <el-input v-model="queryParams.vehiclenumber" placeholder="请输入车牌号" clearable size="small" @input="handleQuery" />
+      </el-form-item>
       <el-form-item>
         <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>

src/views/militaryvehicleManagement/thebusAccessLog/index.vue

@@ -659,4 +659,10 @@ export default {
 .box {
   background-color: #ffba00 !important;
 }
+::v-deep .el-table__body{
+  width: 1460px !important;
+}
+::v-deep .el-table__header{
+  width: 1460px !important;
+}
 </style>

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -15,22 +15,6 @@
           size="small"
           @input="handleQuery"
         />
-        <!-- <el-select
-          v-model="queryParams.peopleId"
-          placeholder="请选择用车人姓名"
-          @change="handleQuery"
-          filterable
-          class="input_xiala"
-        >
-          <el-option
-            v-for="item in renYuans"
-            :key="item.id"
-            :label="item.name"
-            :value="item.id"
-            class="input_xiala"
-          >
-          </el-option>
-        </el-select> -->
       </el-form-item>
       <el-form-item>
         <!-- <el-button
@@ -542,6 +526,7 @@
             placeholder="请选择人员名称"
             filterable
             :disabled="dislable"
+            clearable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -706,12 +691,13 @@
             :disabled="dislable"
           />
         </el-form-item>
-        <el-form-item label="人员名称" prop="peopleId">
+        <el-form-item label="人员名称" prop="peopleId" >
           <el-select
             v-model="form.peopleId"
             placeholder="请选择人员名称"
             filterable
             :disabled="dislable"
+            clearable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -877,6 +863,7 @@
             placeholder="请选择人员名称"
             filterable
             :disabled="dislable"
+            clearable
           >
             <el-option
               v-for="(item, i) in renYuan"
@@ -1142,8 +1129,6 @@ export default {
       // 用车审批状态
       carApprova: [],
       teJi: true,
-      // 外面的人员
-      renYuans: [],
       // 禁止输入
       dislable: false,
       // 批量审批数组
@@ -1159,7 +1144,8 @@ export default {
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
-        this.renYuan = res.rows;
+        // console.log(res);
+        this.renYuan = res.data;
       });
     },
     // 特殊审批通过
@@ -1442,7 +1428,8 @@ export default {
     // 选择部门单位触发
     selectPeo(data) {
       this.form.unitName = data.label;
-      this.getSuozaiRen(data.id);
+      this.form.peopleId="";
+      this.getRen(data.id);
     },
     getSuozaiRen(id) {
       getUser(id).then((res) => {

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -120,6 +120,7 @@
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
+        width="200"
       >
         <template slot-scope="scope">
           <el-button
@@ -794,4 +795,11 @@ export default {
   color: #fff;
   background-color: #ff4949;
 }
+
+::v-deep .el-table__body{
+  width: 1460px !important;
+}
+::v-deep .el-table__header{
+  width: 1460px !important;
+}
 </style>