EOEG SAI

master/src/main/java/com/ruoyi/project/plant/mapper/TStaffmgrMapper.java

@@ -35,6 +35,11 @@ public interface TStaffmgrMapper
      */
     public List<TStaffmgr> selectSaiExecutors();
 
+    /**
+     * 获取SAI评估人列表
+     */
+    public List<TStaffmgr> selectSaiAssessor();
+
     /**
      * 查询导师下拉列表
      *

master/src/main/java/com/ruoyi/project/production/controller/TEoegSaiApplyController.java

@@ -9,6 +9,7 @@ import com.ruoyi.common.thread.Trainning.MeetingInvitationMailThread;
 import com.ruoyi.common.thread.sai.SaiApplyMailThread;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.file.ExcelUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.utils.spring.SpringUtils;
@@ -24,6 +25,7 @@ import com.ruoyi.framework.web.page.TableDataInfo;
 import com.ruoyi.framework.web.page.TableSupport;
 import com.ruoyi.project.approve.damain.DevTask;
 import com.ruoyi.project.plant.domain.TStaffmgr;
+import com.ruoyi.project.plant.mapper.TStaffmgrMapper;
 import com.ruoyi.project.plant.service.ITStaffmgrService;
 import com.ruoyi.project.process.domain.TMoc;
 import com.ruoyi.project.production.controller.vo.EoegSaiApplyExportVO;
@@ -104,6 +106,9 @@ public class TEoegSaiApplyController extends BaseController
     @Autowired
     private ITStaffmgrService staffmgrService;
 
+    @Autowired
+    private TStaffmgrMapper staffmgrMapper;
+
     @Autowired
     private ISysMessageService sysMessageService;
 
@@ -139,31 +144,11 @@ public class TEoegSaiApplyController extends BaseController
     public TableDataInfo list(EoegSaiApplyQueryVO tSaiApply)
     {
         tSaiApply.setCurrentUser(getUserId());
-        tSaiApply.setSpecialRole(this.isSpecialRole());
         startPage();
         List<TEoegSaiApply> list = tSaiApplyService.selectTSaiApplyList(tSaiApply);
         return getDataTable(list);
     }
 
-    /**
-     * 当前登录用户是否为特殊角色（供SAI功能展示使用）
-     *
-     * @return 是否为特殊角色
-     */
-    private boolean isSpecialRole() {
-        boolean isSpecialRole = false;
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        SysUser user = loginUser.getUser();
-        List<SysRole> roles = user.getRoles();
-        for (SysRole role : roles) {
-            Long roleId = role.getRoleId();
-            if (roleId.toString().equals("23140")) {
-                isSpecialRole = true;
-            }
-        }
-        return isSpecialRole;
-    }
-
     /**
      * 批量导入SAI开项管理列表
      */
@@ -459,18 +444,28 @@ public class TEoegSaiApplyController extends BaseController
         Date date = new Date();
         date.setDate(date.getDate() + 7);
         tSaiApply.setEstimateFinishDate(date);
-        tSaiApply.setAssessor("20276");//todo:修改为四个班长
-        tSaiApply.setHandler("20276");//todo:修改为四个班长
+        // 查询四个班长
+        List<TStaffmgr> tStaffmgrs = staffmgrMapper.selectSaiAssessor();
+        List<String> monitorList = new ArrayList<>();
+        for (TStaffmgr tStaffmgr : tStaffmgrs) {
+            String userId1 = tStaffmgr.getUserId();
+            monitorList.add(userId1);
+        }
+        String[] monitors = new String[monitorList.size()];
+        monitorList.toArray(monitors);
+        String monitorJoin = StringUtils.join(monitors, ",");
+        tSaiApply.setAssessor(monitorJoin);
+        tSaiApply.setHandler(monitorJoin);
         // 开始申请流程
         tSaiApply.setApNo(DateUtils.dateTimeNow() + userId);
         Authentication.setAuthenticatedUserId(userId);//设置当前申请人
         // 声明流程变量集合
         Map<String, Object> variables = new HashMap<>();
