EOEG SAI

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

@@ -459,14 +459,14 @@ public class TEoegSaiApplyController extends BaseController
         Date date = new Date();
         date.setDate(date.getDate() + 7);
         tSaiApply.setEstimateFinishDate(date);
-        tSaiApply.setAssessor("20276");
-        tSaiApply.setHandler("20276");
+        tSaiApply.setAssessor("20276");//todo:修改为四个班长
+        tSaiApply.setHandler("20276");//todo:修改为四个班长
         // 开始申请流程
         tSaiApply.setApNo(DateUtils.dateTimeNow() + userId);
         Authentication.setAuthenticatedUserId(userId);//设置当前申请人
         // 声明流程变量集合
         Map<String, Object> variables = new HashMap<>();
-        variables.put("assessor", "20276");
+        variables.put("assessor", "20276");//todo:修改为四个班长
         // 流程businessKey = SAI开项管理对象saiApplyId
         long businessKey = saiApplyId;
         // 采用key来启动流程定义并设置流程变量，返回流程实例
@@ -479,7 +479,7 @@ public class TEoegSaiApplyController extends BaseController
         ProcessEngine processEngine = ProcessEngines.getDefaultProcessEngine();
         List<Task> list = processEngine.getTaskService()//获取任务service
                 .createTaskQuery()//创建查询对象
