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

src/pages/details/consultationDetails/index.vue

@@ -0,0 +1,15 @@
+<template>
+<div>
+  征求意见详情
+</div>
+</template>
+
+<script>
+export default {
+  name: "consultationDetails"
+};
+</script>
+
+<style scoped>
+
+</style>

src/pages/details/otherStandardDetails/index.vue

@@ -5,6 +5,9 @@
     <div class="details-header">
       <span>{{sarStandardsInfoEO.standSortShow || ''}} {{sarStandardsInfoEO.standNumber}}-{{sarStandardsInfoEO.standYear}} 《{{sarStandardsInfoEO.standName}}》 标准详情</span>
     </div>
+    <div class="details-fraction">
+      <span>9.5分</span>
+    </div>
     <!--主体内容-->
     <div class="details-content">
       <div class="details-content-modular basic-information">
@@ -2795,6 +2798,7 @@ export default {
           & > p{
             min-height: 55px;
             line-height: 55px;
+            border-bottom: 1px solid #E5E5E5;
           }
         }
       }
@@ -2812,6 +2816,18 @@ export default {
         width: 100%;
       }
     }
+    .details-fraction{
+      float: right;
+      width:270px;
+      height:80px;
+      line-height: 80px;
+      text-align: center;
+      font-size: 30px;
+      font-weight: bold;
+      color: #e88218;
+      margin-top: -80px;
+      background: #E5E5E5;
+    }
     /deep/.details-content{
       /*padding: 0 67px;*/
       .details-content-modular{
@@ -3007,7 +3023,6 @@ export default {
       }
       .basic-information{
         border-top: 2px dashed #D1D1D1;
-        border-bottom: 2px dashed #D1D1D1;
         .modular-header{
           height: 60px;
           border-bottom: none;
@@ -3016,6 +3031,7 @@ export default {
           & > p{
             min-height: 55px;
             line-height: 55px;
+            border-bottom: 1px solid #E5E5E5;
           }
         }
       }

src/pages/regulatoryRepository/standardForComments/index.vue

@@ -1,5 +1,5 @@
 <comment>
-# 标准对比
+# 标准征求意见
 </comment>
 <template>
   <div class="standardForComments">
@@ -15,10 +15,12 @@
               <el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
             </el-formItem>
             <el-formItem label="开始日期" class="search-item">
-              <el-input v-model="newNumOrName" class="s-c-input" placeholder="" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
+              <el-datePicker v-model="newNumOrName1" :editable="false"
+                             placeholder="请选择开始日期"></el-datePicker>
             </el-formItem>
             <el-formItem label="结束日期" class="search-item">
-              <el-input v-model="newNumOrName" class="s-c-input" placeholder="请输入关键字" clearable :maxlength="100" @keyup.enter.native="sarStandCompareHis()"></el-input>
+              <el-datePicker v-model="newNumOrName2" :editable="false"
+                             placeholder="请选择结束日期"></el-datePicker>
             </el-formItem>
             <el-formItem class="search-item btn-box">
               <el-button
@@ -64,6 +66,9 @@
               prop="oldStandName"
               label="标准名称/政策名称"
               align="center">
+              <template slot-scope="scope">
+                <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.oldStandName }}</a>
+              </template>
             </el-table-column>
             <el-table-column
               prop="createTime"
@@ -119,6 +124,8 @@ export default {
       standCommonlySearch: {},
       oldNumOrName: '',
       newNumOrName: '',
+      newNumOrName1: '',
+      newNumOrName2: '',
       standInfoList: [],
       tableHeight: null,
       total: 0,
@@ -266,39 +273,49 @@ export default {
       this.drawerModal = false
       this.$refs.drawerModalTree.treeReload()
     },
-    // 查看
+    // 点击查看
-    handlePreview (params) {
+    handlePreview (item) {
-      if (params.compareType === '条款比对') {
+       let routeUrl = this.$router.resolve({
-        this.$store.commit('setDetailMap', this.$route.path)
+         name: 'consultationDetails',
-        this.$router.push({
+         params: {
-          name: 'SeeDatalis',
+           id: item.id,
-          query: {
+           pageType: 'INLAND_STAND'
-            row: JSON.stringify(params)
+         }
-          }
+       })
-        })
+      window.open(routeUrl.href, '_blank')
-      } else {
-        let rowDataLeft = {}
-        let rowDataRight = {}
-        rowDataLeft.showNumber = params.oldStandNum
-        rowDataLeft.standName = params.oldStandName
-        rowDataLeft.standNameSplit = null
-        rowDataLeft.standNumSplit = null
-        rowDataRight.showNumber = params.newStandNum
-        rowDataRight.standName = params.newStandName
-        rowDataRight.standNameSplit = null
-        rowDataRight.standNumSplit = null
-        this.$store.commit('setDetailMap', this.$route.path)
-        this.$router.push({
-          name: 'TextComparison',
-          query: {
-            id: params.id,
-            flag: '查看',
-            rowDataLeft: JSON.stringify(rowDataLeft),
-            rowDataRight: JSON.stringify(rowDataRight)
-          }
-        })
-      }
     },
+    // handlePreview (params) {
+    //   if (params.compareType === '条款比对') {
+    //     this.$store.commit('setDetailMap', this.$route.path)
+    //     this.$router.push({
+    //       name: 'SeeDatalis',
+    //       query: {
+    //         row: JSON.stringify(params)
+    //       }
+    //     })
+    //   } else {
+    //     let rowDataLeft = {}
+    //     let rowDataRight = {}
+    //     rowDataLeft.showNumber = params.oldStandNum
+    //     rowDataLeft.standName = params.oldStandName
+    //     rowDataLeft.standNameSplit = null
+    //     rowDataLeft.standNumSplit = null
+    //     rowDataRight.showNumber = params.newStandNum
+    //     rowDataRight.standName = params.newStandName
+    //     rowDataRight.standNameSplit = null
+    //     rowDataRight.standNumSplit = null
+    //     this.$store.commit('setDetailMap', this.$route.path)
+    //     this.$router.push({
+    //       name: 'TextComparison',
+    //       query: {
+    //         id: params.id,
+    //         flag: '查看',
+    //         rowDataLeft: JSON.stringify(rowDataLeft),
+    //         rowDataRight: JSON.stringify(rowDataRight)
+    //       }
+    //     })
+    //   }
+    // },
     // 删除
     delFileEditInfo (id) {
       this.$confirm('是否删除?', '提示', {

src/router/index.js

@@ -2397,6 +2397,18 @@ const routes = [
           menuId: 'SSA6WR4HV8'
         }
       },
+      {
+        path: '/consultationDetails/:id/:pageType',
+        name: 'consultationDetails',
+        component: () =>
+          import('@/pages/details/consultationDetails/index'),
+        meta: {
+          requireAuth: true,
+          title: '征求意见详情',
+          isBoolean: true,
+          menuId: ''
+        }
+      },
       {
         path: '/standInvolveProjectTwo',
         name: 'standInvolveProjectTwo',