给首页新增日历，修改用车申请表

oa-ui/src/api/system/post.js

@@ -50,3 +50,13 @@ export function delPost(postId) {
     method: 'delete'
   })
 }
+
+
+// 查询当前用户的部门负责人
+export function getUsersDeptLeader(query) {
+  return request({
+    url: '/system/post/deptLeader',
+    method: 'get',
+    params: query
+  })
+}

oa-ui/src/components/Calendar/index.vue

@@ -0,0 +1,557 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-07 10:00:26
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-07 10:14:41
+-->
+
+<template>
+  <div class="contianer">
+    <div class="calendar">
+      <div class="calendar-header">
+        <span class="month-picker" id="month-picker"> May </span>
+        <div class="year-picker" id="year-picker">
+          <span class="year-change" id="pre-year">
+            <pre><</pre>
+          </span>
+          <span id="year">2020 </span>
+          <span class="year-change" id="next-year">
+            <pre>></pre>
+          </span>
+        </div>
+      </div>
+
+      <div class="calendar-body">
+        <div class="calendar-week-days">
+          <div>Sun</div>
+          <div>Mon</div>
+          <div>Tue</div>
+          <div>Wed</div>
+          <div>Thu</div>
+          <div>Fri</div>
+          <div>Sat</div>
+        </div>
+        <div class="calendar-days">
+        </div>
+      </div>
+      <div class="calendar-footer">
+      </div>
+      <div class="date-time-formate">
+        <div class="day-text-formate">TODAY</div>
+        <div class="date-time-value">
+          <div class="time-formate">02:51:20</div>
+          <div class="date-formate">23 - july - 2022</div>
+        </div>
+      </div>
+      <div class="month-list"></div>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'Calendar',
+  mounted() {
+    this.initCalendar();
+  },
+  methods: {
+    initCalendar() {
+      const isLeapYear = (year) => {
+        return (
+          (year % 4 === 0 && year % 100 !== 0 && year % 400 !== 0) ||
+          (year % 100 === 0 && year % 400 === 0)
+        );
+      };
+      const getFebDays = (year) => {
+        return isLeapYear(year) ? 29 : 28;
+      };
+      let calendar = document.querySelector('.calendar');
+      const month_names = [
+        'January',
+        'February',
+        'March',
+        'April',
+        'May',
+        'June',
+        'July',
+        'August',
+        'September',
+        'October',
+        'November',
+        'December',
+      ];
+      let month_picker = document.querySelector('#month-picker');
+      const dayTextFormate = document.querySelector('.day-text-formate');
+      const timeFormate = document.querySelector('.time-formate');
+      const dateFormate = document.querySelector('.date-formate');
+
+      month_picker.onclick = () => {
+        month_list.classList.remove('hideonce');
+        month_list.classList.remove('hide');
+        month_list.classList.add('show');
+        dayTextFormate.classList.remove('showtime');
+        dayTextFormate.classList.add('hidetime');
+        timeFormate.classList.remove('showtime');
+        timeFormate.classList.add('hideTime');
+        dateFormate.classList.remove('showtime');
+        dateFormate.classList.add('hideTime');
+      };
+
+      const generateCalendar = (month, year) => {
+        let calendar_days = document.querySelector('.calendar-days');
+        calendar_days.innerHTML = '';
+        let calendar_header_year = document.querySelector('#year');
+        let days_of_month = [
+          31,
+          getFebDays(year),
+          31,
+          30,
+          31,
+          30,
+          31,
+          31,
+          30,
+          31,
+          30,
+          31,
+        ];
+
+        let currentDate = new Date();
+
+        month_picker.innerHTML = month_names[month];
+
+        calendar_header_year.innerHTML = year;
+
+        let first_day = new Date(year, month);
+
+
+        for (let i = 0; i <= days_of_month[month] + first_day.getDay() - 1; i++) {
+
+          let day = document.createElement('div');
+
+          if (i >= first_day.getDay()) {
+            day.innerHTML = i - first_day.getDay() + 1;
+
+            if (i - first_day.getDay() + 1 === currentDate.getDate() &&
+              year === currentDate.getFullYear() &&
+              month === currentDate.getMonth()
+            ) {
+              day.classList.add('current-date');
+            }
+          }
+          calendar_days.appendChild(day);
+        }
+      };
+
+      let month_list = calendar.querySelector('.month-list');
+      month_names.forEach((e, index) => {
+        let month = document.createElement('div');
+        month.innerHTML = `<div>${e}</div>`;
+
+        month_list.append(month);
+        month.onclick = () => {
+          currentMonth.value = index;
+          generateCalendar(currentMonth.value, currentYear.value);
+          month_list.classList.replace('show', 'hide');
+          dayTextFormate.classList.remove('hideTime');
+          dayTextFormate.classList.add('showtime');
+          timeFormate.classList.remove('hideTime');
+          timeFormate.classList.add('showtime');
+          dateFormate.classList.remove('hideTime');
+          dateFormate.classList.add('showtime');
+        };
+      });
+
+      (function () {
+        month_list.classList.add('hideonce');
+      })();
+      document.querySelector('#pre-year').onclick = () => {
+        --currentYear.value;
+        generateCalendar(currentMonth.value, currentYear.value);
+      };
+      document.querySelector('#next-year').onclick = () => {
+        ++currentYear.value;
+        generateCalendar(currentMonth.value, currentYear.value);
+      };
+
+      let currentDate = new Date();
+      let currentMonth = { value: currentDate.getMonth() };
+      let currentYear = { value: currentDate.getFullYear() };
+      generateCalendar(currentMonth.value, currentYear.value);
+
+      const todayShowTime = document.querySelector('.time-formate');
+      const todayShowDate = document.querySelector('.date-formate');
+
+      const currshowDate = new Date();
+      const showCurrentDateOption = {
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric',
+        weekday: 'long',
+      };
+      const currentDateFormate = new Intl.DateTimeFormat(
+        'en-US',
+        showCurrentDateOption
+      ).format(currshowDate);
+      todayShowDate.textContent = currentDateFormate;
+      setInterval(() => {
+        const timer = new Date();
+        const option = {
+          hour: 'numeric',
+          minute: 'numeric',
+          second: 'numeric',
+        };
+        const formateTimer = new Intl.DateTimeFormat('en-us', option).format(timer);
+        let time = `${`${timer.getHours()}`.padStart(
+          2,
+          '0'
+        )}:${`${timer.getMinutes()}`.padStart(
+          2,
+          '0'
+        )}: ${`${timer.getSeconds()}`.padStart(2, '0')}`;
+        todayShowTime.textContent = formateTimer;
+      }, 1000);
+
+    }
+  },
+}
+</script>
+
+<style lang="scss">
+:root {
+  --dark-text: #f8fbff;
+  --light-body: #f3f8fe;
+  --light-main: #fdfdfd;
+  --light-second: #c3c2c8;
+  --light-hover: #f0f0f0;
+  --light-text: #151426;
+  --light-btn: #9796f0;
+  --blue: #0000ff;
+  --white: #fff;
+  --shadow: rgba(100, 100, 111, 0.2) 0px 7px 29px 0px;
+  --font-family: consolas;
+}
+
+
+.contianer {
+  width: max-content;
+  height: max-content;
+  position: relative;
+  display: flex;
+  padding: 2% 0px 0px 0px;
+  justify-content: center;
+  top: 10%;
+  right: 0%;
+  width: 100%;
+  height: 100%;
+}
+
+.calendar {
+  // height: 610px;
+  width: max-content;
+  background-color: white;
+  border-radius: 25px;
+  overflow: hidden;
+  padding: 30px 50px 0px 50px;
+}
+
+.calendar {
+  box-shadow: var(--shadow);
+}
+
+.calendar-header {
+  background: #9796f0;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  font-weight: 700;
+  color: var(--white);
+  padding: 10px;
+}
+
+.calendar-body {
+  pad: 10px;
+}
+
+.calendar-week-days {
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  font-weight: 600;
+  cursor: pointer;
+  color: rgb(104, 104, 104);
+}
+
+.calendar-week-days div:hover {
+  color: black;
+  transform: scale(1.2);
+  transition: all .2s ease-in-out;
+}
+
+.calendar-week-days div {
+  display: grid;
+  place-items: center;
+  color: var(--bg-second);
+  height: 50px;
+}
+
+.calendar-days {
+  display: grid;
+  grid-template-columns: repeat(7, 1fr);
+  gap: 2px;
+  color: var(--color-txt);
+}
+
+.calendar-days div {
+  width: 37px;
+  height: 33px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 5px;
+  position: relative;
+  cursor: pointer;
+  animation: to-top 1s forwards;
+}
+
+.month-picker {
+  padding: 5px 10px;
+  border-radius: 10px;
+  cursor: pointer;
+}
+
+.month-picker:hover {
+  background-color: var(--color-hover);
+}
+
+.month-picker:hover {
+  color: var(--color-txt);
+}
+
+.year-picker {
+  display: flex;
+  align-items: center;
+}
+
+.year-change {
+  height: 30px;
+  width: 30px;
+  border-radius: 50%;
+  display: grid;
+  place-items: center;
+  margin: 0px 10px;
+  cursor: pointer;
+}
+
+.year-change:hover {
+  background-color: var(--light-btn);
+  transition: all .2s ease-in-out;
+  transform: scale(1.12);
+}
+
+.year-change:hover pre {
+  color: var(--bg-body);
+}
+
+.calendar-footer {
+  padding: 10px;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
+}
+
+#year:hover {
+  cursor: pointer;
+  transform: scale(1.2);
+  transition: all 0.2 ease-in-out;
+}
+
+.calendar-days div span {
+  position: absolute;
+}
+
+.calendar-days div:hover {
+  transition: width 0.2s ease-in-out, height 0.2s ease-in-out;
+  background-color: #fbc7d4;
+  border-radius: 20%;
+  color: var(--dark-text);
+}
+
+.calendar-days div.current-date {
+  color: var(--dark-text);
+  background-color: var(--light-btn);
+  border-radius: 20%;
+}
+
+.month-list {
+  position: relative;
+  left: 0;
+  top: -50px;
+  background-color: #ebebeb;
+  color: var(--light-text);
+  display: grid;
+  grid-template-columns: repeat(3, auto);
+  gap: 5px;
+  border-radius: 20px;
+}
+
+.month-list>div {
+  display: grid;
+  place-content: center;
+  margin: 5px 10px;
+  transition: all 0.2s ease-in-out;
+}
+
+.month-list>div>div {
+  border-radius: 15px;
+  padding: 10px;
+  cursor: pointer;
+}
+
+.month-list>div>div:hover {
+  background-color: var(--light-btn);
+  color: var(--dark-text);
+  transform: scale(0.9);
+  transition: all 0.2s ease-in-out;
+}
+
+.month-list.show {
+  visibility: visible;
+  pointer-events: visible;
+  transition: 0.6s ease-in-out;
+  animation: to-left .71s forwards;
+}
+
+.month-list.hideonce {
+  visibility: hidden;
+}
+
+.month-list.hide {
+  animation: to-right 1s forwards;
+  visibility: none;
+  pointer-events: none;
+}
+
+.date-time-formate {
+  width: max-content;
+  height: max-content;
+  font-family: Dubai Light, Century Gothic;
+  position: relative;
+  display: inline;
+  top: 140px;
+  justify-content: center;
+}
+
+.day-text-formate {
+  font-family: Microsoft JhengHei UI;
+  font-size: 1.4rem;
+  padding-right: 5%;
+  border-right: 3px solid #9796f0;
+  position: absolute;
+  left: -1rem;
+}
+
+.date-time-value {
+  display: block;
+  height: max-content;
+  width: max-content;
+  position: relative;
+  left: 40%;
+  top: -18px;
+  text-align: center;
+}
+
+.time-formate {
+  font-size: 1.5rem;
+}
+
+.time-formate.hideTime {
+  animation: hidetime 1.5s forwards;
+}
+
+.day-text-formate.hidetime {
+  animation: hidetime 1.5s forwards;
+}
+
+.date-formate.hideTime {
+  animation: hidetime 1.5s forwards;
+}
+
+.day-text-formate.showtime {
+  animation: showtime 1s forwards;
+}
+
+.time-formate.showtime {
+  animation: showtime 1s forwards;
+}
+
+.date-formate.showtime {
+  animation: showtime 1s forwards;
+}
+
+@keyframes to-top {
+  0% {
+    transform: translateY(0);
+    opacity: 0;
+  }
+
+  100% {
+    transform: translateY(100%);
+    opacity: 1;
+  }
+}
+
+@keyframes to-left {
+  0% {
+    transform: translatex(230%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translatex(0);
+    opacity: 1;
+  }
+}
+
+@keyframes to-right {
+  10% {
+    transform: translatex(0);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translatex(-150%);
+    opacity: 1;
+  }
+}
+
+@keyframes showtime {
+  0% {
+    transform: translatex(250%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translatex(0%);
+    opacity: 1;
+  }
+}
+
+@keyframes hidetime {
+  0% {
+    transform: translatex(0%);
+    opacity: 1;
+  }
+
+  100% {
+    transform: translatex(-370%);
+    opacity: 1;
+  }
+}
+
+@media (max-width:375px) {
+  .month-list>div {
+
+    margin: 5px 0px;
+  }
+}
+</style>

oa-ui/src/views/flowable/form/carForm.vue

@@ -1,8 +1,14 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-02-29 11:44:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-07 17:25:40
+-->
 <!--
  * @Author: wrh
  * @Date: 2024-02-29 17:24:39
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-06 17:24:51
+ * @LastEditTime: 2024-03-07 13:43:50
 -->
 
 <template>
@@ -30,27 +36,6 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
-          <el-col :span="6" :xs="24">
-            <el-form-item label="开始日期：">
-              <el-date-picker style="width:140px;" v-model="form.startTime" value-format="yyyy-MM-dd" type="date"
-                placeholder="选择日期" @change="calculateDay">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="6" :xs="24">
-            <el-form-item label="结束日期：">
-              <el-date-picker style="width:140px;" v-model="form.endTime" value-format="yyyy-MM-dd" type="date"
-                placeholder="选择日期" @change="calculateDay">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8" :xs="24">
-            <el-form-item label="共计:">
-              {{ form.day + '天' }}
-            </el-form-item>
-          </el-col>
-        </el-row>
         <el-form-item label="项目编号：" prop="projectNumber">
           <el-select v-model="form.projectNumber" filterable placeholder="请选择" @change="handleSelectProject" clearable>
             <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
@@ -71,21 +56,58 @@
               }}</el-descriptions-item>
           </el-descriptions>
         </el-form-item>