-                .taskCandidateOrAssigned("20276").list();
+                .taskCandidateOrAssigned("20276").list();//todo:修改为四个班长
         for (Task task : list) {
             if (tSaiApply.getProcessId().equals(task.getProcessInstanceId())) {
                 tSaiApply.setTaskId(task.getId());

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

@@ -115,14 +115,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     @Excel(name = "实际完成时间", width = 30, dateFormat = "yyyy-MM-dd")
     private Date actualFinishDate;
 
-    /** 是否录入开项系统 */
-    @Excel(name = "是否录入开项系统")
-    private Long isRecorded;
-
-    /** 开项编号 */
-    @Excel(name = "开项编号")
-    private String recordNo;
-
     /** 申请编号 */
     private String apNo;
 
@@ -150,12 +142,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     /** 采取的措施 */
     private String reaction;
 
-    /** 是否需要VE验证 */
-    private Long needVe;
-
-    /** VE验证条款 */
-    private String veItems;
-
     /** VC/VE验证成果 */
     private String veResult;
 
@@ -483,24 +469,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     {
         return actualFinishDate;
     }
-    public void setIsRecorded(Long isRecorded)
-    {
-        this.isRecorded = isRecorded;
-    }
-
-    public Long getIsRecorded()
-    {
-        return isRecorded;
-    }
-    public void setRecordNo(String recordNo)
-    {
-        this.recordNo = recordNo;
-    }
-
-    public String getRecordNo()
-    {
-        return recordNo;
-    }
     public void setReaction(String reaction)
     {
         this.reaction = reaction;
@@ -510,28 +478,6 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
     {
         return reaction;
     }
-    public void setNeedVe(Long needVe)
-    {
-        this.needVe = needVe;
-    }
-
-    public Long getNeedVe()
-    {
-        return needVe;
-    }
-    public void setVeItems(String veItems)
-    {
-        this.veItems = veItems;
-    }
-
-    public String getVeItems()
-    {
-        return veItems;
-    }
-    public void setVeResult(String veResult)
-    {
-        this.veResult = veResult;
-    }
 
     public String getVeResult()
     {
@@ -616,11 +562,7 @@ public class EoegSaiApplyQueryVO extends BaseEntity {
                 .append("taskName", getTaskName())
                 .append("estimateFinishDate", getEstimateFinishDate())
                 .append("actualFinishDate", getActualFinishDate())
-                .append("isRecorded", getIsRecorded())
-                .append("recordNo", getRecordNo())
                 .append("reaction", getReaction())
-                .append("needVe", getNeedVe())
-                .append("veItems", getVeItems())
                 .append("veResult", getVeResult())
                 .append("remarks", getRemarks())
                 .append("veItemOther", getVeItemOther())

master/src/main/java/com/ruoyi/project/production/domain/TEoegSaiApply.java

@@ -34,6 +34,10 @@ public class TEoegSaiApply extends BaseEntity
     @Excel(name = "SAI类型")
     private String saiType;
 
+    /** TPM状态 */
+    @Excel(name = "TPM状态")
+    private String tpmStatus;
+
     /** 问题描述 */
     @Excel(name = "问题描述")
     private String description;
@@ -144,6 +148,14 @@ public class TEoegSaiApply extends BaseEntity
     /** 备注（执行阶段） */
     private String remarksExecute;
 
+    public String getTpmStatus() {
+        return tpmStatus;
+    }
+
+    public void setTpmStatus(String tpmStatus) {
+        this.tpmStatus = tpmStatus;
+    }
+
     public String getSaiType() {
         return saiType;
     }

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

@@ -7,6 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <resultMap type="TEoegSaiApply" id="TEoegSaiApplyResult">
         <result property="saiApplyId"    column="sai_apply_id"    />
         <result property="saiType"    column="sai_type"    />
+        <result property="tpmStatus"    column="tpm_status"    />
         <result property="delFlag"    column="del_flag"    />
         <result property="createBy"    column="create_by"    />
         <result property="createTime"    column="create_time"    />
@@ -65,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         d.applicant, d.assessor, d.executor, d.inspectors, d.applicant_dept, d.applicant_team, d.description,
         d.unsafe_status, d.unsafe_action, d.apply_date, d.task_id, d.task_name,d.remarks, d.ve_item_other,
         d.handler, d.estimate_finish_date, d.actual_finish_date, d.reaction, d.ve_result,
-        d.sai_level, d.category, d.remarks_assess, d.remarks_execute, d.work_area, d.sai_type
+        d.sai_level, d.category, d.remarks_assess, d.remarks_execute, d.work_area, d.sai_type, d.tpm_status
         from t_eoeg_sai_apply d
         left join sys_dept s on s.dept_id = d.dept_id
     </sql>
@@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         insert into t_eoeg_sai_apply
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="saiType != null">sai_type,</if>
+            <if test="tpmStatus != null">tpm_status,</if>
             <if test="saiApplyId != null">sai_apply_id,</if>
             <if test="delFlag != null">del_flag,</if>
             <if test="createBy != null">create_by,</if>
@@ -189,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="saiType != null">#{saiType},</if>
+            <if test="tpmStatus != null">#{tpmStatus},</if>
             <if test="saiApplyId != null">#{saiApplyId},</if>
             <if test="delFlag != null">#{delFlag},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -230,6 +233,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         update t_eoeg_sai_apply
         <trim prefix="SET" suffixOverrides=",">
             <if test="saiType != null">sai_type = #{saiType},</if>
+            <if test="tpmStatus != null">tpm_status = #{tpmStatus},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="createTime != null">create_time = #{createTime},</if>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 搜索条件 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="SAI类型" prop="saiType">
         <el-form-item prop="saiType">
           <el-select
@@ -13,6 +13,14 @@
           </el-select>
         </el-form-item>
       </el-form-item>
+      <el-form-item label="TPM状态" prop="tpmStatus">
+        <el-select
+          v-model="queryParams.tpmStatus"
+          placeholder="请选择TPM状态">
+          <el-option key="未完成" label="未完成" value="未完成"></el-option>
+          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
         <el-form-item prop="applicantDept">
           <el-select
@@ -111,12 +119,8 @@
           multiple
           v-model="queryParams.workArea"
           placeholder="请选择片区">
-          <el-option
-            v-for="dict in workAreaList"
-            :key="dict"
-            :label="dict"
-            :value="dict"
-          ></el-option>
+          <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+          <el-option key="NIS" label="NIS" value="NIS"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -188,11 +192,17 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.saiType=='TPM'">{{scope.row.tpmStatus}}</span>
+          <span v-if="scope.row.saiType=='SAI'">/</span>
+        </template>
+      </el-table-column>
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :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.workArea</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
@@ -249,25 +259,15 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- 申请已提交操作 -->
-          <!-- 申请状态为进行中/待验收 -->
-          <!-- 当前登录用户为张力飞 -->
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelay(scope.row)"
-            v-if="(scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && loginStaffInfo.userId == '20276'"
-          >延期</el-button>
           <!-- 申请状态为待评估/进行中/待验收 -->
-          <!-- 当前登录用户为处理人（之一）或张力飞 -->
+          <!-- 当前登录用户为处理人（之一） -->
           <el-button
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1) || loginStaffInfo.userId == '20276')"
+            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
           >处理</el-button>
           <!-- 申请状态为已完成/已中止-->
           <el-button
@@ -283,24 +283,6 @@
             @click="processImg(scope.row.processId)"
             v-if="scope.row.applyStatus != 0"
           >{{ $t('流程图') }}</el-button>
-          <!-- 申请未提交操作 -->
-          <!-- 申请状态为未提交 -->
-          <!-- 当前登录用户为处理人（之一） -->
-          <span v-if="scope.row.applyStatus == 0 && scope.row.handler.indexOf(loginStaffInfo.userId) != -1">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-              icon="el-icon-s-claim"
-            >提交申请</el-button>
-            <!--<el-button-->
-              <!--size="mini"-->
-              <!--type="text"-->
-              <!--icon="el-icon-document"-->
-              <!--@click="handleDoc(scope.row)"-->
-            <!--&gt;上传附件</el-button>-->
-          </span>
           <el-button
             size="mini"
             type="text"
@@ -315,19 +297,6 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['production:eoegapply:remove']"
           >删除</el-button>
-          <span v-if="(scope.row.applyStatus == 1
-                      || scope.row.applyStatus == 2
-                      || scope.row.applyStatus == 3
-                      || scope.row.applyStatus == 4)
-                      && (loginStaffInfo.isMonitor || loginStaffInfo.userId == '20276')">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate2(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-            >修改</el-button>
-          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -343,7 +312,7 @@
     <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="0px">
         <el-descriptions title="" :column="3" border>
-          <el-descriptions-item label="SAI类型" :span="3">
+          <el-descriptions-item label="SAI类型" :span="1">
             <el-form-item prop="saiType">
               <el-select
                 v-model="form.saiType"
@@ -353,6 +322,16 @@
               </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="form.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
@@ -426,7 +405,7 @@
               </span>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="SAI类别" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
             <el-form-item prop="category">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -443,7 +422,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -451,11 +430,24 @@
                 clearable
                 v-model="form.workArea"
                 placeholder="请选择片区">
+                <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+                <el-option key="NIS" label="NIS" value="NIS"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+            <el-form-item prop="executor">
+              <el-select
+                filterable
+                :disabled="assessDisabled"
+                clearable
+                v-model="form.executor"
+                placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in workAreaList"
-                  :key="dict"
-                  :label="dict"
-                  :value="dict"
+                  v-for="dict in executorOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -560,7 +552,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -971,14 +964,14 @@ export default {
         // 设置上传的请求头部
         headers: { Authorization: "Bearer " + getToken() },
         // 上传的地址
-        url: process.env.VUE_APP_BASE_API + "/production/saiFile/uploadFile",
+        url: process.env.VUE_APP_BASE_API + "/production/eoegSaiFile/uploadFile",
         commonfileList: null,
         commonfileListApply: null,
         queryParams: {
           pId: null,
-          pType: 'saiApply'
+          pType: 'eoegSaiApply'
         },
-        pType: 'saiApply',
+        pType: 'eoegSaiApply',
         pId: null
       },
       // pdf文件参数

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 搜索条件 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="SAI类型" prop="saiType">
         <el-form-item prop="saiType">
           <el-select
@@ -13,6 +13,14 @@
           </el-select>
         </el-form-item>
       </el-form-item>
+      <el-form-item label="TPM状态" prop="tpmStatus">
+        <el-select
+          v-model="queryParams.tpmStatus"
+          placeholder="请选择TPM状态">
+          <el-option key="未完成" label="未完成" value="未完成"></el-option>
+          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
         <el-form-item prop="applicantDept">
           <el-select
@@ -111,12 +119,8 @@
           multiple
           v-model="queryParams.workArea"
           placeholder="请选择片区">
-          <el-option
-            v-for="dict in workAreaList"
-            :key="dict"
-            :label="dict"
-            :value="dict"
-          ></el-option>
+          <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+          <el-option key="NIS" label="NIS" value="NIS"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -181,11 +185,17 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.saiType=='TPM'">{{scope.row.tpmStatus}}</span>
+          <span v-if="scope.row.saiType=='SAI'">/</span>
+        </template>
+      </el-table-column>
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :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.workArea</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
@@ -242,25 +252,15 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- 申请已提交操作 -->
-          <!-- 申请状态为进行中/待验收 -->
-          <!-- 当前登录用户为张力飞 -->
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelay(scope.row)"
-            v-if="(scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && loginStaffInfo.userId == '20276'"
-          >延期</el-button>
           <!-- 申请状态为待评估/进行中/待验收 -->
-          <!-- 当前登录用户为处理人（之一）或张力飞 -->
+          <!-- 当前登录用户为处理人（之一） -->
           <el-button
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1) || loginStaffInfo.userId == '20276')"
+            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
           >处理</el-button>
           <!-- 申请状态为已完成/已中止-->
           <el-button
