更改主页图标，更改军车管理

src/api/militaryvehicleManagement/thebus.js

@@ -68,4 +68,12 @@ export function getZhuChiRen(data) {
     method: 'get',
     params: { deptId: data }
   })
+}
+// 查询军车司机设置列表
+export function getRen(data) {
+  return request({
+    url: '/militaryvehicleManagement/driver/list',
+    method: 'get',
+    params: { unitId: data }
+  })
 }

src/views/militaryvehicleManagement/driver/index.vue

@@ -102,7 +102,12 @@
           }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="150px"
+      />
       <el-table-column label="姓名" align="center" prop="peopleName" />
       <el-table-column
         label="性别"

src/views/militaryvehicleManagement/thebus/index.vue

@@ -287,7 +287,12 @@
         prop="peopleNames"
         width="120"
       />
-      <el-table-column label="所属单位" align="center" prop="unitName" />
+      <el-table-column
+        label="所属单位"
+        align="center"
+        prop="unitName"
+        width="150px"
+      />
       <el-table-column
         label="联系方式"
         align="center"
@@ -411,8 +416,8 @@
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"
-              :label="item.name"
-              :value="item.id"
+              :label="item.peopleName"
+              :value="item.peopleId"
               @click.native="cheRen(item)"
               class="input_xiala"
             >
@@ -541,8 +546,9 @@ import {
   updateThebus,
   exportThebus,
   getDept,
-  getZhuChiRen,
+  getRen,
 } from "@/api/militaryvehicleManagement/thebus";
