修改处理流程

oa-ui/src/assets/datas/SCContent.js

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-24 10:17:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-25 16:48:56
+ * @LastEditTime: 2024-02-01 14:49:31
  */
 export const SCContent = [
   {
@@ -300,19 +300,19 @@ export const SCContent = [
         unit: 'km²'
       }, {
         label: '1:1000',
-        value: 'f0602',
+        value: 'f1002',
         unit: 'km²'
       }, {
         label: '1:2000',
-        value: 'f0603',
+        value: 'f1003',
         unit: 'km²'
       }, {
         label: '1:5000',
-        value: 'f0604',
+        value: 'f1004',
         unit: 'km²'
       }, {
         label: '1:10000',
-        value: 'f0605',
+        value: 'f1005',
         unit: 'km²'
       }
     ]

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

@@ -83,16 +83,16 @@
   box-sizing: content-box;
 }
 
-.el-menu--collapse
-  > div
-  > .el-submenu
-  > .el-submenu__title
-  .el-submenu__icon-arrow {
+.el-menu--collapse>div>.el-submenu>.el-submenu__title .el-submenu__icon-arrow {
   display: none;
 }
+
 // .el-form-item{
 //   margin-bottom: 10px;
 // }
 // .el-form-item--small.el-form-item{
 //   margin-bottom: 10px;
-// }
+// }
+.el-scrollbar__wrap {
+  overflow-x: hidden;
+}

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

@@ -2,14 +2,15 @@
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-30 17:34:24
+ * @LastEditTime: 2024-02-01 15:06:32
 -->
 <template>
   <div>
     <el-form ref="scform" :model="form">
       <el-form-item label="选择项目：">
-        <el-select v-model="form.projectId" placeholder="请选择项目">
-          <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectNumber + item.projectName" :value="item.projectId">
+        <el-select v-model="form.projectId" placeholder="请选择项目" style="width:900px" @change="getProjectById(form.projectId)">
+          <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectNumber + item.projectName"
+            :value="item.projectId">
           </el-option>
         </el-select>
       </el-form-item>
@@ -87,7 +88,7 @@
         </el-card>
       </el-row>
       <el-form-item label="其他工作：">
-        <el-input style="width:900px" type="textarea" :rows="2" placeholder="请输入内容" v-model="form['otherWork']">
+        <el-input style="width:900px" type="textarea" :rows="2" placeholder="有其他工作请在此写入内容" v-model="form['otherWork']">
         </el-input>
       </el-form-item>
       <el-row>
@@ -107,6 +108,7 @@ import ScTable from './scTable.vue';
 import { Snowflake } from '@/utils/snowFlake.js'
 import { submitAssess } from '@/api/oa/assess/assess.js'
 import { listProject } from '@/api/oa/project/project.js'
+import { getProject } from '@/api/oa/project/project'
 export default {
   dicts: ['cmc_skill'],
   components: { ScTable },
@@ -131,7 +133,7 @@ export default {
   },
   methods: {
     initForm() {
-      listProject({pageSize: 200}).then(res => {
+      listProject({ pageSize: 200 }).then(res => {
         this.projectList = res.rows;
       })
       for (let i = 0; i < SCContent.length + 1; i++) {
@@ -191,6 +193,14 @@ export default {
         }
       }
     },
+    getProjectById(id) {
+      getProject(id).then(res => {
+        if (res.data != undefined) {
+          this.form.projectName = res.data.projectName;
+          this.form.projectNumber = res.data.projectNumber;
+        }
+      })
+    },
     closeItem(item) {
       let index = this.checkedBtn.indexOf(item);
       let number;

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

@@ -4,9 +4,13 @@
     <table class="table">
       <tr>
         <td class="table-title">项目编号</td>
-        <td colspan="1"></td>
+        <td colspan="1">
+          {{ tableForm.projectNumber }}
+        </td>
         <td class="table-title">项目名称</td>
-        <td colspan="2"></td>
+        <td colspan="9" style="text-align:left;padding-left:10px;">
+          {{ tableForm.projectName }}
+        </td>
       </tr>
       <tr>
         <td class="table-title">姓名</td>
@@ -114,7 +118,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality01" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'quality01')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality01')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -123,14 +128,14 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill01" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'skill01')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill01')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice01" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice01" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -183,7 +188,8 @@
         <td rowspan="10">
           <el-radio-group v-model="tableForm.quality02" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'quality02')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality02')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -192,14 +198,14 @@
         <td rowspan="10">
           <el-radio-group v-model="tableForm.skill02" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'skill02')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill02')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="10">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice02" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice02" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -275,7 +281,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality03" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'quality03')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality03')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -284,14 +291,14 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill03" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"  @click.native.prevent="cancelSelect(dict.value,'skill03')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill03')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice03" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice03" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -342,7 +349,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality04" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality04')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality04')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -351,14 +359,14 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill04" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill04')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill04')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="4">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice04" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice04" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -401,7 +409,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality05" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality05')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality05')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -410,14 +419,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill05" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill05')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill05')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice05" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice05" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -469,7 +478,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality06" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality06')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality06')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -478,14 +488,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill06" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill06')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill06')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice06" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice06" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -537,7 +547,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality07" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality07')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality07')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -546,14 +557,14 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill07" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill07')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill07')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="4">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice07" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice07" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -596,7 +607,8 @@
         <td rowspan="3">
           <el-radio-group v-model="tableForm.quality08" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality08')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality08')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -605,14 +617,14 @@
         <td rowspan="3">
           <el-radio-group v-model="tableForm.skill08" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill08')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill08')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td  rowspan="3">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice08" :disabled="!isDeptLeader"> 
