根据项目id查询项目进度

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcProjectProgressController.java

@@ -61,10 +61,10 @@ public class CmcProjectProgressController extends BaseController
     /**
      * 获取cmc项目进度详细信息
      */
-    @GetMapping(value = "/{progressId}")
-    public AjaxResult getInfo(@PathVariable("progressId") String progressId)
+    @GetMapping(value = "/{projectId}")
+    public AjaxResult getInfo(@PathVariable("projectId") String projectId)
     {
-        return success(cmcProjectProgressService.selectCmcProjectProgressByProgressId(progressId));
+        return success(cmcProjectProgressService.selectCmcProjectProgressByProjectId(projectId));
     }
 
     /**
@@ -74,7 +74,7 @@ public class CmcProjectProgressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody CmcProjectProgress cmcProjectProgress)
     {
-        cmcProjectProgress.setProgressId(new SnowFlake().generateId());
+        cmcProjectProgress.setProjectId(new SnowFlake().generateId());
         return toAjax(cmcProjectProgressService.insertCmcProjectProgress(cmcProjectProgress));
     }
 
@@ -92,9 +92,9 @@ public class CmcProjectProgressController extends BaseController
      * 删除cmc项目进度
      */
     @Log(title = "cmc项目进度", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{progressIds}")
-    public AjaxResult remove(@PathVariable String[] progressIds)
+	@DeleteMapping("/{projectIds}")
+    public AjaxResult remove(@PathVariable String[] projectIds)
     {
-        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProgressIds(progressIds));
+        return toAjax(cmcProjectProgressService.deleteCmcProjectProgressByProjectIds(projectIds));
     }
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/mapper/CmcProjectProgressMapper.java

@@ -14,10 +14,10 @@ public interface CmcProjectProgressMapper
     /**
      * 查询cmc项目进度
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return cmc项目进度
      */
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
 
     /**
      * 查询cmc项目进度列表
@@ -46,16 +46,16 @@ public interface CmcProjectProgressMapper
     /**
      * 删除cmc项目进度
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return 结果
      */
-    public int deleteCmcProjectProgressByProgressId(String progressId);
+    public int deleteCmcProjectProgressByProjectId(String projectId);
 
     /**
      * 批量删除cmc项目进度
      * 
-     * @param progressIds 需要删除的数据主键集合
+     * @param projectIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/ICmcProjectProgressService.java

@@ -14,10 +14,10 @@ public interface ICmcProjectProgressService
     /**
      * 查询cmc项目进度
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return cmc项目进度
      */
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId);
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId);
 
     /**
      * 查询cmc项目进度列表
@@ -46,16 +46,16 @@ public interface ICmcProjectProgressService
     /**
      * 批量删除cmc项目进度
      * 
-     * @param progressIds 需要删除的cmc项目进度主键集合
+     * @param projectIds 需要删除的cmc项目进度主键集合
      * @return 结果
      */
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds);
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds);
 
     /**
      * 删除cmc项目进度信息
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return 结果
      */
-    public int deleteCmcProjectProgressByProgressId(String progressId);
+    public int deleteCmcProjectProgressByProjectId(String projectId);
 }

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/service/impl/CmcProjectProgressServiceImpl.java

@@ -22,13 +22,13 @@ public class CmcProjectProgressServiceImpl implements ICmcProjectProgressService
     /**
      * 查询cmc项目进度
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return cmc项目进度
      */
     @Override
-    public CmcProjectProgress selectCmcProjectProgressByProgressId(String progressId)
+    public CmcProjectProgress selectCmcProjectProgressByProjectId(String projectId)
     {
-        return cmcProjectProgressMapper.selectCmcProjectProgressByProgressId(progressId);
+        return cmcProjectProgressMapper.selectCmcProjectProgressByProjectId(projectId);
     }
 
     /**
@@ -70,24 +70,24 @@ public class CmcProjectProgressServiceImpl implements ICmcProjectProgressService
     /**
      * 批量删除cmc项目进度
      * 
-     * @param progressIds 需要删除的cmc项目进度主键
+     * @param projectIds 需要删除的cmc项目进度主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectProgressByProgressIds(String[] progressIds)
+    public int deleteCmcProjectProgressByProjectIds(String[] projectIds)
     {
-        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressIds(progressIds);
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProjectIds(projectIds);
     }
 
     /**
      * 删除cmc项目进度信息
      * 
-     * @param progressId cmc项目进度主键
+     * @param projectId cmc项目进度主键
      * @return 结果
      */
     @Override
