From 40792ad0a1df3368e3800c71752dca4b32eec2e0 Mon Sep 17 00:00:00 2001
From: danshihao <danshihao@syxysoft.com>
Date: Fri, 19 Jan 2024 15:52:49 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/InspectionPlanTable.vue           |  9 +-------
 .../modules/ShowOpinionModal.vue              | 21 ++++++++++++++-----
 .../modules/InspectionProcessContent.vue      |  6 ++----
 .../InspectionProcessRectificationPlan.vue    |  6 ++----
 .../modules/InspectionProcessReport.vue       |  7 ++-----
 .../modules/InspectionProcessTable.vue        |  9 +-------
 .../modules/InspectionProcessTableModal.vue   |  7 ++-----
 .../modules/ExtensionRequestTable.vue         |  9 +-------
 .../modules/BaseInfoTable.vue                 |  7 ++-----
 9 files changed, 29 insertions(+), 52 deletions(-)

diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
index 4f99e733..46a76187 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/InspectionPlanTable.vue
@@ -22,8 +22,7 @@
         :loading="loading"
         :pagination="false"
         :row-selection="hasTableOperator ? { selectedRowKeys: selectedRowKeys, onChange: onSelectChange, getCheckboxProps } : null"
-        :scroll="{x: '100%', y: '50vh'}"
-        @change="tableOnChange">
+        :scroll="{x: '100%', y: '50vh'}">
 
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
@@ -377,12 +376,6 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
-      this.ipagination = pagination
-      this.getTableList()
-    },
     // 填写意见
     handleWriteOpinion (record, index) {
       this.$refs.writeOpinionModal.show(record, index)
diff --git a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
index d053ed95..2bc82ab4 100644
--- a/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionPlan/modules/ShowOpinionModal.vue
@@ -15,8 +15,9 @@
         :dataSource="dataSource"
         :can-drag="true"
         rowKey="id"
-        :pagination="false"
-        :scroll="{x: '100%',y: '50vh'}">
+        :pagination="ipagination"
+        :scroll="{x: '100%',y: '50vh'}"
+        @change="handleTableChange">
       </j-table>
     </a-spin>
   </j-modal>
@@ -37,6 +38,18 @@ export default {
       url: {
         list: ''
       },
+      /* 分页参数 */
+      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
+      },
       dataSource: [],
       columns: [
         { // 征求意见对象
@@ -75,9 +88,7 @@ export default {
       this.dataSource = []
       this.visible = false
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination) {
       this.ipagination = pagination
     }
   }
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
index e93e21ef..0eb55a45 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessContent.vue
@@ -22,7 +22,7 @@
         :row-selection="null"
         :pagination="ipagination"
         :scroll="{x: '100%',y: '50vh'}"
-        @change="tableOnChange">
+        @change="handleTableChange">
 
         <!-- 整改部门 -->
         <template slot="rectificationDepartment" slot-scope="{text, record}">
@@ -143,9 +143,7 @@ export default {
       this.index = -1
       this.visible = false
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination, filters, sorter) {
       this.ipagination = pagination
     },
     handleAdd () {
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
index 4658c309..e6201ea4 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessRectificationPlan.vue
@@ -26,7 +26,7 @@
         :row-selection="null"
         :pagination="ipagination"
         :scroll="{x: '100%',y: '50vh'}"
-        @change="tableOnChange">
+        @change="handleTableChange">
 
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
@@ -192,9 +192,7 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination, filters, sorter) {
       this.ipagination = pagination
     },
     handleAdd () {
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
index d8415fc8..62eaa24e 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessReport.vue
@@ -26,7 +26,7 @@
         :row-selection="null"
         :pagination="ipagination"
         :scroll="{x: '100%',y: '50vh'}"
-        @change="tableOnChange">
+        @change="handleTableChange">
 
         <!--  附件  -->
         <template v-slot:file="{text, record}">
@@ -175,11 +175,8 @@ export default {
       this.$emit('close')
       this.visible = false
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination, filters, sorter) {
       this.ipagination = pagination
-      this.getTableList()
     },
     handleAdd () {
       this.$refs.modalForm.add(this.model)
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
index 844e1cd9..2a249639 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTable.vue
@@ -13,8 +13,7 @@
         :rowKey="(_, index) => index"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y: '50vh'}"
-        @change="tableOnChange">
+        :scroll="{x: '100%',y: '50vh'}">
 
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
@@ -316,12 +315,6 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
-      this.ipagination = pagination
-      this.getTableList()
-    },
     // 稽查报告
     handleInspectionReport (record, index) {
       this.$refs.inspectionProcessReport.show(record, index)
diff --git a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
index cb082a20..831c128a 100644
--- a/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
+++ b/src/views/workCenter/enterpriseStandardInspectionProcess/modules/InspectionProcessTableModal.vue
@@ -40,7 +40,7 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :pagination="ipagination"
         :scroll="{x: '100%',y: '50vh'}"
-        @change="tableOnChange">
+        @change="handleTableChange">
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
           <a-tooltip overlay-class-name="tooltip-style">
@@ -198,11 +198,8 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination, filters, sorter) {
       this.ipagination = pagination
-      this.getTableList()
     }
   }
 }
diff --git a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
index 1f78ceac..6f16fff8 100644
--- a/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
+++ b/src/views/workCenter/inspectionExtensionRequestProcess/modules/ExtensionRequestTable.vue
@@ -13,8 +13,7 @@
         rowKey="id"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%'}"
-        @change="tableOnChange">
+        :scroll="{x: '100%'}">
 
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
@@ -280,12 +279,6 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
-      this.ipagination = pagination
-      this.getTableList()
-    },
     // 获取向上第n个父节点
     getNumParentNode (el, n) {
       if (n < 1 || el === document.body) {
diff --git a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
index f9b31147..a54c6eee 100644
--- a/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
+++ b/src/views/workCenter/permissionApplicationProcess/modules/BaseInfoTable.vue
@@ -15,7 +15,7 @@
         :row-selection="null"
         :pagination="false"
         :scroll="{x: '100%'}"
-        @change="tableOnChange">
+        @change="handleTableChange">
 
         <!--  企标号、企标名称  -->
         <template v-slot:standard="{text, record}">
@@ -133,11 +133,8 @@ export default {
         }
       })
     },
-    tableOnChange (pagination, filters, sorter) {
-      this.orderBy = sorter.order === 'ascend' ? '1' : '2'
-      this.orderByField = sorter.columnKey
+    handleTableChange (pagination, filters, sorter) {
       this.ipagination = pagination
-      this.getTableList()
     },
     // 获取所有标准号
     getStandardNumbers () {