修改一些细节

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

@@ -4,7 +4,7 @@
     <table class="table" ref="tableDatas">
       <tr>
         <td class="table-title">项目编号</td>
-        <td colspan="1">
+        <td colspan="1" style="text-align:left;padding-left:10px;">
           {{ tableForm.projectNumber }}
         </td>
         <td class="table-title">项目名称</td>
@@ -14,15 +14,15 @@
       </tr>
       <tr>
         <td class="table-title">姓名</td>
-        <td style="text-align:left;padding-left:10px;">{{ user.nickName }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.nickName }}</td>
         <td class="table-title">考核年度</td>
-        <td></td>
+        <td> {{ tableForm.assessTime }}</td>
         <td colspan="3" class="table-title">部门负责人考核意见</td>
         <td colspan="3" class="table-title">分管领导考核意见</td>
       </tr>
       <tr>
         <td class="table-title">所在部门</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ user.dept ? user.dept.deptName : "" }}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.deptName }}</td>
         <td colspan="3">
           <el-radio-group v-model="tableForm.deptAssessment" :disabled="!isDeptLeader">
             <el-radio v-for="dict in dict.type.cmc_accessment" :key="dict.value" :label="dict.value">
@@ -40,41 +40,41 @@
       </tr>
       <tr>
         <td class="table-title">部门职务</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ user.postGroup }}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
         <td colspan="3" rowspan="5">
           <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
           </el-input>
-          <el-row justify="center">
-            <el-col :span="12">考核人：</el-col>
-            <el-col :span="12">日期：</el-col>
+          <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-row>
         </td>
         <td colspan="3" rowspan="5">
           <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：</el-col>
-            <el-col :span="12">日期：</el-col>
+            <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-row>
         </td>
       </tr>
       <tr>
         <td class="table-title">项目经理</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ user.pmLevel }}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.pmLevel }}</td>
       </tr>
       <tr>
         <td class="table-title">技术职称</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ user.titles }}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.titles }}</td>
       </tr>
       <tr>
         <td class="table-title">作业类别</td>