+        <el-form-item label="乘车人数：" prop="passengers">
+          <el-input-number v-model="form.passengers" :min="1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="用车事由：" prop="applyReason">
+          <el-input type="textarea" :rows="2" placeholder="请输入用车事由" v-model="form.applyReason">
+          </el-input>
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="开始日期：">
+              <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" @change="calculateDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="结束日期：">
+              <el-date-picker style="width:140px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" @change="calculateDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :xs="24">
+            <el-form-item label="共计:">
+              {{ form.days + '天' }}
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-divider></el-divider>
+        <!-- 部门审核意见 -->
+        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskName == '部门审核'">
+          <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment">
+          </el-input>
+        </el-form-item>
+        <!-- 分管审核意见 -->
+        <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="taskName == '分管审核'">
+          <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
+          </el-input>
+        </el-form-item>
         <!-- 综合事务部管理人员填写 -->
-
-        <el-form-item label="车牌号："  v-if="taskName != '用车申请'">
+        <el-form-item label="车牌号：" v-if="taskName == '安排用车'">
           <el-select v-model="form.licensePlate" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in carList" :key="item.id" :label="item.licensePlate" :value="item.id">
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="驾驶员："  v-if="taskName != '用车申请'">
-          <!-- <el-select v-model="form.driver" filterable multiple placeholder="请选择" clearable>
+        <el-form-item label="驾驶员：" v-if="taskName == '安排用车'">
+          <!-- <el-select v-model="form.drivers" filterable multiple placeholder="请选择" clearable>
             <el-option v-for="item in driverList" :key="item.userId" :label="item.nickName" :value="item.userId">
             </el-option>
           </el-select> -->