@@ -276,24 +276,6 @@
             @click="processImg(scope.row.processId)"
             v-if="scope.row.applyStatus != 0"
           >{{ $t('流程图') }}</el-button>
-          <!-- 申请未提交操作 -->
-          <!-- 申请状态为未提交 -->
-          <!-- 当前登录用户为处理人（之一） -->
-          <span v-if="scope.row.applyStatus == 0 && scope.row.handler.indexOf(loginStaffInfo.userId) != -1">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-              icon="el-icon-s-claim"
-            >提交申请</el-button>
-            <!--<el-button-->
-            <!--size="mini"-->
-            <!--type="text"-->
-            <!--icon="el-icon-document"-->
-            <!--@click="handleDoc(scope.row)"-->
-            <!--&gt;上传附件</el-button>-->
-          </span>
           <el-button
             size="mini"
             type="text"
@@ -308,19 +290,6 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['production:eoegapply:remove']"
           >删除</el-button>
-          <span v-if="(scope.row.applyStatus == 1
-                      || scope.row.applyStatus == 2
-                      || scope.row.applyStatus == 3
-                      || scope.row.applyStatus == 4)
-                      && (loginStaffInfo.isMonitor || loginStaffInfo.userId == '20276')">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate2(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-            >修改</el-button>
-          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -336,7 +305,7 @@
     <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="0px">
         <el-descriptions title="" :column="3" border>
