From bbfb1357b5cdf5212e8005b210bcd214a49166f7 Mon Sep 17 00:00:00 2001
From: "wangxiahui@91isoft.com" <140316hui>
Date: Thu, 16 Sep 2021 10:51:18 +0800
Subject: [PATCH 01/11] Default Changelist

---
 .../regulatoryRepository/nonConfomity/pages/historicalData.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
index 6b4009dc0..da065c8d0 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/historicalData.vue
@@ -163,7 +163,7 @@
         </el-table-column>
         <el-table-column
         prop="actualCloseTime"
-        width="150"
+        width="130"
         align="center"
         sortable
         label="实际关闭时间">

From 1b2fbca6fe85eb7530957d5aabf7aa5ce7a83144 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 16 Sep 2021 10:51:43 +0800
Subject: [PATCH 02/11] commit

---
 src/pages/home1/components/solicitopinions/index.vue      | 2 +-
 src/pages/processCenter/pages/creatProcess/bzdy/step5.vue | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index ab32c8cec..f4d931cd3 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -41,7 +41,6 @@ export default {
       const newmonth = date.month > 10 ? date.month : "0" + date.month;
       const day = date.date > 10 ? date.date : "0" + date.date;
       this.updateTime = date.year + "-" + newmonth + "-" + day;
-      console.log("当前时间" + this.updateTime);
     },
     //截取时间
     getDate(date) {
@@ -56,6 +55,7 @@ export default {
         _this: this
       }, res => {
         this.domesticDynamics = res.data.records
+        console.log(res.data.records);
       }, e => {
 
       });
diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
index 3a5c40337..a95f5bfff 100644
--- a/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5.vue
@@ -100,6 +100,12 @@
                                 </div>
                             </template>
                         </el-table-column>
+
+                        <el-table-column
+                                prop="dyhz"
+                                label="回执说明"
+                                align="center">
+                        </el-table-column>
                     </el-table>
                 </div>
                 <el-collapse accordion>
@@ -392,6 +398,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                        console.log(data);
                         this.form.title = data.title || data.form.title
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form

From df0aec16b48b72d6dd4526f29463ec92b5cd1efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 10:54:52 +0800
Subject: [PATCH 03/11] commit

---
 src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue | 4 ----
 src/pages/processCenter/pages/creatProcess/xmpg/step2.vue   | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
index 3d1c61169..3a02b3ed5 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1-2.vue
@@ -71,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index 9d2296c0b..5c67efa1b 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -71,10 +71,6 @@
             width="55"
             align="center">
           </el-table-column>
-          <el-table-column
-            prop="productLine"
-            label="条款号">
-          </el-table-column>
           <el-table-column
             prop="productLine"
             label="产品线">

From 005f7dbf2db9fa212addcd222bcb67f3db85416f Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 16 Sep 2021 10:58:14 +0800
Subject: [PATCH 04/11] commit

---
 src/pages/home1/components/release/index.vue | 149 +++++++++++--------
 1 file changed, 84 insertions(+), 65 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index d61f2b528..8f70a3639 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -2,87 +2,106 @@
 <template>
   <div class="release">
     <ul>
+      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
+        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+        <span class="time">{{item.issueTime }}</span>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-          <div style="height: 18px;">
-            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
-          </div>
+        <div style="height: 18px;">
+          <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+        </div>
       </li>
     </ul>
   </div>
 </template>
 
 <script>
