安全检查详情调整

src/api/safetycheck/register.js

@@ -10,6 +10,14 @@ export function info(id) {
 }
 
 // 登记信息
+export function appinfo(id) {
+  return request({
+    url: "/core/safetycheck/register/app/" + id,
+    method: "get",
+    showLoading:true
+  });
+}
+// 登记信息
 export function submit(data) {
   return request({
     url: "/core/safetycheck/register/websubmit",

src/views/safetycheck/taskManager/components/register.vue

@@ -4,6 +4,16 @@
       <el-descriptions-item label="任务名称">{{
         taskInfo.taskName
       }}</el-descriptions-item>
+      <el-descriptions-item label="任务进度"
+        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
+      </el-descriptions-item>
+      <el-descriptions-item label="任务时间"
+        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
+      </el-descriptions-item>
+      <el-descriptions-item label="截止日期"
+        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
+      </el-descriptions-item>
+
       <el-descriptions-item label="检查主体">{{
         taskInfo.checkOrgName
       }}</el-descriptions-item>
@@ -17,15 +27,6 @@
             : ""
         }}
       </el-descriptions-item>
-      <el-descriptions-item label="开始日期"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
-      <el-descriptions-item label="截止日期"
-        >{{ dayjs(taskInfo.planEndTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
-      <el-descriptions-item label="创建时间"
-        >{{ dayjs(taskInfo.planStartTime).format("YYYY-MM-DD") }}
-      </el-descriptions-item>
       <el-descriptions-item label="检查组成员"
         ><el-input
           style="width: 80%; margin-top: -8px"
@@ -36,24 +37,30 @@
         ></el-input>
         <span v-else>{{ taskInfo.checkTeam }}</span>
       </el-descriptions-item>
-      <el-descriptions-item label="检查状态"
-        >{{ getLabel(dict.type.safety_check_status, taskInfo.status) }}
+      <el-descriptions-item label="登记人" v-if="!isRegister"
+        >{{ taskInfo.submitBy }}
+      </el-descriptions-item>
+      <el-descriptions-item label="隐患问题数" v-if="!isRegister"
+        >{{ taskInfo.exceptionCount }}
+      </el-descriptions-item>
+      <el-descriptions-item label="检查时间" v-if="!isRegister"
+        >{{
+          taskInfo.submitTime
+            ? dayjs(taskInfo.submitTime).format("YYYY-MM-DD")
+            : ""
+        }}
       </el-descriptions-item>
     </el-descriptions>
-    <el-row class="el-row-button">
+    <el-row class="el-row-button" v-if="isRegister">
       <el-col>
         <span style="margin-right: 20px">检查区域</span>
-        <el-button
-          type="primary"
-          size="mini"
-          @click="onAddPoint()"
-          v-if="isRegister"
+        <el-button type="primary" size="mini" @click="onAddPoint()"
           >新增检查内容</el-button
         >
       </el-col>
     </el-row>
 
-    <div class="content">
+    <div class="content" v-if="isRegister">
       <div class="area_content" v-for="area in taskInfo.checkList">
         <div>
           {{ area.areaName }}
@@ -107,17 +114,6 @@
                       maxlength="255"
                     ></el-input>
                   </el-form-item>
-                  <el-form-item label="异常图片" prop="image">
-                    <imgUpload
-                      type="more"
-                      :value="
-                        point.imgData
-                          ? point.imgData.map((d) => d.imgPath).join(',')
-                          : ''
-                      "
-                      @input="onImageChanged(point, $event)"
-                    ></imgUpload>
-                  </el-form-item>
                   <el-form-item label="整改期限" prop="rectificationDeadline">
                     <el-select
                       v-model="point.rectificationDeadline"
@@ -131,8 +127,19 @@
                       ></el-option>
                     </el-select>
                   </el-form-item>
+                  <el-form-item label="异常图片" prop="image">
+                    <imgUpload
+                      type="more"
+                      :value="
+                        point.imgData
+                          ? point.imgData.map((d) => d.imgPath).join(',')
+                          : ''
+                      "
+                      @input="onImageChanged(point, $event)"
+                    ></imgUpload>
+                  </el-form-item>
                 </el-form>
-                <el-descriptions v-else :column="1">
+                <!-- <el-descriptions v-else :column="1">
                   <el-descriptions-item label="情况描述">{{
                     point.remark
                   }}</el-descriptions-item>
@@ -153,24 +160,77 @@
                       >
                       </el-image></div
                   ></el-descriptions-item>
-                </el-descriptions>
+                </el-descriptions> -->
               </div>
             </div>
           </div>
         </div>
       </div>
     </div>
-
+    <div v-else class="itemDetail">
+      <el-collapse>
+        <el-collapse-item
+          v-for="item in taskInfo.checkList"
+          :title="item.itemName"
+          :value="item.itemId"
+        >
+          <el-table :data="item.pointList" size="small">
+            <el-table-column
+              header-align="center"
+              prop="pointName"
+              label="检查内容"
+            >
+            </el-table-column>
+            <el-table-column align="center" prop="areaName" label="检查区域">
+            </el-table-column>
+            <el-table-column align="center" prop="status" label="检查结果">
+              <template slot-scope="r">
+                {{
+                  r.row.status == null
+                    ? "-"
+                    : r.row.status == 0
+                    ? "正常"
+                    : "异常"
+                }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              align="center"
+              prop="remark"
+              label="问题描述"
+            >
+              <template slot-scope="r">
+                {{ r.row.remark ? r.row.remark : "-" }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              header-align="center"
+              prop="imgData"
+              label="异常图片"
+            >
+              <template slot-scope="r">
+                <div  v-if="r.row.imgData && r.row.imgData.length > 0">
+                  <el-image                 
+                  style="width: 30px; height: 30px; margin: 0 10px"
+                  v-for="img in r.row.imgData"
+                  :src="img.imgPath"
+                  :preview-src-list="
+                    r.row.imgData ? r.row.imgData.map((r) => r.imgPath) : []
+                  "
+                ></el-image></div>                
+                <span v-else>-</span>
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-collapse-item>
+      </el-collapse>
+    </div>
     <div class="dialog-footer">
       <el-button type="primary" @click="onSubmit()" v-if="showSaveBtn"
         >提交</el-button
       >
       <el-button @click="onSave" v-if="showSaveBtn">保存</el-button>
-      <el-button
-        @click="onGrant"
-        v-if="showGrantBtn"
-        >授权</el-button
-      >
+      <el-button @click="onGrant" v-if="showGrantBtn">授权</el-button>
       <el-button @click="onClose">关闭</el-button>
     </div>
     <SelectPoint
@@ -234,7 +294,7 @@ export default {
       return (
         this.isRegister &&
         this.taskInfo.status != 3 &&
-        this.taskInfo.planType==3 &&
+        this.taskInfo.planType == 3 &&
         this.taskInfo.checkOrgId == this.orgId &&
         userRoleIds.find((ur) => taskRoleIds.includes(ur))
       );
@@ -243,11 +303,16 @@ export default {
   mounted() {
     let id = this.$route.params.taskId;
     let mode = this.$route.query.mode;
+    let request = api.info;
     if (!mode) {
       mode = "info";
     }
 
-    api.info(id).then((r) => {
+    if (mode == "info") {
+      request = api.appinfo;
+    }
+
+    request(id).then((r) => {
       this.mode = mode;
       if (mode != "register") {
         this.taskInfo = r.data;
@@ -461,6 +526,11 @@ export default {
   margin-top: 20px;
   flex-direction: column;
 }
+.itemDetail {
+  max-height: calc(100% - 300px);
+  overflow-y: auto;
+  margin-top: 20px;
+}
 .area_content {
   border: #b8bdc0 1px solid;
   display: flex;
@@ -534,10 +604,9 @@ export default {
   margin-bottom: 3px;
   margin-top: 6px;
 }
-.el-descriptions{
-  ::v-deep .el-descriptions__body{
-  background-color:transparent !important;
-}
+.el-descriptions {
+  ::v-deep .el-descriptions__body {
+    background-color: transparent !important;
+  }
 }
-
 </style>