-          <el-descriptions-item label="SAI类型" :span="3">
+          <el-descriptions-item label="SAI类型" :span="1">
             <el-form-item prop="saiType">
               <el-select
                 v-model="form.saiType"
@@ -346,6 +315,16 @@
               </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="form.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
@@ -419,7 +398,7 @@
               </span>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="SAI类别" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
             <el-form-item prop="category">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -436,7 +415,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -444,11 +423,24 @@
                 clearable
                 v-model="form.workArea"
                 placeholder="请选择片区">
+                <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+                <el-option key="NIS" label="NIS" value="NIS"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+            <el-form-item prop="executor">
+              <el-select
+                filterable
+                :disabled="assessDisabled"
+                clearable
+                v-model="form.executor"
+                placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in workAreaList"
-                  :key="dict"
-                  :label="dict"
-                  :value="dict"
+                  v-for="dict in executorOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -553,7 +545,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -863,14 +856,14 @@
           // 设置上传的请求头部
           headers: { Authorization: "Bearer " + getToken() },
           // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/production/saiFile/uploadFile",
+          url: process.env.VUE_APP_BASE_API + "/production/eoegSaiFile/uploadFile",
           commonfileList: null,
           commonfileListApply: null,
           queryParams: {
             pId: null,
-            pType: 'saiApply'
+            pType: 'eoegSaiApply'
           },
