单日请假,谈心记录卡,军车管理,首页,

src/components/look_word/bdglmeeting.vue

@@ -323,4 +323,7 @@ tr:last-child {
   border: 1px solid rgb(129, 130, 131);
   border-radius: 5px;
 }
+span {
+  color: #000;
+}
 </style>

src/layout/components/Sidebar/Logo.vue

@@ -1,50 +1,88 @@
 <template>
-  <div class="sidebar-logo-container" :class="{'collapse':collapse}" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBackground : variables.menuLightBackground }">
+  <div
+    class="sidebar-logo-container"
+    :class="{ collapse: collapse }"
+    :style="{
+      backgroundColor:
+        sideTheme === 'theme-dark'
+          ? variables.menuBackground
+          : variables.menuLightBackground,
+    }"
+  >
     <transition name="sidebarLogoFade">
-      <router-link v-if="collapse" key="collapse" class="sidebar-logo-link" to="/pt" @click="btn">
+      <router-link
+        v-if="collapse"
+        key="collapse"
+        class="sidebar-logo-link"
+        to="/pt"
+        @click="btn"
+      >
         <img v-if="logo" :src="logo" class="sidebar-logo" />
-        <h1 v-else class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1
+          v-else
+          class="sidebar-title"
+          :style="{
+            color:
+              sideTheme === 'theme-dark'
+                ? variables.logoTitleColor
+                : variables.logoLightTitleColor,
+          }"
+          style="font-size: 20px"
+        >
+          {{ title }}
+        </h1>
       </router-link>
       <router-link v-else key="expand" class="sidebar-logo-link" to="/pt">
         <!-- <img v-if="logo" :src="logo" class="sidebar-logo" /> -->
-        <h1 class="sidebar-title" :style="{ color: sideTheme === 'theme-dark' ? variables.logoTitleColor : variables.logoLightTitleColor }">{{ title }} </h1>
+        <h1
+          class="sidebar-title"
+          :style="{
+            color:
+              sideTheme === 'theme-dark'
+                ? variables.logoTitleColor
+                : variables.logoLightTitleColor,
+          }"
+          style="font-size: 20px"
+        >
+          {{ title }}
+        </h1>
       </router-link>
     </transition>
   </div>
 </template>
 
 <script>
-import logoImg from '@/assets/images/八一.png'
-import variables from '@/assets/styles/variables.scss'
+import logoImg from "@/assets/images/八一.png";
+import variables from "@/assets/styles/variables.scss";
 
 export default {
-  name: 'SidebarLogo',
+  name: "SidebarLogo",
   props: {
     collapse: {
       type: Boolean,
-      required: true
-    }
+      required: true,
+    },
   },
   computed: {
     variables() {
       return variables;
     },
-	sideTheme() {
-      return this.$store.state.settings.sideTheme
-    }
+    sideTheme() {
+      return this.$store.state.settings.sideTheme;
+    },
   },
   data() {
     return {
-      title: '智能督查管理平台',
-      logo: logoImg
-    }
+      title: "智能督查管理平台",
+      logo: logoImg,
+    };
   },