+
 // 导入树形结构
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
@@ -677,8 +683,9 @@ export default {
     },
     // 选择车辆人员触发
     cheRen(item) {
-      this.form.contactnumber = item.phone;
-      this.form.peopleNames = item.name;
+      console.log(item);
+      this.form.contactnumber = item.contact;
+      this.form.peopleNames = item.peopleName;
     },
     // 选择部门单位触发
     selectPeo(data) {
@@ -688,8 +695,8 @@ export default {
     },
     // 获取人员列表
     getRen(id) {
-      getZhuChiRen(id).then((res) => {
-        this.renYuan = res.data;
+      getRen(id).then((res) => {
+        this.renYuan = res.rows;
       });
     },
     //  获取单位列表

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -186,20 +186,39 @@
       />
       <el-table-column label="一级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peopleoneState == 1" style="color: #ffba00"
+          <el-col
+            v-if="scope.row.peopleoneId == (null || '' || undefined)"
+          ></el-col>
+          <el-col
+            v-if="
+              scope.row.peopleoneState == 1 &&
+              scope.row.peopleoneId != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未处理</el-col
           >
-          <el-col v-if="scope.row.peopleoneState == 2" style="color: #13ce66"
+          <el-col
+            v-if="
+              scope.row.peopleoneState == 2 &&
+              scope.row.peopleoneId != (null || '' || undefined)
+            "
+            style="color: #13ce66"
             >已审批</el-col
           >
           <el-col
-            v-if="scope.row.peopleoneState == 3"
+            v-if="
+              scope.row.peopleoneState == 3 &&
+              scope.row.peopleoneId != (null || '' || undefined)
+            "
             :title="scope.row.peopleoneRemark"
             style="color: #00eaff"
             >已驳回</el-col
           >
           <el-col
-            v-if="scope.row.peopleoneState == 4"
+            v-if="
+              scope.row.peopleoneState == 4 &&
+              scope.row.peopleoneId != (null || '' || undefined)
+            "
             :title="scope.row.peopleoneRemark"
             style="color: #1d96ff"
             >特殊审批</el-col
@@ -214,20 +233,39 @@
       />
       <el-table-column label="二级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peopletwoState == 1" style="color: #ffba00"
+          <el-col
+            v-if="scope.row.peopletwoId == (null || '' || undefined)"
+          ></el-col>
+          <el-col
+            v-if="
+              scope.row.peopletwoState == 1 &&
+              scope.row.peopletwoId != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未处理</el-col
           >
-          <el-col v-if="scope.row.peopletwoState == 2" style="color: #13ce66"
+          <el-col
+            v-if="
+              scope.row.peopletwoState == 2 &&
+              scope.row.peopletwoId != (null || '' || undefined)
+            "
+            style="color: #13ce66"
             >已审批</el-col
           >
           <el-col
-            v-if="scope.row.peopletwoState == 3"
+            v-if="
+              scope.row.peopletwoState == 3 &&
+              scope.row.peopletwoId != (null || '' || undefined)
+            "
             :title="scope.row.peopletwoRemark"
             style="color: #00eaff"
             >已驳回</el-col
           >
           <el-col
-            v-if="scope.row.peopletwoState == 4"
+            v-if="
+              scope.row.peopletwoState == 4 &&
+              scope.row.peopletwoId != (null || '' || undefined)
+            "
             :title="scope.row.peopletwoRemark"
             style="color: #1d96ff"
             >特殊审批</el-col
@@ -242,20 +280,39 @@
       />
       <el-table-column label="三级审批状态" align="center" width="100">
         <template slot-scope="scope">
-          <el-col v-if="scope.row.peoplethreeState == 1" style="color: #ffba00"
+          <el-col
+            v-if="scope.row.peoplethreeId == (null || '' || undefined)"
+          ></el-col>
+          <el-col
+            v-if="
+              scope.row.peoplethreeState == 1 &&
+              scope.row.peoplethreeId != (null || '' || undefined)
+            "
+            style="color: #ffba00"
             >未处理</el-col
           >
-          <el-col v-if="scope.row.peoplethreeState == 2" style="color: #13ce66"
+          <el-col
+            v-if="
+              scope.row.peoplethreeState == 2 &&
+              scope.row.peoplethreeId != (null || '' || undefined)
+            "
+            style="color: #13ce66"
             >已审批</el-col
           >
           <el-col
-            v-if="scope.row.peoplethreeState == 3"
+            v-if="
+              scope.row.peoplethreeState == 3 &&
+              scope.row.peoplethreeId != (null || '' || undefined)
+            "
             :title="scope.row.peoplethreeRemark"
             style="color: #00eaff"
             >已驳回</el-col
           >
           <el-col
-            v-if="scope.row.peoplethreeState == 4"
+            v-if="
+              scope.row.peoplethreeState == 4 &&
+              scope.row.peoplethreeId != (null || '' || undefined)
+            "
             :title="scope.row.peoplethreeRemark"
             style="color: #1d96ff"
             >特殊审批</el-col
@@ -480,15 +537,16 @@
             clearable
             size="small"
             v-model="form.authEtime"
+            value-format="yyyy-MM-dd HH:mm:ss"
             type="datetime"
             placeholder="用车结束时间"
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="所在单位审批" prop="unitPeopleId">
+        <el-form-item label="单位审批人" prop="unitPeopleId">
           <el-select
             v-model="form.unitPeopleId"
-            placeholder="请选择所在单位审批人"
+            placeholder="请选择单位审批人"
             filterable
           >
             <el-option
@@ -934,7 +992,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        unitPeopleId: [
+          { required: true, message: "请选择所在单位审批人", trigger: "blur" },
+        ],
+      },
       // 树形列表
       treeList: [],
       // 人员列表
@@ -1005,6 +1067,7 @@ export default {
                 this.getList();
               });
             } else if (this.form.shenpijiedian == "3") {
+              console.log(1);
               this.form.isTongguo = "0";
               this.form.ojtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";
@@ -1014,6 +1077,7 @@ export default {
                 this.opensTe = false;
               });
             } else if (this.form.shenpijiedian == "4") {
+              console.log(2);
               this.form.isTongguo = "0";
               this.form.tjtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";
@@ -1023,6 +1087,7 @@ export default {
                 this.opensTe = false;
               });
             } else if (this.form.shenpijiedian == "5") {
+              console.log(3);
               this.form.isTongguo = "0";
               this.form.sjtsYuanyin = this.form.teShuYuanYing;
               this.form.isTeShu = "1";

src/views/militaryvehicleManagement/thebusConfig/index.vue

@@ -177,6 +177,7 @@
                   v-model="item1.onshenpirenid"
                   placeholder="请选择一级审批人"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(item, i) in userRen"
@@ -193,6 +194,7 @@
                   v-model="item1.twoshenpirenid"
                   placeholder="请选择二级审批人"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(item, i) in userRen"
@@ -209,6 +211,7 @@
                   v-model="item1.threeshenpirenid"
                   placeholder="请选择三级审批人"
                   filterable
+                  clearable
                 >
                   <el-option
                     v-for="(item, i) in userRen"
@@ -245,7 +248,7 @@
         <el-button @click="cancel" size="btn">取消</el-button>
       </div>
     </el-dialog>
-    <!-- 军车管理设置 -->
+    <!-- 修改军车管理设置 -->
     <el-dialog
       :title="title"
       :visible.sync="opens"
@@ -272,6 +275,7 @@
               v-model="form.onshenpirenid"
               placeholder="请选择一级审批人"
               filterable
+              clearable
             >
               <el-option
                 v-for="(item, i) in userRen"
@@ -287,6 +291,7 @@
               v-model="form.twoshenpirenid"
               placeholder="请选择二级审批人"
               filterable
+              clearable
             >
               <el-option
                 v-for="(item, i) in userRen"
@@ -302,6 +307,7 @@
               v-model="form.threeshenpirenid"
               placeholder="请选择三级审批人"
               filterable
+              clearable
             >
               <el-option
                 v-for="(item, i) in userRen"
@@ -489,23 +495,35 @@ export default {
     },
     /** 提交按钮 */
     submitForm() {
-      this.$refs["form"].validate((valid) => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateThebusConfig(this.form).then((response) => {
-              this.$modal.msgSuccess("修改成功");
-              this.opens = false;
-              this.getList();
-            });
-          } else {
-            addThebusConfig(this.checkShop).then((response) => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
+      if (
+        this.form.twoshenpirenid ||
+        this.form.onshenpirenid ||
+        this.form.threeshenpirenid
+      ) {
+        this.$refs["form"].validate((valid) => {
+          if (valid) {
+            if (this.form.id != null) {
+              updateThebusConfig(this.form).then((response) => {
+                this.$modal.msgSuccess("修改成功");
+                this.opens = false;
+                this.getList();
+              });
+            } else {
+              addThebusConfig(this.checkShop).then((response) => {
+                this.$modal.msgSuccess("新增成功");
+                this.open = false;
+                this.getList();
+              });
+            }
           }
-        }
-      });
+        });
+      } else {
+        this.$message({
+          showClose: true,
+          message: "审批人必须有一个",
+          type: "warning",
+        });
+      }
     },
     /** 删除按钮操作 */
     handleDelete(row) {

src/views/pt.vue

@@ -248,21 +248,7 @@
                 <a href="#" class="a">人力资源</a>
               </div>
             </li>
-            <li>
-              <div class="demo-box">
-                <div
-                  class="demo active"
-                  v-on:click="xitongfun"
-                  data-url="/diary?ref=addtabs"
-                >
-                  <img src="../images/xt.png" alt />
-                </div>
-              </div>
-              <div class="demo-a">
-                <a href="#" class="a">系统管理</a>
-              </div>
-            </li>
-            <li>
+            <!-- <li>
               <div class="demo-box">
                 <div
                   class="demo active"
@@ -276,7 +262,7 @@
               <div class="demo-a">
                 <a href="#" class="a">系统工具</a>
               </div>
-            </li>
+            </li> -->
             <img src="../assets/images/椭圆 513 (2).png" class="li-img" alt />
           </ul>
           <!-- <hr /> -->
@@ -347,6 +333,20 @@
                 <a href="#" class="a">涉密载体</a>
               </div>
             </li>
+            <li>
+              <div class="demo-box">
+                <div
+                  class="demo active"
+                  v-on:click="xitongfun"
+                  data-url="/diary?ref=addtabs"
+                >
+                  <img src="../images/xt1.png" alt />
+                </div>
+              </div>
+              <div class="demo-a">
+                <a href="#" class="a">系统管理</a>
+              </div>
+            </li>
           </ul>
         </div>
         <!-- 右面盒子 -->