-          pType: 'saiApply',
+          pType: 'eoegSaiApply',
           pId: null
         },
         // pdf文件参数

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <!-- 搜索条件 -->
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">
       <el-form-item label="SAI类型" prop="saiType">
         <el-form-item prop="saiType">
           <el-select
@@ -13,6 +13,14 @@
           </el-select>
         </el-form-item>
       </el-form-item>
+      <el-form-item label="TPM状态" prop="tpmStatus">
+        <el-select
+          v-model="queryParams.tpmStatus"
+          placeholder="请选择TPM状态">
+          <el-option key="未完成" label="未完成" value="未完成"></el-option>
+          <el-option key="已完成" label="已完成" value="已完成"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="登记人部门" prop="applicantDept">
         <el-form-item prop="applicantDept">
           <el-select
@@ -111,12 +119,8 @@
           multiple
           v-model="queryParams.workArea"
           placeholder="请选择片区">
-          <el-option
-            v-for="dict in workAreaList"
-            :key="dict"
-            :label="dict"
-            :value="dict"
-          ></el-option>
+          <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+          <el-option key="NIS" label="NIS" value="NIS"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -181,11 +185,17 @@
     <el-table v-loading="loading" :data="applyList" @selection-change="handleSelectionChange" :height="clientHeight" border>
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="SAI类型" align="center" prop="saiType" :show-overflow-tooltip="true" width="80"/>
+      <el-table-column label="TPM状态" align="center" prop="tpmStatus" :show-overflow-tooltip="true" width="80">
+        <template slot-scope="scope">
+          <span v-if="scope.row.saiType=='TPM'">{{scope.row.tpmStatus}}</span>
+          <span v-if="scope.row.saiType=='SAI'">/</span>
+        </template>
+      </el-table-column>
       <el-table-column label="问题描述" align="center" prop="description" :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="片区" align="center" prop="workArea" :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.workArea</span>
+          <span v-if="scope.row.saiType=='SAI'">{{scope.row.workArea}}</span>
         </template>
       </el-table-column>
       <el-table-column label="申请状态" align="center" prop="applyStatus" :show-overflow-tooltip="true">
@@ -242,25 +252,15 @@
       </el-table-column>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-          <!-- 申请已提交操作 -->
-          <!-- 申请状态为进行中/待验收 -->
-          <!-- 当前登录用户为张力飞 -->
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleDelay(scope.row)"
-            v-if="(scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && loginStaffInfo.userId == '20276'"
-          >延期</el-button>
           <!-- 申请状态为待评估/进行中/待验收 -->
-          <!-- 当前登录用户为处理人（之一）或张力飞 -->
+          <!-- 当前登录用户为处理人（之一） -->
           <el-button
             size="mini"
             type="text"
             @click="handleDetail(scope.row)"
             icon="el-icon-edit-outline"
             v-if="(scope.row.applyStatus == 1 || scope.row.applyStatus == 2 || scope.row.applyStatus == 3)
-            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1) || loginStaffInfo.userId == '20276')"
+            && ((scope.row.handler.indexOf(loginStaffInfo.userId) != -1))"
           >处理</el-button>
           <!-- 申请状态为已完成/已中止-->
           <el-button
@@ -276,24 +276,6 @@
             @click="processImg(scope.row.processId)"
             v-if="scope.row.applyStatus != 0"
           >{{ $t('流程图') }}</el-button>
-          <!-- 申请未提交操作 -->
-          <!-- 申请状态为未提交 -->
-          <!-- 当前登录用户为处理人（之一） -->
-          <span v-if="scope.row.applyStatus == 0 && scope.row.handler.indexOf(loginStaffInfo.userId) != -1">
-            <el-button
-              size="mini"
-              type="text"
-              @click="handleSubmit(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-              icon="el-icon-s-claim"
-            >提交申请</el-button>
-            <!--<el-button-->
-            <!--size="mini"-->
-            <!--type="text"-->
-            <!--icon="el-icon-document"-->
-            <!--@click="handleDoc(scope.row)"-->
-            <!--&gt;上传附件</el-button>-->
-          </span>
           <el-button
             size="mini"
             type="text"
