Merge branch 'develop' into 'test'

Develop

See merge request LAWS/laws-system-front-FOTON!146

src/pages/home1/components/release/index.vue

@@ -21,7 +21,6 @@
     return {
       putTime: '',
       standardReleaseList: [],  //标准发布数据
-        updateTime:""
     }
   },
   computed: {},
@@ -32,19 +31,6 @@
     this.addDate()
   },
   methods: {
-      //获取当前年月日
-      addDate(){
-        const nowDate = new Date();
-        const date = {
-          year: nowDate.getFullYear(),
-          month: nowDate.getMonth() + 1,
-          date: nowDate.getDate(),
-        }
-        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({
@@ -63,11 +49,10 @@
     //获取数据
     getAdvice() {
       let obj = {}
-        obj.limit = 8
+      obj.limit = 10
       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 !== ""){
@@ -101,4 +86,3 @@
   }
 }
 </style>
-

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 => {

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">

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>

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>

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>

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

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">

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>