From 24fb226ac57ea0c0bee50de4bca1055a26b57729 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Wed, 17 Jul 2024 14:39:48 +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=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/DesignEngineerEvaluation.vue      | 29 +++++++++++++++++--
 .../modules/FinishAuditBaseInfo.vue           |  2 +-
 .../modules/MainFinderCollectBaseInfo.vue     |  2 +-
 .../modules/MainFinderSingleAuditBaseInfo.vue | 22 ++++++++++++--
 4 files changed, 47 insertions(+), 8 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
index f70d91b..e6ce50e 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/DesignEngineerEvaluation.vue
@@ -5,13 +5,15 @@
       <j-expand-table
         :can-drag="true"
         :scroll="{x: '100%'}"
-        ref="table"
+        ref="expandTable"
         rowKey="standardNumber"
         :columns="columns"
         :dataSource="dataSource"
         formIsDepend="result"
         :extraForm="extraForm"
-        :loading="loading">
+        :pagination="ipagination"
+        :loading="loading"
+        @change="handleTableChange">
 
         <template slot="result" slot-scope="{text, record}">
           <j-dict-select-tag
@@ -43,6 +45,18 @@ export default {
   data () {
     return {
       loading: false,
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '30', '50', '100', '150', '200'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' ' + this.$t('total') + ' ' + total + ' ' + this.$t('strip')
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       columns: [
         { // 条款号
           title: this.$t('clauseNo'),
@@ -259,8 +273,17 @@ export default {
     // 外层获取数据要过校验,返回false表示没有通过校验
     async getDataValidate () {
       let data = {}
-      data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+      const expandTableValid = this.$refs.expandTable.submit()
+      if (!expandTableValid) {
+        this.$message.warning(this.$t('pleaseCompleteTableInfo'))
+        data = false
+      } else {
+        data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
+      }
       return data
+    },
+    handleTableChange (pagination) {
+      this.ipagination = pagination
     }
   }
 }
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
index f8dbbc3..e341de9 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
@@ -99,7 +99,7 @@ export default {
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.appraiser'),
           align: 'center',
           width: 180,
-          dataIndex: 'appraiser_dictText',
+          dataIndex: 'assessor_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 评估结果
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
index a209857..5667b9b 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderCollectBaseInfo.vue
@@ -167,7 +167,7 @@ export default {
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.appraiser'),
           align: 'center',
           width: 180,
-          dataIndex: 'appraiser_dictText',
+          dataIndex: 'assessor_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 评估结果
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
index 6ea07d9..f6a6bdd 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue
@@ -16,8 +16,9 @@
       rowKey="standardNumber"
       :columns="columns"
       :dataSource="dataSource"
-      :pagination="false"
-      :loading="loading">
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange">
 
       <!--  佐证材料 -->
       <template v-slot:material="{text, record}">
@@ -51,6 +52,18 @@ export default {
   data () {
     return {
       loading: false,
+      /* 分页参数 */
+      ipagination: {
+        current: 1,
+        pageSize: 10,
+        pageSizeOptions: ['10', '30', '50', '100', '150', '200'],
+        showTotal: (total, range) => {
+          return range[0] + '-' + range[1] + ' ' + this.$t('total') + ' ' + total + ' ' + this.$t('strip')
+        },
+        showQuickJumper: true,
+        showSizeChanger: true,
+        total: 0
+      },
       columns: [
         {
           title: this.$t('serialNumber'),
@@ -101,7 +114,7 @@ export default {
           title: this.$t('workCenter.regulatoryComplianceCheckProcess.appraiser'),
           align: 'center',
           width: 180,
-          dataIndex: 'appraiser_dictText',
+          dataIndex: 'assessor_dictText',
           scopedSlots: { customRender: 'text' }
         },
         { // 评估结果
@@ -194,6 +207,9 @@ export default {
       data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
       return data
     },
+    handleTableChange (pagination) {
+      this.ipagination = pagination
+    },
     handleExportXls (fileName, fileSuffix = '.xls') {
       if (!fileName || typeof fileName !== 'string') {
         fileName = this.$t('exportFile')