完成了车辆管理审批

src/api/militaryvehicleManagement/thebusConfig.js

@@ -50,4 +50,13 @@ export function exportThebusConfig(query) {
     method: 'get',
     params: query
   })
-}
+}
+
+// 获取所有用户
+// 查询军车管理设置详细
+export function getThebusUser(id) {
+  return request({
+    url: 'system/user/list',
+    method: 'get'
+  })
+}

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -369,7 +369,7 @@
       </el-col>
       <!-- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> -->
     </el-row>
-
+    <!-- 列表选项 -->
     <el-table
       v-loading="loading"
       :data="thebusApplyList"
@@ -383,7 +383,11 @@
       <el-table-column label="人员名称" align="center" prop="peopleId" />
       <el-table-column label="联系方式" align="center" prop="contact" />
       <el-table-column label="外出事由" align="center" prop="cause" />
-      <el-table-column label="营级审批人" align="center" prop="unitPeopleId" />
+      <el-table-column
+        label="营级审批人"
+        align="center"
+        prop="unitPeopleName"
+      />
       <el-table-column
         label="营级审批状态"
         align="center"
@@ -413,93 +417,42 @@
         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="driver" />
-      <el-table-column
-        label="车辆联系方式"
-        align="center"
-        prop="driverContact"
-      />
-      <el-table-column label="人数" align="center" prop="peopleCount" />
-
-      <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"
+        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:thebusApply:edit']"
             >修改</el-button
           >
           <el-button
-            size="mini"
+            size="btc"
             type="text"
-            icon="el-icon-delete"
             @click="handleDelete(scope.row)"
             v-hasPermi="['militaryvehicleManagement:thebusApply:remove']"
             >删除</el-button
           >
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleShenPi(scope.row)"
+            v-if="scope.row.isCaoZuo !== '1'"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+            >审批</el-button
+          >
+          <el-button
+            size="btc"
+            type="text"
+            @click="handleTeShuShenPi(scope.row)"
+            v-hasPermi="['militaryvehicleManagement:thebusApply:edit']"
+            >特殊审批</el-button
+          >
         </template>
       </el-table-column>
     </el-table>
@@ -577,27 +530,63 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item label="营级审批人" prop="unitPeopleId">
-          <el-input
+          <!-- <el-input
             v-model="form.unitPeopleId"
             placeholder="请输入营级审批人"
-          />
+          /> -->
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
-        <el-form-item label="审批模板" prop="model">
-          <el-input v-model="form.model" placeholder="请输入审批模板" />
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="一级审批人" prop="people1Id">
-          <el-input v-model="form.people1Id" placeholder="请输入一级审批人" />
+          <el-input
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
+          />
         </el-form-item>
         <el-form-item label="二级审批人" prop="people2Id">
-          <el-input v-model="form.people2Id" placeholder="请输入二级审批人" />
+          <el-input
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
+          />
         </el-form-item>
         <el-form-item label="三级审批人" prop="people3Id">
-          <el-input v-model="form.people3Id" placeholder="请输入三级审批人" />
+          <el-input
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
+          />
         </el-form-item>
         <div class="jiben">出车路线</div>
-        <el-form-item prop="remarks">
+        <el-form-item prop="route">
           <el-input
-            v-model="form.remarks"
+            v-model="form.route"
             type="textarea"
             placeholder="请输入出车路线"
           />
@@ -608,6 +597,286 @@
         <el-button @click="cancel">取 消</el-button>
       </div>
     </el-dialog>
