修改生产表格里项目负责人审核部分

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

@@ -3,25 +3,31 @@
     <h2 style="text-align: center;">生产部门考核表</h2>
     <table class="table">
       <tr>
-        <td>姓名</td>
+        <td class="table-title">项目编号</td>
+        <td colspan="1"></td>
+        <td class="table-title">项目名称</td>
+        <td colspan="2"></td>
+      </tr>
+      <tr>
+        <td class="table-title">姓名</td>
         <td></td>
-        <td>考核年度</td>
+        <td class="table-title">考核年度</td>
         <td></td>
-        <td colspan="3">负责人考核意见</td>
-        <td colspan="3">分管领导考核意见</td>
+        <td colspan="3" class="table-title">部门负责人考核意见</td>
+        <td colspan="3" class="table-title">分管领导考核意见</td>
       </tr>
       <tr>
-        <td>所在部门</td>
+        <td class="table-title">所在部门</td>
         <td colspan="3"></td>
         <td colspan="3">
-          <el-radio-group v-model="radio1">
+          <el-radio-group v-model="tableForm.deptAssessment">
             <el-radio v-for="dict in dict.type.cmc_accessment" :key="dict.value" :label="dict.value">
               {{ dict.label }}
             </el-radio>
           </el-radio-group>
         </td>
         <td colspan="3">
-          <el-radio-group v-model="radio2">
+          <el-radio-group v-model="tableForm.managerAssessment">
             <el-radio v-for="dict in dict.type.cmc_accessment" :key="dict.value" :label="dict.value">
               {{ dict.label }}
             </el-radio>
@@ -29,7 +35,7 @@
         </td>
       </tr>
       <tr>
-        <td>部门职务</td>
+        <td class="table-title">部门职务</td>
         <td colspan="3"></td>
         <td colspan="3" rowspan="5">
           <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="textarea1">
@@ -49,38 +55,38 @@
         </td>
       </tr>
       <tr>
-        <td>项目经理</td>
+        <td class="table-title">项目经理</td>
         <td colspan="3"></td>
       </tr>
       <tr>
-        <td>技术职称</td>
+        <td class="table-title">技术职称</td>
         <td colspan="3"></td>
       </tr>
       <tr>
-        <td>作业类别</td>
+        <td class="table-title">作业类别</td>
         <td colspan="3"></td>
       </tr>
       <tr>
-        <td>入职年月</td>
+        <td class="table-title">入职年月</td>
         <td></td>
-        <td>年龄</td>
+        <td class="table-title">年龄</td>
         <td></td>
       </tr>
       <tr>
-        <td rowspan="2">考核内容</td>
-        <td colspan="6">被考核人填写</td>
-        <td colspan="3">负责人考核</td>
+        <td rowspan="2" class="table-title">考核内容</td>
+        <td colspan="6" class="table-title">被考核人填写</td>
+        <td colspan="3" class="table-title">负责人考核</td>
       </tr>
       <tr>
-        <td>等级、比例尺等</td>
-        <td>单位</td>
-        <td>工作量</td>
-        <td>熟练程度</td>
-        <td>承担角色</td>
-        <td>备注</td>
-        <td>产品质量</td>
-        <td>技能掌握</td>
-        <td>考核建议</td>
+        <td class="table-title">等级、比例尺等</td>
+        <td class="table-title">单位</td>
+        <td class="table-title">工作量</td>
+        <td class="table-title">熟练程度</td>
+        <td class="table-title">承担角色</td>
+        <td class="table-title">备注</td>
+        <td class="table-title">产品质量</td>
+        <td class="table-title">技能掌握</td>
+        <td class="table-title">考核建议</td>
       </tr>
       <tr>
         <td rowspan="5">项目负责</td>
@@ -105,9 +111,28 @@
         <td rowspan="5">
           <div>{{ tableForm.remark01 }}</div>
         </td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>外业负责</td>
@@ -155,9 +180,28 @@
         <td rowspan="10">
           <div>{{ tableForm.remark02 }}</div>
         </td>
-        <td rowspan="10"></td>
-        <td rowspan="10"></td>
-        <td rowspan="10"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>监测网技术设计</td>
@@ -228,9 +272,28 @@
         <td rowspan="5">
           <div>{{ tableForm.remark03 }}</div>
         </td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>外业-配合测量</td>
@@ -276,9 +339,28 @@
         <td rowspan="4">
           <div>{{ tableForm.remark04 }}</div>
         </td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>三</td>
@@ -316,9 +398,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark05 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -365,9 +466,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark06 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -414,9 +534,28 @@
         <td rowspan="4">
           <div>{{ tableForm.remark07 }}</div>
         </td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>飞马</td>
@@ -454,8 +593,28 @@
         <td rowspan="3">
           <div>{{ tableForm.remark08 }}</div>
         </td>
-        <td rowspan="3"></td>
-        <td rowspan="3"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td  rowspan="3">
+          <el-input type="textarea" :rows="4"  v-model="tableForm.advice08" :disabled="!isDeptLeader"> 
+          </el-input>
+        </td>
       </tr>
       <tr>
         <td>航片</td>