-    public int deleteCmcProjectProgressByProgressId(String progressId)
+    public int deleteCmcProjectProgressByProjectId(String projectId)
     {
-        return cmcProjectProgressMapper.deleteCmcProjectProgressByProgressId(progressId);
+        return cmcProjectProgressMapper.deleteCmcProjectProgressByProjectId(projectId);
     }
 }

oa-back/ruoyi-system/src/main/resources/mapper/oa/CmcProjectProgressMapper.xml

@@ -26,9 +26,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
     
-    <select id="selectCmcProjectProgressByProgressId" parameterType="String" resultMap="CmcProjectProgressResult">
+    <select id="selectCmcProjectProgressByProjectId" parameterType="String" resultMap="CmcProjectProgressResult">
         <include refid="selectCmcProjectProgressVo"/>
-        where progress_id = #{progressId}
+        where project_id = #{projectId}
     </select>
         
     <insert id="insertCmcProjectProgress" parameterType="CmcProjectProgress">
@@ -60,14 +60,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where progress_id = #{progressId}
     </update>
 
-    <delete id="deleteCmcProjectProgressByProgressId" parameterType="String">
-        delete from cmc_project_progress where progress_id = #{progressId}
+    <delete id="deleteCmcProjectProgressByProjectId" parameterType="String">
+        delete from cmc_project_progress where project_id = #{projectId}
     </delete>
 
-    <delete id="deleteCmcProjectProgressByProgressIds" parameterType="String">
-        delete from cmc_project_progress where progress_id in 
-        <foreach item="progressId" collection="array" open="(" separator="," close=")">
-            #{progressId}
+    <delete id="deleteCmcProjectProgressByProjectIds" parameterType="String">
+        delete from cmc_project_progress where project_id in
+        <foreach item="projectId" collection="array" open="(" separator="," close=")">
+            #{projectId}
         </foreach>
     </delete>
 </mapper>

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