+
+    <!-- 审批对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opens"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="forms"
+        :model="form"
+        :rules="formRules"
+        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="peopleCount">
+          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+        </el-form-item>
+        <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.name)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="外出事由" prop="cause">
+          <el-input v-model="form.cause" placeholder="请输入外出事由" />
+        </el-form-item>
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="营级审批人" prop="unitPeopleId">
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
+          <el-input
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
+          />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="people2Id">
+          <el-input
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
+          />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="people3Id">
+          <el-input
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
+          />
+        </el-form-item>
+        <div class="jiben">出车路线</div>
+        <el-form-item prop="route">
+          <el-input
+            v-model="form.route"
+            type="textarea"
+            placeholder="请输入出车路线"
+          />
+        </el-form-item>
+        <div class="jiben">不通过原因</div>
+        <el-form-item prop="routes">
+          <el-input v-model="form.routes" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormShenPi">通过</el-button>
+        <el-button @click="cancelShenPi">不通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 特殊审批对话框 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opensTe"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="formsTe"
+        :model="form"
+        :rules="formRulesTe"
+        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="peopleCount">
+          <el-input v-model="form.peopleCount" placeholder="请输入人数" />
+        </el-form-item>
+        <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.name)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="联系方式" prop="contact">
+          <el-input v-model="form.contact" placeholder="请输入联系方式" />
+        </el-form-item>
+        <el-form-item label="外出事由" prop="cause">
+          <el-input v-model="form.cause" placeholder="请输入外出事由" />
+        </el-form-item>
+        <el-form-item label="授权开始时间" prop="authStime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authStime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权开始时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="授权结束时间" prop="authEtime">
+          <el-date-picker
+            clearable
+            size="small"
+            v-model="form.authEtime"
+            type="date"
+            value-format="yyyy-MM-dd"
+            placeholder="授权结束时间"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="营级审批人" prop="unitPeopleId">
+          <el-select
+            v-model="form.unitPeopleId"
+            placeholder="请选择营级审批人"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in userRen"
+              :key="i"
+              :label="item.nickName"
+              :value="item.userId"
+              @click.native="yinJi(item.nickName)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="审批模板" prop="thebusThemplateId">
+          <el-select
+            v-model="form.thebusThemplateId"
+            placeholder="请选择审批模板"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in shenPi"
+              :key="i"
+              :label="item.shenpiname"
+              :value="item.id"
+              @click.native="shenPiThemplate(item)"
+            >
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="一级审批人" prop="people1Id">
+          <el-input
+            v-model="form.peopleoneName"
+            placeholder="请输入一级审批人"
+          />
+        </el-form-item>
+        <el-form-item label="二级审批人" prop="people2Id">
+          <el-input
+            v-model="form.peopletwoName"
+            placeholder="请输入二级审批人"
+          />
+        </el-form-item>
+        <el-form-item label="三级审批人" prop="people3Id">
+          <el-input
+            v-model="form.peoplethreeName"
+            placeholder="请输入三级审批人"
+          />
+        </el-form-item>
+        <div class="jiben">出车路线</div>
+        <el-form-item prop="route">
+          <el-input
+            v-model="form.route"
+            type="textarea"
+            placeholder="请输入出车路线"
+          />
+        </el-form-item>
+        <div class="jiben">特殊审批原因</div>
+        <el-form-item prop="teShuYuanYing">
+          <el-input v-model="form.teShuYuanYing" type="textarea" />
+        </el-form-item>
+        <div class="jiben">不通过原因</div>
+        <el-form-item prop="routes">
+          <el-input v-model="form.routes" type="textarea" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitFormTeShenPi">通过</el-button>
+        <el-button @click="cancelTeShenPi">不通过</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -625,6 +894,11 @@ import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getZhuChiRen, getDept } from "@/api/militaryvehicleManagement/thebus";
 
