综合事务部、技术质量部考核表单修改

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

@@ -167,6 +167,7 @@ public class CmcAssessController extends BaseController
         cmcAssess.setUserId(getLoginUser().getUserId());
         cmcAssess.setFillTime(DateUtils.getNowDate());
         cmcAssess.setAssessId(formDataJson.getString("formId"));
+        cmcAssess.setAssessType(formDataJson.getString("assessType"));
         cmcAssessService.insertCmcAssess(cmcAssess);
         for (String key : formDataJson.keySet()) {
             //必填项
@@ -176,7 +177,7 @@ public class CmcAssessController extends BaseController
                 cmcAssessContentWork.setWorkLoad(formDataJson.getString(key));
                 cmcAssessContentWorkService.insertCmcAssessContentWork(cmcAssessContentWork);
                 CmcAssessContent cmcAssessContent = new CmcAssessContent();
-                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(3));
+                cmcAssessContent.setContentId(cmcAssess.getAssessId() + key.substring(1,3));
                 cmcAssessContentService.insertCmcAssessContent(cmcAssessContent);
             }
         }
@@ -238,6 +239,7 @@ public class CmcAssessController extends BaseController
         JSONObject formDataJson = JSONObject.parse(formData);
         CmcAssess cmcAssess = cmcAssessService.selectCmcAssessByAssessId(formDataJson.getString("assessId"));
         cmcAssess.setProjectId(formDataJson.getString("projectId"));
+        cmcAssess.setAssessType(formDataJson.getString("assessType"));
         cmcAssess.setAssessTime(formDataJson.getDate("assessTime"));
         cmcAssess.setOtherWork(formDataJson.getString("otherWork"));
         cmcAssess.setSelfAssess(formDataJson.getString("selfAssess"));

oa-back/ruoyi-system/src/main/java/com/ruoyi/oa/domain/CmcAssess.java

@@ -42,6 +42,10 @@ public class CmcAssess extends BaseEntity
     @Excel(name = "部门考核等级", readConverterExp = "0=不合格,1=合格,2=良好,3=优秀")
     private String deptAssessment;
 
+    /** 考核类型 */
+    @Excel(name = "考核类型", readConverterExp = "0=生产部门考核,1=经营发展部考核,2=综合事务部考核,3=技术质量与安全部考核,4=财务部考核")
+    private String assessType;
+
     /** 部门考核意见 */
     @Excel(name = "部门考核意见")
     private String deptAdvice;
@@ -241,6 +245,15 @@ public class CmcAssess extends BaseEntity
     {
         return otherWork;
     }
