修改已办任务显示、修改用车审批等

oa-ui/src/assets/styles/element-reset.scss

@@ -0,0 +1,36 @@
+::v-deep .el-input.is-disabled .el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
+  background-color: #409EFF;
+  width: 6px;
+  height: 6px;
+}
+
+::v-deep .el-radio__input.is-disabled .el-radio__inner,
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  border-color: #409EFF;
+}
+
+// 复选框
+::v-deep .el-checkbox__input.is-disabled+span.el-checkbox__label{
+  color: #686a6e;
+}
+
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner{
+  background-color: #409EFF;
+  border-color: #409EFF;
+}
+::v-deep .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner::after{
+  border-color: #fff;
+}

oa-ui/src/assets/styles/element-ui.scss

@@ -97,7 +97,8 @@
   overflow-x: hidden;
 }
 
-.el-form-item__label{
+.el-form-item__label {
   font-family: '微软雅黑';
   color: #34363b;
-}
+}
+

oa-ui/src/assets/styles/index.scss

@@ -198,4 +198,9 @@ aside {
   writing-mode: vertical-rl;
   transform: rotate(360deg);
   letter-spacing: 5px;
+}
+
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
 }

oa-ui/src/assets/styles/ruoyi.scss

@@ -289,3 +289,26 @@
   position: relative;
   float: right;
 }
+el-input.is-disabled >.el-input__inner {
+  color: #686a6e;
+}
+
+::v-deep .el-textarea.is-disabled .el-textarea__inner,
+.el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled+span.el-radio__label {
+  color: #686a6e;
+}
+
+::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner::after {
+  background-color: var(--current-color);
+  width: 6px;
+  height: 6px;
+}
+
+::v-deep .el-radio__input.is-disabled .el-radio__inner,
+.el-radio__input.is-disabled.is-checked .el-radio__inner {
+  border-color: var(--current-color);
+}

oa-ui/src/layout/components/Navbar.vue

@@ -24,7 +24,7 @@
         </el-tooltip>
 
       </template> -->
-
+      <span class="right-menu-item">当前用户：{{ name }}</span>
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
         <div class="avatar-wrapper">
           <img :src="avatar" class="user-avatar">
@@ -72,7 +72,8 @@ export default {
     ...mapGetters([
       'sidebar',
       'avatar',
-      'device'
+      'device',
+      'name'
     ]),
     setting: {
       get() {
@@ -158,7 +159,7 @@ export default {
       display: inline-block;
       padding: 0 8px;
       height: 100%;
-      font-size: 18px;
+      font-size: 14px;
       color: #5a5e66;
       vertical-align: text-bottom;
 
@@ -197,4 +198,5 @@ export default {
     }
   }
 }
+
 </style>

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

@@ -1,12 +1,12 @@
 <!--
  * @Author: ysh
  * @Date: 2024-02-29 11:44:28
- * @LastEditors: wrh
- * @LastEditTime: 2024-04-19 17:39:20
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-04-23 14:48:39
 -->
 
 <template>
-  <div>
+  <div v-loading="loading" element-loading-text="拼命加载中" element-loading-spinner="el-icon-loading">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
         <el-card>
@@ -35,36 +35,36 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6" :xs="24">
-                  <el-form-item label="申请用途：" prop="carUsage">
-                    <el-radio-group v-model="form.carUsage" @change="useChange" size="small"
-                      :disabled="taskName != '用车申请'">
-                      <el-radio-button label="1">工会用车</el-radio-button>
-                      <el-radio-button label="0">非工会用车</el-radio-button>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
               </el-row>
-              <el-form-item label="项目编号：" prop="projectId">
+              <el-form-item label="申请用途：" prop="carUsage">
+                <el-radio-group v-model="form.carUsage" @change="useChange" size="small" :disabled="taskName != '用车申请'">
+                  <el-radio label="0">项目用车</el-radio>
+                  <el-radio label="1">非项目用车</el-radio>
+                  <el-radio label="2">工会用车</el-radio>
+                  <el-radio label="3">党委用车</el-radio>
+                  <el-radio label="4">团委用车</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="项目编号：" prop="projectId" v-if="form.carUsage == '0'">
                 <el-select v-model="form.projectId" filterable placeholder="请选择" @change="handleSelectProject"
-                  :disabled="taskName != '用车申请' || form.carUsage == '1'" clearable>
+                  :disabled="taskName != '用车申请'" 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>
                   <el-descriptions-item label="项目名称" label-class-name="my-label">{{ chooseProject.projectName
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="项目负责人" label-class-name="my-label">{{ chooseProject.projectLeaderUser ?
-                    chooseProject.projectLeaderUser.nickName : ''
-                  }}</el-descriptions-item>
+    chooseProject.projectLeaderUser.nickName : ''
+                    }}</el-descriptions-item>
                   <el-descriptions-item label="承担部门" label-class-name="my-label">
                     <el-tag size="small">{{ chooseProject.undertakingDeptName }}</el-tag>
                   </el-descriptions-item>
                   <el-descriptions-item label="项目类型" label-class-name="my-label">{{ chooseProject.projectType
-                  }}</el-descriptions-item>
+                    }}</el-descriptions-item>
                 </el-descriptions>
               </el-form-item>
               <el-form-item label="用车事由：" prop="applyReason">