-  methods:{
-    btn(){
-      this.$router.path('/pt')
-    }
-  }
-}
+  methods: {
+    btn() {
+      this.$router.path("/pt");
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>

src/layout/components/Sidebar/index.vue

@@ -5,7 +5,7 @@
       backgroundColor:
         settings.sideTheme === 'theme-dark'
           ? variables.menuBackground
-          : variables.menuLightBackground
+          : variables.menuLightBackground,
     }"
   >
     <logo v-if="showLogo" :collapse="isCollapse" />
@@ -29,13 +29,12 @@
         mode="vertical"
         :default-active="$route.path"
       >
-      <!-- @click.native="a(route,index)" -->
+        <!-- @click.native="a(route,index)" -->
         <sidebar-item
           v-for="(route, index) in routs"
           :key="route.path + index"
           :item="route"
           :base-path="route.path"
-          
         />
       </el-menu>
     </el-scrollbar>
@@ -54,7 +53,7 @@ export default {
     return {
       routs: [],
       p: null,
-      defaultpath: null
+      defaultpath: null,
     };
   },
   components: { SidebarItem, Logo },
@@ -78,7 +77,7 @@ export default {
     },
     isCollapse() {
       return !this.sidebar.opened;
-    }
+    },
   },
   created() {
     console.log(this.$route.name);
@@ -91,11 +90,11 @@ export default {
     // window.location.reload()
   },
   methods: {
-    a(route,index){
-      console.log(route,index)
+    a(route, index) {
+      console.log(route, index);
     },
     sidebarRoutersfun() {
-      this.sidebarRouters.map(item => {
+      this.sidebarRouters.map((item) => {
         // console.log(this.$route.query.name);
         if (item.path == this.$route.query.name) {
           // console.log(item);
@@ -129,13 +128,13 @@ export default {
           .push({
             name: "pt",
             params: {
-              name: "您暂无权限访问"
-            }
+              name: "您暂无权限访问",
+            },
           })
           .catch(() => {});
       }
-    }
-  }
+    },
+  },
 };
 </script>
 

src/views/militaryvehicleManagement/driver/index.vue

@@ -33,9 +33,7 @@
           @click="handleQuery"
           >搜索</el-button
         > -->
-        <el-button size="btr" @click="resetQuery"
-          >重置</el-button
-        >
+        <el-button size="btr" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
@@ -77,7 +75,7 @@
       </el-col>
       <el-col :span="1.5">
         <el-button
-        class="box"
+          class="box"
           type="warning"
           plain
           icon="el-icon-download"
@@ -133,29 +131,6 @@
         prop="contact"
         width="180"
       />
-      <!-- <el-table-column
-        label="驾驶证号"
-        align="center"
-        prop="driversLicense"
-        width="180"
-      /> -->
-      <!-- <el-table-column
-        label="出生日期"
-        align="center"
-        prop="birthDate"
-        width="180"
-      /> -->
-
-      <!-- <el-table-column
-        label="初领日期"
-        align="center"
-        prop="chulingriq"
-        width="180"
-      >
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.chulingriq, "{y}-{m}-{d}") }}</span>
-        </template>
-      </el-table-column> -->
       <!-- <el-table-column
         label="核发日期"
         align="center"