@@ -308,19 +290,6 @@
             @click="handleDelete(scope.row)"
             v-hasPermi="['production:eoegapply:remove']"
           >删除</el-button>
-          <span v-if="(scope.row.applyStatus == 1
-                      || scope.row.applyStatus == 2
-                      || scope.row.applyStatus == 3
-                      || scope.row.applyStatus == 4)
-                      && (loginStaffInfo.isMonitor || loginStaffInfo.userId == '20276')">
-            <el-button
-              size="mini"
-              type="text"
-              icon="el-icon-edit"
-              @click="handleUpdate2(scope.row)"
-              v-hasPermi="['production:eoegapply:edit']"
-            >修改</el-button>
-          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -336,7 +305,7 @@
     <el-dialog  :close-on-click-modal="false" :title="title" :visible.sync="open" width="60%" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="0px">
         <el-descriptions title="" :column="3" border>
-          <el-descriptions-item label="SAI类型" :span="3">
+          <el-descriptions-item label="SAI类型" :span="1">
             <el-form-item prop="saiType">
               <el-select
                 v-model="form.saiType"
@@ -346,6 +315,16 @@
               </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="form.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
@@ -419,7 +398,7 @@
               </span>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="SAI类别" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="SAI类别" :span="2" v-if="form.saiType == 'SAI'">
             <el-form-item prop="category">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -436,7 +415,7 @@
               </el-select>
             </el-form-item>
           </el-descriptions-item>
-          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI'">
+          <el-descriptions-item label="片区" :span="1" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
             <el-form-item prop="workArea">
               <el-select
                 @change="handleSaiCategoryChange"
@@ -444,11 +423,24 @@
                 clearable
                 v-model="form.workArea"
                 placeholder="请选择片区">
+                <el-option key="EOEG" label="EOEG" value="EOEG"></el-option>
+                <el-option key="NIS" label="NIS" value="NIS"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-descriptions-item>
+          <el-descriptions-item label="整改负责人" :span="2" v-if="form.saiType == 'SAI' || (form.saiType == 'TPM' && form.tpmStatus == '未完成')">
+            <el-form-item prop="executor">
+              <el-select
+                filterable
+                :disabled="assessDisabled"
+                clearable
+                v-model="form.executor"
+                placeholder="请选择整改负责人">
                 <el-option
-                  v-for="dict in workAreaList"
-                  :key="dict"
-                  :label="dict"
-                  :value="dict"
+                  v-for="dict in executorOptions"
+                  :key="dict.dictValue"
+                  :label="dict.dictLabel"
+                  :value="dict.dictValue"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -553,7 +545,8 @@
         </el-descriptions>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button v-if="form.saiType == 'TPM'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '已完成'" type="primary" @click="submitForm">保 存 TPM</el-button>
+        <el-button v-if="form.saiType == 'TPM' && form.tpmStatus == '未完成'" type="primary" @click="handleSaveAndSubmit">提 交 TPM</el-button>
         <el-button v-if="form.saiType == 'SAI'" type="primary" @click="handleSaveAndSubmit" :disabled="submitDisabled">提 交 SAI</el-button>
         <el-button v-if="form.saiType == 'SAI'" @click="submitForm" :disabled="submitDisabled">保 存 SAI</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -863,14 +856,14 @@
           // 设置上传的请求头部
           headers: { Authorization: "Bearer " + getToken() },
           // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/production/saiFile/uploadFile",
+          url: process.env.VUE_APP_BASE_API + "/production/eoegSaiFile/uploadFile",
           commonfileList: null,
           commonfileListApply: null,
           queryParams: {
             pId: null,
-            pType: 'saiApply'
+            pType: 'eoegSaiApply'
           },
-          pType: 'saiApply',
+          pType: 'eoegSaiApply',
           pId: null
         },
         // pdf文件参数