-export default {
-  name: 'Release',
-  components: {},
-  mixins: [],
-  data() {
-    return {
-      putTime: '',
-      standardReleaseList: [],  //标准发布数据
-    }
-  },
-  computed: {},
-  watch: {},
-  mounted() {
-    this.getDate()
-    this.getAdvice()
-    this.addDate()
-  },
-  methods: {
-    // 点击查看
-    handlePreview (item) {
-      let routeUrl = this.$router.resolve({
-        name: 'OtherStandardDetails',
-        params: {
-          id: item.id,
-          pageType: item.standType + '_STAND'
+  export default {
+    name: 'Release',
+    components: {},
+    mixins: [],
+    data() {
+      return {
+        putTime: '',
+        standardReleaseList: [],  //标准发布数据
+        updateTime:""
+      }
+    },
+    computed: {},
+    watch: {},
+    mounted() {
+      this.getDate()
+      this.getAdvice()
+      this.addDate()
+    },
+    methods: {
+      //获取当前年月日
+      addDate(){
+        const nowDate = new Date();
+        const date = {
+          year: nowDate.getFullYear(),
+          month: nowDate.getMonth() + 1,
+          date: nowDate.getDate(),
         }
-      })
-      window.open(routeUrl.href, '_blank')
-    },
-    //截取时间
-    getDate (date) {
-      return date != null ? date.substring(0, date.indexOf(' ')) : ''
-    },
-    //获取数据
-    getAdvice() {
-      let obj = {}
-      obj.limit = 8
-      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-        _this: this
-      }, res => {
-        let arr = res.data
-        arr.forEach(item => {
-          if(item.standName !== ""){
-            this.standardReleaseList.push(item)
+        const newmonth = date.month>10?date.month:'0'+date.month
+        const day = date.date>10?date.date:'0'+date.date
+        this.updateTime = date.year + '-' + newmonth + '-' + day
+        console.log("当前时间"+this.updateTime)
+      },
+      // 点击查看
+      handlePreview (item) {
+        let routeUrl = this.$router.resolve({
+          name: 'OtherStandardDetails',
+          params: {
+            id: item.id,
+            pageType: item.standType + '_STAND'
           }
         })
-      }, e => {
-      })
+        window.open(routeUrl.href, '_blank')
+      },
+      //截取时间
+      getDate (date) {
+        return date != null ? date.substring(0, date.indexOf(' ')) : ''
+      },
+      //获取数据
+      getAdvice() {
+        let obj = {}
+        obj.limit = 8
+        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+          _this: this
+        }, res => {
+          this.standardReleaseList = res.data
+          let arr = res.data
+          arr.forEach(item => {
+            if(item.standName !== ""){
+              this.standardReleaseList.push(item)
+            }
+          })
+        }, e => {
+        })
+      },
     },
-  },
 
-}
+  }
 </script>
 
 <style lang="less" scoped>
-.release {
-  .time-title {
-    margin: 15px;
-    .time {
-      float: right;
-      color:#FFFFFF;
-    }
-    a {
-      color: #ffffff;
-      &:hover {
-        color: #e9c851;
-        cursor:pointer;
-        text-decoration: underline;
+  .release {
+    .time-title {
+      margin: 15px;
+      .time {
+        float: right;
+        color:#FFFFFF;
+      }
+      a {
+        color: #ffffff;
+        &:hover {
+          color: #e9c851;
+          cursor:pointer;
+          text-decoration: underline;
+        }
       }
     }
   }
-}
 </style>
+

From 9f65c3803bd6c2e1122018bf92b7de88f6f624f1 Mon Sep 17 00:00:00 2001
From: "Mr.Z" <709235321@qq.com>
Date: Thu, 16 Sep 2021 11:02:07 +0800
Subject: [PATCH 05/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=A2=84=E8=AD=A6?=
 =?UTF-8?q?=E6=A0=87=E5=87=86=E7=BC=96=E5=8F=B7bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/localTool/standardWarning.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue
index 6a371a151..85c93ef7a 100644
--- a/src/pages/localTool/standardWarning.vue
+++ b/src/pages/localTool/standardWarning.vue
@@ -109,7 +109,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -172,7 +172,7 @@
                 </el-table-column>
                 <el-table-column label="标准类型" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -237,7 +237,7 @@
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                   </template>
                 </el-table-column>
                 <el-table-column prop="dutyEngineer" label="标准责任工程师" align="center">
@@ -301,7 +301,7 @@
                 </el-table-column>
                 <el-table-column prop="mark" label="标准分类" align="center">
                   <template slot-scope="scope">
-                    <div>{{ scope.row.standCode.slice(0, 3) }}</div>
+                    <div>{{ scope.row.standCode.split(' ')[0] }}</div>
                     <!--                        <a @click="showStandDetails(scope.row)">{{ scope.row.mark }}</a>-->
                   </template>
                 </el-table-column>

From a66b4ef40fc4813003a442841bc6fea48ad942e4 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 16 Sep 2021 11:02:55 +0800
Subject: [PATCH 06/11] commit

---
 src/pages/home1/components/release/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 8f70a3639..872f0da42 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -2,9 +2,6 @@
 <template>
   <div class="release">
     <ul>
-      <li v-for="item in standardReleaseList" :key="item.id" class="time-title" v-if="updateTime>=item.issueTime">
-        <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-        <span class="time">{{item.issueTime }}</span>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
         <div style="height: 18px;">
           <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>

From 76d0dbda65988cf3605a9709cbb28c0d5211adad Mon Sep 17 00:00:00 2001
From: shenyanpei <shenyanpei>
Date: Thu, 16 Sep 2021 11:15:17 +0800
Subject: [PATCH 07/11] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E5=BD=A2?=
 =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EnterpriseStandardDatabase.vue                   | 1 +
 .../foreignStandardsAndRegulations/index.vue                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
index bf92cb8d4..6d304d8dd 100644
--- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
+++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue
@@ -4157,6 +4157,7 @@ export default {
         .el-card{
           min-width: min-content;
         }
+        height: 95%;
         width: 95%;
         position: absolute;
         left: 0;
diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
index c156c9622..a29c0a152 100644
--- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
+++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue
@@ -4736,7 +4736,7 @@ export default {
       .el-card {
         min-width: min-content;
       }
-
+      height: 95%;
       width: calc(~'100% - 15px');
       position: absolute;
       left: 0;

From 053c6d50b42473d386e5d4d60f6969d82961ac79 Mon Sep 17 00:00:00 2001
From: super_liu <396572590@qq.com>
Date: Thu, 16 Sep 2021 15:07:32 +0800
Subject: [PATCH 08/11] feat: There is no way the router beforeEach

---
 src/api/process.js |  8 ++++++
 src/main.js        | 63 +++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/src/api/process.js b/src/api/process.js
index d14dbba20..c6bbdfcaf 100644
--- a/src/api/process.js
+++ b/src/api/process.js
@@ -415,6 +415,14 @@ export function isEnd (data) {
   })
 }
 
+export function get_verify_by_instance (data) {
+  return axios({
+    url: '/api/lawss/activiti/get_verify_by_instance',
+    method: 'get',
+    params: data
+  })
+}
+
 // 流程委托接口
 export function changeAssigneeNew (data) {
   return axios({
diff --git a/src/main.js b/src/main.js
index 98e9de1ae..0fcaa19db 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,7 +4,6 @@ require('es6-promise').polyfill();
 require('es6-promise/auto');
 import Vue from 'vue'
 import App from './App'
-import router from './router'
 import ElementUI from 'element-ui'
 import 'element-ui/lib/theme-chalk/index.css'
 // jQuery
@@ -42,6 +41,68 @@ import Contextmenu from 'vue-contextmenujs'
 
 import animate from 'animate.css'
 
+// 引入路由器
+import router from './router'
+// 路由解析器
+import Re from 'path-to-regexp'
+
+import { get_verify_by_instance } from 'api/process'
+
+
+// 路由拦截
+router.beforeEach(function (to, from, next) {
+  let path = to.path;
+  console.log("auth : to =>", to);
+  console.log("auth : path =>" + path);
+  let taskId = to.query.taskIds;
+  let prcId = to.query.prcId;
+  let prcNum = to.query.prcNum;
+  let prcName = to.query.prcName;
+  let prcType = to.query.prcType;
+  if(taskId !== undefined && taskId !== null && prcId !== undefined && prcId !== null){
+    get_verify_by_instance({
+      taskId: taskId, // 任务id
+      pId: prcId // 流程实例
+    }).then(res => {
+      if(res && res > 0){
+        let param = "?taskIds="+taskId+"&prcId="+prcId
+        +"&prcNum="+prcNum+"&prcName="+prcName+"&prcType="+prcType;
+        // 根据type判断跳转具体流程页面
+        if (prcType === '1') {
+          // 标准入库流程数据
+          next({path:"bzrkStep5"+param})
+        }else if(prcType === '4'){
+          //标准清单发布流程数据
+          next({path:"bzqdfbStep1-4"+param})
+        }else if (prcType === '5'){
+          //标准项目合规评估 标准维度
+          next({path:"xmpgStep1-2"+param})
+        }else if(prcType === '6'){
+          //标准项目合规评估 项目维度
+          next({path:"xmpg2Step1-2"+param})
+        } else if (prcType === '8') {
+          // 未符合项整改
+          next({path:"wfhxzgStep5-1"+param})
+        } else if(prcType === '9'){
+          next({path:"bzjdStep1-6"+param})
+          //标准调研流程
+        }else if(prcType === '2'){
+          next({path:"bzdyStep1-9"+param})
+        }else if(prcType === '3'){
+          //标准征求意见
+          next({path:"bzzqyjStep1-9"+param})
+        }else if(prcType === '10'){
+          //项目清单确认
+          next({path:"xmqdqrStep1-2"+param})
+        }
+      }
+      console.log("res : res =>", res);
+    })
+  }
+  next()
+})
+
+
 Vue.config.productionTip = false
 // jquery
 Vue.prototype.$ = $

From cb816f003210644cff393bbace03af0664776b64 Mon Sep 17 00:00:00 2001
From: zhutianqi <ztq_qi@sina.com>
Date: Thu, 16 Sep 2021 15:47:36 +0800
Subject: [PATCH 09/11] commit

---
 src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue | 1 +
 src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue | 1 +
 7 files changed, 7 insertions(+)

diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
index 2978a6953..57e94c939 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue
@@ -94,6 +94,7 @@
                     <el-table-column
                             prop="chapterNumber"
                             align="center"
+                            sortable
                             label="章条编号"
                             width="170px">
                         <template slot-scope="scope">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
index 88a1ca485..de93015bb 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue
@@ -76,6 +76,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
index 237efc785..ccc396254 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue
@@ -76,6 +76,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
index 2a6b4bf0b..1f9d8477a 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue
@@ -88,6 +88,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
index 9548f9b50..54be7acc5 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue
@@ -89,6 +89,7 @@
             prop="chapterNumber"
             align="center"
             label="章条编号"
+            sortable
             width="170px">
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
index 7ad799adc..cb709789e 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue
@@ -87,6 +87,7 @@
           </el-table-column>
           <el-table-column
             prop="chapterNumber"
+            sortable
             align="center"
             label="章条编号"
             width="170px">
diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
index ad6a58fe2..0c6246efe 100644
--- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue
@@ -88,6 +88,7 @@
           <el-table-column
             prop="chapterNumber"
             align="center"
+            sortable
             label="章条编号"
             width="170px">
           </el-table-column>

From c529e1b77fc89b6eb5fa4a997697b51f901cda06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 16:17:15 +0800
Subject: [PATCH 10/11] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/home1/components/release/index.vue  | 146 ++++++++----------
 .../components/solicitopinions/index.vue      |   2 +-
 2 files changed, 66 insertions(+), 82 deletions(-)

diff --git a/src/pages/home1/components/release/index.vue b/src/pages/home1/components/release/index.vue
index 872f0da42..3fe4a1059 100644
--- a/src/pages/home1/components/release/index.vue
+++ b/src/pages/home1/components/release/index.vue
@@ -3,102 +3,86 @@
   <div class="release">
     <ul>
       <li v-for="item in standardReleaseList" :key="item.id" class="time-title" >
-        <div style="height: 18px;">
-          <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
-          <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
-        </div>
+          <div style="height: 18px;">
+            <a @click="handlePreview(item)" class="table-jump">{{ item.standName }}</a>
+              <span class="time">{{item.issueTime ? $moment(item.issueTime).format('YYYY-MM-DD') : '' }}</span>
+          </div>
       </li>
     </ul>
   </div>
 </template>
 
 <script>
-  export default {
-    name: 'Release',
-    components: {},
-    mixins: [],
-    data() {
-      return {
-        putTime: '',
-        standardReleaseList: [],  //标准发布数据
-        updateTime:""
-      }
-    },
-    computed: {},
-    watch: {},
-    mounted() {
-      this.getDate()
-      this.getAdvice()
-      this.addDate()
-    },
-    methods: {
-      //获取当前年月日
-      addDate(){
-        const nowDate = new Date();
-        const date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1,
-          date: nowDate.getDate(),
+export default {
+  name: 'Release',
+  components: {},
+  mixins: [],
+  data() {
+    return {
+      putTime: '',
+      standardReleaseList: [],  //标准发布数据
+    }
+  },
+  computed: {},
+  watch: {},
+  mounted() {
+    this.getDate()
+    this.getAdvice()
+    this.addDate()
+  },
+  methods: {
+    // 点击查看
+    handlePreview (item) {
+      let routeUrl = this.$router.resolve({
+        name: 'OtherStandardDetails',
+        params: {
+          id: item.id,
+          pageType: item.standType + '_STAND'
         }
-        const newmonth = date.month>10?date.month:'0'+date.month
-        const day = date.date>10?date.date:'0'+date.date
-        this.updateTime = date.year + '-' + newmonth + '-' + day
-        console.log("当前时间"+this.updateTime)
-      },
-      // 点击查看
-      handlePreview (item) {
-        let routeUrl = this.$router.resolve({
-          name: 'OtherStandardDetails',
-          params: {
-            id: item.id,
-            pageType: item.standType + '_STAND'
+      })
+      window.open(routeUrl.href, '_blank')
+    },
+    //截取时间
+    getDate (date) {
+      return date != null ? date.substring(0, date.indexOf(' ')) : ''
+    },
+    //获取数据
+    getAdvice() {
+      let obj = {}
+      obj.limit = 10
+      this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
+        _this: this
+      }, res => {
+        let arr = res.data
+        arr.forEach(item => {
+          if(item.standName !== ""){
+            this.standardReleaseList.push(item)
           }
         })
-        window.open(routeUrl.href, '_blank')
-      },
-      //截取时间
-      getDate (date) {
-        return date != null ? date.substring(0, date.indexOf(' ')) : ''
-      },
-      //获取数据
-      getAdvice() {
-        let obj = {}
-        obj.limit = 8
-        this.$http.get('sarStandardsInfo/sar-standards-info/getStandInfoByList', obj, {
-          _this: this
-        }, res => {
-          this.standardReleaseList = res.data
-          let arr = res.data
-          arr.forEach(item => {
-            if(item.standName !== ""){
-              this.standardReleaseList.push(item)
-            }
-          })
-        }, e => {
-        })
-      },
+      }, e => {
+      })
     },
+  },
 
-  }
+}
 </script>
 
 <style lang="less" scoped>
-  .release {
-    .time-title {
-      margin: 15px;
-      .time {
-        float: right;
-        color:#FFFFFF;
-      }
-      a {
-        color: #ffffff;
-        &:hover {
-          color: #e9c851;
-          cursor:pointer;
-          text-decoration: underline;
-        }
+.release {
+  .time-title {
+    margin: 15px;
+    .time {
+      float: right;
+      color:#FFFFFF;
+    }
+    a {
+      color: #ffffff;
+      &:hover {
+        color: #e9c851;
+        cursor:pointer;
+        text-decoration: underline;
       }
     }
   }
+}
 </style>
-
diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 675997379..689255518 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -40,7 +40,7 @@ export default {
     getAdvice() {
       this.$http.get("slrs/sar-public-idea/SelectAllPage", {
         page: 1,
-        size: 1000
+        size: 10
       }, {
         _this: this
       }, res => {

From 1e1c7eee89aeeedd9bb084ddf5808b8dd8b2f502 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 16 Sep 2021 16:51:05 +0800
Subject: [PATCH 11/11] =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home1/components/solicitopinions/index.vue |  9 ++-------
 .../standardForComments/index.vue              |  4 ++--
 .../pags/consultationDetails.vue               | 18 +++++++++---------
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/pages/home1/components/solicitopinions/index.vue b/src/pages/home1/components/solicitopinions/index.vue
index 689255518..3bed9ea18 100644
--- a/src/pages/home1/components/solicitopinions/index.vue
+++ b/src/pages/home1/components/solicitopinions/index.vue
@@ -4,7 +4,7 @@
     <ul>
       <li v-for="item in domesticDynamics" :key="item.id" class="time-title">
         <div style="height: 18px">
-          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cname }}</a>
+          <a class="title" :title="item.cname" @click="standForComments(item)">{{ item.cid }}</a>
           <span class="time">{{ item.endTime }}</span>
         </div>
       </li>
@@ -44,12 +44,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        let arr = res.data.records;
-        arr.forEach(item => {
-          if (item.cname !== "") {
-            this.domesticDynamics.push(item);
-          }
-        });
+        this.domesticDynamics = res.data.records
       }, e => {
 
       });
diff --git a/src/pages/regulatoryRepository/standardForComments/index.vue b/src/pages/regulatoryRepository/standardForComments/index.vue
index 66500fdb5..cc2d4744b 100644
--- a/src/pages/regulatoryRepository/standardForComments/index.vue
+++ b/src/pages/regulatoryRepository/standardForComments/index.vue
@@ -74,11 +74,11 @@
               </template>
             </el-table-column>
             <el-table-column
-              prop="cname"
+              prop="cid"
               label="标准名称/政策名称"
               align="center">
               <template slot-scope="scope">
-                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cname }}</a>
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.cid }}</a>
               </template>
             </el-table-column>
             <el-table-column
diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
index 9f421b5d9..0118fab41 100644
--- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
+++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue
@@ -10,21 +10,21 @@
     <transition name="el-zoom-in-top">
       <div v-show="heightShow" class="transition-box">
         <p class="transition-box-p">
-          <label class="transition-box-label">标准号：</label>
+          <label class="transition-box-label">标准名称：</label>
           <span class="transition-box-span table-jump"
                 @click="handlePreview(itemData)"
           >
                       {{ this.$route.query.item.cid }}
                     </span>
         </p>
-        <p class="transition-box-p">
-          <label class="transition-box-label">标准名称：</label>
-          <span class="transition-box-span table-jump"
-                @click="handlePreview(itemData)"
-          >
-                      {{ this.$route.query.item.cname || '-' }}
-                    </span>
-        </p>
+<!--        <p class="transition-box-p">-->
+<!--          <label class="transition-box-label">标准名称：</label>-->
+<!--          <span class="transition-box-span table-jump"-->
+<!--                @click="handlePreview(itemData)"-->
+<!--          >-->
+<!--                      {{ this.$route.query.item.cname || '-' }}-->
+<!--                    </span>-->
+<!--        </p>-->
         <p class="transition-box-p">
           <label class="transition-box-label">附件：</label>
           <span class="file-box" v-if="fileInfoList.length > 0">