@@ -75,7 +75,8 @@
               <el-row>
                 <el-col :span="6" :xs="24">
                   <el-form-item label="乘车人数：" prop="passengers">
-                    <el-input-number v-model="form.passengers" :min="1" :disabled="taskName != '用车申请'"></el-input-number>
+                    <el-input-number v-model="form.passengers" :min="1"
+                      :disabled="taskName != '用车申请'"></el-input-number>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6" :xs="24">
@@ -135,20 +136,20 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <!-- 工会审核意见 -->
-              <el-form-item label="工会审核意见：" prop="unionComment" label-width="120px" v-if="showFormItem('工会审核')">
-                <el-input type="textarea" :rows="2" placeholder="请输入工会审核意见" v-model="form.unionComment"
-                  :disabled="taskName != '工会审核'">
+              <!-- 党工团审核意见 -->
+              <el-form-item :label="dgtAdvice" prop="unionComment" label-width="120px" v-if="showFormItem('党工团审核')">
+                <el-input type="textarea" :rows="2" placeholder="请输入审核意见" v-model="form.unionComment"
+                  :disabled="taskName != '党工团审核'">
                 </el-input>
               </el-form-item>
               <el-row>
                 <el-col :span="6" :xs="24" :offset="12">
-                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('工会审核签名')">
+                  <el-form-item label="签名：" label-width="120px" v-if="showFormItem('党工团审核签名')">
                     <span class="auditor"> {{ form.unionUser ? form.unionUser.nickName : unionUser }} </span>
                   </el-form-item>
                 </el-col>
                 <el-col :span="6">
-                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('工会审核签名')">
+                  <el-form-item label="日期：" label-width="120px" v-if="showFormItem('党工团审核签名')">
                     <span> {{ form.unionTime ? form.unionTime : unionTime }} </span>
                   </el-form-item>
                 </el-col>
@@ -263,7 +264,7 @@ export default {
       this.managerUser = this.$store.getters.name;
       this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
-    if (this.taskName == '工会审核') {
+    if (this.taskName == '党工团审核') {
       this.unionUser = this.$store.getters.name;
       this.unionTime = parseTime(new Date(), '{y}-{m}-{d}')
     }
@@ -285,6 +286,7 @@ export default {
   },
   data() {
     return {
+      loading: true,
       deptUser: '',
       managerUser: '',
       unionUser: '',
@@ -335,6 +337,7 @@ export default {
       formTotal: 0,
       flowData: {},
       dept: 0,
+      dgtAdvice: '审核意见'//党工团审核意见的label
     }
   },
   mounted() {
@@ -351,10 +354,19 @@ export default {
           this.dept = this.$store.getters.deptId;
           this.form.dept.deptName = this.$store.getters.deptName;
           this.form.applyDate = new Date();
+          this.loading = false
         }
         else {
           this.formTotal = 1;
           let data = res.data;
+          // 初始化党工团审核意见的label
+          if (data.carUsage == '2') {
+            this.dgtAdvice = '工会审核意见'
+          } else if (data.carUsage == '3') {
+            this.dgtAdvice = '党委审核意见'
+          } else {
+            this.dgtAdvice = '团委审核意见'
+          }
           if (res.data.drivers == null || res.data.drivers == undefined || res.data.drivers == "") {
             data.drivers = []
           } else {
@@ -382,6 +394,7 @@ export default {
               this.isSelect = true
             })
           }
+          this.loading = false
         }
       })
     },