-          <el-checkbox-group v-model="form.driver">
+          <el-checkbox-group v-model="form.drivers">
             <el-checkbox :label="item.userId" v-for="item in driverList">{{ item.nickName }}</el-checkbox>
           </el-checkbox-group>
         </el-form-item>
@@ -101,11 +123,19 @@
 import { listProject, getProject } from "@/api/oa/project/project";
 import { listCar } from "@/api/oa/car/car";
 import { listDriver } from "@/api/system/post";
+import {
+  complete, rejectTask, returnList, returnTask, getNextFlowNode, delegate, flowTaskForm,
+} from "@/api/flowable/todo";
+import { getUsersDeptLeader } from '@/api/system/post.js'
 export default {
   props: {
     taskName: {
       type: String,
       required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
     }
   },
   created() {
@@ -119,19 +149,37 @@ export default {
     return {
       form: {
         date: new Date(),
-        day: '',
-        driver: []
+        days: '',
+        drivers: []
       },
       projectList: [],
       carList: [],
       driverList: [],
       chooseProject: {},
-      isSelect: false
+      isSelect: false,
     }
   },
   methods: {
-    submit(){
-      this.$emit('submit',form)
+    submit() {
+      let formData = new FormData();
+      let jsonForm = JSON.stringify(this.form);
+      formData.append("form", jsonForm);
+      const params = { taskId: this.taskForm.taskId }
+      // 获取下一个流程节点
+      getNextFlowNode(params).then(res => {
+        const data = res.data;
+        debugger
+        this.taskForm.formData = formData;
+        complete(this.taskForm).then(response => {
+          this.$modal.msgSuccess(response.msg);
+          this.goBack();
+        });
+      })
+    },
+    // 获取下一个审批人
+    getNextFlowNodeApproval() {
+      getUsersDeptLeader()
+      this.$set(this.taskForm.variables, "approval", selectVal.join(','));
     },
     // 查询项目列表
     getProjectList() {
@@ -175,18 +223,18 @@ export default {
       })
     },
     calculateDay() {
-      if (this.form.startTime && this.form.endTime) {
-        let y1 = new Date(this.form.startTime);
-        let y2 = new Date(this.form.endTime);
+      if (this.form.beginDate && this.form.endDate) {
+        let y1 = new Date(this.form.beginDate);
+        let y2 = new Date(this.form.endDate);
         if (y2 < y1) {
-          this.form.day = '';
+          this.form.days = '';
           return
         }
         let sub = Math.abs(y2 - y1);
-        let day = Math.floor(sub / (1000 * 60 * 60 * 24)) + 1;
-        this.form.day = day;
+        let days = Math.floor(sub / (1000 * 60 * 60 * 24)) + 1;
+        this.form.days = days;
       } else {
-        this.form.day = '';
+        this.form.days = '';
       }
 
     }

oa-ui/src/views/flowable/form/deviceForm.vue

@@ -0,0 +1,174 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-03-07 13:44:39
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-03-07 14:26:46
+-->
+
+<template>
+  <div>
+    <h2 style="text-align: center;">设备申请表</h2>
+    <div>
+      <el-form :model="form" label-width="100px">
+        <!-- 申请人填写 -->
+        <el-row :gutter="20">
+          <el-col :span="6" :xs="24">
+            <el-form-item label="申请人：" prop="user">
+              <el-input v-model="form.user"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="所在部门：" prop="deptName">
+              <el-input v-model="form.deptName"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="申请时间：" prop="date">
+              <el-date-picker style="width:140px;" v-model="form.date" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="项目编号：" prop="projectNumber">
+          <el-select v-model="form.projectNumber" filterable allow-create placeholder="请选择"
+            @change="handleSelectProject" clearable>
+            <el-option v-for="item in projectList" :key="item.value" :label="item.projectNumber"
+              :value="item.projectId">
+            </el-option>
+          </el-select>
+          <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
+            <el-descriptions-item label="项目编号" label-class-name="my-label">{{ chooseProject.projectNumber
+              }}</el-descriptions-item>
+            <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
+              }}</el-descriptions-item>
+            <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeader
+              }}</el-descriptions-item>
+            <el-descriptions-item label="承担部门" label-class-name="my-label">
+              <el-tag size="small">{{ chooseProject.undertakingDept }}</el-tag>
+            </el-descriptions-item>
+            <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
+              }}</el-descriptions-item>
+          </el-descriptions>
+        </el-form-item>
+        <el-form-item label="申领事由：" prop="applyReason">
+          <el-input type="textarea" :rows="2" placeholder="请输入申领事由" v-model="form.applyReason">
+          </el-input>
+        </el-form-item>
+        <el-row>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="开始日期：">
+              <el-date-picker style="width:140px;" v-model="form.beginDate" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" @change="calculateDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6" :xs="24">
+            <el-form-item label="结束日期：">
+              <el-date-picker style="width:140px;" v-model="form.endDate" value-format="yyyy-MM-dd" type="date"
+                placeholder="选择日期" @change="calculateDay">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" :xs="24">
+            <el-form-item label="共计:">
+              {{ form.days + '天' }}
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+
+        <!-- 部门审核意见 -->
+        <el-form-item label="部门审核意见：" prop="deptComment" label-width="120px" v-if="taskName == '部门审核'">
+          <el-input type="textarea" :rows="2" placeholder="请输入部门审核意见" v-model="form.deptComment">
+          </el-input>
+        </el-form-item>
+        <!-- 分管审核意见 -->
+        <el-form-item label="分管审核意见：" prop="managerComment" label-width="120px" v-if="taskName == '分管审核'">
+          <el-input type="textarea" :rows="2" placeholder="请输入分管审核意见" v-model="form.managerComment">
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <el-row style="text-align: center;" v-if="taskName == '设备申请'">
+        <el-button type="primary" @click="submit">提交申请</el-button>
+      </el-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listProject, getProject } from "@/api/oa/project/project";
+export default {
+  props: {
+    taskName: {
+      type: String,
+      required: true
+    },
+    taskForm: {
+      type: Object,
+      required: true
+    }
+  },
+  created() {
+    this.form.user = this.$store.getters.name;
+    this.form.deptName = this.$store.getters.deptName;
+    this.getProjectList();
+  },
+  data() {
+    return {
+      form: {
+        date: new Date(),
+        days: ""
+      },
+      projectList: [],
+      chooseProject: {},
+      isSelect: false
+    }
+  },
+  methods: {
+    submit() {
+
+    },
+    // 查询项目列表
+    getProjectList() {
+      this.loading = true
+      listProject({
+        pageNum: 1,
+        pageSize: 9999999999
+      }).then(response => {
+        this.projectList = response.rows;
+      })
+    },
+    // 选择项目
+    handleSelectProject(val) {
+      if (val != "" && val != undefined && val != null) {
+        getProject(val).then(res => {
+          this.chooseProject = res.data;
+          this.isSelect = true
+        })
+      } else {
+        this.isSelect = false
+      }
+    },
+    // 计算天数
+    calculateDay() {
+      if (this.form.beginDate && this.form.endDate) {
+        let y1 = new Date(this.form.beginDate);
+        let y2 = new Date(this.form.endDate);
+        if (y2 < y1) {
+          this.form.days = '';
+          return
+        }
+        let sub = Math.abs(y2 - y1);
+        let days = Math.floor(sub / (1000 * 60 * 60 * 24)) + 1;
+        this.form.days = days;
+      } else {
+        this.form.days = '';
+      }
+
+    }
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -22,7 +22,8 @@
             v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :tableForm="tableForm" :taskName="taskName" @submit="handleComplete"
             v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
-          <car-form :taskName="taskName" v-else-if="taskForm.procDefName == '用车审批'" @submit="handleComplete"></car-form>
+          <car-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
+          <device-form :taskName="taskName" :taskForm="taskForm" v-else-if="taskForm.procDefName == '设备审批'"></device-form>
           <el-row type="flex" justify="center" v-show="isShowApprove()">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
@@ -163,6 +164,7 @@ import JsTable from "../../../form/jsTable.vue";
 import XmTable from "../../../form/xmTable.vue";
 import CwTable from "../../../form/cwTable.vue";
 import carForm from "../../../form/carForm.vue";
+import deviceForm from "../../../form/deviceForm";
 
 export default {
   name: "Record",
@@ -177,7 +179,8 @@ export default {
     XmTable,
     CwTable,
     JyTable,
-    carForm
+    carForm,
+    deviceForm
   },
   props: {},
   data() {
@@ -492,7 +495,6 @@ export default {
     /** 申请流程表单数据提交 */
     submitForm(formData, assessId) {
       listAssess({ assessId }).then(result => {
-
         let list = result;
         if (list.total != 0) {
           modifyAssess(formData).then(res => {
@@ -534,7 +536,7 @@ export default {
     },
     // 是否显示审批通过
     isShowApprove(){
-      if(this.taskName == '员工填报' || this.taskName == '用车申请'){
+      if(this.taskName == '员工填报' || this.taskName == '用车申请' || this.taskName == '设备申请'){
         return false
       }else{
         return true

oa-ui/src/views/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-03-06 16:14:12
+ * @LastEditTime: 2024-03-07 10:13:48
 -->
 
 <template>
@@ -15,7 +15,7 @@
             <img :src="avatar" class="user-avatar" />
           </div>
           <div class="username">
-            {{  user.nickName }}
+            {{ user.nickName }}
           </div>
         </div>
       </el-col>
@@ -37,8 +37,9 @@
       <el-col :span="8">
         <div class="header">日历</div>
         <div class="calendar">
-          <el-calendar v-model="times">
-          </el-calendar>
+          <Calendar></Calendar>
+          <!-- <el-calendar v-model="times">
+          </el-calendar> -->
         </div>
       </el-col>
       <el-col></el-col>
@@ -53,7 +54,11 @@ import { getUserProfile } from "@/api/system/user";
 import { listProject } from "@/api/oa/project/project";
 import { todoList } from "@/api/flowable/todo";
 import { finishedList } from "@/api/flowable/finished";
+import Calendar from '@/components/Calendar'
 export default {
+  components: {
+    Calendar
+  },
   computed: {
     ...mapGetters(["avatar"]),
   },
@@ -272,7 +277,7 @@ export default {
 
 
 .calendar {
-  height: 300px;
+  // height: 300px;
 }
 
 ::v-deep .el-calendar-table .el-calendar-day {