From 28304b7f3f10f8fdaac6b557e0912e5183ffd69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Wed, 30 Mar 2022 11:23:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?52250=20=E6=A0=87=E5=87=86=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B--=E5=88=9B?=
 =?UTF-8?q?=E5=BB=BA=E6=97=B6=E9=97=B4=E8=BF=98=E6=9C=89=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/processCenter/pages/creatProcess/bzpg/step2.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step3.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step4.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step5.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step6.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step7.vue   | 1 -
 src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue | 3 +--
 src/pages/processCenter/pages/creatProcess/bzpg/step8.vue   | 1 -
 8 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
index e41f61e51..13f7997e1 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue
@@ -165,7 +165,6 @@
         <el-table-column
           prop="createTime"
           label="创建时间"
-          sortable="custom"
           align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
index 9f23d54af..21fccdec3 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue
@@ -185,7 +185,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
index 4dcc3d587..494056ebd 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue
@@ -230,7 +230,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
index 877f9745c..e784e848d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue
@@ -376,7 +376,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
index a586db27c..21a4ba3fa 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue
@@ -307,7 +307,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
index 8cd22da6c..9c6958979 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue
@@ -316,7 +316,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
index 492d531bb..3bcbecd94 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue
@@ -316,8 +316,7 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
-            align="center">
+            align="center"
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>
             </template>
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
index 6b9af8609..2a2589286 100644
--- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue
@@ -316,7 +316,6 @@
           <el-table-column
             prop="createTime"
             label="创建时间"
-            sortable="custom"
             align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format("YYYY-MM-DD HH:mm:ss") : "" }}</span>

From af7339a2db6c7707541509753c463aeb58b1a263 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Wed, 30 Mar 2022 11:25:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2052200=20=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E6=B8=85=E5=8D=95--=E8=BD=A6=E5=9E=8B=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB=E6=B8=85=E5=8D=95=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=B8=80=E7=9B=B4=E8=BD=AC=E5=9C=88=EF=BC=8Cloading?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=BF=87=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../accessStandardsAndRegulations/pages/details.vue              | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
index ddcd87b5e..1145a49cd 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue
@@ -815,6 +815,7 @@ export default {
             });
             this.standinfoList = res.data.records;
             this.standardFormTotal = res.data.total;
+            this.total = res.data.total;
             this.standinfoList.forEach(item => {
               if (item.standYear === null) {
                 item.standNumber = item.standSortShow + " " + item.standNumber;