@@ -410,6 +423,7 @@ export default {
       })
     },
     completeApply() {
+      debugger
       this.form.formId = this.taskForm.formId;
       this.form.carApplyId = this.taskForm.formId;
       let formData = new FormData();
@@ -428,9 +442,15 @@ export default {
     getNextFlowNodeApproval() {
       if (this.taskName == '用车申请') {
         getUsersDeptLeader({ userId: this.$store.getters.userId }).then(res => {
+          debugger
           this.$set(this.taskForm.variables, "dept", this.dept);
-          if (res.data)
+          if (res.data && this.dept != 0) {
             this.$set(this.taskForm.variables, "approval", res.data.userId);
+          } else {
+            let userId = this.getChooseType()
+            this.$set(this.taskForm.variables, "approval", userId);
+          }
+
           complete(this.taskForm).then(response => {
             this.$modal.msgSuccess(response.msg);
             this.$emit('goBack')
@@ -445,7 +465,7 @@ export default {
             this.$emit('goBack')
           });
         })
-      } else if (this.taskName == '分管审核' || this.taskName == '工会审核' || this.taskName == '总经理审核') {
+      } else if (this.taskName == '分管审核' || this.taskName == '党工团审核' || this.taskName == '总经理审核') {
         this.$set(this.taskForm.variables, "approvalList", [8, 16]);
         complete(this.taskForm).then(response => {
           this.$modal.msgSuccess(response.msg);
@@ -458,6 +478,13 @@ export default {
         });
       }
     },
+    getChooseType() {
+      if (this.form.carUsage == '2' || this.form.carUsage == '3') {
+        return 4 // 4为党委书记
+      } else {
+        return 142  //142为团委书记
+      }
+    },
     // 查询项目列表
     getProjectList() {
       this.loading = true
@@ -525,8 +552,9 @@ export default {
       return true;
     },
     useChange(val) {
-      if (val == '1')
+      if (val == '2' || val == '3' || val == '4') {
         this.dept = 0;
+      }
       else
         this.dept = this.$store.getters.deptId;
     },
@@ -536,16 +564,16 @@ export default {
         isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
       else if (name == '分管审核')
         isShow = (this.dept > 102 && this.taskName == '用车申请') || (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
-      else if (name == '工会审核')
-        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+      else if (name == '党工团审核')
+        isShow = (this.dept == 0 && this.taskName == '用车申请') || this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
       else if (name == '总经理审核')
         isShow = (this.dept == 102 && this.taskName == '用车申请') || this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
       else if (name == '部门审核签名')
         isShow = (this.taskName == '部门审核' || this.taskName == '分管审核') || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.deptUserId != null);
       else if (name == '分管审核签名')
         isShow = this.taskName == '分管审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.managerUserId != null);
-      else if (name == '工会审核签名')
-        isShow = this.taskName == '工会审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
+      else if (name == '党工团审核签名')
+        isShow = this.taskName == '党工团审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.unionUserId != null);
       else if (name == '总经理审核签名')
         isShow = this.taskName == '总经理审核' || ((this.taskName == '安排用车' || this.taskName == '申请确认') && this.form.gmUserId != null);
       return isShow;
@@ -554,7 +582,9 @@ export default {
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
+</style>
 
 <style>
 .auditor {
@@ -566,12 +596,4 @@ export default {
   width: 100px;
   background: #E1F3D8;
 }
-
-::v-deep .el-input.is-disabled .el-input__inner {
-  color: #121212 !important;
-}
-
-::v-deep .el-textarea.is-disabled .el-textarea__inner {
-  color: #121212 !important;
-}
 </style>

oa-ui/src/views/flowable/form/conditionDisplay/index.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
+    <jy-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
+    <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+    <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
+    <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
+    <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
+    <project-process :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
+    <car-form :taskForm="taskForm" :taskName="''" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
+    <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
+    <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
+  </div>
+</template>
+
+<script>
+import ScTable from "@/views/flowable/form/scTable.vue";
+import JyTable from "@/views/flowable/form/jyTable.vue";
+import ZhTable from "@/views/flowable/form/zhTable.vue";
+import JsTable from "@/views/flowable/form/jsTable.vue";
+import XmTable from "@/views/flowable/form/xmTable.vue";
+import CwTable from "@/views/flowable/form/cwTable.vue";
+import CarForm from '@/views/flowable/form/carForm.vue';
+import projectProcess from '@/views/flowable/form/projectProcess/index'
+import TechnicalForm from '@/views/flowable/form/technicalForm.vue';
+import SafeForm from '@/views/flowable/form/safeForm.vue';
+export default {
+  props: {
+    passingParam: {
+      type: Object
+    }
+  },
+  watch:{
+    passingParam(newval,old){
+      this.init(newval)
+    }
+  },
+  components: {
+    ScTable,
+    ZhTable,
+    JsTable,
+    XmTable,
+    CwTable,
+    JyTable,
+    CarForm,
+    projectProcess,
+    TechnicalForm,
+    SafeForm
+  },
+  data() {
+    return {
+      taskForm: {},
+      taskName: '',
+      procDefName: ''
+    }
+  },
+  created() {
+    this.init(this.passingParam)
+  },
+  methods: {
+    init(val) {
+      this.taskForm = val
+      this.taskName = val.taskName
+      this.procDefName = val.procDefName
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-17 15:27:10
+ * @LastEditTime: 2024-04-23 17:50:04
 -->
 
 <template>
@@ -164,6 +164,7 @@ export default {
   },
   created() {
     this.registerTime = parseTime(new Date(), '{y}-{m}-{d}')
+    debugger
     if (this.$route.query.taskName != '项目登记') {
       this.getProjectInfo();
       this.getProjectWorkList();

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

@@ -2,12 +2,12 @@
  * @Author: ysh
  * @Date: 2024-04-08 13:56:14
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-17 17:58:35
+ * @LastEditTime: 2024-04-22 11:31:51
 -->
 <template>
   <div>
-    <el-skeleton animated :rows="20" v-if="loading" class="app-container" />
-    <div class="app-container" v-if="!loading">
+    <!-- <el-skeleton animated :rows="20" v-if="loading" class="app-container" /> -->
+    <div class="app-container">
       <h2 style="text-align: center">项目运作情况</h2>
       <div class="headers">
         基本作业情况记录
@@ -29,8 +29,8 @@
         <el-form-item label="参与人员：" v-if="!noBudget">
           {{ form.staff }}
         </el-form-item>
-        <div v-if="noBudget">
-          <el-alert title="项目未做预算表，请先编制预算表" type="warning" effect="dark">
+        <div v-if="noBudget" class="mb20">
+          <el-alert title="项目未做预算表，请先编制预算表" type="warning" :closable="false">
           </el-alert>
         </div>
         <el-row :gutter="20">

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

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-02-27 14:49:15
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-19 17:39:47
+ * @LastEditTime: 2024-04-23 16:06:30
 -->
 
 <template>
@@ -125,7 +125,9 @@ export default {
     }
   },
   created() {
-    this.activeName = this.taskName;
+    if(this.taskName !='' && this.taskName != undefined &&this.taskName != null){
+      this.activeName = this.taskName;
+    }
     console.log(this.taskName);
     this.getList();
     this.getDeptList();

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <el-row :gutter="20">
       <el-col :span="18" :xs="24">
-        <el-form ref="form" :model="form" :rules="rules" label-width="150px">
+        <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="taskName != '安全交底'">
           <el-form-item label="项目编号：" prop="projectId" v-if="taskForm.procDefName == '安全交底'">
             <el-input v-model="chooseProject.projectNumber" placeholder="请输入项目编号" disabled style="width: 300px" />
             <el-descriptions border v-if="isSelect" style="margin-top: 10px;" :column="1">
@@ -316,7 +316,8 @@ export default {
 };
 </script>
 
-<style>
+<style lang="scss" scoped>
+@import "@/assets/styles/element-reset.scss";
 .auditor {
   font-family: '华文行楷';
   font-size: 20px;

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

@@ -155,8 +155,7 @@ export default {
   name: "Technical",
   props: {
     taskName: {
-      type: String,
-      required: true
+      type: String
     },
     taskForm: {
       type: Object,

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

@@ -21,6 +21,10 @@
           <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
           <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>
+          <project-process :taskForm="taskForm" v-else-if="taskForm.procDefName == '项目流转'"></project-process>
+          <car-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '用车审批'"></car-form>
+          <technical-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '技术交底'"></technical-form>
+          <safe-form :taskForm="taskForm" v-else-if="taskForm.procDefName == '安全交底'"></safe-form>
           <el-col :span="16" :offset="4" v-else>
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="variablesData" />
@@ -83,13 +87,17 @@ import Parser from '@/components/parser/Parser'
 import { getProcessVariables, flowXmlAndNode } from "@/api/flowable/definition";
 import flow from '@/views/flowable/task/finished/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-import ScTable from "../../../form/scTable.vue";
 import { getAssess, modifyAssess } from '@/api/oa/assess/assess'
+import ScTable from "@/views/flowable/form/scTable.vue";
 import JyTable from "@/views/flowable/form/jyTable.vue";
 import ZhTable from "@/views/flowable/form/zhTable.vue";
 import JsTable from "@/views/flowable/form/jsTable.vue";
 import XmTable from "@/views/flowable/form/xmTable.vue";
 import CwTable from "@/views/flowable/form/cwTable.vue";
+import CarForm from '@/views/flowable/form/carForm.vue';
+import projectProcess from '@/views/flowable/form/projectProcess/index'
+import TechnicalForm from '../../../form/technicalForm.vue';
+import SafeForm from '../../../form/safeForm.vue';
 
 export default {
   name: "Record",
@@ -101,7 +109,11 @@ export default {
     JsTable,
     XmTable,
     CwTable,
-    JyTable
+    JyTable,
+    CarForm,
+    projectProcess,
+    TechnicalForm,
+    SafeForm
   },
   props: {},
   data() {

oa-ui/src/views/flowable/task/finished/index.vue

@@ -40,8 +40,8 @@
       <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-tickets" @click="handleFlowRecord(scope.row)">流转记录</el-button>
-          <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
-          </el-button>
+          <!-- <el-button size="mini" type="text" icon="el-icon-refresh-left" @click="handleRevoke(scope.row)">撤回
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-03 09:23:11
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-04-19 15:08:13
+ * @LastEditTime: 2024-04-23 17:17:12
 -->
 <template>
   <div class="app-container">
@@ -36,37 +36,37 @@
 
     <el-table v-loading="loading" :data="myProcessList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="流程状态" align="center" width="100">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
+          <el-tag type="success" v-if="scope.row.finishTime != null" size="mini">已完成</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="流程编号" align="center" prop="procInsId" :show-overflow-tooltip="true" />
       <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
-      <el-table-column label="流程类别" align="center" prop="category" width="100px" />
+      <!-- <el-table-column label="流程类别" align="center" prop="category" width="100px" /> -->
       <!-- <el-table-column label="流程版本" align="center" width="80px">
         <template slot-scope="scope">
           <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
         </template>
 </el-table-column> -->
       <el-table-column label="提交时间" align="center" prop="createTime" width="180" />
-      <el-table-column label="流程状态" align="center" width="100">
-
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.finishTime == null" size="mini">进行中</el-tag>
-          <el-tag type="success" v-if="scope.row.finishTime != null" size="mini">已完成</el-tag>
-        </template>
-      </el-table-column>
       <el-table-column label="耗时" align="center" prop="duration" width="180" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
-      <el-table-column label="办理人" align="center">
+      <el-table-column label="待办人" align="center">
 
         <template slot-scope="scope">
-          <label v-if="scope.row.assigneeName">{{ scope.row.assigneeName }} <el-tag type="info" size="mini">{{
-      scope.row.assigneeDeptName }}</el-tag></label>
+          <label v-if="scope.row.assigneeName">
+            {{ scope.row.assigneeName }}
+            <el-tag type="info" size="mini">{{ scope.row.assigneeDeptName }}</el-tag></label>
           <!--          <label v-if="scope.row.candidate">{{scope.row.candidate}}</label>-->
         </template>
       </el-table-column>
-      <el-table-column label="操作" width="150" fixed="right" class-name="small-padding fixed-width">
-
+      <el-table-column label="操作" width="200" fixed="right" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">进度</el-button>
-          <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button>
+          <el-button @click="handleFlowRecord(scope.row)" type="text" size="small">办理进度</el-button>
+          <el-button @click="handleFlowNote(scope.row)" type="text" size="small">表单信息</el-button>
+          <!-- <el-button @click="handleStop(scope.row)" type="text" size="small">取消申请</el-button> -->
           <el-button @click="handleDelete(scope.row)" type="text" size="small"
             v-hasPermi="['system:deployment:remove']">删除</el-button>
         </template>
@@ -113,6 +113,10 @@
         <RowDetail :rows="clickRow"></RowDetail>
       </el-scrollbar>
     </el-dialog>
+
+    <el-dialog title="表单信息" :visible.sync="formOpen" append-to-body width="80%">
+      <conditionDisplay :passingParam="passingParam"></conditionDisplay>
+    </el-dialog>
   </div>
 </template>
 
@@ -133,11 +137,14 @@ import { definitionStart, flowXmlAndNode } from "@/api/flowable/definition";
 import { Snowflake } from '@/utils/snowFlake.js'
 import RowDetail from './send/rowDetail.vue'
 import ProgressTree from './progressTree.vue';
+import { getProcessVariables } from "@/api/flowable/definition";
+import conditionDisplay from '@/views/flowable/form/conditionDisplay/index'
 export default {
   name: "Deploy",
   components: {
     RowDetail,
-    ProgressTree
+    ProgressTree,
+    conditionDisplay
   },
   data() {
     return {
@@ -163,6 +170,7 @@ export default {
       open: false,
       // 详情弹出框
       detailsOpen: false,
+      formOpen: false,
       src: "",
       definitionList: [],
       // 查询参数
@@ -199,7 +207,8 @@ export default {
       rules: {
       },
       // 当前点击的行数据
-      clickRow: {}
+      clickRow: {},
+      passingParam: {}
     };
   },
   created() {
@@ -278,8 +287,8 @@ export default {
     /**  发起流程申请 */
     handleStartProcess(row) {
       // if (row.category == "assess" || row.category == "car" || ) {
-        let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
-      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {formId:formId} }).then(res => {
+      let formId = new Snowflake(1n, 1n, 0n).nextId().toString();
+      getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: { formId: formId } }).then(res => {
         let data = res.data;
         if (data.dataType === 'dynamic') {
           if (data.type === 'assignee') { // 指定人员
@@ -373,6 +382,17 @@ export default {
       this.clickRow = row;
       this.detailsOpen = true;
     },
+    // 表单信息
+    handleFlowNote(row) {
+      getProcessVariables(row.taskId).then(res => {
+        console.log(res);
+        if (res.data) {
+          this.passingParam = row
+          this.passingParam.formId = res.data.formId
+          this.formOpen = true
+        }
+      })
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();