+import {
+  listThebusConfig,
+  getThebusUser,
+} from "@/api/militaryvehicleManagement/thebusConfig";
+
 export default {
   name: "ThebusApply",
   components: {
@@ -699,13 +973,102 @@ export default {
       treeList: [],
       // 人员列表
       renYuan: [],
+      // 获取营级审批人
+      userRen: [],
+      // 审批模板
+      shenPi: [],
+      // 审批是否显示弹出层
+      opens: false,
+      // 审批表单校验
+      formRules: {
+        routes: [
+          { required: true, message: "请输入不通过原因", trigger: "blur" },
+        ],
+      },
+      // 特殊审批是否显示弹出层
+      opensTe: false,
+      // 特殊审批表单校验·
+      formRulesTe: {
+        routes: [
+          { required: true, message: "请输入不通过原因", trigger: "blur" },
+        ],
+        teShuYuanYing: [
+          { required: true, message: "请输特级审批原因", trigger: "blur" },
+        ],
+      },
     };
   },
   created() {
     this.getList();
   },
   methods: {
-    // 选择车辆人员触发
+    // 特殊审批通过
+    submitFormTeShenPi() {
+      this.$refs["formsTe"].validateField("teShuYuanYing", (valid) => {
+        if (!valid) {
+          console.log("通过");
+        }
+      });
+    },
+    // 特殊审批不通过
+    cancelTeShenPi() {
+      this.$refs["formsTe"].validate((valid) => {
+        if (valid) {
+          alert("通过");
+          this.opensTe = true;
+        }
+      });
+    },
+    // 特殊审批按钮
+    handleTeShuShenPi() {
+      this.reset();
+      this.opensTe = true;
+    },
+    // 审批通过
+    submitFormShenPi() {
+      alert("通过");
+      this.opens = false;
+    },
+    // 审批不通过
+    cancelShenPi() {
+      this.$refs["forms"].validate((valid) => {
+        if (valid) {
+          console.log("不通过");
+          this.opens = false;
+        }
+      });
+    },
+    // 审批按钮
+    handleShenPi() {
+      this.opens = true;
+    },
+    // 选择营级人员触发
+    yinJi(name) {
+      this.form.unitPeopleName = name;
+    },
+    // 选择审批模板触发
+    shenPiThemplate(data) {
+      console.log(data);
+      this.form.peopleoneName = data.oneshenpirenname;
+      this.form.peopletwoName = data.twoshenpirenname;
+      this.form.peoplethreeName = data.threeshenpirenname;
+      this.form.peopleoneId = data.onshenpirenid;
+      this.form.peopletwoId = data.twoshenpirenid;
+      this.form.peoplethreeId = data.threeshenpirenid;
+    },
+    // 获取审批模板列表
+    getShenPi() {
+      listThebusConfig().then((response) => {
+        this.shenPi = response.rows;
+      });
+    },
+    // 获取营级审批
+    getYingJi() {
+      getThebusUser().then((res) => {
+        this.userRen = res.rows;
+      });
+    },
+    // 选择人员触发
     cheRen(name) {
       this.form.driverName = name;
     },
@@ -800,6 +1163,8 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getYingJi();
+      this.getShenPi();
       this.getTreeList();
       this.open = true;
       this.title = "添加用车申请";

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -89,10 +89,22 @@
     >
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="id" />
-      <el-table-column label="审批模板名称" align="center" prop="peopleType" />
-      <el-table-column label="一级审批人" align="center" prop="authAutoOpen" />
-      <el-table-column label="二级审批人" align="center" prop="carAutoBack" />
-      <el-table-column label="三级审批人" align="center" prop="noauthOpen" />
+      <el-table-column label="审批模板名称" align="center" prop="shenpiname" />
+      <el-table-column
+        label="一级审批人"
+        align="center"
+        prop="oneshenpirenname"
+      />
+      <el-table-column
+        label="二级审批人"
+        align="center"
+        prop="twoshenpirenname"
+      />
+      <el-table-column
+        label="三级审批人"
+        align="center"
+        prop="threeshenpirenname"
+      />
       <el-table-column
         label="操作"
         align="center"
@@ -127,7 +139,7 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改军车管理设置对话框 -->
+    <!-- 添加军车管理设置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form
         ref="form"
@@ -136,64 +148,150 @@
         label-width="80px"
         inline
       >
-        <el-form-item label="" prop="">
-          <el-input
-            v-model="form.shenpiname"
-            placeholder="审批模板名称"
-          ></el-input>
-        </el-form-item>
         <div class="box3">
           <el-form v-for="(item1, e) in checkShop" :key="e">
-            <el-form-item label="" prop="">
-              <el-input
-                v-model="item1.oneshenpirenid"
-                placeholder="一级审批人"
-              ></el-input>
-            </el-form-item>
-            <el-form-item>
-              <el-button
-                type="primary"
-                icon="el-icon-plus"
-                size="btc"
-                @click="addForms"
-                v-if="e == checkShop.length - 1"
-              ></el-button>
-              <el-button
-                type="primary"
-                icon="el-icon-delete"
-                size="btd"
-                v-if="e > 0"
-                @click="delForms(e)"
-              ></el-button>
-            </el-form-item>
+            <div>
+              <el-form-item label="" prop="" class="box4">
+                <el-input
+                  v-model="item1.shenpiname"
+                  placeholder="审批模板名称"
+                ></el-input>
+              </el-form-item>
+              <el-form-item label="" prop="onshenpirenid">
+                <el-select
+                  v-model="item1.onshenpirenid"
+                  placeholder="请选择一级审批人"
+                  filterable
+                >
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="twoshenpirenid">
+                <el-select
+                  v-model="item1.twoshenpirenid"
+                  placeholder="请选择二级审批人"
+                  filterable
+                >
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="" prop="threeshenpirenid">
+                <el-select
+                  v-model="item1.threeshenpirenid"
+                  placeholder="请选择三级审批人"
+                  filterable
+                >
+                  <el-option
+                    v-for="(item, i) in userRen"
+                    :key="i"
+                    :label="item.nickName"
+                    :value="item.userId"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item>
+                <el-button
+                  type="primary"
+                  icon="el-icon-plus"
+                  size="btc"
+                  @click="addForms"
+                  v-if="e == checkShop.length - 1"
+                ></el-button>
+                <el-button
+                  type="primary"
+                  icon="el-icon-delete"
+                  size="btd"
+                  v-if="e > 0"
+                  @click="delForms(e)"
+                ></el-button>
+              </el-form-item>
+            </div>
           </el-form>
-          <el-form-item label="" prop="">
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+    <!-- 修改军车管理设置 -->
+    <el-dialog
+      :title="title"
+      :visible.sync="opens"
+      width="500px"
+      append-to-body
+    >
+      <el-form
+        ref="form"
+        :model="form"
+        :rules="rules"
+        label-width="80px"
+        inline
+      >
+        <div>
+          <el-form-item label="" prop="" class="box4">
             <el-input
-              v-model="twoshenpirenid"
-              placeholder="二级审批人"
+              v-model="form.shenpiname"
+              placeholder="审批模板名称"
             ></el-input>
           </el-form-item>
-          <el-form-item label="" prop="">
-            <el-input
-              v-model="threeshenpirenid"
-              placeholder="三级审批人"
-            ></el-input>
+          <el-form-item label="" prop="onshenpirenid">
+            <el-select
+              v-model="form.onshenpirenid"
+              placeholder="请选择一级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="" prop="twoshenpirenid">
+            <el-select
+              v-model="form.twoshenpirenid"
+              placeholder="请选择二级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
-          <el-form-item>
-            <el-button
-              type="primary"
-              icon="el-icon-plus"
-              size="btc"
-              @click="addForms"
-              v-if="e == checkShop.length - 1"
-            ></el-button>
-            <el-button
-              type="primary"
-              icon="el-icon-delete"
-              size="btd"
-              v-if="e > 0"
-              @click="delForms(e)"
-            ></el-button>
+          <el-form-item label="" prop="threeshenpirenid">
+            <el-select
+              v-model="form.threeshenpirenid"
+              placeholder="请选择三级审批人"
+              filterable
+            >
+              <el-option
+                v-for="(item, i) in userRen"
+                :key="i"
+                :label="item.nickName"
+                :value="item.userId"
+              >
+              </el-option>
+            </el-select>
           </el-form-item>
         </div>
       </el-form>
@@ -214,6 +312,7 @@ import {
   updateThebusConfig,
   exportThebusConfig,
 } from "@/api/militaryvehicleManagement/thebusConfig";
+import { getThebusUser } from "@/api/militaryvehicleManagement/thebusConfig";
 
 export default {
   name: "ThebusConfig",
@@ -260,17 +359,28 @@ export default {
       checkShop: [
         {
           shenpiname: null,
-          oneshenpirenid: null,
+          onshenpirenid: null,
           twoshenpirenid: null,
           threeshenpirenid: null,
         },
       ],
+      // 获取审批人
+      userRen: [],
+      // 修改弹出框
+      opens: false,
     };
   },
   created() {
     this.getList();
   },
   methods: {
+    // 获取所有用户审批人
+    getUserRen() {
+      getThebusUser().then((response) => {
+        this.userRen = response.rows;
+        console.log(this.userRen);
+      });
+    },
     // 删除对话框查铺
     delForms(i) {
       this.checkShop.splice(i, 1);
@@ -280,7 +390,7 @@ export default {
     addForms() {
       this.checkShop.push({
         shenpiname: null,
-        oneshenpirenid: null,
+        onshenpirenid: null,
         twoshenpirenid: null,
         threeshenpirenid: null,
       });
@@ -312,7 +422,15 @@ export default {
         defaultUnitId: null,
         defaultPeopleId: null,
       };
-      this.resetForm("form");
+      (this.checkShop = [
+        {
+          shenpiname: null,
+          onshenpirenid: null,
+          twoshenpirenid: null,
+          threeshenpirenid: null,
+        },
+      ]),
+        this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -333,16 +451,19 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getUserRen();
       this.open = true;
       this.title = "添加军车管理设置";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getUserRen();
       const id = row.id || this.ids;
       getThebusConfig(id).then((response) => {
         this.form = response.data;
-        this.open = true;
+        console.log(this.form, 1);
+        this.opens = true;
         this.title = "修改军车管理设置";
       });
     },
@@ -353,11 +474,11 @@ export default {
           if (this.form.id != null) {
             updateThebusConfig(this.form).then((response) => {
               this.$modal.msgSuccess("修改成功");
-              this.open = false;
+              this.opens = false;
               this.getList();
             });
           } else {
-            addThebusConfig(this.form).then((response) => {
+            addThebusConfig(this.checkShop).then((response) => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();