Parcourir la source

记录校核回退显示图标

xy il y a 1 mois
Parent
commit
ea63271301

+ 17 - 3
yudao-ui-admin-vue3/src/views/pressure2/boilerReportPreparationList/BoilerReportList.vue

@@ -5,9 +5,14 @@
       :key="item?.id"
       class="report-item"
     >
-      <span
-        class="color-dot"
-        :style="{ backgroundColor: getStatusColor(item.taskStatus) }"
+      <el-icon v-if="item?.recheckStatus === 300"
+               class="warning-icon"
+      >
+        <Warning />
+      </el-icon>
+      <span v-else
+            class="color-dot"
+            :style="{ backgroundColor: getStatusColor(item.taskStatus) }"
       ></span>
       <span
         class="report-name"
@@ -30,6 +35,7 @@
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import {useRouter} from "vue-router";
+import { Warning } from '@element-plus/icons-vue'
 
 interface ReportItem {
   id: string
@@ -104,6 +110,14 @@ const handleClick = (row, item: ReportItem) => {
     margin-right: 4px;
   }
 
+  .warning-icon {
+    color: lightcoral;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 4px;
+    font-size: 13px;
+  }
+
   .report-name {
     cursor: pointer;
     transition: opacity 0.2s;

+ 18 - 1
yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/components/InspectionItemList.vue

@@ -118,6 +118,11 @@
                         item.checkUsers.length ? item.checkUsers[0].nickname : '未分配'
                       }}</span>
                     <span v-else>{{ item.checkUsers.length ? item.checkUsers[0]?.nickname : '' }}</span>
+                    <el-icon v-if="item?.recheckStatus === 300"
+                             class="warning-icon"
+                    >
+                      <Warning />
+                    </el-icon>
                     <div
                       class="text-[14px]"
                       v-if="item.reportType === 300 && !item.instructionId && item.instructionTempId"
@@ -248,7 +253,7 @@
 import { ref, computed, nextTick, onMounted, onUnmounted } from 'vue'
 import calcCheckItemFee from '@/views/pressure2/boilertaskorder/components/calcCheckItemFee.vue'
 
-import {User, Delete, ArrowUp, ArrowDown, Setting, RefreshLeft, Plus, CopyDocument} from '@element-plus/icons-vue'
+import {User, Delete, ArrowUp, ArrowDown, Setting, RefreshLeft, Plus, CopyDocument,Warning} from '@element-plus/icons-vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import { 
   PressureCheckerMyTaskStatusMap,
@@ -1171,6 +1176,18 @@ const isDisabledBtn = (item) => {
                 font-size: 14px;
                 vertical-align: baseline;
               }
+
+              .warning-icon {
+                color: lightcoral;
+                display: inline-flex;
+                align-items: flex-end;
+                vertical-align: baseline;
+                margin-left: 4px;
+                font-size: 16px;
+                line-height: 1;
+                transform: translateY(3px);
+              }
+
             }
           }
 

+ 17 - 3
yudao-ui-admin-vue3/src/views/pressure2/pipeReportPreparationList/PipeReportList.vue

@@ -5,9 +5,14 @@
       :key="item?.id"
       class="report-item"
     >
-      <span
-        class="color-dot"
-        :style="{ backgroundColor: getStatusColor(item.taskStatus) }"
+      <el-icon v-if="item?.recheckStatus === 300"
+        class="warning-icon"
+      >
+        <Warning />
+      </el-icon>
+      <span v-else
+         class="color-dot"
+         :style="{ backgroundColor: getStatusColor(item.taskStatus) }"
       ></span>
       <span
         class="report-name"
@@ -30,6 +35,7 @@
 <script setup lang="ts">
 import { DICT_TYPE, getStrDictOptions } from '@/utils/dict'
 import {useRouter} from "vue-router";
+import { Warning } from '@element-plus/icons-vue'
 
 interface ReportItem {
   id: string
@@ -104,6 +110,14 @@ const handleClick = (row, item: ReportItem) => {
     margin-right: 4px;
   }
 
+  .warning-icon {
+    color: lightcoral;
+    display: inline-block;
+    vertical-align: middle;
+    margin-right: 4px;
+    font-size: 13px;
+  }
+
   .report-name {
     cursor: pointer;
     transition: opacity 0.2s;

+ 17 - 1
yudao-ui-admin-vue3/src/views/pressure2/pipechecker/components/InspectionItemList.vue

@@ -76,6 +76,11 @@
                       item.checkUsers.length ? item.checkUsers[0].nickname : '未分配'
                     }}</span>
                   <span v-else>{{ item.checkUsers.length ? item.checkUsers[0]?.nickname : '' }}</span>
+                  <el-icon v-if="item?.recheckStatus === 300"
+                           class="warning-icon"
+                  >
+                    <Warning />
+                  </el-icon>
                   <div
                     class="text-[14px]"
                     v-if="item.reportType === 300 && !item.instructionId && item.instructionTempId"
@@ -201,7 +206,7 @@
 import { ref, computed, nextTick, onMounted, onUnmounted } from 'vue'
 import calcCheckItemFee from '@/views/pressure2/boilertaskorder/components/calcCheckItemFee.vue'
 
-import { User, Delete, ArrowUp, ArrowDown,Setting, RefreshLeft } from '@element-plus/icons-vue'
+import { User, Delete, ArrowUp, ArrowDown,Setting, RefreshLeft,Warning } from '@element-plus/icons-vue'
 import {ElMessage, ElMessageBox} from 'element-plus'
 import { 
   PressureCheckerMyTaskStatusMap,
@@ -903,6 +908,17 @@ const isDisabledBtn = (item) => {
                 // align-items: center;
               }
 
+              .warning-icon {
+                color: lightcoral;
+                display: inline-flex;
+                align-items: flex-end;
+                vertical-align: baseline;
+                margin-left: 4px;
+                font-size: 16px;
+                line-height: 1;
+                transform: translateY(3px);
+              }
+
               .el-button {
                 padding: 0 4px;
                 height: auto;