+        <td rowspan="3">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice08" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -651,7 +663,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality09" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality09')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality09')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -660,14 +673,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill09" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill09')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill09')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice09" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice09" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -697,73 +710,69 @@
         <td>{{ tableForm.f0906 }}</td>
       </tr>
       <tr>
-        <td rowspan="6">内业-激光制图</td>
-        <td>1:200</td>
+        <td rowspan="5">内业-激光制图</td>
+        <td>1:500</td>
         <td>km²</td>
         <td>{{ tableForm.f1001 }}</td>
-        <td rowspan="6">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.familiar10" disabled>
             <div><el-radio :label="0">生疏</el-radio></div>
             <div><el-radio :label="2">熟练</el-radio></div>
           </el-radio-group>
         </td>
-        <td rowspan="6">
+        <td rowspan="5">
           <el-checkbox-group v-model="form.role10" disabled>
             <div><el-checkbox label="25" style="display:inline-block">作业</el-checkbox></div>
             <div><el-checkbox label="26" style="display:inline-block">检查</el-checkbox></div>
             <div><el-checkbox label="27" style="display:inline-block">负责</el-checkbox></div>
           </el-checkbox-group>
         </td>
-        <td rowspan="6">
+        <td rowspan="5">
           <div>{{ tableForm.remark10 }}</div>
         </td>
-        <td rowspan="6">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.quality10" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality10')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality10')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="6">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.skill10" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill10')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill10')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice10" :disabled="!isDeptLeader"> 
+        <td rowspan="5">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice10" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
-      <tr>
-        <td>1:500</td>
-        <td>km²</td>
-        <td>{{ tableForm.f1002 }}</td>
-      </tr>
       <tr>
         <td>1:1000</td>
         <td>km²</td>
-        <td>{{ tableForm.f1003 }}</td>
+        <td>{{ tableForm.f1002 }}</td>
       </tr>
       <tr>
         <td>1:2000</td>
         <td>km²</td>
-        <td>{{ tableForm.f1004 }}</td>
+        <td>{{ tableForm.f1003 }}</td>
       </tr>
       <tr>
         <td>1:5000</td>
         <td>km²</td>
-        <td>{{ tableForm.f1005 }}</td>
+        <td>{{ tableForm.f1004 }}</td>
       </tr>
       <tr>
         <td>1:10000</td>
         <td>km²</td>
-        <td>{{ tableForm.f1006 }}</td>
+        <td>{{ tableForm.f1005 }}</td>
       </tr>
       <tr>
         <td rowspan="6">内业-编图</td>
@@ -789,7 +798,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality11" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality11')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality11')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -798,14 +808,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill11" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill11')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill11')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice11" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice11" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -858,7 +868,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality12" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality12')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality12')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -867,14 +878,14 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill12" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill12')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill12')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice12" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice12" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -922,7 +933,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality13" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality13')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality13')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -931,14 +943,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill13" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill13')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill13')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice13" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice13" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -991,7 +1003,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality14" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality14')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality14')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1000,14 +1013,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill14" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill14')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill14')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice14" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice14" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -1060,7 +1073,8 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality15" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality15')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality15')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1069,14 +1083,14 @@
         <td rowspan="6">
           <el-radio-group v-model="tableForm.skill15" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill15')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill15')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="6">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice15" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice15" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -1129,7 +1143,8 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality16" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality16')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality16')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1138,14 +1153,14 @@
         <td rowspan="4">
           <el-radio-group v-model="tableForm.skill16" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill16')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill16')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="4">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice16" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice16" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -1187,7 +1202,8 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality17" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'quality17')">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'quality17')">
                 {{ dict.label }}
               </el-radio>
             </div>
