修改前端用车审批的返回时间

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcCarApproval.java

@@ -171,7 +171,7 @@ public class CmcCarApproval extends BaseEntity
     private Date dispatchTime;
 
     /** 返回时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
     @Excel(name = "返回时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date returnDate;
 

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

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-22 17:57:05
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-23 10:23:54
 -->
 
 <template>
@@ -25,7 +25,7 @@
                 <el-col :span="7" :xs="24">
                   <el-form-item label="所在部门：" prop="dept.deptName">
                     <!-- <el-input v-model="form.deptName"></el-input> -->
-                    {{ form.dept ? form.dept.deptName:'' }}
+                    {{ form.dept ? form.dept.deptName : '' }}
                   </el-form-item>
                 </el-col>
                 <el-col :span="7" :xs="24">
@@ -230,13 +230,17 @@
               <el-row>
                 <el-col :span="12" :xs="24">
                   <el-form-item label="返回日期" prop="returnDate">
-                    <el-date-picker v-model="form.returnDate" clearable type="date" value-format="yyyy-MM-dd" placeholder="选择日期" :disabled="taskName != '安排用车'">
+                    <!-- <el-date-picker v-model="form.returnDate" clearable type="datetime" value-format="yyyy-MM-dd-HH-mm"
+                      placeholder="选择日期" :disabled="taskName != '安排用车'">
+                    </el-date-picker> -->
+                    <el-date-picker v-model="form.returnDate" type="datetime" placeholder="选择日期时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" :disabled="taskName != '安排用车'">
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
                 <el-col :span="12" :xs="24">
                   <el-form-item label="行驶公里：" prop="kilometers" label-width="120px">
-                    <el-input placeholder="请输入行驶公里" v-model="form.kilometers" style="width: 200px;" :disabled="taskName != '安排用车'"/>
+                    <el-input placeholder="请输入行驶公里" v-model="form.kilometers" style="width: 200px;"
+                      :disabled="taskName != '安排用车'" />
                     <span> 公里</span>
                   </el-form-item>
                 </el-col>
@@ -335,7 +339,7 @@ export default {
       this.dispatchUser = this.$store.getters.name;
       this.dispatchTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    this.dept = this.$store.getters.deptId;    
+    this.dept = this.$store.getters.deptId;
     this.getProjectList();
     this.getCarList();
     this.getDriverList();

oa-ui/src/views/flowable/form/projectProcess/addproject.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 11:00:04
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-22 12:39:12
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-23 14:55:46
 -->
 <template>
   <div class="project-wrapper">
@@ -58,7 +58,7 @@
             <span class="el-icon-download">下载文件</span>
           </el-link>
         </div>
-        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书'"
+        <FileUpload v-if="$route.query.taskName == '项目登记'" ref="orz" :limit="1" :filePathName="'项目任务书/' + parseTime(new Date(),'{y}-{m}-{d}-{h}-{i}-{s}')"
           :fileType="['doc', 'docx', 'xls', 'xlsx', 'pdf', 'rar', 'zip']" @input="setProjectDocument">
         </FileUpload>
       </el-form-item>

oa-ui/src/views/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-16 15:20:45
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-23 16:54:28
 -->
 
 <template>
@@ -50,15 +50,7 @@
 
     </el-row>
     <el-row :gutter="20">
-      <el-col :span="8" :xs="24">
-        <div class="header">日历</div>
-        <div class="calendar-warpper">
-          <!-- <Calendar></Calendar> -->
-          <el-calendar v-model="times">
-          </el-calendar>
-        </div>
-      </el-col>
-      <el-col :span="16" :xs="24">
+      <el-col :span="10" :xs="24">
         <div class="header">通知公示</div>
         <div class="notice-content">
           <el-table v-loading="noticeLoading" :data="noticeList" height="320px">
@@ -90,6 +82,34 @@
 
         </div>
       </el-col>
+      <el-col :span="14" :xs="24">
+        <div class="header">待办任务</div>
+        <div class="calendar-warpper">
+          <el-table v-loading="taskLoading" :data="todoList" height="400px">
+            <el-table-column type="index" label="序号" width="55" align="center" />
+            <el-table-column label="流程名称" align="center" prop="procDefName" />
+            <el-table-column label="当前节点" align="center" prop="taskName" />
+            <el-table-column label="流程发起人" align="center">
+              <template slot-scope="scope">
+                <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName
+                    }}</el-tag></label>
+              </template>
+            </el-table-column>
+            <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+              <template slot-scope="scope">
+                <el-button size="mini" type="text" icon="el-icon-edit-outline" @click="handleProcess(scope.row)">处理
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- <div class="calendar-warpper"> -->
+        <!-- <Calendar></Calendar> -->
+        <!-- <el-calendar v-model="times"> -->
+        <!-- </el-calendar> -->
+        <!-- </div> -->
+      </el-col>
       <!-- <el-col :span="8" :xs="24">
         <div class="header">XXXX</div>
         <div class="project-content">
@@ -113,6 +133,7 @@ import { todoList } from "@/api/flowable/todo";
 import { finishedList } from "@/api/flowable/finished";
 import Calendar from '@/components/Calendar';
 import { listNotice } from "@/api/system/notice";
+import { getProcessVariables } from "@/api/flowable/definition"
 export default {
   dicts: ['sys_notice_status', 'sys_notice_type'],
   components: {
@@ -140,7 +161,9 @@ export default {
       noticeList: [],// 数据
       noticeTotal: 0,
       clickNotice: {},
+      todoList: [],
       noticeLoading: true,
+      taskLoading: true,
       noticeQueryParams: {
         pageNum: 1,
         pageSize: 10
@@ -266,12 +289,15 @@ export default {
     },
     // 获取考核待办
     getDetail() {
+      this.taskLoading = true;
       todoList({
         pageNum: 1,
-        pageSize: 10,
+        pageSize: 999,
         name: null
       }).then(response => {
         this.detail = response.data.total;
+        this.todoList = response.data.records;
+        this.taskLoading = false;
       });
     },
     getFinish() {
@@ -329,7 +355,37 @@ export default {
         });
       }
       return html;
-    }
+    },
+    handleProcess(row){
+      let path = this.getRoutePath(row);
+      getProcessVariables(row.taskId).then(res => {
+        this.$router.push({
+          path: path,
+          query: {
+            procInsId: row.procInsId,
+            executionId: row.executionId,
+            deployId: row.deployId,
+            taskId: row.taskId,
+            taskName: row.taskName,
+            startUser: row.startUserName + '-' + row.startDeptName,
+            formId: res.data.formId,
+            procDefName: row.procDefName
+          }
+        })
+      })
+    },
+    getRoutePath(row) {
+      let path;
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.procDefName) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
+      }
+      return path
+    },
   }
 }
 </script>
@@ -430,6 +486,7 @@ export default {
 }
 
 .calendar-warpper {
+padding: 10px;
   width: 100%;
   height: 400px;
   background-color: #ffffff;

oa-ui/src/views/oa/contract/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-03-18 09:05:41
- * @LastEditors: wrh
- * @LastEditTime: 2024-07-03 11:33:28
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-07-23 17:11:21
 -->
 <template>
   <div class="app-container">
@@ -54,6 +54,10 @@
         <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
           v-hasPermi="['oa:contract:remove']">删除</el-button>
       </el-col> -->
+      <!-- <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleRegister"
+          v-hasPermi="['oa:contract:add']">登记合同</el-button>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport"
           v-hasPermi="['oa:contract:export']">导出</el-button>
@@ -178,6 +182,10 @@
 import { listContract, getContract, delContract, addContract, updateContract } from "@/api/oa/contract/contract";
 import contractInfo from './contractInfo.vue';
 import ContractForm from '../../flowable/form/business/contractForm.vue';
+import { listDefinition } from "@/api/flowable/definition";
+import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
+import { todoList, getNextFlowNodeByStart } from "@/api/flowable/todo";
+import { Snowflake } from '@/utils/snowFlake.js'
 export default {
   components: { contractInfo, ContractForm },
   name: "Contract",
@@ -224,7 +232,7 @@ export default {
       rules: {
       },
       project: {},
-      taskForm:{}
+      taskForm: {}
     };
   },
   created() {
@@ -301,7 +309,7 @@ export default {
       this.openInfo = true;
       this.title = "合同详情";
       this.form = row;
-      this.$set(this.taskForm,'formId',row.contractId)
+      this.$set(this.taskForm, 'formId', row.contractId)
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
@@ -313,6 +321,63 @@ export default {
         this.title = "修改cmc合同评审";
       });
     },
+    // 登记合同
+    handleRegister(row) {
+      // this.handleStartProcess(row)
+    },
+    handleStartProcess(row) {
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
+        let data = res.data;
+        const variables = {};
+        const formData = {};
+        formData.disabled = true;
+        formData.formBtns = false;
+        formData.formId = formId
+        if (row.id) {
+          variables.variables = formData;
+          let routePath = this.getRoutePath(row);
+          definitionStart(row.id, JSON.stringify(variables)).then(res => {
+            this.$modal.msgSuccess(res.msg);
+            let procInstanceId = res.data;
+            todoList({
+              pageNum: 1,
+              pageSize: 99999999, processInsId: procInstanceId
+            }).then(toDoRes => {
+              let records = toDoRes.data.records;
+              if (records.length == 1) {
+                records = records[0]
+              }
+              this.$router.push({
+                path: routePath,
+                query: {
+                  procInsId: records.procInsId,
+                  executionId: records.executionId,
+                  deployId: records.deployId,
+                  taskId: records.taskId,
+                  taskName: records.taskName,
+                  startUser: records.startUserName + '-' + records.startDeptName,
+                  formId: formData.formId,
+                  procDefName: records.procDefName
+                }
+              })
+            })
+          })
+        }
+      })
+    },
+    getRoutePath(row) {
+      let path;
+      for (let p of this.publicData.pathRoute) {
+        if (p.name == row.name) {
+          path = p.path
+          break
+        } else {
+          path = '/flowable/task/todo/detail/index'
+        }
+      }
+      return path
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {