修改

src/views/patrol/add.vue

@@ -72,13 +72,13 @@
             <el-form ref="addFormRef" :model="addForm" :rules="addRules" label-width="auto" size="large" label-position="left">
                 <el-row :gutter="20">
                     <el-col :span="12">
-                        <el-form-item label="检查名称" prop="name">
-                            <el-input v-model="addForm.name" placeholder="请输入" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
+                        <el-form-item label="检查名称" prop="inspectName">
+                            <el-input v-model="addForm.inspectName" placeholder="请输入" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
                         </el-form-item>
                     </el-col>
                     <el-col :span="12">
-                        <el-form-item label="检查类别" prop="type">
-                            <el-select v-model="addForm.type" placeholder="请选择" clearable style="width:100%" :disabled="type === 'changeRow' || type === 'review' || type === 'view'">
+                        <el-form-item label="检查类别" prop="inspectType">
+                            <el-select v-model="addForm.inspectType" placeholder="请选择" clearable style="width:100%" :disabled="type === 'changeRow' || type === 'review' || type === 'view'">
                                 <el-option v-for="item in typeOptions" :key="item.value" :label="item.label" :value="item.value" />
                             </el-select>
                         </el-form-item>
@@ -86,8 +86,8 @@
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="12">
-                        <el-form-item label="是否需要整改" prop="key3">
-                            <el-radio-group v-model="addForm.key3" class="ml-4" :disabled="type === 'view'">
+                        <el-form-item label="是否需要整改" prop="isRectify">
+                            <el-radio-group v-model="addForm.isRectify" class="ml-4" :disabled="type === 'view'">
                                 <el-radio label="1" size="large">需要整改</el-radio>
                                 <el-radio label="2" size="large">不要整改</el-radio>
                             </el-radio-group>
@@ -96,9 +96,9 @@
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="12">
-                        <el-form-item label="整改日期" prop="time">
+                        <el-form-item label="整改日期" prop="rectifyDate">
                             <el-date-picker
-                                v-model="addForm.time"
+                                v-model="addForm.rectifyDate"
                                 type="date"
                                
                                 placeholder="请选择整改日期"
@@ -109,7 +109,7 @@
                 </el-row>
                 <el-row :gutter="20">
                     <el-col :span="8">
-                        <el-form-item label="整改人" prop="key4">
+                        <el-form-item label="整改人" prop="rectifyUser">
                             <HcTasksUser
                                 :disabled="type === 'changeRow' || type === 'review' || type === 'view'" :is-change-popele="true"
                                 :contract-id="contractId" :project-id="projectId" :users="peoples"
@@ -121,7 +121,7 @@
                 <el-divider border-style="dashed" style="border: 1px dashed #cdd4e3;" />
                 <el-row :gutter="20">
                     <el-col :span="4">
-                        <el-form-item label="检查部位" prop="key5">
+                        <el-form-item label="检查部位" prop="inspectLocation">
                             <el-button
                                 hc-btn
                                 type="primary"
@@ -133,7 +133,7 @@
                             </el-button>
                         </el-form-item>
                     </el-col>
-                    <el-col :span="24">
+                    <!-- <el-col :span="24">
                         <div class="hc-process-box">
                             <el-scrollbar style="max-height: 200px;overflow-y: auto;">
                                 <div v-for="(item, index) in processDataList" class="process-item-box">
@@ -144,30 +144,35 @@
                                 </div>
                             </el-scrollbar>
                         </div>
-                    </el-col>
+                    </el-col> -->
                 </el-row>
                 <div style="position: relative; height: 400px">
-                    <HcTable :column="tableColumn" :datas="tableData">
-                        <template #key1="{ row }">
-                            <hc-table-input v-model="row.key1" type="textarea" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
+                    <HcTable :column="tableColumn" :datas="processDataList">
+                        <template #inspectProject="{ row }">
+                            <hc-table-input v-model="row.inspectProject" type="textarea" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
                         </template>
-                        <template #key2="{ row }">
-                            <hc-table-input v-model="row.key2" type="textarea" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
+                        <template #inspectContent="{ row }">
+                            <hc-table-input v-model="row.inspectContent" type="textarea" :disabled="type === 'changeRow' || type === 'review' || type === 'view'" />
                         </template>
-                        <template #key3="{ row }">
-                            <hc-table-input v-model="row.key3" type="textarea" :disabled="type === 'review' || type === 'view'" />
+                        <template #deductionStandard="{ row }">
+                            <hc-table-input v-model="row.deductionStandard" type="textarea" :disabled="type === 'review' || type === 'view'" />
                         </template>
-                        <template #key11="{ row }">
-                            <hc-table-input v-model="row.key11" type="textarea" :disabled="type === 'review' || type === 'view'" />
+                        <template #rectifyFeedback="{ row }">
+                            <hc-table-input v-model="row.rectifyFeedback" type="textarea" :disabled="type === 'review' || type === 'view'" />
                         </template>
-                        <template #key12="{ row }">
-                            <el-link v-if="row.key12" type="primary" :disabled="type === 'review' || type === 'view'">{{ row.key12 }}</el-link>
+                        <template #rectifyAttachment="{ row }">
+                            <el-link v-if="row.rectifyAttachment" type="primary" :disabled="type === 'review' || type === 'view'">{{ row.key12 }}</el-link>
                             <el-link v-else type="primary" @click="clickUpload">上传</el-link>
                         </template>
-                        <template #key4="{ row }">
-                            <hc-table-input v-model="row.key4" type="textarea" :disabled="type === 'review' || type === 'view'" />
+                        <template #inspectUserName="{ row }">
+                            <hc-table-input v-model="row.inspectUserName" type="textarea" :disabled="type === 'review' || type === 'view'" />
+                        </template>
+                        <template #inspectPdfUrl="{ row }">
+                            <el-link v-if="!row?.ishowImage" type="primary" :disabled="type === 'review' || type === 'view'" @click="clickUpload(row)">上传</el-link>
+                       
+                            <el-image v-else style="width: 100px; height: 100px" src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg" />
                         </template>
-                        <template #key5="{ row }">
+                        <template #rectifyPdfUrl="{ row }">
                             <el-link v-if="!row?.ishowImage" type="primary" :disabled="type === 'review' || type === 'view'" @click="clickUpload(row)">上传</el-link>
                        
                             <el-image v-else style="width: 100px; height: 100px" src="https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg" />
@@ -258,32 +263,32 @@ const contractId = ref(useAppState.getContractId)
 const addFormRef = ref(null)
 const addForm = ref({})
 const addRules = {
-    name: {
+    inspectName: {
         required: true,
         trigger: 'blur',
         message: '请输入名称',
     },
-    type: {
+    inspectType: {
         required: true,
         trigger: 'blur',
         message: '请选择类别',
     },
-    key3: {
+    isRectify: {
         required: true,
         trigger: 'blur',
         message: '请选择是否需要整改',
     },
-    key4: {
+    rectifyUser: {
         required: true,
         trigger: 'blur',
         message: '请选择整改人',
     },
-    key5: {
+    inspectLocation: {
         required: true,
         trigger: 'blur',
         message: '请选择检查部位',
     },
-    time:{
+    rectifyDate:{
         required: true,
         trigger: 'blur',
         message: '请选择整改时间',
@@ -298,7 +303,14 @@ const typeOptions = ref([
     { label:'质量巡检', value:2 },
 ])
 
-const tableColumn = ref([])
+const tableColumn = ref([
+{ key: 'inspectProject', name: '检查项目' },
+            { key: 'inspectContent', name: '检查内容' },
+            { key: 'rectifyFeedback', name: '整改反馈' },
+            { key: 'rectifyAttachment', name: '整改附件' },
+            { key: 'inspectPdfUrl', name: '图片', width:150 },
+            { key: 'action', name: '操作', width:100 },
+])
 //整改显示列
 
 const tableData = ref([
@@ -316,32 +328,32 @@ onActivated(()=>{
     console.log( type.value, ' type.value')
     if (type.value === 'changeRow') {
         tableColumn.value = [
-            { key: 'key1', name: '检查项目' },
-            { key: 'key2', name: '检查内容' },
-            { key: 'key11', name: '整改反馈' },
-            { key: 'key12', name: '整改附件' },
-            { key: 'key5', name: '图片', width:150 },
+            { key: 'inspectProject', name: '检查项目' },
+            { key: 'inspectContent', name: '检查内容' },
+            { key: 'rectifyFeedback', name: '整改反馈' },
+            { key: 'rectifyAttachment', name: '整改附件' },
+            { key: 'inspectPdfUrl', name: '图片', width:150 },
             { key: 'action', name: '操作', width:100 },
         ]
     } else if (type.value === 'review') {
         tableColumn.value = [
-            { key: 'key1', name: '检查项目' },
-            { key: 'key2', name: '检查内容' },
-            { key: 'key3', name: '扣分标准' },
-            { key: 'key4', name: '检查人名称' },
+            { key: 'inspectProject', name: '检查项目' },
+            { key: 'inspectContent', name: '检查内容' },
+            { key: 'deductionStandard', name: '扣分标准' },
+            { key: 'inspectUserName', name: '检查人名称' },
             { key: 'key5', name: '图片', width:150 },
-            { key: 'key11', name: '整改反馈' },
-            { key: 'key12', name: '整改附件' },
-            { key: 'key5', name: '整改后图片', width:150 },
+            { key: 'rectifyFeedback', name: '整改反馈' },
+            { key: 'rectifyAttachment', name: '整改附件' },
+            { key: 'rectifyPdfUrl', name: '整改后图片', width:150 },
          
         ]
     } else {
         tableColumn.value = [
-        { key: 'key1', name: '检查项目' },
-        { key: 'key2', name: '检查内容' },
-        { key: 'key3', name: '扣分标准' },
-        { key: 'key4', name: '检查人名称' },
-        { key: 'key5', name: '图片', width:150 },
+        { key: 'inspectProject', name: '检查项目' },
+        { key: 'inspectContent', name: '检查内容' },
+        { key: 'deductionStandard', name: '扣分标准' },
+        { key: 'inspectUserName', name: '检查人名称' },
+        { key: 'inspectPdfUrl', name: '图片', width:150 },
         { key: 'action', name: '操作', width:100 },
         ]
     }
@@ -413,7 +425,7 @@ const linksRelateModalSave = ()=>{
         let node = processElTree.value.treeRef.getNode(keys[index])
         getPathName(node, pathArr)
         linkTabIds.push({
-            path: pathArr.join('/'),
+            inspectProject: pathArr.join('/'),
             primaryKeyId: keys[index],
             autoExpandKeys:TreeAutoExpandKeys.value,
         })
@@ -422,7 +434,7 @@ const linksRelateModalSave = ()=>{
      getNorepeatArr(linkTabIds)
      console.log(linkTabIds, 'linkTabIds')
      processDataList.value = linkTabIds
-     linksRelateModal.value = false
+ 
    
 }
 const getNorepeatArr = (tempArr)=> {

src/views/patrol/safe.vue

@@ -25,13 +25,13 @@ import { useRouter } from 'vue-router'
 //初始变量
 const router = useRouter()
 const tableColumn = [
-    { key: 'key1', name: '项目' },
-    { key: 'key2', name: '检查类别' },
-    { key: 'key3', name: '检查名称' },
-    { key: 'key4', name: '复核检查状态' },
-    { key: 'key5', name: '是否需要整改' },
-    { key: 'key6', name: '需求整改完成日期' },
-    { key: 'key7', name: '实际整改完成日期' },
+    { key: 'projectName	', name: '项目' },
+    { key: 'inspectTypeName', name: '检查类别' },
+    { key: 'inspectName', name: '检查名称' },
+    { key: 'reviewInspectStatusName', name: '复核检查状态' },
+    { key: 'submitRectify', name: '是否需要整改' },
+    { key: 'rectifyDate', name: '需求整改完成日期' },
+    { key: 'actualRectifyDate', name: '实际整改完成日期' },
     { key: 'action', name: '操作' },
 ]
 const tableData = ref([