-        <td colspan="3" style="text-align:left;padding-left:10px;">{{ user.remark }}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.remark }}</td>
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ user.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
-        <td style="text-align:left;padding-left:10px;">{{ user.age }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>
       <tr>
         <td rowspan="2" class="table-title">考核内容</td>
@@ -1522,11 +1522,17 @@
       </tr>
       <tr style="height:90px;">
         <td>其他工作</td>
-        <td colspan="9">{{ tableForm.otherWork }}</td>
+        <td colspan="9">
+          <span v-if="!isStaff">{{ tableForm.otherWork }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.otherWork" type="textarea" :rows="2"></el-input>
+        </td>
       </tr>
       <tr style="height:90px;">
         <td>年度自述</td>
-        <td colspan="9">{{ tableForm.selfAssess }}</td>
+        <td colspan="9">
+          <span v-if="!isStaff">{{ tableForm.selfAssess }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.selfAssess" type="textarea" :rows="2"></el-input>
+        </td>
       </tr>
     </table>
     <el-row justify="center" type="flex" style="margin-top:20px;"
@@ -1540,7 +1546,6 @@
 <script>
 import { SCContent } from '@/assets/datas/SCContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
-import { getUserProfile } from '../../../api/system/user'
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment'],
   props: {
@@ -1565,26 +1570,15 @@ export default {
       isPiLeader: false,
       isManager: false,
       isStaff: false,
-      user: {}
     }
   },
   created() {
     this.initForm();
-    this.getUseInfo();
   },
   mounted() {
     this.formatForm();
   },
   methods: {
-    getUseInfo() {
-      getUserProfile().then(res => {
-        console.log(res);
-        if (res.data) {
-          this.user = res.data;
-          this.user.postGroup = res.postGroup
-        }
-      })
-    },
     initForm() {
       for (let i = 0; i < SCContent.length + 1; i++) {
         if (i.toString().length == 1) {
@@ -1658,33 +1652,6 @@ export default {
         if (this.tableForm[name] !== undefined)
           this.tableForm[name] = value
       }
-    },
-    addDoubleClickEvent() {
-      document.querySelector('.personInput').addEventListener('dblclick', this.handleDoubleClickEvent)
-    },
-    handleDoubleClickEvent(e) {
-      const input = document.createElement("input");
-      input.type = "text";
-      e.target.append(input);
-      input.style.display = "block";
-      input.value = e.target.innerText;
-      input.focus();
-      input.addEventListener("keyup", function (ev) {
-        if (ev.key === "Enter") {
-          e.target.innerText = input.value;
-          input.style.display = "none";
-        }
-      });
-      input.addEventListener("blur", function (e) {
-        e.target.innerText = input.value;
-        input.style.display = "none";
-      });
-    },
-    removeDoubleClickEvent() {
-      let dom = document.querySelector('.personInput')
-      if (dom.removeEventListener)
-        dom.removeEventListener('dblclick', this.handleDoubleClickEvent)
-
     }
   },
 }

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

@@ -7,12 +7,15 @@
       </div>
       <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
-        <el-tab-pane label="表单信息" name="1">
+        <!-- <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4" v-if="variableOpen">
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="variablesData" />
             </div>
           </el-col>
+        </el-tab-pane> -->
+        <el-tab-pane label="表单信息" name="1">
+          <ScTable :tableForm="tableForm"></ScTable>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
@@ -74,13 +77,16 @@ 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'
 
 export default {
   name: "Record",
   components: {
     Parser,
     flow,
-  },
+    ScTable
+},
   props: {},
   data() {
     return {
@@ -116,18 +122,23 @@ export default {
       variables: [], // 流程变量数据
       variablesData: {}, // 流程变量数据
       variableOpen: false, // 是否加载流程变量数据
+      // 表单信息
+      tableForm: {}
     };
   },
   created() {
     this.taskForm.deployId = this.$route.query && this.$route.query.deployId;
     this.taskForm.taskId  = this.$route.query && this.$route.query.taskId;
     this.taskForm.procInsId = this.$route.query && this.$route.query.procInsId;
+    this.taskForm.formId = this.$route.query.formId;
     // 回显流程记录
     // 流程任务重获取变量表单
     if (this.taskForm.taskId){
       this.processVariables( this.taskForm.taskId)
+      this.getAssessByAssessId(this.taskForm.formId)
     }
     this.getFlowRecordList( this.taskForm.procInsId, this.taskForm.deployId);
+    
   },
   methods: {
     handleClick(tab, event) {
@@ -177,6 +188,23 @@ export default {
       const obj = { path: "/task/finished", query: { t: Date.now()} };
       this.$tab.closeOpenPage(obj);
     },
+    // 获取需要处理的表单表格信息
+    getAssessByAssessId(formId) {
+      getAssess(formId).then(res => {
+        let data = res.data;
+        for (let d in data) {
+          if (d.includes('role')) {
+            data[d] = data[d].split(',')
+          }
+          if (d.includes('familiar')) {
+            data[d] = parseInt(data[d])
+          }
+        }
+        this.tableForm = data;
+        this.tableForm.taskId = this.$route.query.taskId;
+        this.tableForm.taskName = this.$route.query.taskName;
+      })
+    },
   }
 };
 </script>

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

@@ -2,20 +2,12 @@
   <div class="app-container">
     <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
+        <el-input v-model="queryParams.name" placeholder="请输入名称" clearable size="small"
+          @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="开始时间" prop="deployTime">
-        <el-date-picker clearable size="small"
-                        v-model="queryParams.deployTime"
-                        type="date"
-                        value-format="yyyy-MM-dd"
-                        placeholder="选择时间">
+        <el-date-picker clearable size="small" v-model="queryParams.deployTime" type="date" value-format="yyyy-MM-dd"
+          placeholder="选择时间">
         </el-date-picker>
       </el-form-item>
       <el-form-item>
@@ -26,64 +18,42 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:deployment:remove']"
-        >删除</el-button>
+        <el-button type="danger" plain icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete"
+          v-hasPermi="['system:deployment:remove']">删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="finishedList" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true"/>
-      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true"/>
+      <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
+      <el-table-column label="流程名称" align="center" prop="procDefName" :show-overflow-tooltip="true" />
       <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>
+          <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" prop="finishTime" width="180"/>
-      <el-table-column label="耗时" align="center" prop="duration" width="180"/>
+      <el-table-column label="接收时间" align="center" prop="createTime" width="180" />
+      <el-table-column label="审批时间" align="center" prop="finishTime" width="180" />
+      <el-table-column label="耗时" align="center" prop="duration" width="180" />
       <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 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>
         </template>
       </el-table-column>
     </el-table>
 
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+      @pagination="getList" />
   </div>
 </template>
 
 <script>
 import { finishedList, getDeployment, delDeployment, addDeployment, updateDeployment, exportDeployment, revokeProcess } from "@/api/flowable/finished";
-
+import { getProcessVariables } from "@/api/flowable/definition";
 export default {
   name: "Deploy",
   components: {
@@ -164,18 +134,18 @@ export default {
       };
       this.resetForm("form");
     },
-    setIcon(val){
-      if (val){
+    setIcon(val) {
+      if (val) {
         return "el-icon-check";
-      }else {
+      } else {
         return "el-icon-time";
       }
 
     },
-    setColor(val){
-      if (val){
+    setColor(val) {
+      if (val) {
         return "#2bc418";
-      }else {
+      } else {
         return "#b3bdbb";
       }
 
@@ -193,7 +163,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.id)
-      this.single = selection.length!==1
+      this.single = selection.length !== 1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -203,21 +173,28 @@ export default {
       this.title = "添加流程定义";
     },
     /** 流程流转记录 */
-    handleFlowRecord(row){
-      this.$router.push({ path: '/flowable/task/finished/detail/index',
-        query: {
-          procInsId: row.procInsId,
-          deployId: row.deployId,
-          taskId: row.taskId,
-      }})
+    handleFlowRecord(row) {
+      console.log(row);
+
+      getProcessVariables(row.taskId).then(res => {
+        this.$router.push({
+          path: '/flowable/task/finished/detail/index',
+          query: {
+            procInsId: row.procInsId,
+            deployId: row.deployId,
+            taskId: row.taskId,
+            formId: res.data.formId
+          }
+        })
+      })
     },
     /** 撤回任务 */
-    handleRevoke(row){
+    handleRevoke(row) {
       const params = {
         instanceId: row.procInsId
       }
-      revokeProcess(params).then( res => {
-       this.$modal.msgSuccess(res.msg);
+      revokeProcess(params).then(res => {
+        this.$modal.msgSuccess(res.msg);
         this.getList();
       });
     },
@@ -258,11 +235,11 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return delDeployment(ids);
       }).then(() => {
         this.getList();
-       this.$modal.msgSuccess("删除成功");
+        this.$modal.msgSuccess("删除成功");
       })
     },
     /** 导出按钮操作 */
@@ -272,7 +249,7 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning"
-      }).then(function() {
+      }).then(function () {
         return exportDeployment(queryParams);
       }).then(response => {
         this.download(response.msg);

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

@@ -33,11 +33,11 @@
       <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" width="80px">
+      <!-- <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> -->
       <el-table-column label="提交时间" align="center" prop="createTime" width="180" />
       <el-table-column label="流程状态" align="center" width="100">
         <template slot-scope="scope">

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

@@ -16,7 +16,7 @@
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>-->
 <!--                <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>-->
-            <el-button  icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
+            <!-- <el-button  icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button> -->
             <el-button  icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
           </div>
      </el-col>

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

@@ -9,32 +9,13 @@
       </div>
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
-        <!-- <el-tab-pane label="表单信息" name="1">
-          <el-col :span="16" :offset="4">
-            <div class="test-form">
-                           <parser :key="new Date().getTime()" :form-conf="variablesData"/>
-              <parser :key="new Date().getTime()" :form-conf="variablesData" @submit="submitForm" ref="parser" />
-
-            </div>
-            <div style="margin-left:15%;margin-bottom: 20px;font-size: 14px;">
-              <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
-                @click="handleComplete">审批
-              </el-button>
-              <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">委派</el-button>
-              <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleAssign">转办</el-button>
-              <el-button  icon="el-icon-edit-outline" type="primary" size="mini" @click="handleDelegate">签收</el-button>
-              <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
-              <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
-            </div>
-          </el-col>
-        </el-tab-pane> -->
         <el-tab-pane label="表单信息" name="1">
           <ScTable :tableForm="tableForm" @submit="handleComplete"></ScTable>
           <el-row type="flex" justify="center" v-if="taskName != '员工修改'">
             <el-button v-if="!formKeyExist" icon="el-icon-edit-outline" type="success" size="mini"
               @click="handleComplete">审核通过
             </el-button>
-            <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button>
+            <!-- <el-button icon="el-icon-refresh-left" type="warning" size="mini" @click="handleReturn">退回</el-button> -->
             <el-button icon="el-icon-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
           </el-row>
         </el-tab-pane>
@@ -515,7 +496,7 @@ export default {
             }
           }
           this.completeOpen = true;
-          this.completeTitle = "流程审批";
+          this.completeTitle = "选择下一节点审核人";
         })
       });
     },

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

@@ -30,11 +30,11 @@
       <el-table-column label="任务编号" align="center" prop="taskId" :show-overflow-tooltip="true" />
       <el-table-column label="流程名称" align="center" prop="procDefName" />
       <el-table-column label="当前节点" align="center" prop="taskName" />
-      <el-table-column label="流程版本" align="center">
+      <!-- <el-table-column label="流程版本" align="center">
         <template slot-scope="scope">
           <el-tag size="medium">v{{ scope.row.procDefVersion }}</el-tag>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="流程发起人" align="center">
         <template slot-scope="scope">
           <label>{{ scope.row.startUserName }} <el-tag type="info" size="mini">{{ scope.row.startDeptName

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-01-24 09:11:33
+ * @LastEditTime: 2024-02-05 14:56:35
 -->
 <template>
   <div class="app-container home">
@@ -11,7 +11,7 @@
       <div class="user-info">
         <el-row align="bottom" :gutter="40">
           <el-col :span="4">
-            <h3 style="font-weight: bold;text-align: right;font-size: 18px;"> {{ user.userName }}，您好！ </h3>
+            <h3 style="font-weight: bold;text-align: right;font-size: 18px;"> {{ user.nickName }}，您好！ </h3>
             <h2 style="text-align: right;font-size: 24px;font-weight: bold;"> {{ 10 }}℃ </h2>
             <el-row style="font-size:12px;text-align: right;"> {{ "2024-01-22" }} {{ "星期一" }} </el-row>
           </el-col>
@@ -20,7 +20,7 @@
           </el-col>
           <el-col :span="16">
             <el-row style="font-size: 20px;font-weight: bold;margin-bottom: 20px;">
-              {{ user.userName }} <el-tag type="warning">{{ "高级工程师" }}</el-tag>
+              {{ user.nickName }} <el-tag type="warning">{{ "高级工程师" }}</el-tag>
             </el-row>
             <el-row>
               <el-col :span="4">