From 7da65bb45d0e6fbc37f0d8119b0b60ea4a20c685 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 25 Jun 2024 15:05:05 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=B3=95=E8=A7=84=E7=AC=A6=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E8=AF=84=E4=BC=B0=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nonmatchItem/NonmatchItemList.vue                | 12 ++++++------
 .../RegulatoryComplianceAssessmentList.vue           |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
index ebacd0d..af49a67 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/nonmatchItem/NonmatchItemList.vue
@@ -77,7 +77,7 @@
               {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
-            <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" v-has="'lawsEvaluationNotMet:search'">{{ $t('query') }}</a-button>
             <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>
 
@@ -176,7 +176,7 @@ export default {
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.modelStatus'),
           align: 'center',
           width: 180,
-          dataIndex: 'modelStatus',
+          dataIndex: 'modelStatus_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 标准编号
@@ -211,28 +211,28 @@ export default {
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.responsibleDepartment'),
           align: 'center',
           width: 180,
-          dataIndex: 'authDept',
+          dataIndex: 'authDept_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 评估人
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.appraiser'),
           align: 'center',
           width: 180,
-          dataIndex: 'userId',
+          dataIndex: 'userId_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 问题类型
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.problemType'),
           align: 'center',
           width: 180,
-          dataIndex: 'problemType',
+          dataIndex: 'problemType_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 整改状态
           title: this.$t('regulatoryComplianceAssessmentDatabase.nonmatchItem.rectificationState'),
           align: 'center',
           width: 180,
-          dataIndex: 'rectifyStatus',
+          dataIndex: 'rectifyStatus_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // PCR编号
diff --git a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
index 4608ba0..b9b2c4f 100644
--- a/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
+++ b/src/views/regulatoryComplianceAssessmentDatabase/regulatoryComplianceAssessment/RegulatoryComplianceAssessmentList.vue
@@ -50,7 +50,7 @@
               {{ toggleSearchStatus ? $t('putAway') : $t('open') }}
               <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
             </a>
-            <a-button type="primary" @click="searchQuery" icon="search">{{ $t('query') }}</a-button>
+            <a-button type="primary" @click="searchQuery" icon="search" v-has="'lawsConformityAssessment:search'">{{ $t('query') }}</a-button>
             <a-button type="primary" ghost @click="searchReset" icon="reload" style="margin-left: 8px">{{ $t('reset') }}</a-button>
           </div>