-        variables.put("assessor", "20276");//todo:修改为四个班长
+        variables.put("assessor", monitorJoin);
         // 流程businessKey = SAI开项管理对象saiApplyId
         long businessKey = saiApplyId;
         // 采用key来启动流程定义并设置流程变量，返回流程实例
-        ProcessInstance pi = runtimeService.startProcessInstanceByKey("saiApplyProcess", String.valueOf(businessKey), variables);
+        ProcessInstance pi = runtimeService.startProcessInstanceByKey("eoegSaiApplyProcess", String.valueOf(businessKey), variables);
         logger.info("流程定义id：" + pi.getProcessDefinitionId());
         logger.info("流程实例id：" + pi.getProcessInstanceId());
         // SAI开项管理对象processId = 流程实例id
@@ -479,7 +474,7 @@ public class TEoegSaiApplyController extends BaseController
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         List<Task> list = processEngine.getTaskService()//获取任务service
                 .createTaskQuery()//创建查询对象
-                .taskCandidateOrAssigned("20276").list();//todo:修改为四个班长
+                .taskCandidateOrAssigned(monitors[0]).list();
         for (Task task : list) {
             if (tSaiApply.getProcessId().equals(task.getProcessInstanceId())) {
                 tSaiApply.setTaskId(task.getId());
@@ -534,9 +529,6 @@ public class TEoegSaiApplyController extends BaseController
                 if ("1".equals(condition)) {
                     form.setApplyStatus(2);
                     String executor = form.getExecutor();
-                    if (!"20276".equals(form.getExecutor())) {
-                        executor = form.getExecutor() + ",20276";
-                    }
                     param.put("executor", executor);
                     nextHandler = form.getExecutor();
                     form.setHandler(form.getExecutor());
@@ -603,26 +595,24 @@ public class TEoegSaiApplyController extends BaseController
                 split[0] = nextHandler;
             }
             for (int i = 0; i < split.length; i++) {
-                if (!split[i].equals("20276")) {    // 张力飞不发邮件
-                    SysUser sysUser = userService.selectUserById(Long.parseLong(split[i]));
-                    String staffId = sysUser.getStaffId();
-                    String loginName = sysUser.getUserName();
-                    TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(staffId);
-                    String staffName = staffmgr.getName();
-                    String email = sysUser.getEmail();
-                    if (email != null) {
-                        // 系统通知
-                        SysMessage message = new SysMessage();
-                        message.setUserId(Long.parseLong(split[i]));
-                        message.setMsgTitle("您有一条系统消息");
-                        message.setMsgContent("您有一条SAI开项申请消息待查看");
-                        // 发送邮件
+                SysUser sysUser = userService.selectUserById(Long.parseLong(split[i]));
+                String staffId = sysUser.getStaffId();
+                String loginName = sysUser.getUserName();
+                TStaffmgr staffmgr = staffmgrService.selectTStaffmgrByStaffId(staffId);
+                String staffName = staffmgr.getName();
+                String email = sysUser.getEmail();
+                if (email != null) {
+                    // 系统通知
+                    SysMessage message = new SysMessage();
+                    message.setUserId(Long.parseLong(split[i]));
+                    message.setMsgTitle("您有一条系统消息");
+                    message.setMsgContent("您有一条SAI开项申请消息待查看");
+                    // 发送邮件
 //                        email = "lihui@seashoreept.com";
 //                        SaiApplyMailThread saiApplyMailThread = new SaiApplyMailThread(
 //                                mailService, sysMessageService, message, email, nextHandlerTask, form, staffName, loginName);
 //                        Thread thread = new Thread(saiApplyMailThread);
 //                        thread.start();
-                    }
                 }
             }
         }
@@ -649,7 +639,7 @@ public class TEoegSaiApplyController extends BaseController
                 tSaiApply.setHandler(tSaiApply.getApplicant());
                 break;
             case "1":
-                tSaiApply.setHandler("20276");
+                tSaiApply.setHandler(tSaiApply.getAssessor());
                 break;
             case "2":
                 tSaiApply.setHandler(tSaiApply.getExecutor());

master/src/main/java/com/ruoyi/project/production/controller/vo/EoegSaiApplyQueryVO.java

@@ -28,9 +28,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     /** 当前登录用户id */
     private long currentUser;
 
-    /** 当前登录用户是否为特殊角色（供SAI功能展示使用） */
-    private boolean isSpecialRole;
-
     /** 删除状态 */
     private String delFlag;
 
@@ -184,14 +181,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
         this.workArea = workArea;
     }
 
-    public boolean isSpecialRole() {
-        return isSpecialRole;
-    }
-
-    public void setSpecialRole(boolean specialRole) {
-        isSpecialRole = specialRole;
-    }
-
     public long getCurrentUser() {
         return currentUser;
     }

master/src/main/java/com/ruoyi/project/production/service/impl/TEoegSaiApplyServiceImpl.java

@@ -91,36 +91,6 @@ public class TEoegSaiApplyServiceImpl implements ITEoegSaiApplyService
     @Override
     public List<TEoegSaiApply> selectTSaiApplyList(EoegSaiApplyQueryVO tSaiApply)
     {
-//        // 当前登录用户userId
-//        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-//        Long userId = loginUser.getUser().getUserId();
-//
-//        List<TSaiApply> result = tSaiApplyMapper.selectTSaiApplyList(tSaiApply);
-//
-//        List<TSaiApply> tSaiApplies = new ArrayList<>();
-//
-//        for (TSaiApply saiApply : result) {
-//            // 待处理：当前用户为流程当前处理人（之一），申请流程未结束
-//            if (tSaiApply.getTab() == 1) {
-//                if (saiApply.getHandler().indexOf(userId.toString()) != -1 && saiApply.getApplyStatus() != 4 && saiApply.getApplyStatus() != 5) {
-//                    tSaiApplies.add(saiApply);
-//                }
-//            }
-//            // 我的：当前用户为登记人、评估人、整改负责人或验证人（之一）
-//            else if (tSaiApply.getTab() == 2) {
-//                if ((saiApply.getApplicant() != null && saiApply.getApplicant().indexOf(userId.toString()) != -1)
-//                     || (saiApply.getAssessor() != null && saiApply.getAssessor().indexOf(userId.toString()) != -1)
-//                     || (saiApply.getExecutor() != null && saiApply.getExecutor().indexOf(userId.toString()) != -1)
-//                     || (saiApply.getInspectors() != null && saiApply.getInspectors().indexOf(userId.toString()) != -1)) {
-//                    tSaiApplies.add(saiApply);
-//                }
-//            }
-//            // 总数据
-//            else if (tSaiApply.getTab() == 3) {
-//                tSaiApplies.add(saiApply);
-//            }
-//        }
-
         List<TEoegSaiApply> tSaiApplies = tSaiApplyMapper.selectTSaiApplyList(tSaiApply);
 
         List<SysDictData> staffUnitDict = iSysDictTypeService.selectDictDataByType("STAFF_UNIT");
@@ -201,38 +171,9 @@ public class TEoegSaiApplyServiceImpl implements ITEoegSaiApplyService
         }
         executorService.shutdown();
 
-//        boolean specialRole = this.isSpecialRole();
-//        if (specialRole) {  // 当前登录用户是特殊角色
-//            for (TSaiApply saiApply : tSaiApplies) {
-//                long applyStatus = saiApply.getApplyStatus();
-//                if (Long.toString(applyStatus).equals("5")) {   // 申请状态为“已取消”的数据
-//                    tSaiApplies.remove(saiApply);   // 从列表中移除
-//                }
-//            }
-//        }
-
         return tSaiApplies;
     }
 
