From 35e0c6ef31a3dae777f44c9308451208bb759d33 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Wed, 29 Nov 2023 15:55:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E7=A8=BD=E6=9F=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enterpriseStandardLibrary/check/CheckList.vue    | 12 ++++++------
 .../modules/InspectionPlanTable.vue                  |  7 ++-----
 .../InspectionProcessRectificationPlanModal.vue      |  7 ++++---
 .../modules/InspectionProcessReport.vue              |  2 +-
 .../modules/InspectionProcessTable.vue               |  2 +-
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/src/views/enterpriseStandardLibrary/check/CheckList.vue b/src/views/enterpriseStandardLibrary/check/CheckList.vue
index 520061d3..3c1df1cc 100644
--- a/src/views/enterpriseStandardLibrary/check/CheckList.vue
+++ b/src/views/enterpriseStandardLibrary/check/CheckList.vue
@@ -229,7 +229,7 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.planCheckTarget'),
           align: 'center',
           width: 180,
-          dataIndex: 'planInspectObject',
+          dataIndex: 'planInspectObject_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 主责标准化工作组
@@ -243,7 +243,7 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.department'),
           align: 'center',
           width: 180,
-          dataIndex: 'belongDept',
+          dataIndex: 'belongDept_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 计划稽查日期
@@ -257,14 +257,14 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.headOfCheck'),
           align: 'center',
           width: 180,
-          dataIndex: 'inspectUser',
+          dataIndex: 'inspectUser_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准化组对接人
           title: this.$t('enterpriseStandardLibrary.check.contactPerson'),
           align: 'center',
           width: 180,
-          dataIndex: 'standardizationDockingUser',
+          dataIndex: 'standardizationDockingUser_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 实际稽查完成日期
@@ -278,7 +278,7 @@ export default {
           title: this.$t('enterpriseStandardLibrary.check.actualChecker'),
           align: 'center',
           width: 180,
-          dataIndex: 'actualInspectUser',
+          dataIndex: 'actualInspectUser_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 状态
@@ -304,7 +304,7 @@ export default {
         }
       ],
       url: {
-        list: '/enterprise/inspect/page',
+        list: '/enterprise/inspect/queryByPage',
         exportXlsUrl: '/enterprise/inspect/exportData',
         exportPostponeDataUrl: '/enterprise/inspect/exportDataWithDelay', // 导出延期数据
         exportRectificationPlanUrl: '/enterprise/inspect/exportDataRectifyPlan' // 导出整改计划
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index 2e41470a..e78b9863 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -35,11 +35,8 @@
 
         <!--  所属部门意见  -->
         <template v-slot:departOpinion="{text, record}">
-          <a-tooltip overlay-class-name="tooltip-style">
-            <template slot="title">{{ text || text === 0 ? text : global.emptyLine }}</template>
-            <a class="table-text can-click-table-text" @click="showDepartOpinion(record)" v-if="text && text.length">{{ $t('view') }}</a>
-            <div class="table-text" v-else>{{ global.emptyLine }}</div>
-          </a-tooltip>
+          <a class="table-text can-click-table-text" @click="showDepartOpinion(record)" v-if="text && text.length">{{ $t('view') }}</a>
+          <div class="table-text" v-else>{{ global.emptyLine }}</div>
         </template>
 
         <!--  操作  -->
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
index 00d68c1b..cf56a0dc 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlanModal.vue
@@ -235,13 +235,14 @@ export default {
           if (!params.processEsInspectId) {
             params.processEsInspectId = this.data.id
           }
-          // 根据是否整改，判断整改状态 1整改中 4无需整改
+          // 是否整改isRectify 1是 0否
+          // 判断整改状态rectifyStatus 1整改中 4无需整改
           switch (params.isRectify + '') {
             case '0':
-              params.rectifyStatus = '1'
+              params.rectifyStatus = '4'
               break
             case '1':
-              params.rectifyStatus = '4'
+              params.rectifyStatus = '1'
               break
           }
           this.confirmLoading = true
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
index 3f0b4424..a9373cc3 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
@@ -115,7 +115,7 @@ export default {
         title: this.$t('workCenter.esInspectionProcess.file'),
         align: 'center',
         width: 140,
-        dataIndex: 'attachmentName',
+        dataIndex: 'attachment',
         scopedSlots: { customRender: 'file' }
       },
       { // 评分
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index 1994028b..a8b7920c 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -205,7 +205,7 @@ export default {
           title: this.$t('workCenter.esInspectionProcess.actualInspector'),
           align: 'center',
           width: 200,
-          dataIndex: 'actualInspectUser',
+          dataIndex: 'actualInspectUser_dictText',
           showCodeList: [
             EsInspectionProcess.inputInspectionReport.value,
             EsInspectionProcess.directorLeaderApprovalTwo.value,