@@ -39,10 +39,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
@@ -50,10 +52,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -529,6 +533,8 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { XMContent } from '@/assets/datas/XMContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -551,6 +557,10 @@ export default {
   },
   data() {
     return {
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
       tableForm: {},
       form: {},
       radio1: "",
@@ -564,6 +574,14 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -588,13 +606,8 @@ export default {
     },
     formatForm() {
 
-      if (this.taskName == '项目负责人审核') {
+      if (this.taskName == '部门审核') {
         this.isPiLeader = true;
-        this.isDeptLeader = false;
-        this.isManager = false;
-        this.isStaff = false;
-      } else if (this.taskName == '部门审核') {
-        this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
@@ -784,4 +797,8 @@ td {
   border-radius: 0px;
   background: none;
 }
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
 </style>

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

@@ -40,10 +40,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="4">
@@ -51,10 +53,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -610,6 +614,8 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -632,6 +638,10 @@ export default {
   },
   data() {
     return {
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
       tableForm: {},
       form: {},
       radio1: "",
@@ -645,6 +655,14 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -668,13 +686,9 @@ export default {
       })
     },
     formatForm() {
-      if (this.taskName == '项目负责人审核') {
+
+      if (this.taskName == '部门审核') {
         this.isPiLeader = true;
-        this.isDeptLeader = false;
-        this.isManager = false;
-        this.isStaff = false;
-      } else if (this.taskName == '部门审核') {
-        this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
@@ -864,4 +878,8 @@ td {
   border-radius: 0px;
   background: none;
 }
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
 </style>

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

@@ -39,10 +39,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
@@ -50,10 +52,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -313,6 +317,8 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -335,6 +341,10 @@ export default {
   },
   data() {
     return {
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
       tableForm: {},
       form: {},
       radio1: "",
@@ -348,6 +358,14 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -371,12 +389,9 @@ export default {
       })
     },
     formatForm() {
-      if (this.taskName == '项目负责人审核') {
+
+      if (this.taskName == '部门审核') {
         this.isPiLeader = true;
-        this.isDeptLeader = false;
-        this.isManager = false;
-        this.isStaff = false;
-      } else if (this.taskName == '部门审核') {
         this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
@@ -568,4 +583,8 @@ td {
   border-radius: 0px;
   background: none;
 }
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
 </style>

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

@@ -57,10 +57,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="5">
@@ -68,10 +70,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -1595,6 +1599,8 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { SCContent } from '@/assets/datas/SCContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { listProject } from '@/api/oa/project/project.js'
@@ -1620,6 +1626,10 @@ export default {
   },
   data() {
     return {
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
       tableForm: {},
       form: {},
       radio1: "",
@@ -1634,6 +1644,14 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -1909,4 +1927,9 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}</style>
+}
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>

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

@@ -39,10 +39,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
@@ -50,10 +52,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -336,13 +340,15 @@
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;">
-      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过'  }}</el-button>
+      <el-button type="primary" size="mini" @click="submit">{{ taskName == '员工填报' ? '提交' : '审核通过' }}</el-button>
       <el-button v-if="taskName == '员工填报'" type="warning" size="mini" @click="$emit('close')">取消</el-button>
     </el-row>
   </div>
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { XMContent } from '@/assets/datas/XMContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -365,7 +371,11 @@ export default {
   },
   data() {
     return {
-      tableForm: {},      
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
+      tableForm: {},
       form: {},
       radio1: "",
       radio2: "",
@@ -377,7 +387,18 @@ export default {
       isStaff: false,
     }
   },
+  computed: {
+    ...mapGetters(["userId", "name"]),
+  },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -401,13 +422,9 @@ export default {
       })
     },
     formatForm() {
-      if (this.taskName == '项目负责人审核') {
+
+      if (this.taskName == '部门审核') {
         this.isPiLeader = true;
-        this.isDeptLeader = false;
-        this.isManager = false;
-        this.isStaff = false;
-      } else if (this.taskName == '部门审核') {
-        this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
@@ -598,4 +615,9 @@ td {
   border-radius: 0px;
   background: none;
 }
+
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
 </style>

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

@@ -39,10 +39,12 @@
             :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
-                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+                        <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.deptAssesser ? tableForm.deptAssesser.nickName : deptAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.deptTime ? tableForm.deptTime : deptTime }} </span>
+            </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="3">
@@ -50,10 +52,12 @@
             :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
-                :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
-                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">考核人：
+              <span class="auditor"> {{ tableForm.managerAssesser ? tableForm.managerAssesser.nickName : managerAssesser }} </span>
+            </el-col>
+            <el-col :span="12" style="text-align:center; padding-top:7px;">日期：
+              <span> {{ tableForm.managerTime ? tableForm.managerTime : managerTime }} </span>
+            </el-col>
           </el-row>
         </td>
       </tr>
@@ -761,6 +765,8 @@
 </template>
 
 <script>
+import { parseTime } from "@/utils/ruoyi";
+import { mapGetters } from "vuex";
 import { JYContent } from '@/assets/datas/JYContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
 import { complete, getNextFlowNode } from "@/api/flowable/todo";
@@ -787,6 +793,10 @@ export default {
   },
   data() {
     return {
+      deptAssesser: '',
+      deptTime: undefined,
+      managerAssesser: '',
+      managerTime: undefined,
       tableForm: {},
       form: {},
       radio1: "",
@@ -800,6 +810,14 @@ export default {
     }
   },
   created() {
+    if (this.taskName == '部门审核') {
+      this.deptTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.deptAssesser = this.name;
+    }
+    else if (this.taskName == '分管审核') {
+      this.managerTime = parseTime(new Date(), '{y}-{m}-{d}')
+      this.managerAssesser = this.name;
+    }
     this.initForm();
   },
   mounted() {
@@ -823,13 +841,9 @@ initForm() {
       })
     },
     formatForm() {
-      if (this.taskName == '项目负责人审核') {
+
+      if (this.taskName == '部门审核') {
         this.isPiLeader = true;
-        this.isDeptLeader = false;
-        this.isManager = false;
-        this.isStaff = false;
-      } else if (this.taskName == '部门审核') {
-        this.isPiLeader = false;
         this.isDeptLeader = true;
         this.isManager = false;
         this.isStaff = false;
@@ -1019,4 +1033,9 @@ td {
   transform: rotate(-45deg);
   border-radius: 0px;
   background: none;
-}</style>
+}
+.auditor {
+  font-family: '华文行楷';
+  font-size: 20px;
+}
+</style>