问卷详情 - 开项未关闭前操作栏开项按钮显示红色

rc-buisness/src/main/java/com/ruoyi/rc/domain/TQuestionnaire.java

@@ -90,6 +90,17 @@ public class TQuestionnaire extends BaseEntity
     @Excel(name = "装置")
     private String deptName;
 
+    /** 开项问题处理状态 */
+    private String openitemStatus;
+
+    public String getOpenitemStatus() {
+        return openitemStatus;
+    }
+
+    public void setOpenitemStatus(String openitemStatus) {
+        this.openitemStatus = openitemStatus;
+    }
+
     public String getPersonInChargeName() {
         return personInChargeName;
     }

rc-buisness/src/main/resources/mapper/rc/TQuestionnaireMapper.xml

@@ -24,16 +24,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="deptId"    column="dept_id"    />
         <result property="personInChargeName"    column="person_in_charge_name"    />
         <result property="reviewerName"    column="reviewer_name"    />
+        <result property="openitemStatus"    column="openitem_status"    />
     </resultMap>
 
     <sql id="selectTQuestionnaireVo">
-        select id, audit_id, chapter_id, year, type, directory, code, name, yes_no_na, minimum_standard,
-        good_practices, standard, completion_status, person_in_charge, reviewer, remarks, q.dept_id,
+        select q.id, audit_id, chapter_id, year, q.type, directory, code, name, yes_no_na, minimum_standard,
+        good_practices, standard, completion_status, q.person_in_charge, q.reviewer, q.remarks, q.dept_id,
         SUBSTR(q.directory, 1, INSTR(q.directory, '.') - 1) as codeSubStr,
-        u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name
+        u1.nick_name as person_in_charge_name, u2.nick_name as reviewer_name,
+        o.status as openitem_status
         from t_questionnaire q
         left join sys_user u1 on q.person_in_charge = u1.user_id
         left join sys_user u2 on q.reviewer = u2.user_id
+        left join t_open_item o on o.questionnaire_id = q.id
     </sql>
 
     <select id="selectTQuestionnaireList" parameterType="TQuestionnaire" resultMap="TQuestionnaireResult">

ruoyi-ui/src/views/rc/openitem/index.vue

@@ -183,11 +183,6 @@
           <span>{{ parseTime(scope.row.closeTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="问题处理状态" align="center" prop="status" width="100">
-        <template slot-scope="scope">
-          <dict-tag :options="dict.type.t_open_item_status" :value="scope.row.status"/>
-        </template>
-      </el-table-column>
       <el-table-column label="负责人" align="center" prop="personInChargeName" width="100" />
       <el-table-column label="审核人" align="center" prop="reviewerName" width="100" />
       <el-table-column label="负责人确认" align="center" prop="result" width="100">
@@ -201,6 +196,11 @@
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remarks" width="200"/>
+      <el-table-column label="问题处理状态" align="center" prop="status" width="100" fixed="right">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.t_open_item_status" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
       <el-table-column label="审计文档" align="center" width="100" fixed="right">
         <template slot-scope="scope">
           <el-button icon="el-icon-folder" style="color:#6e96fa;" circle @click="handleDoc(scope.row , 'audit')"></el-button>

ruoyi-ui/src/views/rc/questionnaire/index.vue

@@ -134,14 +134,14 @@
           <!--<dict-tag :options="dict.type.t_sec_sub_chap_standard" :value="scope.row.standard"/>-->
         <!--</template>-->
       <!--</el-table-column>-->
-      <el-table-column label="完成情况" align="center" prop="completionStatus">
+      <el-table-column label="负责人" align="center" prop="personInChargeName" />
+      <el-table-column label="审核人" align="center" prop="reviewerName" />
+      <el-table-column label="备注" align="center" prop="remarks" width="150" />
+      <el-table-column label="完成情况" align="center" prop="completionStatus" fixed="right">
         <template slot-scope="scope">
           <dict-tag :options="dict.type.t_sec_sub_chap_completion_status" :value="scope.row.completionStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="负责人" align="center" prop="personInChargeName" />
-      <el-table-column label="审核人" align="center" prop="reviewerName" />
-      <el-table-column label="备注" align="center" prop="remarks" width="150" />
       <el-table-column label="标准附件" align="center" width="100" fixed="right">
         <template slot-scope="scope">
           <el-button icon="el-icon-folder" style="color:#6e96fa;" circle @click="handleDoc(scope.row , 'questionnaire-standard')"></el-button>
@@ -166,11 +166,20 @@
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
           >删除</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            @click="handleOpenitem(scope.row)"
-          >开项</el-button>
+          <span v-if="scope.row.openitemStatus != '2'">
+            <el-button
+              size="mini"
+              type="text"
+              @click="handleOpenitem(scope.row)"
+            >开项</el-button>
+          </span>
+          <span v-if="scope.row.openitemStatus == '2'">
+            <el-button
+              size="mini"
+              type="text"
+              style="color: red; cursor: default;"
+            >开项中</el-button>
+          </span>
         </template>
       </el-table-column>
     </el-table>
@@ -670,8 +679,6 @@ export default {
       if (auditId != null) {
         this.queryParams.auditId = auditId;
       }
-      console.log(this.queryParams.chapterId)
-      console.log(this.queryParams.auditId)
       listQuestionnaire(this.queryParams).then(response => {
         this.questionnaireList = response.rows;
         this.total = response.total;
@@ -731,6 +738,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
+      console.log(row)
       this.reset();
       const id = row.id || this.ids
       getQuestionnaire(id).then(response => {