对接法规月报

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue

@@ -27,7 +27,7 @@
                 <span>{{$t('technicalField')}}</span>
               </div>
               <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('technicalField')"
-                       v-model="queryParam.technicalField"></j-input>
+                       v-model="queryParam.technologyTerritory"></j-input>
             </div>
           </a-col>
           <template v-if="toggleSearchStatus">
@@ -37,7 +37,7 @@
                   <span>{{$t('collectResults')}}</span>
                 </div>
                 <j-input class="box-input" :placeholder="$t('PleaseEnter')+$t('collectResults')"
-                         v-model="queryParam.collectResults"></j-input>
+                         v-model="queryParam.gatherResult"></j-input>
               </div>
             </a-col>
           </template>
@@ -89,12 +89,18 @@
         />
       </div>
     </div>
+    <evaluationResultsList ref="evaluationResultsListRef"/>
   </a-card>
 </template>
 
 <script>
+  import evaluationResultsList from './components/evaluationResultsList'
+
   export default {
     name: 'index',
+    components: {
+      evaluationResultsList
+    },
     data() {
       return {
         //url传参严格按照当前命名
@@ -103,7 +109,7 @@
         },
         loading: false,
         toggleSearchStatus: false,
-        dataSource: [],
+        dataSource: [{}],
         selectedRowKeys: [],
         total: 0,
         pageSize: 10,
@@ -127,34 +133,34 @@
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'technology_territory'
+            dataIndex: 'technologyTerritory'
           },
           {
             title: this.$t('collectResults'),
             align: 'center',
             width: 170,
             ellipsis: true,
-            dataIndex: 'collectResults'
+            dataIndex: 'gatherResult'
           },
           {
             title: this.$t('dateOfInitiation'),
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'dateOfInitiation'
+            dataIndex: 'startTime'
           },
           {
             title: this.$t('closingDate'),
             align: 'center',
             ellipsis: true,
             width: 170,
-            dataIndex: 'closingDate'
+            dataIndex: 'endTime'
           },
           {
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 180,
+            width: 260,
             scopedSlots: { customRender: 'operation' }
           }
         ]
@@ -191,19 +197,19 @@
         this.selectedRowKeys = value
       },
       initiatingProcessClick() {
-        // let newUrl = this.$router.resolve({
-        //   path: '/regulatoryInitiatingProcess'
-        // })
         let newUrl = this.$router.resolve({
-          path: '/regulatoryProcessReview'
+          path: '/regulatoryInitiatingProcess'
         })
+        // let newUrl = this.$router.resolve({
+        //   path: '/regulatoryProcessReview'
+        // })
         window.open(newUrl.href, '_blank')
       },
       viewProcessClick() {
 
       },
-      evaluationResultsClick() {
-
+      evaluationResultsClick(row) {
+        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
       }
     }
   }
@@ -250,4 +256,7 @@
     /*margin-top: 2px;*/
   }
 
+  .text-operation {
+    margin-right: 8px;
+  }
 </style>