From ee05b64d0a60e687581f12211759217459ccd805 Mon Sep 17 00:00:00 2001
From: lideqin <694785430@qq.com>
Date: Tue, 16 Jul 2024 18:05:45 +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

---
 .../RegulatoryComplianceCheckProcess.vue      | 12 +++++++----
 .../modules/FinishAuditBaseInfo.vue           | 21 +++++++++++++++++--
 .../modules/MainFinderDistributesBaseInfo.vue | 20 +++---------------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
index a42c1dc..d09438b 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/RegulatoryComplianceCheckProcess.vue
@@ -320,19 +320,23 @@ export default {
       processInfoForm: this.$form.createForm(this),
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 4 }
+        xl: { span: 6 },
+        xxl: { span: 4 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 20 }
+        xl: { span: 18 },
+        xxl: { span: 20 }
       },
       longLabelCol: {
         xs: { span: 24 },
-        sm: { span: 2 }
+        xl: { span: 3 },
+        xxl: { span: 2 }
       },
       longWrapperCol: {
         xs: { span: 24 },
-        sm: { span: 22 }
+        xl: { span: 21 },
+        xxl: { span: 22 }
       },
       labelColEn: {
         xs: { span: 24 },
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
index 0ccbaea..f8dbbc3 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/FinishAuditBaseInfo.vue
@@ -9,8 +9,9 @@
       rowKey="standardNumber"
       :columns="columns"
       :dataSource="dataSource"
-      :pagination="false"
-      :loading="loading">
+      :pagination="ipagination"
+      :loading="loading"
+      @change="handleTableChange">
 
       <!--  佐证材料 -->
       <template v-slot:material="{text, record}">
@@ -36,6 +37,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'),
@@ -175,6 +188,10 @@ export default {
       let data = {}
       data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
       return data
+    },
+    handleTableChange (pagination, filters, sorter) {
+      // 分页、排序、筛选变化时触发
+      this.ipagination = pagination
     }
   }
 }
diff --git a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
index 50e875c..ff00207 100644
--- a/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
+++ b/src/views/workCenter/regulatoryComplianceCheckProcess/modules/MainFinderDistributesBaseInfo.vue
@@ -126,7 +126,7 @@
                               filedName="manager"
                               @nameChange="userSelectNameChangeForm"
                               :nameStr="personFormInline.manager_dictText"
-                              type="radio"/>
+                              type="checkbox"/>
             </a-form-model-item>
           </div>
           <!--  批准人员  -->
@@ -144,7 +144,7 @@
                               filedName="seniorManager"
                               @nameChange="userSelectNameChangeForm"
                               :nameStr="personFormInline.seniorManager_dictText"
-                              type="radio"/>
+                              type="checkbox"/>
             </a-form-model-item>
           </div>
         </div>
@@ -539,23 +539,9 @@ export default {
         if (valid) {
           if (this.formInline.distributeFlag === YesOrNoEnum.YES.value) {
             // 排查任务是否下发选了是
-            // 校验设计工程师是否全部填写
-            let hasErr = false
-            for (const i in this.dataSource) {
-              if (!this.dataSource[i].designEngineer) {
-                // 需要选设计工程师,但是没有选择
-                hasErr = true
-                // 根据下标跳转到第一个没有填的的这一页表格
-                this.ipagination.current = Math.floor(i / Number(this.ipagination.pageSize)) + 1
-                break
-              }
-            }
-            if (valid && !hasErr) {
+            if (valid) {
               data.standardInfo = Object.assign({}, this.formInline)
               data.detailInfoList = JSON.parse(JSON.stringify(this.dataSource))
-            } else if (hasErr) {
-              this.$message.warning(this.$t('workCenter.regulatoryComplianceCheckProcess.pleaseSelectDesignEngineer'))
-              data = false
             } else {
               data = false
             }