@@ -166,7 +141,14 @@
           <span>{{ parseTime(scope.row.hefariqi, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column> -->
-      <el-table-column label="准驾车型" align="center" prop="drivingModel" />
+      <el-table-column label="准驾车型" align="center" prop="drivingModel">
+        <template slot-scope="scope">
+          <dict-tag
+            :options="dict.type.quasi_driving_model"
+            :value="scope.row.drivingModel"
+          />
+        </template>
+      </el-table-column>
       <el-table-column
         label="有效日期"
         align="center"
@@ -309,10 +291,27 @@
           </el-select>
         </el-form-item>
         <el-form-item label="驾龄" prop="drivingAge">
-          <el-input v-model="form.drivingAge" placeholder="请输入驾龄" />
+          <el-input
+            v-model="form.drivingAge"
+            placeholder="请输入驾龄"
+            disabled
+          />
         </el-form-item>
         <el-form-item label="准驾车型" prop="drivingModel">
-          <el-input v-model="form.drivingModel" placeholder="请输入准驾车型" />
+          <el-select
+            v-model="form.drivingModel"
+            placeholder="请选择准驾车型"
+            filterable
+          >
+            <el-option
+              v-for="(item, i) in quasiDrivingList"
+              :key="i"
+              :label="item.dictLabel"
+              :value="item.dictValue"
+              class="input_xiala"
+            >
+            </el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="初领日期" prop="chulingriq">
           <el-date-picker
@@ -322,6 +321,7 @@
             type="date"
             value-format="yyyy-MM-dd"
             placeholder="选择初领日期"
+            @change="collectionDate"
           >
           </el-date-picker>
         </el-form-item>
@@ -399,6 +399,7 @@ export default {
   components: {
     Treeselect,
   },
+  dicts: ["quasi_driving_model"],
   data() {
     return {
       // 遮罩层
@@ -446,7 +447,11 @@ export default {
       // 表单参数
       form: {},
       // 表单校验
-      rules: {},
+      rules: {
+        chulingriq: [
+          { required: true, message: "请选择初领日期", trigger: "blur" },
+        ],
+      },
       // 树形列表
       treeList: [],
       // 人员列表
@@ -459,6 +464,8 @@ export default {
       vocational: [],
       // 外面的人员
       renYuans: [],
+      // 准驾车型
+      quasiDrivingList: [],
     };
   },
   created() {
@@ -472,9 +479,30 @@ export default {
     getDicts("vocational").then((response) => {
       this.vocational = response.data;
     });
+    getDicts("quasi_driving_model").then((response) => {
+      this.quasiDrivingList = response.data;
+    });
     this.getSuo();
   },
   methods: {
+    // 初领时间计算驾龄
+    collectionDate(value) {
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      var tiem = y + "-" + M + "-" + d;
+      let times1 = Date.parse(tiem);
+      let times2 = Date.parse(value);
+      let times3 = (times1 - times2) / 31104000000;
+      this.form.drivingAge = Math.trunc(times3) + "年";
+    },
     // 获取搜索所有人
     getSuo() {
       getAll().then((res) => {
@@ -702,7 +730,6 @@ export default {
   background: transparent;
   color: #fff;
   border: 1px solid white !important;
-
 }
 /* 单位框背景颜色 */
 ::v-deep .vue-treeselect__control {
@@ -820,9 +847,13 @@ export default {
   color: #bdbdbd4f !important;
 }
 ::v-deep .el-input__inner {
-    border: 1px solid white !important;
+  border: 1px solid white !important;
 }
-.box{
+.box {
   background-color: #ffba00 !important;
 }
+::v-deep .el-input.is-disabled .el-input__inner {
+  background-color: transparent !important;
+  color: #fff;
+}
 </style>

src/views/militaryvehicleManagement/privateCar/index.vue

@@ -207,7 +207,11 @@
           </el-select>
         </el-form-item>
         <el-form-item label="车辆所有人" prop="peopleId">
-          <el-select v-model="form.peopleId" placeholder="请输入车辆所有人" filterable >
+          <el-select
+            v-model="form.peopleId"
+            placeholder="请输入车辆所有人"
+            filterable
+          >
             <el-option
               v-for="(item, i) in renYuan"
               :key="i"

src/views/militaryvehicleManagement/thebus/index.vue

@@ -279,7 +279,7 @@
       <el-table-column
         label="车辆负责人"
         align="center"
-        prop="peopleName"
+        prop="peopleNames"
         width="120"
       />
       <el-table-column label="所属单位" align="center" prop="unitName" />
@@ -620,17 +620,22 @@ export default {
   },
   created() {
     this.getList();
+    this.getCatPai();
     getDicts("license").then((response) => {
       this.license = response.data;
     });
     getDicts("military").then((response) => {
       this.military = response.data;
     });
-    getDicts("brand").then((response) => {
-      this.brand = response.data;
-    });
   },
   methods: {
+    // 厂牌型号
+    getCatPai() {
+      getDicts("brand").then((response) => {
+        this.brand = response.data;
+        // console.log(this.brand);
+      });
+    },
     // 重置人员
     ChongZhi() {
       (this.form.peopleId = null), (this.form.contactnumber = null);
@@ -668,7 +673,7 @@ export default {
     // 选择车辆人员触发
     cheRen(item) {
       this.form.contactnumber = item.phone;
-      this.form.peopleName = item.name;
+      this.form.peopleNames = item.name;
     },
     // 选择部门单位触发
     selectPeo(data) {

src/views/militaryvehicleManagement/thebusApply/index.vue

@@ -104,7 +104,12 @@
         </template>
       </el-table-column>
       <el-table-column label="人数" align="center" prop="peopleCount" />
-      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column
+        label="单位"
+        align="center"
+        prop="unitName"
+        width="100"
+      />
       <el-table-column label="人员名称" align="center" prop="peopleName" />
       <el-table-column
         label="联系方式"
@@ -113,6 +118,16 @@
         width="130"
       />
       <el-table-column label="外出事由" align="center" prop="cause" />
+      <el-table-column
+        label="申请时间"
+        align="center"
+        prop="authStime"
+        width="100"
+      >
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.authStime, "{y}-{m}-{d}") }}</span>
+        </template>
+      </el-table-column>
       <el-table-column
         label="所在单位审批人"
         align="center"
@@ -441,8 +456,8 @@
         <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 label="出车路线" prop="route">
+          <el-input v-model="form.route" placeholder="请输入出车路线" />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -450,6 +465,8 @@
             size="small"
             v-model="form.authStime"
             type="datetime"
+            default-time="00:00:00"
+            value-format="yyyy-MM-dd HH:mm:ss"
             placeholder="用车开始时间"
           >
           </el-date-picker>
@@ -522,12 +539,12 @@
             readonly
           />
         </el-form-item>
-        <div class="jiben">出车路线</div>
-        <el-form-item prop="route">
+        <div class="jiben">外出事由</div>
+        <el-form-item label="" prop="cause">
           <el-input
-            v-model="form.route"
+            v-model="form.cause"
+            placeholder="请输入外出事由"
             type="textarea"
-            placeholder="请输入出车路线"
           />
         </el-form-item>
       </el-form>
@@ -582,8 +599,8 @@
         <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 label="出车路线" prop="route">
+          <el-input v-model="form.route" placeholder="请输入出车路线" />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -658,12 +675,12 @@
             readonly
           />
         </el-form-item>
-        <div class="jiben">出车路线</div>
-        <el-form-item prop="route">
+        <div class="jiben">外出事由</div>
+        <el-form-item label="" prop="cause">
           <el-input
-            v-model="form.route"
+            v-model="form.cause"
+            placeholder="请输入外出事由"
             type="textarea"
-            placeholder="请输入出车路线"
           />
         </el-form-item>
         <div class="jiben">不通过原因</div>
@@ -722,8 +739,8 @@
         <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 label="出车路线" prop="route">
+          <el-input v-model="form.route" placeholder="请输入出车路线" />
         </el-form-item>
         <el-form-item label="用车开始时间" prop="authStime">
           <el-date-picker
@@ -795,12 +812,12 @@
             placeholder="请输入三级审批人"
           />
         </el-form-item>
-        <div class="jiben">出车路线</div>
-        <el-form-item prop="route">
+        <div class="jiben">外出事由</div>
+        <el-form-item label="" prop="cause">
           <el-input
-            v-model="form.route"
+            v-model="form.cause"
+            placeholder="请输入外出事由"
             type="textarea"
-            placeholder="请输入出车路线"
           />
         </el-form-item>
         <div class="jiben">特殊审批原因</div>
@@ -1253,11 +1270,6 @@ export default {
     getList() {
       this.loading = true;
       listThebusApply(this.queryParams).then((response) => {
-        // console.log(
-        //   (response.rows.unitPeopleState == "1" ||
-        //     response.rows.status == "1") &&
-        //     response.rows.isCaoZuo != null
-        // );
         this.thebusApplyList = response.rows;
         this.total = response.total;
         this.loading = false;
@@ -1334,6 +1346,31 @@ export default {
       this.getTreeList();
       this.open = true;
       this.title = "添加用车申请";
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      var h = today.getHours();
+      var m = today.getMinutes();
+      var s = today.getSeconds();
+      var w = today.getDay();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      if (h < 10) {
+        h = "0" + h;
+      }
+      if (m < 10) {
+        m = "0" + m;
+      }
+      if (s < 10) {
+        s = "0" + s;
+      }
+      this.form.authStime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      this.form.authEtime = y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {

src/views/militaryvehicleManagement/thebusList/index.vue

@@ -91,9 +91,9 @@
           >
         </template>
       </el-table-column>
-      <el-table-column label="出车时间" align="center" prop="outtime">
+      <el-table-column label="申请时间" align="center" prop="authStime">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.outtime, "{y}-{m}-{d}") }}</span>
+          <span>{{ parseTime(scope.row.authStime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
       <el-table-column label="流程" align="center" prop="outtime">
@@ -201,6 +201,7 @@
             v-model="fomr1.authStime"
             type="datetime"
             placeholder="用车开始时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -211,6 +212,7 @@
             v-model="fomr1.authEtime"
             type="datetime"
             placeholder="用车结束时间"
+            value-format="yyyy-MM-dd HH:mm:ss"
           >
           </el-date-picker>
         </el-form-item>
@@ -735,6 +737,33 @@ export default {
       this.getCar();
       this.getSi();
       this.openes = true;
+      var today = new Date();
+      var y = today.getFullYear();
+      var M = today.getMonth() + 1;
+      var d = today.getDate();
+      var h = today.getHours();
+      var m = today.getMinutes();
+      var s = today.getSeconds();
+      var w = today.getDay();
+      if (M < 10) {
+        M = "0" + M;
+      }
+      if (d < 10) {
+        d = "0" + d;
+      }
+      if (h < 10) {
+        h = "0" + h;
+      }
+      if (m < 10) {
+        m = "0" + m;
+      }
+      if (s < 10) {
+        s = "0" + s;
+      }
+      this.fomr1.authStime =
+        y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
+      this.fomr1.authEtime =
+        y + "-" + M + "-" + d + " " + h + ":" + m + ":" + s;
       this.getTreeList();
     },
     /** 修改按钮操作 */

src/views/peopleChuRu/bdglLeave/index.vue

@@ -95,7 +95,7 @@
       <el-table-column label="请假类型" align="center" prop="leaveType">
         <template slot-scope="scope">
           <dict-tag
-            :options="dict.type.Leave_type"
+            :options="dict.type.people_state"
             :value="scope.row.leaveType"
           />
         </template>
@@ -637,7 +637,7 @@
           >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="一级审批人" prop="peopleId2">
+        <el-form-item label="一级审批人" prop="peopleId1">
           <el-select
             v-model="form.peopleId1"
             filterable
@@ -763,7 +763,7 @@ export default {
   components: {
     Treeselect,
   },
-  dicts: ["Leave_type", "sys_is"],
+  dicts: ["Leave_type", "sys_is", "people_state"],
   data() {
     return {
       // 审批按钮状态 审批按钮状态1 修改为0,超级审批状态2
@@ -834,6 +834,18 @@ export default {
         leaveType: [
           { required: true, message: "请假类型不能为空", trigger: "blur" },
         ],
+        peopleId1: [
+          { required: true, message: "审批人不能为空", trigger: "blur" },
+        ],
+        peopleId2: [
+          { required: true, message: "审批人不能为空", trigger: "blur" },
+        ],
+        peopleId3: [
+          { required: true, message: "审批人不能为空", trigger: "blur" },
+        ],
+        peopleId4: [
+          { required: true, message: "审批人不能为空", trigger: "blur" },
+        ],
       },
       // 特殊审批表单验证
       rulesform: {

src/views/peopleChuRu/leaveOne/index.vue

@@ -385,7 +385,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <el-table-column label="序号" align="center" type="index" />
-      <el-table-column label="请假人员" align="center" prop="peopleId" />
+      <el-table-column label="请假人员" align="center" prop="peopleName" />
       <el-table-column
         label="单位"
         align="center"

src/views/phone/cabinet/index.vue

@@ -230,9 +230,6 @@ import {
   xianPhoneOppe,
 } from "@/api/phone/cabinet";
 
-import axios from "axios";
-import Cookies from "js-cookie";
-
 export default {
   name: "Cabinet",
   data() {
@@ -301,7 +298,6 @@ export default {
   },
   created() {
     this.getList();
-    this.xianShang();
   },
   methods: {
     // 开关们记录查询
@@ -329,17 +325,7 @@ export default {
       //     this.loading = false;
       //   });
     },
-    // 线上地址
-    xianShang() {
-      axios
-        .post("http://114.115.153.156:12090/wl/api/getAccessToken", {
-          password: "super123fs456wl",
-          username: "admin",
-        })
-        .then((res) => {
-          Cookies.set("accessToken", res.data.accessToken);
-        });
-    },
+
     // 点击名字触发
     buttOn(row, data) {
       this.jiBen = row;

src/views/pt.vue

@@ -9,6 +9,11 @@
           <span class="span" style="padding-left: 4px">{{ danWie }}</span>
           <span style="color: #00f6ff">用户名 :</span>
           <span style="padding-left: 4px; color: #00f6ff">{{ yongHu }}</span>
+          <span
+            class="iconfont icon-logout"
+            @click="logout"
+            style="font-size: 19px; margin-left: 23px; cursor: pointer"
+          ></span>
         </div>
         <span style="color: #00f6ff; font-size: 1vw" class="tiem">{{
           times
@@ -634,6 +639,7 @@ import {
 } from "@/api/pt";
 import { getUserProfile } from "@/api/system/user";
 import Cookies from "js-cookie";
+import axios from "axios";
 export default {
   dicts: ["sys_notice_status", "sys_notice_type"],
   data() {
@@ -678,6 +684,7 @@ export default {
     this.startTime();
     this.timer2 = null;
     this.startTime2();
+    this.xianShang();
   },
   mounted() {
     if (this.$route.params.name) {
@@ -688,6 +695,31 @@ export default {
     // console.log(this.$route.params.name)
   },
   methods: {
+    // 退出
+    async logout() {
+      this.$confirm("确定注销并退出系统吗？", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      })
+        .then(() => {
+          this.$store.dispatch("LogOut").then(() => {
+            location.href = "/index";
+          });
+        })
+        .catch(() => {});
+    },
+    // 手机柜线上地址
+    xianShang() {
+      axios
+        .post("http://114.115.153.156:12090/wl/api/getAccessToken", {
+          password: "super123fs456wl",
+          username: "admin",
+        })
+        .then((res) => {
+          Cookies.set("accessToken", res.data.accessToken);
+        });
+    },
     // 获取登录信息
     getUser() {
       getUserProfile().then((response) => {

src/views/thought/talk/index.vue

@@ -39,7 +39,7 @@
         <div class="tree">
           <el-tree
             class="userAgrees"
-            style="height:calc(100vh - 170px); overflow: auto"
+            style="height: calc(100vh - 170px); overflow: auto"
             :data="deptOptions"
             :props="defaultProps"
             @node-click="handleNodeClick"
@@ -436,8 +436,7 @@
             clearable
             size="small"
             v-model="form.startTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
             placeholder="选择开始时间"
           >
           </el-date-picker>
@@ -447,8 +446,7 @@
             clearable
             size="small"
             v-model="form.endTime"
-            type="date"
-            value-format="yyyy-MM-dd"
+            type="datetime"
             placeholder="选择结束时间"
           >
           </el-date-picker>
@@ -1325,7 +1323,7 @@ export default {
   text-indent: 0.5em;
 }
 /* 卡片样式 */
-.app-container{
- height: calc(100vh - 108px) !important;
+.app-container {
+  height: calc(100vh - 108px) !important;
 }
 </style>