Merge remote-tracking branch 'origin/develop' into develop

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>

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>

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>

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>

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>

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>

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>

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>

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;