@@ -489,9 +648,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark09 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -539,9 +717,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark10 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <td rowspan="6">
+          <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="6">
+          <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="6">
+          <el-input type="textarea" :rows="4"  v-model="tableForm.advice10" :disabled="!isDeptLeader"> 
+          </el-input>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -589,9 +786,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark11 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -639,9 +855,28 @@
         <td rowspan="5">
           <div>{{ tableForm.remark12 }}</div>
         </td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:1000</td>
@@ -684,9 +919,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark13 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -734,8 +988,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark14 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -783,9 +1057,28 @@
         <td rowspan="6">
           <div>{{ tableForm.remark15 }}</div>
         </td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
-        <td rowspan="6"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -833,9 +1126,28 @@
         <td rowspan="4">
           <div>{{ tableForm.remark16 }}</div>
         </td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
-        <td rowspan="4"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>gsd 3cm～4.9cm</td>
@@ -872,9 +1184,28 @@
         <td rowspan="5">
           <div>{{ tableForm.remark17 }}</div>
         </td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
-        <td rowspan="5"></td>
+        <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')">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <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')">
+                {{ 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>
+        </td>
       </tr>
       <tr>
         <td>1:500</td>
@@ -905,7 +1236,7 @@
         <td colspan="9">{{ tableForm.selfAssess }}</td>
       </tr>
     </table>
-    <el-row justify="center" type="flex" style="margin-top:20px;">
+    <el-row justify="center" type="flex" style="margin-top:20px;" v-if="tableForm.taskName == undefined">
       <el-button type="primary" @click="submit">提交</el-button>
       <el-button>取消</el-button>
     </el-row>
@@ -925,7 +1256,6 @@ export default {
   },
   watch: {
     tableForm: function (newval, oldval) {
-      console.log(oldval);
       this.formatForm();
       console.log(newval);
     }
@@ -936,7 +1266,9 @@ export default {
       radio1: "",
       radio2: "",
       textarea1: "",
-      textarea2: ""
+      textarea2: "",
+      isDeptLeader: false,
+      isManager: false
     }
   },
   created() {
@@ -967,9 +1299,21 @@ export default {
             this.form['role' + i] = this.tableForm['role' + i]
         }
       }
+      if (this.tableForm.taskName == '项目负责人审核') {
+        this.isDeptLeader = true;
+      }
     },
     submit() {
-      this.$emit('submit',this.tableForm);
+      this.$emit('submit', this.tableForm);
+    },
+    cancelSelect(value,name){
+      debugger
+      if(this.tableForm[name] == value){
+        this.tableForm[name] = null
+      }else{
+        if(this.tableForm[name] !== undefined)
+          this.tableForm[name] = value
+      }
     }
   },
 }
@@ -981,6 +1325,10 @@ export default {
   width: 100%;
 }
 
+.table-title {
+  background-color: #dad4d4;
+}
+
 .table,
 th,
 td {

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

@@ -30,11 +30,14 @@
         </el-tab-pane> -->
         <el-tab-pane label="表单信息" name="1">
           <ScTable :tableForm="tableForm"></ScTable>
-          <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-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
+          <el-row type="flex" justify="center">
+            <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-circle-close" type="danger" size="mini" @click="handleReject">驳回</el-button>
+          </el-row>
+
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
@@ -91,9 +94,6 @@
             <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect"></flow-user>
             <flow-role v-if="checkSendRole" @handleRoleSelect="handleRoleSelect"></flow-role>
           </el-form-item>
-          <el-form-item label="熟练程度" label-width="80px" prop="comment">
-            <el-checkbox v-model="taskForm.check">备选项</el-checkbox>
-          </el-form-item>
           <el-form-item label="处理意见" label-width="80px" prop="comment"
             :rules="[{ required: true, message: '请输入处理意见', trigger: 'blur' }]">
             <el-input type="textarea" v-model="taskForm.comment" placeholder="请输入处理意见" />
@@ -168,7 +168,7 @@ export default {
     FlowUser,
     FlowRole,
     ScTable
-},
+  },
   props: {},
   data() {
     return {
@@ -342,14 +342,19 @@ export default {
     },
     // 获取需要处理的表单表格信息
     getAssessByAssessId(formId) {
-      getAssess(formId ).then(res => {
+      getAssess(formId).then(res => {
         let data = res.data;
-        for(let d in data){
-          if(d.includes('role') || d.includes('familiar')){
+        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;
         console.log(data);
       })
     },
@@ -361,6 +366,7 @@ export default {
     },
     /** 用户审批任务 */
     taskComplete() {
+      debugger
       this.$set(this.taskForm.variables, "pass", "通过");
       if (!this.taskForm.variables && this.checkSendUser) {
         this.$modal.msgError("请选择流程接收人员!");

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

@@ -119,7 +119,7 @@ export default {
     // 跳转到处理页面
     handleProcess(row) {
       getProcessVariables(row.taskId).then(res => {
-        console.log(res);
+        console.log(row);
         this.$router.push({
           path: '/flowable/task/todo/detail/index',
           query: {