-    /**
-     * 当前登录用户是否为特殊角色（供SAI功能展示使用）
-     *
-     * @return 是否为特殊角色
-     */
-    private boolean isSpecialRole() {
-        boolean isSpecialRole = false;
-        LoginUser loginUser = SpringUtils.getBean(TokenService.class).getLoginUser(ServletUtils.getRequest());
-        SysUser user = loginUser.getUser();
-        List<SysRole> roles = user.getRoles();
-        for (SysRole role : roles) {
-            Long roleId = role.getRoleId();
-            if (roleId.toString().equals("23140")) {
-                isSpecialRole = true;
-            }
-        }
-        return isSpecialRole;
-    }
-
     /**
      * 新增SAI开项管理
      *

master/src/main/resources/mybatis/plant/TStaffmgrMapper.xml

@@ -115,12 +115,23 @@
     </select>
 
     <select id="selectSaiInspectors" resultMap="TStaffmgrResult">
-        select u.user_id, d.id, d.plant_code,d.left_date, d.staffid, d.name, d.photo, d.sex, d.birthday, d.unit, d.team, d.actualpost, d.contact, d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.education, d.en_ability, d.accident_num, d.mail, d.skill_score, d.p_id , d.special_duty, d.region, s.dept_name from t_staffmgr d
+        select u.user_id, d.id, d.plant_code,d.left_date, d.staffid, d.name, d.photo, d.sex, d.birthday, d.unit, d.team, d.actualpost, d.contact,
+        d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.education, d.en_ability, d.accident_num,
+        d.mail, d.skill_score, d.p_id , d.special_duty, d.region, s.dept_name from t_staffmgr d
         left join sys_dept s on s.dept_id = d.dept_id
         inner join sys_user u on d.staffid = u.staffid
         where d.unit = 10 and d.team = 18 and d.del_flag = 0
     </select>
 
+    <select id="selectSaiAssessor" resultMap="TStaffmgrResult">
+        select u.user_id, d.id, d.plant_code,d.left_date, d.staffid, d.name, d.photo, d.sex, d.birthday, d.unit, d.team, d.actualpost, d.contact,
+        d.del_flag, d.creater_code, d.createdate, d.updater_code, d.updatedate, d.dept_id, d.remarks, d.education, d.en_ability, d.accident_num,
+        d.mail, d.skill_score, d.p_id , d.special_duty, d.region, s.dept_name from t_staffmgr d
+        left join sys_dept s on s.dept_id = d.dept_id
+        inner join sys_user u on d.staffid = u.staffid
+        where d.unit = 38 and d.team in (10, 12, 14, 16) and d.ACTUALPOST= 12 and d.DEL_FLAG= 0
+    </select>
+
     <select id="selectTStaffmgrList" parameterType="TStaffmgr" resultMap="TStaffmgrResult">
         <include refid="selectTStaffmgrVo"/>
         Left join SYS_DICT_DATA s0 on d.UNIT = s0.DICT_VALUE and s0.DICT_TYPE ='STAFF_UNIT'

master/src/main/resources/mybatis/production/TEoegSaiApplyMapper.xml

@@ -87,9 +87,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 or executor like concat(concat('%', #{currentUser}), '%')
                 or inspectors like concat(concat('%', #{currentUser}), '%'))
             </if>
-            <if test="isSpecialRole == true">
-                and apply_status != 5
-            </if>
             <if test="applyDateStart != null ">and apply_date <![CDATA[>=]]> #{applyDateStart}</if>
             <if test="applyDateEnd != null">and apply_date <![CDATA[<=]]>#{applyDateEnd}</if>
             <if test="estimateFinishDateStart != null ">and estimate_finish_date <![CDATA[>=]]> #{estimateFinishDateStart}</if>

ui/src/views/approve/approveDetail/eoeg-sai-apply-detail.vue

@@ -10,6 +10,26 @@
       <div id="apply-div">
         <h4>申请详情</h4>
         <el-descriptions title="" :column="3" border>
+          <el-descriptions-item label="SAI类型" :span="1">
+            <el-form-item prop="saiType">
+              <el-select
+                v-model="dataForm.saiType"
+                placeholder="请选择SAI类型">
+                <el-option key="SAI" label="SAI" value="SAI"></el-option>
+                <el-option key="TPM" label="TPM" value="TPM"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="TPM状态" :span="2" v-if="form.saiType == 'TPM'">
+            <el-form-item prop="tpmStatus">
+              <el-select
+                v-model="dataForm.tpmStatus"
+                placeholder="请选择TPM状态">
+                <el-option key="未完成" label="未完成" value="未完成"></el-option>
+                <el-option key="已完成" label="已完成" value="已完成"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item label="登记人部门">
             <el-form-item prop="applicantDept">
               <el-select
@@ -60,6 +80,11 @@
               <el-input :disabled="applyDisabled" v-model="dataForm.description" placeholder="请输入问题描述" type="textarea" :rows="3"/>
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item label="采取的措施" :span="2">
+            <el-form-item prop="reaction">
+              <el-input :disabled="assessDisabled" v-model="dataForm.reaction" placeholder="请输入采取的措施" type="textarea" :rows="3"/>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item label="SAI级别" :span="1">
           <el-form-item prop="saiLevel">
               <el-select v-model="dataForm.saiLevel" placeholder="请选择SAI级别" :disabled="applyDisabled">
@@ -103,6 +128,23 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
+          <el-descriptions-item label="整改负责人">
+            <el-form-item prop="executor">
+              <el-select
+                filterable
+                :disabled="assessDisabled"
+                clearable
+                v-model="dataForm.executor"
+                placeholder="请选择整改负责人">
+                <el-option
+                  v-for="dict in applicantOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
           <el-descriptions-item label="附件" :span="3">
             <el-table :data="doc.commonfileListApply" border>
               <el-table-column :label="$t('文件名')" align="center" prop="fileName" :show-overflow-tooltip="true">
@@ -112,9 +154,6 @@
                   </a>
                 </template>
               </el-table-column>
-              <!--<el-table-column :label="$t('大小(Kb)')" align="center" prop="fileSize" :show-overflow-tooltip="true" width="80" />-->
-              <!--<el-table-column :label="$t('上传人')" align="center" prop="creator" :show-overflow-tooltip="true" width="120"/>-->
-              <!--<el-table-column :label="$t('上传时间')" align="center" prop="createdate" :show-overflow-tooltip="true" width="120"/>-->
               <el-table-column :label="$t('操作')" align="center" width="120" class-name="small-padding fixed-width">
                 <template slot-scope="scope">
                   <el-button
@@ -203,66 +242,16 @@
               </el-date-picker>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="是否录入开项系统">
-            <el-form-item prop="isRecorded">
-              <el-radio :disabled="assessDisabled" v-model="dataForm.isRecorded" label="1" @change="handleIsRecordedChange">是</el-radio>
-              <el-radio :disabled="assessDisabled" v-model="dataForm.isRecorded" label="0" @change="handleIsRecordedChange">否</el-radio>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="开项编号">
-            <el-form-item prop="recordNo">
-              <el-input v-model="dataForm.recordNo" placeholder="请输入开项编号" :disabled="recordNoDisabled" style="width: 200px;"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="采取的措施" :span="2">
-            <el-form-item prop="reaction">
-              <el-input :disabled="assessDisabled" v-model="dataForm.reaction" placeholder="请输入采取的措施" type="textarea" :rows="3"/>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="整改负责人">
-            <el-form-item prop="executor">
-              <el-select
-                filterable
-                :disabled="assessDisabled"
-                clearable
-                v-model="dataForm.executor"
-                placeholder="请选择整改负责人">
-                <el-option
-                  v-for="dict in executorOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-descriptions-item>
           <el-descriptions-item label="验证人">
-            <el-form-item prop="inspector1" style="display: inline-block;">
-              <el-input v-model="inspector1Name" placeholder="" disabled style="width: 180px; margin-right: 10px;"/>
-              <!--<el-select-->
-                <!--filterable-->
-                <!--:disabled="assessDisabled"-->
-                <!--clearable-->
-                <!--v-model="inspector1"-->
-                <!--placeholder="请选择验证人"-->
-                <!--style="margin-right: 10px;">-->
-                <!--<el-option-->
-                  <!--v-for="dict in applicantOptions"-->
-                  <!--:key="dict.dictValue"-->
-                  <!--:label="dict.dictLabel"-->
-                  <!--:value="dict.dictValue"-->
-                <!--&gt;</el-option>-->
-              <!--</el-select>-->
-            </el-form-item>
-            <el-form-item prop="inspector2" style="display: inline-block;">
+            <el-form-item prop="inspector" style="display: inline-block;">
               <el-select
                 filterable
                 :disabled="assessDisabled"
                 clearable
-                v-model="inspector2"
+                v-model="inspector"
                 placeholder="请选择验证人">
                 <el-option
-                  v-for="dict in inspectorOptions"
+                  v-for="dict in applicantOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -270,27 +259,6 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="是否需要VE验证" :span="2">
-            <el-form-item prop="needVe">
-              <el-radio :disabled="assessDisabled" v-model="dataForm.needVe" label="1" @change="handleNeedVeChange">是</el-radio>
-              <el-radio :disabled="assessDisabled" v-model="dataForm.needVe" label="0" @change="handleNeedVeChange">否</el-radio>
-            </el-form-item>
-          </el-descriptions-item>
-          <el-descriptions-item label="VE验证条款" :span="2">
-            <el-form-item prop="veItemsList">
-              <el-checkbox-group v-model="veItemsList" :disabled="veItemsDisabled">
-                <el-checkbox label="Level3、Level4的时间纠正措施"></el-checkbox>
-                <el-checkbox label="HIRA的补充措施"></el-checkbox>
-                <el-checkbox label="整改措施为程序的制定、更新"></el-checkbox>
-                <el-checkbox label="整改措施有关培训"></el-checkbox>
-                <el-checkbox label="整改措施为增加新设备、设施、部件，或对设备、设施进行改造"></el-checkbox><br/>
-                <el-checkbox label="其它" @change="handleVeItemOtherVeChange"></el-checkbox>
-                <el-form-item prop="veItemOther" style="display: inline-block;">
-                  <el-input v-model="dataForm.veItemOther" placeholder="请输入" :disabled="veItemOtherDisabled" style="display: inline-block; width: 200px; margin-left: 10px;"/>
-                </el-form-item>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-descriptions-item>
           <el-descriptions-item label="备注" :span="3">
             <el-form-item prop="remarksAssess">
               <el-input :disabled="assessDisabled" v-model="dataForm.remarksAssess" placeholder="请输入备注" type="textarea" :rows="3"/>
@@ -307,7 +275,7 @@
                 ref="doc"
                 :limit="50"
                 :headers="doc.headers"
-                :action="doc.url + '?pType=saiExecute&pId=' + doc.pId"
+                :action="doc.url + '?pType=eoegSaiExecute&pId=' + doc.pId"
                 :disabled="doc.isUploading"
                 :on-progress="handleFileDocProgress"
                 :on-success="handleFileDocSuccess"
@@ -391,7 +359,7 @@
       <div id="inspect-div" v-if="showInspect">
         <h4>验收详情</h4>
         <el-descriptions title="" :column="3" border>
-          <el-descriptions-item label="VC/VE验证成果" :span="3">
+          <el-descriptions-item label="验证成果" :span="3">
             <el-form-item prop="veResult">
               <el-radio :disabled="inspectDisabled" v-model="dataForm.veResult" label="1">合格</el-radio>
               <el-radio :disabled="inspectDisabled" v-model="dataForm.veResult" label="0">不合格</el-radio>
@@ -491,8 +459,8 @@
     <!--</div>-->
     <!-- 流程操作 -->
     <div slot="footer" class="dialog-footer">
-      <!-- 当前登录用户为处理人（之一）或张力飞 -->
-      <span v-if="dataForm.handler.indexOf(loginStaffInfo.userId) != -1 || loginStaffInfo.userId == '20276'" style="margin-right: 10px;">
+      <!-- 当前登录用户为处理人（之一） -->
+      <span v-if="dataForm.handler.indexOf(loginStaffInfo.userId) != -1" style="margin-right: 10px;">
         <el-button v-if="taskName != null && dataForm.applyStatus != 4 && dataForm.applyStatus != 5" @click="dataFormSave()">{{ $t('保存') }}</el-button>
         <el-button type="success" v-if="taskName != null && dataForm.veResult != '0'" @click="dataFormSubmit(1)">{{ $t('通过') }}</el-button>
         <el-button type="danger" v-if="taskName == '验收' && dataForm.veResult == '0'" @click="dataFormSubmit(2)">{{ $t('驳回') }}</el-button>
@@ -501,7 +469,7 @@
       <el-button @click="visible = false">{{ $t('返回') }}</el-button>
     </div>
     <!-- 预览对话框 -->
-    <el-dialog  :close-on-click-modal="false"  v-loading="loadingFlash"     element-loading-background="rgba(0,0,0,0.2)"                 v-dialogDrag :title="pdf.title" :visible.sync="pdf.open"  width="1300px" :center="true" append-to-body>
+    <el-dialog :close-on-click-modal="false" v-loading="loadingFlash" element-loading-background="rgba(0,0,0,0.2)" v-dialogDrag :title="pdf.title" :visible.sync="pdf.open" width="1300px" :center="true" append-to-body>
       <div style="margin-top: -60px;float: right;margin-right: 40px;">
         <el-button size="mini" type="text" @click="openPdf">{{$t('新页面打开PDF')}}</el-button></div>
       <div style="margin-top: -30px" >
@@ -521,55 +489,19 @@
 
 <script>
 import { getToken } from "@/utils/auth";
-import { updateApply, getApply, handleApply } from "@/api/production/apply";
-import { listFile } from "@/api/production/saiApproveFile";
+import { updateApply, getApply, handleApply } from "@/api/production/eoegApply";
+import { listFile } from "@/api/production/eoegSaiApproveFile";
 import { getHistorylist } from "@/api/ehs/approvedanger";
 import { listUserPost } from "@/api/system/user";
 import { treeselect, listDept } from "@/api/system/dept";
 import { listSaiInspectors, listSaiExecutors, listStaffmgrByDeptAndTeam, getLoginStaffInfo } from "@/api/plant/staffmgr";
 import { allFileList, delCommonfile } from "@/api/common/commonfile";
-import { categoryList } from "@/api/production/category";
+import { categoryList } from "@/api/production/eoegCategory";
 import { selectDevice } from "@/api/invoice/device";
 
 export default {
-  name: "sai-apply-detail",
+  name: "eoeg-sai-apply-detail",
   data() {
-    var validateInspector1 = (rule, value, callback) => {
-      if (this.inspector1 == null) {
-        return callback(new Error('验证人不能为空'));
-      } else {
-        return callback();
-      }
-    };
-    var validateInspector2 = (rule, value, callback) => {
-      if (this.inspector2 == null) {
-        return callback(new Error('验证人不能为空'));
-      } else {
-        return callback();
-      }
-    };
-    var validateVeItemsList = (rule, value, callback) => {
-      if (this.dataForm.needVe == '1') {
-        if (this.veItemsList.length == 0) {
-          return callback(new Error('VE验证条款不能为空'));
-        } else {
-          return callback();
-        }
-      } else {
-        return callback();
-      }
-    };
-    var validateRecordNo = (rule, value, callback) => {
-      if (this.dataForm.isRecorded == '1') {
-        if (this.dataForm.recordNo == null) {
-          return callback(new Error('开项编号不能为空'));
-        } else {
-          return callback();
-        }
-      } else {
-        return callback();
-      }
-    };
     return {
       // SAI类别列表
       saiCategoryOptions: [],
@@ -628,9 +560,6 @@ export default {
         estimateFinishDate: [
           { required: true, message: this.$t('预计完成时间') + this.$t('不能为空'), trigger: "change" }
         ],
-        isRecorded: [
-          { required: true, message: this.$t('是否录入开项系统') + this.$t('不能为空'), trigger: "change" }
-        ],
         reaction: [
           { required: true, message: this.$t('采取的措施') + this.$t('不能为空'), trigger: "change" }
         ],
@@ -643,23 +572,8 @@ export default {
         inspector2: [
           { required: true, message: this.$t('验证人2') + this.$t('不能为空'), trigger: "change" }
         ],
-        needVe: [
-          { required: true, message: this.$t('是否需要VE验证') + this.$t('不能为空'), trigger: "change" }
-        ],
-        recordNo: [
-          { validator: validateRecordNo, trigger: 'change' }
-        ],
-        veItemsList: [
-          { validator: validateVeItemsList, trigger: 'change' }
-        ],
-        inspector1: [
-          { validator: validateInspector1, trigger: 'change' }
-        ],
-        inspector2: [
-          { validator: validateInspector2, trigger: 'change' }
-        ],
         veResult: [
-          { required: true, message: this.$t('VC/VE验证成果') + this.$t('不能为空'), trigger: "change" }
+          { required: true, message: this.$t('验证成果') + this.$t('不能为空'), trigger: "change" }
         ],
         remarks: [
           { required: true, message: this.$t('备注') + this.$t('不能为空'), trigger: "change" }
@@ -962,13 +876,13 @@ export default {
       });
       allFileList({
         pId: this.doc.queryParams.pId,
-        pType: "saiExecute"
+        pType: "eoegSaiExecute"
       }).then(response => {
         this.doc.commonfileListExecute = response;
       });
       allFileList({
         pId: this.doc.queryParams.pId,
-        pType: "saiInspect"
+        pType: "eoegSaiInspect"
       }).then(response => {
         this.doc.commonfileListInspect = response;
       });
@@ -1175,7 +1089,6 @@ export default {
     },
     /** 加载登记人列表 */
     listStaffmgrByDeptAndTeam(applicantDept, applicantTeam) {
-      console.log('123');
       listStaffmgrByDeptAndTeam({
         deptId: applicantDept,
         team: applicantTeam

ui/src/views/production/eoegapply/all/index.vue

@@ -225,7 +225,7 @@
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">scope.row.executorName</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -444,7 +444,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in executorOptions"
+                  v-for="dict in applicantOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -855,7 +855,7 @@
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import SaiApplyDetail from "@/views/approve/approveDetail/sai-apply-detail";
+  import SaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
   import ProcessImg from '@/views/approve/processImg/index';
   import { listStaffmgrByDeptAndTeam, getLoginStaffInfo } from "@/api/plant/staffmgr";
   import { allFileList, delCommonfile } from "@/api/common/commonfile";

ui/src/views/production/eoegapply/mine/index.vue

@@ -218,7 +218,7 @@
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">scope.row.executorName</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -437,7 +437,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in executorOptions"
+                  v-for="dict in applicantOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"

ui/src/views/production/eoegapply/pending/index.vue

@@ -218,7 +218,7 @@
       <el-table-column label="整改负责人" align="center" prop="executorName" :show-overflow-tooltip="true">
         <template slot-scope="scope">
           <span v-if="scope.row.saiType=='TPM'">/</span>
-          <span v-if="scope.row.saiType=='SAI'">scope.row.executorName</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.executorName}}</span>
         </template>
       </el-table-column>
       <el-table-column label="登记时间" align="center" prop="applyDate" width="100" sortable>
@@ -437,7 +437,7 @@
                 v-model="form.executor"
                 placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in executorOptions"
+                  v-for="dict in applicantOptions"
                   :key="dict.dictValue"
                   :label="dict.dictLabel"
                   :value="dict.dictValue"
@@ -612,7 +612,7 @@
       </div>
     </el-dialog>
     <!-- SAI开项管理流转详情对话框 -->
-    <sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></sai-apply-detail>
+    <eoeg-sai-apply-detail v-if="saiApplyVisible" ref="saiApplyDetail" @refreshDataList="getList"></eoeg-sai-apply-detail>
     <!-- 流程图对话框 -->
     <process-img v-if="processImgVisible" ref="processImg" @refreshDataList="getList"></process-img>
     <!-- 附件对话框 -->
@@ -761,7 +761,7 @@
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import SaiApplyDetail from "@/views/approve/approveDetail/sai-apply-detail";
+  import EoegSaiApplyDetail from "@/views/approve/approveDetail/eoeg-sai-apply-detail";
   import ProcessImg from '@/views/approve/processImg/index';
   import { listStaffmgrByDeptAndTeam, getLoginStaffInfo } from "@/api/plant/staffmgr";
   import { allFileList, delCommonfile } from "@/api/common/commonfile";
@@ -771,7 +771,7 @@
 
   export default {
     name: "Apply",
-    components: { Treeselect, SaiApplyDetail, ProcessImg },
+    components: { Treeselect, EoegSaiApplyDetail, ProcessImg },
     data() {
       var validateRecordNo = (rule, value, callback) => {
         if (this.delayForm.isRecorded == '1') {