修改

src/views/patrol/add.vue

@@ -522,66 +522,6 @@ const linksRelateModalClose = ()=>{
     linksRelateModal.value = false
 }
 const processDataList = ref([])
-// const linksRelateModalSave = ()=>{
-//     console.log('baocun', processDataList.value )
-//     console.log(defaultChecked.value, 'defaultChecked.value')
-//     const keys = processElTree.value.treeRef.getCheckedKeys()
-//     // const keys = defaultChecked.value
-//     console.log(keys, 'keys')
-//     let linkTabIds = processDataList.value 
-//     if (keys.length === 0) {
-//         linkTabIds = []
-//     }
-//      //去出掉取消勾选的
-//     for (let index = 0; index < keys.length; index++) {
-//        linkTabIds = linkTabIds.filter((ele)=>{
-//             if (ele.primaryKeyId === keys[index]) {
-//                 return ele
-//             }
-//        })
-//     }
-//     for (let index = 0; index < keys.length; index++) {
-//         console.log(keys[index], 'keys[index]')
-//         let node = processElTree.value.treeRef.getNode(keys[index])
-//         console.log(node, 'NODE')
-//         let pathArr = []
-//         getKeys(node, pathArr)
-//         TreeAutoExpandKeys.value = pathArr
-//         linkTabIds.push({
-//             inspectProject: node.data.title,
-//             primaryKeyId: keys[index],
-//             autoExpandKeys:TreeAutoExpandKeys.value,
-//             isShowImage:0,
-//             contractId:contractId.value,
-
-//         })
-//     }
-
-//      //去除掉重复的
-//      getNorepeatArr(linkTabIds)
-//      console.log(linkTabIds, 'linkTabIds')
-//      console.log(processDataList.value, 'processDataList.value')
-//     linkTabIds.forEach((ele)=>{
-//         processDataList.value.forEach((ele1)=>{
-//             if (ele.primaryKeyId === ele1.primaryKeyId) {
-//                 ele.isShowImage = ele1.isShowImage
-//                 ele.inspectContent = ele1.inspectContent
-//                 ele.deductionStandard = ele1.deductionStandard
-//                 ele.inspectUserName = ele1.inspectUserName
-//                 ele.inspectPdfUrl = ele1.inspectPdfUrl
-//                 ele.autoExpandKeys = ele1.autoExpandKeys
-//                 ele.contractId = ele1.contractId
-            
-//             }
-//         })
-//     })
-//     console.log(linkTabIds, 'linkTabIds1111')
-//      processDataList.value = linkTabIds
-//      linksRelateModal.value = false
-//      addForm.value.list = linkTabIds
- 
-   
-// }
 
     //获取展开节点
 const linksRelateModalSave = ()=>{

src/views/patrol/manage.vue

@@ -7,8 +7,12 @@
                     <span class="text-link" @click="tableRowEdit(row)">{{ row?.inspectName }}</span>
                 </template>
                 <template #isRectify="{ row }">
-                    <span v-if="row.isRectify == 1">需要</span>
-                    <span v-else>不需要</span>
+                    <el-tag
+                        v-if="row?.isRectify"
+                        :type="`${row.isRectify === 3 ? 'success' : row.isRectify === 1 ? 'warning' : 'info'}`" class="mx-1" effect="dark"
+                    >
+                        {{ row.isRectify === 3 ? '已整改' : row.isRectify === 2 ? '不需要' : '需要' }}
+                    </el-tag>
                 </template>
                 <template #action="{ row }">
                     <el-link v-if="row.submitRectify == 1" type="primary" :disabled="row.isRectifyUser === 0" @click="changeRow(row)">整改</el-link>

src/views/patrol/safe.vue

@@ -7,13 +7,19 @@
                     <span class="text-link" @click="tableRowEdit(row)">{{ row?.inspectName }}</span>
                 </template>
                 <template #isRectify="{ row }">
-                    <span v-if="row.isRectify == 1">需要</span>
-                    <span v-else>不需要</span>
+                    <!-- <span v-if="row.isRectify == 1">需要</span>
+                    <span v-else>不需要</span> -->
+                    <el-tag
+                        v-if="row?.isRectify"
+                        :type="`${row.isRectify === 3 ? 'success' : row.isRectify === 1 ? 'warning' : 'info'}`" class="mx-1" effect="dark"
+                    >
+                        {{ row.isRectify === 3 ? '已整改' : row.isRectify === 2 ? '不需要' : '需要' }}
+                    </el-tag>
                 </template>
                 <template #action="{ row }">
                     <el-link v-if="row.submitRectify == 2 && row.isRectify == 1" type="primary" @click="reviewRow(row)">复核</el-link>
-                    <el-link type="primary" @click="updateRow(row)">修改</el-link>
-                    <el-link type="primary" @click="delRow(row)">删除</el-link>
+                    <el-link type="primary" :disabled="row.isRectify === 3" @click="updateRow(row)">修改</el-link>
+                    <el-link type="primary" :disabled="row.isRectify === 3" @click="delRow(row)">删除</el-link>
                 </template>
             </HcTable>
             <template #action>