[update] 法规符合性评估流程

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
     }
   }
 }

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' }
         },
         { // 评估结果

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' }
         },
         { // 评估结果

src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderSingleAuditBaseInfo.vue

@@ -16,8 +16,9 @@
       rowKey="standardNumber"
       :columns="columns"
       :dataSource="dataSource"
-      :pagination="false"
+      :pagination="ipagination"
-      :loading="loading">
+      :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')