Эх сурвалжийг харах

fix(eoeg): 调整锁变更流程与界面显示问题

- 修复锁变更申请流程中 SAF信息设置逻辑错误
- 更新文件上传路径,统一使用小写目录名
- 调整维护管理界面列宽,优化表格展示效果
- 修改 EOEG 变更详情页面,移除冗余字段显示-优化前端表单项布局,提升用户体验
jiangbiao 1 сар өмнө
parent
commit
cadaad651d

+ 2 - 3
master/src/main/java/com/ruoyi/project/eoeg/controller/TEoegLockChangeController.java

@@ -253,7 +253,6 @@ public class TEoegLockChangeController extends BaseController {
         Map<String, Object> param = new HashMap<>();
         switch (taskName) {
             case "申请人提交申请":
-                change.setSafa(form.getSafa());
                 change.setChangeReason(form.getChangeReason());
                 change.setChangeDescribe(form.getChangeDescribe());
             case "评估人"://评估人通过后,判断锁风险等级,B->流程至经理,C、D->流程至评估人
@@ -263,6 +262,7 @@ public class TEoegLockChangeController extends BaseController {
                 } else {
                     lockLevel = "1";
                 }
+                change.setSafa(form.getSafa());
                 param.put("lockLevel", lockLevel);
                 change.setSafaTime(date);
                 break;
@@ -574,8 +574,7 @@ public class TEoegLockChangeController extends BaseController {
             logger.error("生成word异常{}", e.getMessage());
             e.printStackTrace();
         }
-        String pathFileName = FileUploadUtils.getPathFileName(RuoYiConfig.getFilePath("/" + "apply/EoegLockChange"), fileName);
-        return pathFileName;
+        return FileUploadUtils.getPathFileName(RuoYiConfig.getFilePath("/apply/eoegLockChange"), fileName);
     }
 
     // 勾选框判断渲染

+ 3 - 13
ui/src/views/approve/approveDetail/eoegLockChange-detail.vue

@@ -121,22 +121,12 @@
           <el-form-item label="状态变更的原因" prop="changeReason">
             <el-input type="textarea" v-model="form.changeReason" placeholder="请输入状态变更的原因"/>
           </el-form-item>
-          <el-form-item label="状态变更的原因" prop="safa">
+        </div>
+        <div v-if="taskName=='评估人'">
+          <el-form-item label="安全评估及临时的安全措施" prop="safa">
             <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估及临时的安全措施"/>
           </el-form-item>
         </div>
-<!--        <div v-if="taskName=='评估人'">-->
-<!--          <el-form-item label="安全评估及临时的安全措施" prop="safa" label-width="190px">-->
-<!--            &lt;!&ndash;            <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估及临时的安全措施"/>&ndash;&gt;-->
-<!--            <el-autocomplete-->
-<!--              type="textarea"-->
-<!--              class="inline-input"-->
-<!--              style="width: 100%"-->
-<!--              v-model="form.safa"-->
-<!--              placeholder="请输入安全评估及临时的安全措施"-->
-<!--              :trigger-on-focus="false"></el-autocomplete>-->
-<!--          </el-form-item>-->
-<!--        </div>-->
         <div v-if="taskName=='变更确认人'">
           <el-form-item label="组织保护措施状态变更执行" prop="changeExecution" label-width="190px">
             <el-input type="textarea" v-model="form.changeExecution" placeholder="请输入组织保护措施状态变更执行"/>

+ 15 - 15
ui/src/views/document/maintenance/maintenance.vue

@@ -65,15 +65,15 @@
 
     <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange"
               :height="clientHeight" border>
-      <el-table-column type="selection" width="55" align="center"/>
-      <el-table-column label="维护对象" align="center" prop="maintenanceObject" :show-overflow-tooltip="true"/>
-      <el-table-column label="维护策略内容" align="center" prop="content" :show-overflow-tooltip="true"/>
-      <el-table-column label="维护周期" align="center" prop="interval" :show-overflow-tooltip="true"/>
-      <el-table-column label="遵循的法规或程序" align="center" prop="regulation" :show-overflow-tooltip="true"/>
-      <el-table-column label="文档" align="center" prop="documentation" :show-overflow-tooltip="true"/>
-      <el-table-column label="负责部门" align="center" prop="responsibleDep" :show-overflow-tooltip="true"/>
-      <el-table-column label="Planned or not" align="center" prop="planned" :show-overflow-tooltip="true"/>
-      <el-table-column label="备注" align="center" prop="remarks" :show-overflow-tooltip="true"/>
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="维护对象" align="center" prop="maintenanceObject"  width="150"/>
+      <el-table-column label="维护策略内容" align="center" prop="content"  width="500"/>
+      <el-table-column label="维护周期" align="center" prop="interval"  width="120"/>
+      <el-table-column label="遵循的法规或程序" align="center" prop="regulation"  width="150"/>
+      <el-table-column label="文档" align="center" prop="documentation"  width="200"/>
+      <el-table-column label="负责部门" align="center" prop="responsibleDep"  width="100"/>
+      <el-table-column label="Planned or not" align="center" prop="planned"  width="100"/>
+      <el-table-column label="备注" align="center" prop="remarks"  width="100"/>
       <el-table-column label="操作" align="center" fixed="right" width="120" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -98,7 +98,7 @@
             icon="el-icon-document"
             @click="handleDoc(scope.row)"
             v-hasPermi="['document:maintenance:edit']"
-          >报告附件
+          >附件
           </el-button>
         </template>
       </el-table-column>
@@ -116,19 +116,19 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="维护对象" prop="maintenanceObject">
-          <el-input v-model="form.maintenanceObject" placeholder="请输入维护对象"/>
+          <el-input type="textarea" v-model="form.maintenanceObject" placeholder="请输入维护对象"/>
         </el-form-item>
         <el-form-item label="维护策略内容">
-          <el-input type="textarea" v-model="form.content" placeholder="请输入维护策略内容"/>
+          <el-input type="textarea"  v-model="form.content" placeholder="请输入维护策略内容"/>
         </el-form-item>
         <el-form-item label="维护周期" prop="interval">
-          <el-input v-model="form.interval" placeholder="请输入维护周期"/>
+          <el-input type="textarea" v-model="form.interval" placeholder="请输入维护周期"/>
         </el-form-item>
         <el-form-item label="遵循的法规或程序" prop="regulation">
-          <el-input v-model="form.regulation" placeholder="请输入遵循的法规或程序"/>
+          <el-input type="textarea" v-model="form.regulation" placeholder="请输入遵循的法规或程序"/>
         </el-form-item>
         <el-form-item label="文档" prop="documentation">
-          <el-input v-model="form.documentation" placeholder="请输入文档"/>
+          <el-input type="textarea" v-model="form.documentation" placeholder="请输入文档"/>
         </el-form-item>
         <el-form-item label="负责部门" prop="responsibleDep">
           <el-input v-model="form.responsibleDep" placeholder="请输入负责部门"/>

+ 6 - 14
ui/src/views/eoeg/eoegChange/index.vue

@@ -82,12 +82,12 @@
           <span>{{ parseTime(scope.row.changeExecutorTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="班长" align="center" prop="monitorName" :show-overflow-tooltip="true" width="200"/>
-      <el-table-column label="班长确认时间" align="center" prop="monitorTime" width="100">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.monitorTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="班长" align="center" prop="monitorName" :show-overflow-tooltip="true" width="200"/>-->
+<!--      <el-table-column label="班长确认时间" align="center" prop="monitorTime" width="100">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.monitorTime, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="状态恢复后,之前采取的安全措施是否已撤销:" align="center" prop="revokeConfirm"
                        :show-overflow-tooltip="true" width="200"/>
       <el-table-column label="组织保护措施状态变更执行" align="center" prop="changeExecution"
@@ -187,11 +187,6 @@
             parseTime(detail.detailData.changeExecutorTime, '{y}-{m}-{d}')
           }}
         </el-descriptions-item>
-        <el-descriptions-item label="班长">{{ detail.detailData.monitorName }}</el-descriptions-item>
-        <el-descriptions-item label="班长确认时间">{{
-            parseTime(detail.detailData.monitorTime, '{y}-{m}-{d}')
-          }}
-        </el-descriptions-item>
         <el-descriptions-item label="确认人1">{{ detail.detailData.resetConfirmerName1 }}</el-descriptions-item>
         <el-descriptions-item label="确认时间1">{{
             parseTime(detail.detailData.resetConfirmTime1, '{y}-{m}-{d}')
@@ -244,9 +239,6 @@
         <el-form-item label="状态变更原因" prop="changeReason">
           <el-input type="textarea" v-model="form.changeReason" placeholder="请输入状态变更原因"/>
         </el-form-item>
-        <el-form-item label="安全评估及临时的安全措施" prop="safa">
-          <el-input type="textarea" v-model="form.safa" placeholder="请输入安全评估及临时的安全措施"/>
-        </el-form-item>
         <el-form-item label="评估人" prop="safaer">
           <el-select clearable filterable v-model="form.safaer">
             <el-option v-for="item in staffmgrOptions" :key="item.userId" :label="item.name" :value="item.userId">