@@ -1196,14 +1212,14 @@
         <td rowspan="5">
           <el-radio-group v-model="tableForm.skill17" :disabled="!isDeptLeader">
             <div v-for="dict in dict.type.cmc_skill" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value,'skill17')">
+              <el-radio :key="dict.value" :label="dict.value" @click.native.prevent="cancelSelect(dict.value, 'skill17')">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="5">
-          <el-input type="textarea" :rows="4"  v-model="tableForm.advice17" :disabled="!isDeptLeader"> 
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice17" :disabled="!isDeptLeader">
           </el-input>
         </td>
       </tr>
@@ -1257,7 +1273,6 @@ export default {
   watch: {
     tableForm: function (newval, oldval) {
       this.formatForm();
-      console.log(newval);
     }
   },
   data() {
@@ -1306,12 +1321,11 @@ export default {
     submit() {
       this.$emit('submit', this.tableForm);
     },
-    cancelSelect(value,name){
-      debugger
-      if(this.tableForm[name] == value){
+    cancelSelect(value, name) {
+      if (this.tableForm[name] == value) {
         this.tableForm[name] = null
-      }else{
-        if(this.tableForm[name] !== undefined)
+      } else {
+        if (this.tableForm[name] !== undefined)
           this.tableForm[name] = value
       }
     }

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

@@ -97,8 +97,10 @@
       <pagination v-show="processTotal > 0" :total="processTotal" :page.sync="queryProcessParams.pageNum"
         :limit.sync="queryProcessParams.pageSize" @pagination="listDefinition" />
     </el-dialog>
-    <el-dialog title="详情" :visible.sync="detailsOpen" width="60%" append-to-body>
+    <el-dialog title="流程详情" :visible.sync="detailsOpen" append-to-body width="600px">
+      <el-scrollbar style="height: 600px;">
       <RowDetail :rows="clickRow"></RowDetail>
+      </el-scrollbar>
     </el-dialog>
   </div>
 </template>

oa-ui/src/views/flowable/task/myProcess/send/rowDetail.vue

@@ -2,16 +2,17 @@
  * @Author: ysh
  * @Date: 2024-01-30 09:56:12
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-30 10:20:24
+ * @LastEditTime: 2024-02-01 16:33:48
 -->
 <template>
   <div>
-    <el-col :span="16" :offset="4">
+    <el-col :span="22" v-loading="loading">
       <div class="block">
-        <el-timeline>
+        <el-timeline class="block">
           <el-timeline-item v-for="(item, index ) in flowRecordList" :key="index" :icon="setIcon(item.finishTime)"
-            :color="setColor(item.finishTime)">
+            size="large" :color="setColor(item.finishTime)">
             <p style="font-weight: 700">{{ item.taskName }}</p>
+
             <el-card :body-style="{ padding: '10px' }">
               <el-descriptions class="margin-top" :column="1" size="small" border>
                 <el-descriptions-item v-if="item.assigneeName" label-class-name="my-label">
@@ -49,7 +50,7 @@
 </template>
 
 <script>
-import {flowRecord} from "@/api/flowable/finished";
+import { flowRecord } from "@/api/flowable/finished";
 export default {
   props: {
     rows: {
@@ -57,12 +58,18 @@ export default {
       default: {}
     }
   },
+  watch: {
+    rows: function (newval, oldval) {
+      this.getFlowRecordList();
+    }
+  },
   created() {
     this.getFlowRecordList();
   },
   data() {
     return {
       flowRecordList: [], // 流程流转数据
+      loading: true
     }
   },
   methods: {
@@ -91,16 +98,23 @@ export default {
     },
     /** 流程流转记录 */
     getFlowRecordList() {
+      this.loading = true
       const that = this
       const params = { procInsId: this.rows.procInsId, deployId: this.rows.deployId }
       flowRecord(params).then(res => {
         that.flowRecordList = res.data.flowList;
+        console.log(that.flowRecordList);
+        this.loading = false
       }).catch(res => {
-        
+
       })
     },
   },
 }
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.block {
+  display: block;
+}
+</style>

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

@@ -20,9 +20,9 @@
               <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-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>
@@ -89,7 +89,7 @@
       </el-tabs>
       <!--审批任务-->
       <el-dialog :title="completeTitle" :visible.sync="completeOpen" width="60%" append-to-body>
-        <el-form ref="taskForm" :model="taskForm">
+        <!-- <el-form ref="taskForm" :model="taskForm">
           <el-form-item prop="targetKey">
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
@@ -98,7 +98,7 @@
             :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
             <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
           </el-form-item>
-        </el-form>
+        </el-form> -->
         <span slot="footer" class="dialog-footer">
           <el-button @click="completeOpen = false">取 消</el-button>
           <el-button type="primary" @click="taskComplete">确 定</el-button>
@@ -360,44 +360,73 @@ export default {
     },
     /** 加载审批任务弹框 */
     handleComplete() {
-      // this.completeOpen = true;
-      // this.completeTitle = "流程审批";
-      this.submitForm(null);
+      this.completeOpen = true;
+      this.completeTitle = "流程审批";
+      // this.submitForm(null);
     },
     /** 用户审批任务 */
     taskComplete() {
       debugger
-      this.$set(this.taskForm.variables, "pass", "通过");
-      if (!this.taskForm.variables && this.checkSendUser) {
-        this.$modal.msgError("请选择流程接收人员!");
-        return;
-      }
-      if (!this.taskForm.variables && this.checkSendRole) {
-        this.$modal.msgError("请选择流程接收角色组!");
-        return;
-      }
-      if (!this.taskForm.comment) {
-        this.$modal.msgError("请输入审批意见!");
-        return;
-      }
-      if (this.taskForm && this.formKeyExist) {
-        // 表单是否禁用
-        this.taskForm.formData.formData.disabled = true;
-        // 是否显示按钮
-        this.taskForm.formData.formData.formBtns = false;
-        this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
-        this.taskForm.variables.variables = this.taskForm.formData.formData;
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.goBack();
-        });
-      } else {
-        // 流程设计人员类型配置为固定人员接收任务时,直接提交任务到下一步
-        complete(this.taskForm).then(response => {
-          this.$modal.msgSuccess(response.msg);
-          this.goBack();
-        });
+      if(this.taskForm.variables === null){
+        this.taskForm.variables= {};
       }
+      getNextFlowNode({taskId: this.taskForm.taskId}).then(res => {
+        const data = res.data;
+        debugger
+        // this.taskForm.formData = formData;
+        if (data) {
+          if (data.dataType === 'dynamic') {
+            if (data.type === 'assignee') { // 指定人员
+              this.checkSendUser = true;
+              this.checkType = "single";
+            } else if (data.type === 'candidateUsers') {  // 候选人员(多个)
+              this.checkSendUser = true;
+              this.checkType = "multiple";
+            } else if (data.type === 'candidateGroups') { // 指定组(所属角色接收任务)
+              this.checkSendRole = true;
+            } else { // 会签
+              // 流程设计指定的 elementVariable 作为会签人员列表
+              this.multiInstanceVars = data.vars;
+              this.checkSendUser = true;
+              this.checkType = "multiple";
+            }
+          }
+        }
+        this.completeOpen = true;
+        this.completeTitle = "流程审批";
+      })
+
+      // this.$set(this.taskForm.variables, "pass", "通过");
+      // if (!this.taskForm.variables && this.checkSendUser) {
+      //   this.$modal.msgError("请选择流程接收人员!");
+      //   return;
+      // }
+      // if (!this.taskForm.variables && this.checkSendRole) {
+      //   this.$modal.msgError("请选择流程接收角色组!");
+      //   return;
+      // }
+      // if (!this.taskForm.comment) {
+      //   this.$modal.msgError("请输入审批意见!");
+      //   return;
+      // }
+      // if (this.taskForm && this.formKeyExist) {
+      //   // 表单是否禁用
+      //   this.taskForm.formData.formData.disabled = true;
+      //   // 是否显示按钮
+      //   this.taskForm.formData.formData.formBtns = false;
+      //   this.taskForm.variables = Object.assign({}, this.taskForm.variables, this.taskForm.formData.valData);
+      //   this.taskForm.variables.variables = this.taskForm.formData.formData;
+      //   complete(this.taskForm).then(response => {
+      //     this.$modal.msgSuccess(response.msg);
+      //     this.goBack();
+      //   });
+      // } else {
+      //   // 流程设计人员类型配置为固定人员接收任务时,直接提交任务到下一步
+      //   complete(this.taskForm).then(response => {
+      //     this.$modal.msgSuccess(response.msg);
+      //     this.goBack();
+      //   });
+      // }
     },
     /** 委派任务 */
     handleDelegate() {
@@ -483,6 +512,7 @@ export default {
       const params = { taskId: this.taskForm.taskId }
       getNextFlowNode(params).then(res => {
         const data = res.data;
+        debugger
         this.taskForm.formData = formData;
         if (data) {
           if (data.dataType === 'dynamic') {