+    public void setAssessType(String assessType)
+    {
+        this.assessType = assessType;
+    }
+
+    public String getAssessType()
+    {
+        return assessType;
+    }
     public void setDeptUser(SysUser deptUser)
     {
         this.deptUser = deptUser;

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

@@ -20,6 +20,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="selfAssess"    column="self_assess"    />
         <result property="fillTime"    column="fill_time"    />
         <result property="otherWork"    column="other_work"    />
+        <result property="assessType"    column="assess_type"    />
         <association property="user"    javaType="SysUser"         resultMap="UserResult" />
         <association property="deptUser"    javaType="SysUser"         resultMap="DeptUserResult" />
         <association property="managerUser"    javaType="SysUser"         resultMap="ManagerUserResult" />
@@ -49,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectCmcAssessVo">
         select a.assess_id, a.user_id, u.nick_name as nick_name, a.project_id, p.project_number, p.project_name, a.assess_time, a.dept_assessment, a.dept_advice, a.dept_time, a.dept_assesser, u1.nick_name as dept_nick_name, a.manager_assessment,
-               a.manager_advice, a.manager_time, a.manager_assesser, u2.nick_name as manager_nick_name, a.self_assess, a.fill_time, a.other_work from cmc_assess as a
+               a.manager_advice, a.manager_time, a.manager_assesser, u2.nick_name as manager_nick_name, a.self_assess, a.fill_time, a.other_work, a.assess_type from cmc_assess as a
         left join sys_user as u on u.user_id = a.user_id
         left join sys_user as u1 on u1.user_id = a.dept_assesser
         left join sys_user as u2 on u2.user_id = a.manager_assesser
@@ -74,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null  and selfAssess != ''"> and a.self_assess = #{selfAssess}</if>
             <if test="fillTime != null "> and a.fill_time = #{fillTime}</if>
             <if test="otherWork != null  and otherWork != ''"> and a.other_work = #{otherWork}</if>
+            <if test="assessType != null  and assessType != ''"> and a.assess_type = #{assessType}</if>
         </where>
     </select>
 
@@ -100,6 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">self_assess,</if>
             <if test="fillTime != null">fill_time,</if>
             <if test="otherWork != null">other_work,</if>
+            <if test="assessType != null">assess_type,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="assessId != null">#{assessId},</if>
@@ -117,6 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">#{selfAssess},</if>
             <if test="fillTime != null">#{fillTime},</if>
             <if test="otherWork != null">#{otherWork},</if>
+            <if test="assessType != null">#{assessType},</if>
         </trim>
     </insert>
 
@@ -137,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="selfAssess != null">self_assess = #{selfAssess},</if>
             <if test="fillTime != null">fill_time = #{fillTime},</if>
             <if test="otherWork != null">other_work = #{otherWork},</if>
+            <if test="assessType != null">assess_type = #{assessType},</if>
         </trim>
         where assess_id = #{assessId}
     </update>

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

@@ -632,6 +632,7 @@ export default {
         // this.$emit('submit', this.tableForm);
         let formData = new FormData();
         this.tableForm.formId = this.taskForm.formId;
+        this.tableForm.assessType = '4';
         let form = JSON.stringify(this.tableForm);
         formData.append("form", form);
         listAssess({ assessId: this.tableForm.formId }).then(result => {

oa-ui/src/views/flowable/form/access/jsForm.vue

@@ -5,7 +5,7 @@
  * @LastEditTime: 2024-02-21 10:00:38
 -->
 <template>
-  <!-- 技术质量部 -->
+  <!-- 技术质量与安全部 -->
   <div>
     <el-form ref="scform" :model="form">
       <el-form-item label="工作自述：">

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

@@ -1,7 +1,7 @@
 <template>
-  <!-- 技术质量部表格 -->
+  <!-- 技术质量与安全部表格 -->
   <div style="padding:10px">
-    <h2 style="text-align: center;">技术质量部考核表</h2>
+    <h2 style="text-align: center;">技术质量与安全部考核表</h2>
     <table class="table" ref="tableDatas">
       <tr>
         <td class="table-title">姓名</td>
@@ -527,8 +527,8 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
-            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">生疏</el-radio></div>
-            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar05', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar05', !isStaff)">熟练</el-radio></div>
             <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05', !isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
@@ -591,6 +591,119 @@
 
       <!--  -->
 
+      <tr>
+        <td rowspan="8">安全管理</td>
+        <td>安全培训</td>
+        <td>项</td>
+        <td class="personInput">
+          <span v-if="!isStaff">{{ tableForm.f0601 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0601"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.familiar06" :disabled="!isStaff">
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar06', !isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar06', !isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar06', !isStaff)">精通</el-radio></div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <div v-if="!isStaff">{{ tableForm.remark06 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.workload06" :disabled="!isPiLeader">
+            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
+              <el-radio :key="dict.value" :label="dict.value"
+                @click.native.prevent="cancelSelect(dict.value, 'workload06', isStaff)">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.skill06" :disabled="!isPiLeader">
+            <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', isStaff)">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-radio-group v-model="tableForm.assessment06" :disabled="!isPiLeader">
+            <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, 'assessment06', isStaff)">
+                {{ dict.label }}
+              </el-radio>
+            </div>
+          </el-radio-group>
+        </td>
+        <td rowspan="8">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice06" :disabled="!isPiLeader">
+          </el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>安全交底</td>
+        <td>次</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0602 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0602"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>组织演练</td>
+        <td>项</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0603 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0603"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>外业现场安全检查</td>
+        <td>人天</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0604 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0604"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>办公场所安全检查</td>
+        <td>次</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0605 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0605"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>商业保险办理</td>
+        <td>次</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0606 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0606"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>工伤保险办理</td>
+        <td>次</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0607 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0607"></el-input>
+        </td>
+      </tr>
+      <tr>
+        <td>组织体检</td>
+        <td>人次</td>
+        <td>
+          <span v-if="!isStaff">{{ tableForm.f0608 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0608"></el-input>
+        </td>
+      </tr>
+
+      <!--  -->
+
       <tr style="height:90px;">
         <td>其他工作</td>
         <td colspan="9">
@@ -713,6 +826,7 @@ export default {
         // this.$emit('submit', this.tableForm);
         let formData = new FormData();
         this.tableForm.formId = this.taskForm.formId;
+        this.tableForm.assessType = '3';
         let form = JSON.stringify(this.tableForm);
         formData.append("form", form);
         listAssess({ assessId: this.tableForm.formId }).then(result => {

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

@@ -417,6 +417,7 @@ export default {
         // this.$emit('submit', this.tableForm);
         let formData = new FormData();
         this.tableForm.formId = this.taskForm.formId;
+        this.tableForm.assessType = '1';
         let form = JSON.stringify(this.tableForm);
         formData.append("form", form);
         listAssess({ assessId: this.tableForm.formId }).then(result => {

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

@@ -1754,6 +1754,7 @@ export default {
         // this.$emit('submit', this.tableForm);
         let formData = new FormData();
         this.tableForm.formId = this.taskForm.formId;
+        this.tableForm.assessType = '0';
         let form = JSON.stringify(this.tableForm);
         formData.append("form", form);
         listAssess({ assessId: this.tableForm.formId }).then(result => {

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

@@ -196,25 +196,25 @@
       <!--  -->
 
       <tr>
-        <td rowspan="8">安全管理</td>
-        <td>安全培训</td>
-        <td>项</td>
+        <td rowspan="5">设备物资</td>
+        <td>设备、物资采购</td>
+        <td>次</td>
         <td class="personInput">
           <span v-if="!isStaff">{{ tableForm.f0201 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0201"></el-input>
         </td>
-        <td rowspan="8">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.role02" :disabled="!isStaff">
             <div><el-radio label="00">主办</el-radio></div>
             <div><el-radio label="01">参与</el-radio></div>
             <div><el-radio label="02">协助</el-radio></div>
           </el-radio-group>
         </td>
-        <td rowspan="8">
+        <td rowspan="5">
           <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
-        <td rowspan="8">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
@@ -224,7 +224,7 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="8">
+        <td rowspan="5">
           <el-radio-group v-model="tableForm.assessment02" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
@@ -234,90 +234,65 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="8">
+        <td rowspan="5">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice02" :disabled="!isPiLeader">
           </el-input>
         </td>
       </tr>
       <tr>
-        <td>安全交底</td>
-        <td>次</td>
+        <td>物资、仪器设备领用、归还</td>
+        <td>项</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0202 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0202"></el-input>
         </td>
       </tr>
       <tr>
-        <td>组织演练</td>
-        <td>项</td>
+        <td>设备维修</td>
+        <td>次</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0203 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0203"></el-input>
         </td>
       </tr>
       <tr>
-        <td>外业现场安全检查</td>
-        <td>人天</td>
+        <td>设备检定</td>
+        <td>台套</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0204 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0204"></el-input>
         </td>
       </tr>
       <tr>
-        <td>办公场所安全检查</td>
+        <td>设备保险办理</td>
         <td>次</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0205 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0205"></el-input>
         </td>
       </tr>
-      <tr>
-        <td>商业保险办理</td>
-        <td>次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0206 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0206"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>工伤保险办理</td>
-        <td>次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0207 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0207"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>组织体检</td>
-        <td>人次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0208 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0208"></el-input>
-        </td>
-      </tr>
-
       <!--  -->
 
       <tr>
-        <td rowspan="5">设备物资</td>
-        <td>设备、物资采购</td>
+        <td rowspan="7">人力资源</td>
+        <td>招聘（校招、社招、内部竞聘）</td>
         <td>次</td>
         <td class="personInput">
           <span v-if="!isStaff">{{ tableForm.f0301 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0301"></el-input>
         </td>
-        <td rowspan="5">
+        <td rowspan="7">
           <el-radio-group v-model="tableForm.role03" :disabled="!isStaff">
             <div><el-radio label="00">主办</el-radio></div>
             <div><el-radio label="01">参与</el-radio></div>
             <div><el-radio label="02">协助</el-radio></div>
           </el-radio-group>
         </td>
-        <td rowspan="5">
+        <td rowspan="7">
           <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
           <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
-        <td rowspan="5">
+        <td rowspan="7">
           <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
@@ -327,7 +302,7 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="5">
+        <td rowspan="7">
           <el-radio-group v-model="tableForm.assessment03" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_accessment" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
@@ -337,21 +312,21 @@
             </div>
           </el-radio-group>
         </td>
-        <td rowspan="5">
+        <td rowspan="7">
           <el-input type="textarea" :rows="4" v-model="tableForm.advice03" :disabled="!isPiLeader">
           </el-input>
         </td>
       </tr>
       <tr>
-        <td>物资、仪器设备领用、归还</td>
-        <td>项</td>
+        <td>薪酬、考勤休假办理</td>
+        <td>次</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0302 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0302"></el-input>
         </td>
       </tr>
       <tr>
-        <td>设备维修</td>
+        <td>社保三险办理</td>
         <td>次</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0303 }}</span>
@@ -359,7 +334,7 @@
         </td>
       </tr>
       <tr>
-        <td>设备检定</td>
+        <td>入、离职、退休办理</td>
         <td>台套</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0304 }}</span>
@@ -367,105 +342,27 @@
         </td>
       </tr>
       <tr>
-        <td>设备保险办理</td>
+        <td>劳动合同办理</td>
         <td>次</td>
         <td>
           <span v-if="!isStaff">{{ tableForm.f0305 }}</span>
           <el-input v-if="isStaff" v-model="tableForm.f0305"></el-input>
         </td>
       </tr>
-      <!--  -->
-
-      <tr>
-        <td rowspan="7">人力资源</td>
-        <td>招聘（校招、社招、内部竞聘）</td>
-        <td>次</td>
-        <td class="personInput">
-          <span v-if="!isStaff">{{ tableForm.f0401 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0401"></el-input>
-        </td>
-        <td rowspan="7">
-          <el-radio-group v-model="tableForm.role04" :disabled="!isStaff">
-            <div><el-radio label="00">主办</el-radio></div>
-            <div><el-radio label="01">参与</el-radio></div>
-            <div><el-radio label="02">协助</el-radio></div>
-          </el-radio-group>
-        </td>
-        <td rowspan="7">
-          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
-        </td>
-        <td rowspan="7">
-          <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
-            <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
-              <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
-                {{ dict.label }}
-              </el-radio>
-            </div>
-          </el-radio-group>
-        </td>
-        <td rowspan="7">
-          <el-radio-group v-model="tableForm.assessment04" :disabled="!isPiLeader">
-            <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, 'assessment04', isStaff)">
-                {{ dict.label }}
-              </el-radio>
-            </div>
-          </el-radio-group>
-        </td>
-        <td rowspan="7">
-          <el-input type="textarea" :rows="4" v-model="tableForm.advice04" :disabled="!isPiLeader">
-          </el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>薪酬、考勤休假办理</td>
-        <td>次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0402 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0402"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>社保三险办理</td>
-        <td>次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0403 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0403"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>入、离职、退休办理</td>
-        <td>台套</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0404 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0404"></el-input>
-        </td>
-      </tr>
-      <tr>
-        <td>劳动合同办理</td>
-        <td>次</td>
-        <td>
-          <span v-if="!isStaff">{{ tableForm.f0405 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0405"></el-input>
-        </td>
-      </tr>
       <tr>
         <td>绩效考评管理</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0406 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0406"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0306 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0306"></el-input>
         </td>
       </tr>
       <tr>
         <td>职称管理</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0407 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0407"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0307 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0307"></el-input>
         </td>
       </tr>
 
@@ -475,42 +372,42 @@
         <td>车辆采购</td>
         <td>次</td>
         <td class="personInput">
-          <span v-if="!isStaff">{{ tableForm.f0501 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0501"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0401 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0401"></el-input>
         </td>
         <td rowspan="10">
-          <el-radio-group v-model="tableForm.role05" :disabled="!isStaff">
+          <el-radio-group v-model="tableForm.role04" :disabled="!isStaff">
             <div><el-radio label="00">主办</el-radio></div>
             <div><el-radio label="01">参与</el-radio></div>
             <div><el-radio label="02">协助</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="10">
-          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
-          <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="10">
-          <el-radio-group v-model="tableForm.assessment05" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.assessment04" :disabled="!isPiLeader">
             <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, 'assessment05', isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment04', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="10">
-          <el-input type="textarea" :rows="4" v-model="tableForm.advice05" :disabled="!isPiLeader">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice04" :disabled="!isPiLeader">
           </el-input>
         </td>
       </tr>
@@ -518,72 +415,72 @@
         <td>车辆保险购置</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0502 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0502"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0402 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0402"></el-input>
         </td>
       </tr>
       <tr>
         <td>生产项目用车（安排）</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0503 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0503"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0403 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0403"></el-input>
         </td>
       </tr>
       <tr>
         <td>出差用车（安排）</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0504 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0504"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0404 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0404"></el-input>
         </td>
       </tr>
       <tr>
         <td>市周边临时驾驶接送（安排）</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0505 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0505"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0405 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0405"></el-input>
         </td>
       </tr>
       <tr>
         <td>驾驶车辆参与项目生产</td>
         <td>人天</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0506 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0506"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0406 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0406"></el-input>
         </td>
       </tr>
       <tr>
         <td>驾驶车辆参与出差</td>
         <td>人天</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0507 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0507"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0407 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0407"></el-input>
         </td>
       </tr>
       <tr>
         <td>年度驾驶里程</td>
         <td>km</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0508 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0508"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0408 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0408"></el-input>
         </td>
       </tr>
       <tr>
         <td>车辆维修保养</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0509 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0509"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0409 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0409"></el-input>
         </td>
       </tr>
       <tr>
         <td>车辆保险理赔</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0510 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0510"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0410 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0410"></el-input>
         </td>
       </tr>
       <!--  -->
@@ -592,42 +489,42 @@
         <td>办公区办公设施检修</td>
         <td>次</td>
         <td class="personInput">
-          <span v-if="!isStaff">{{ tableForm.f0601 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0601"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0501 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0501"></el-input>
         </td>
         <td rowspan="7">
-          <el-radio-group v-model="tableForm.role06" :disabled="!isStaff">
+          <el-radio-group v-model="tableForm.role05" :disabled="!isStaff">
             <div><el-radio label="00">主办</el-radio></div>
             <div><el-radio label="01">参与</el-radio></div>
             <div><el-radio label="02">协助</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="7">
-          <div v-if="!isStaff">{{ tableForm.remark06 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
-          <el-radio-group v-model="tableForm.workload06" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
             <div v-for="dict in dict.type.cmc_workload" style="text-align:left">
               <el-radio :key="dict.value" :label="dict.value"
-                @click.native.prevent="cancelSelect(dict.value, 'workload06', isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'workload05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="7">
-          <el-radio-group v-model="tableForm.assessment06" :disabled="!isPiLeader">
+          <el-radio-group v-model="tableForm.assessment05" :disabled="!isPiLeader">
             <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, 'assessment06', isStaff)">
+                @click.native.prevent="cancelSelect(dict.value, 'assessment05', isStaff)">
                 {{ dict.label }}
               </el-radio>
             </div>
           </el-radio-group>
         </td>
         <td rowspan="7">
-          <el-input type="textarea" :rows="4" v-model="tableForm.advice06" :disabled="!isPiLeader">
+          <el-input type="textarea" :rows="4" v-model="tableForm.advice05" :disabled="!isPiLeader">
           </el-input>
         </td>
       </tr>
@@ -635,48 +532,48 @@
         <td>办公区安全检查</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0602 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0602"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0502 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0502"></el-input>
         </td>
       </tr>
       <tr>
         <td>办公区绿植、送水统计</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0603 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0603"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0503 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0503"></el-input>
         </td>
       </tr>
       <tr>
         <td>办公区电子显示屏展示宣传</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0604 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0604"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0504 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0504"></el-input>
         </td>
       </tr>
       <tr>
         <td>办公区电子信息维护（电话、网络、电脑）</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0605 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0605"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0505 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0505"></el-input>
         </td>
       </tr>
       <tr>
         <td>会议室管理</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0606 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0606"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0506 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0506"></el-input>
         </td>
       </tr>
       <tr>
         <td>工作餐订制、快递、报纸收发</td>
         <td>次</td>
         <td>
-          <span v-if="!isStaff">{{ tableForm.f0607 }}</span>
-          <el-input v-if="isStaff" v-model="tableForm.f0607"></el-input>
+          <span v-if="!isStaff">{{ tableForm.f0507 }}</span>
+          <el-input v-if="isStaff" v-model="tableForm.f0507"></el-input>
         </td>
       </tr>
       <!--  -->
@@ -856,6 +753,7 @@ export default {
         // this.$emit('submit', this.tableForm);
         let formData = new FormData();
         this.tableForm.formId = this.taskForm.formId;
+        this.tableForm.assessType = '2';
         let form = JSON.stringify(this.tableForm);
         formData.append("form", form);
         listAssess({ assessId: this.tableForm.formId }).then(result => {

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

@@ -86,8 +86,8 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-form-item label="技术质量部负责人审核" prop="deptComment">
-            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量部负责人审核意见"
+          <el-form-item label="技术质量与安全部负责人审核" prop="deptComment">
+            <el-input type="textarea" v-model="form.deptComment" placeholder="请输入技术质量与安全部负责人审核意见"
               :disabled="taskName != '技术部审核'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>
@@ -106,8 +106,8 @@
           <el-form-item label="资料管理">
             <el-button type="success" size="mini" @click="gotoFile" :disabled="taskName != '成果归档'">前往资料管理系统</el-button>
           </el-form-item>
-          <el-form-item label="技术质量部归档" prop="archiveComment">
-            <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量部归档意见"
+          <el-form-item label="技术质量与安全部归档" prop="archiveComment">
+            <el-input type="textarea" v-model="form.archiveComment" placeholder="请输入技术质量与安全部归档意见"
               :disabled="taskName != '成果归档'" :autosize="{ minRows: 4 }" />
           </el-form-item>
           <el-row>

oa-ui/src/views/flowable/form/budget/budgetInfo.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: ysh
  * @Date: 2024-04-03 16:28:09
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-08-21 15:49:18
+ * @LastEditors: wrh
+ * @LastEditTime: 2024-08-27 14:34:34
 -->
 <template>
   <div class="main">
@@ -99,7 +99,7 @@
               <td>{{ work.remark ? work.remark : '' }}</td>
             </tr>
             <tr>
-              <td :colspan="6" class="head">直接成本合计</td>
+              <td :colspan="7" class="head">直接成本合计</td>
               <td :colspan="1" class="head">{{ budgetForm.settleExpense }}</td>
               <td></td>
             </tr>

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

@@ -8,7 +8,7 @@
   <div>
     <sc-table :key="'sc'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
     <jy-table :key="'jy'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
-    <js-table :key="'js'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+    <js-table :key="'js'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量与安全部考核'"></js-table>
     <xm-table :key="'xm'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
     <cw-table :key="'cw'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
     <zh-table :key="'zh'+taskForm.taskId" :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>

oa-ui/src/views/flowable/form/components/detailDisplay.vue

@@ -4,7 +4,7 @@
       @goBack="goBack"></sc-table>
     <jy-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '经营发展部考核'"
       @goBack="goBack"></jy-table>
-    <js-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '技术质量部考核'"
+    <js-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '技术质量与安全部考核'"
       @goBack="goBack"></js-table>
     <xm-table :taskForm="taskForm" :taskName="taskName" v-else-if="taskForm.procDefName == '项目管理部考核'"
       @goBack="goBack"></xm-table>

oa-ui/src/views/flowable/form/components/print/settlePrint.vue

@@ -96,7 +96,7 @@
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.zhTime }}</td>
         </tr>
         <tr>
-          <td :colspan="2" class="fontbold">技术质量部(质量及工作量)</td>
+          <td :colspan="2" class="fontbold">技术质量与安全部(质量及工作量)</td>
           <td :colspan="4" class="conment-width">{{ form.jsComment }}</td>
           <td :colspan="2" style="text-align:left;min-width:120px;">签名：<span class="auditor">{{ getUserName(form.jsUserId) }}</span></td>
           <td :colspan="2" style="text-align:left;width:120px;">日期：{{ form.jsTime }}</td>

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

@@ -21,7 +21,7 @@
       <el-table-column label="上报人" prop="reporterName" />
       <el-table-column label="申请时间" prop="reportTime" width="100" />
       <el-table-column label="综合事务部意见" prop="zhComment" show-overflow-tooltip width="120" />
-      <el-table-column label="技术质量部意见" prop="jsComment" show-overflow-tooltip width="120" />
+      <el-table-column label="技术质量与安全部意见" prop="jsComment" show-overflow-tooltip width="120" />
       <el-table-column label="项目管理部意见" prop="xmComment" show-overflow-tooltip width="120" />
       <el-table-column label="承担部门意见" prop="deptComment" show-overflow-tooltip width="120" />
       <el-table-column label="经营管理部意见" prop="jyComment" show-overflow-tooltip width="120" />

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

@@ -17,7 +17,7 @@
         <el-tab-pane label="表单信息" name="1">
           <!-- <sc-table :taskForm="taskForm" :tableForm="tableForm" v-if="taskForm.procDefName == '生产部门考核'"></sc-table>
           <jy-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '经营发展部考核'"></jy-table>
-          <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量部考核'"></js-table>
+          <js-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '技术质量与安全部考核'"></js-table>
           <xm-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '项目管理部考核'"></xm-table>
           <cw-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '财务部考核'"></cw-table>
           <zh-table :taskForm="taskForm" :tableForm="tableForm" v-else-if="taskForm.procDefName == '综合事务部考核'"></zh-table>

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

@@ -20,7 +20,7 @@
           <sc-form @submit="submitForm" v-if="deployName == '生产部门考核'"></sc-form>
           <jy-form @submit="submitForm" v-else-if="deployName == '经营发展部考核'"></jy-form>
           <zh-form @submit="submitForm" v-else-if="deployName == '综合事务部考核'"></zh-form>
-          <js-form @submit="submitForm" v-else-if="deployName == '技术质量部考核'"></js-form>
+          <js-form @submit="submitForm" v-else-if="deployName == '技术质量与安全部考核'"></js-form>
           <xm-form @submit="submitForm" v-else-if="deployName == '项目管理部考核'"></xm-form>
           <cw-form @submit="submitForm" v-else-if="deployName == '财务部考核'"></cw-form>
           <ProjectProcess v-else-if="deployName == '项目流转'"></ProjectProcess>

oa-ui/src/views/oa/assess/index.vue

@@ -20,6 +20,7 @@
         <el-date-picker clearable
           v-model="queryParams.assessTime"
           type="month"
+          value-format="yyyy-MM"
           placeholder="请选择考核时间">
         </el-date-picker>
       </el-form-item>      
@@ -47,6 +48,11 @@
       <el-table-column label="序号" align="center" type="index" />
       <!-- <el-table-column type="selection" width="55" align="center" /> -->
       <!-- <el-table-column label="总考核表id" align="center" prop="assessId" /> -->
+      <el-table-column label="考核类型" width="155" align="center" prop="assessType">
+        <template slot-scope="scope">
+          <el-tag :type="getAssessStyle(scope.row.assessType)">{{ getAssessType(scope.row.assessType) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="被考核人" align="center" prop="userId">
         <template slot-scope="scope">
           <span>{{ getUserName(scope.row.userId) }}</span>
@@ -64,10 +70,14 @@
       </el-table-column>
       <el-table-column label="考核时间" align="center" prop="assessTime" width="180">
         <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.assessTime, '{y}-{m}-{d}') }}</span>
+          <span>{{ parseTime(scope.row.assessTime, '{y}-{m}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="部门考核等级" align="center" prop="deptAssessment">
+        <template slot-scope="scope">
+          <el-tag :type="getAssessmentStyle(scope.row.deptAssessment)">{{ getAssessmentType(scope.row.deptAssessment) }}</el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="部门考核等级" align="center" prop="deptAssessment" />
       <el-table-column label="部门考核意见" align="center" prop="deptAdvice" />
       <el-table-column label="部门考核时间" align="center" prop="deptTime" width="180">
         <template slot-scope="scope">
@@ -79,7 +89,11 @@
           <span>{{ getUserName(scope.row.deptAssesser) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="分管考核等级" align="center" prop="managerAssessment" />
+      <el-table-column label="分管考核等级" align="center" prop="managerAssessment">
+        <template slot-scope="scope">
+          <el-tag :type="getAssessmentStyle(scope.row.managerAssessment)">{{ getAssessmentType(scope.row.managerAssessment) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="分管考核意见" align="center" prop="managerAdvice" />
       <el-table-column label="分管考核时间" align="center" prop="managerTime" width="180">
         <template slot-scope="scope">
@@ -97,25 +111,18 @@
           <span>{{ parseTime(scope.row.fillTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="其他工作" align="center" prop="otherWork" />
-      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="其他工作" align="center" prop="otherWork" /> -->
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
             type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['oa:assess:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['oa:assess:remove']"
-          >删除</el-button>
+            icon="el-icon-view"
+            @click="handleView(scope.row)"
+            v-hasPermi="['oa:assess:query']"
+          >查看</el-button>
         </template>
-      </el-table-column> -->
+      </el-table-column>
     </el-table>
     
     <pagination
@@ -125,16 +132,34 @@
       :limit.sync="queryParams.pageSize"
       @pagination="getList"
     />
-
+    <el-dialog :title="title" :visible.sync="infoOpen" width="70%" append-to-body>
+      <sc-table :taskForm="taskForm" :taskName="''" :isFlow="false" v-if="taskForm.assessType == '0'"></sc-table>
+      <jy-table :taskForm="taskForm" :taskName="''" :isFlow="false" v-if="taskForm.assessType == '1'"></jy-table>
+      <zh-table :taskForm="taskForm" :taskName="''" :isFlow="false" v-if="taskForm.assessType == '2'"></zh-table>
+      <js-table :taskForm="taskForm" :taskName="''" :isFlow="false" v-if="taskForm.assessType == '3'"></js-table>
+      <cw-table :taskForm="taskForm" :taskName="''" :isFlow="false" v-if="taskForm.assessType == '4'"></cw-table>
+    </el-dialog>
   </div>
 </template>
 
 <script>
 import { listAssess, getAssess, delAssess, addAssess, updateAssess } from "@/api/oa/assess/assess";
 import { listProject } from '@/api/oa/project/project';
+import ScTable from '@/views/flowable/form/access/scTable.vue';
+import JyTable from '@/views/flowable/form/access/jyTable.vue';
+import ZhTable from '@/views/flowable/form/access/zhTable.vue';
+import JsTable from '@/views/flowable/form/access/jsTable.vue';
+import CwTable from '@/views/flowable/form/access/cwTable.vue';
 
 export default {
   name: "Assess",
+  components: {
+    ScTable,
+    JyTable,
+    ZhTable,
+    JsTable,
+    CwTable,
+  },
   data() {
     return {
       // 遮罩层
@@ -179,11 +204,16 @@ export default {
       form: {},
       // 表单校验
       rules: {
-      }
+      },
+      taskForm: {
+        formId: ''
+      },
+      infoOpen: false
     };
   },
   created() {
     this.getList();
+    console.log(this.taskForm);
   },
   methods: {
     /** 查询cmc考核列表 */
@@ -297,6 +327,55 @@ export default {
       this.download('oa/assess/export', {
         ...this.queryParams
       }, `assess_${new Date().getTime()}.xlsx`)
+    },
+    handleView(row) {
+      this.taskForm.formId = row.assessId;
+      this.taskForm.assessType = row.assessType;
+      this.infoOpen = true;
+    },
+    getAssessmentType(assessment){
+      if (assessment == '0')
+        return '不合格';
+      else if (assessment == '1')
+        return '合格';
+      else if (assessment == '2')
+        return '良好';
+      else if (assessment == '3')
+        return '优秀';
+    },
+    getAssessmentStyle(assessment){
+      if (assessment == '0')
+        return 'danger';
+      else if (assessment == '1')
+        return 'warning';
+      else if (assessment == '2')
+        return 'primary';
+      else if (assessment == '3')
+        return 'success';
+    },
+    getAssessType(assess){
+      if (assess == '0')
+        return '生产部门考核';
+      else if (assess == '1')
+        return '经营发展部考核';
+      else if (assess == '2')
+        return '综合事务部考核';
+      else if (assess == '3')
+        return '技术质量与安全部考核';
+      else if (assess == '4')
+        return '财务部考核';
+    },
+    getAssessStyle(assess){
+      if (assess == '0')
+        return 'info';
+      else if (assess == '1')
+        return 'success';
+      else if (assess == '2')
+        return 'warning';
+      else if (assess == '3')
+        return 'primary';
+      else if (assess == '4')
+        return 'danger';
     }
   }
 };

oa-ui/src/views/oa/project/info.vue

@@ -223,7 +223,7 @@
           </el-descriptions>
         </div>
       </div>
-      <!-- 技术质量部安排 -->
+      <!-- 技术质量与安全部安排 -->
       <div class="box1 mt20">
         <div class="title">技术安排
           <div class="line"></div>