对接法规月报

jero-web/src/common/lang/en-us.js

@@ -1000,6 +1000,7 @@ module.exports = {
   relevantSections: 'Relevant sections',
   questionsSuggestions: 'Questions or Suggestions',
   reason: 'Reason',
+  proposedTime:'Proposed time',
   feedbackPoint: 'Feedback point',
   link: 'Link',
   planNoChinese: 'Plan No.',

jero-web/src/common/lang/zh-cn.js

@@ -1005,12 +1005,13 @@ module.exports = {
   relevantSections:'相关章节',
   questionsSuggestions:'问题/建议',
   link: '链接',
-  reason:'附件',
+  reason:'理由',
   planNoChinese:'计划号',
   feedbackPoint:'反馈点',
   standardNameCn:'标准名称中文',
   standardNameEn:'标准名称英文',
   deadlineForComments:'征求意见截止日期',
+  proposedTime:'提出时间',
   standardNo:'标准编号',
   implemenDate:'实施日期',
 //  上报库

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue

@@ -0,0 +1,163 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('evaluationResults')"
+      :maskClosable="false"
+      :width="1080"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible"
+      style="height: 100%;overflow: auto;padding-bottom: 53px;">
+      <div class="table-operator-right">
+        <div @click="handleExport" class="operator-text">
+          <a-icon type="export" :rotate="-90"/>
+          {{$t('export')}}
+        </div>
+      </div>
+      <a-table
+        ref="table"
+        size="middle"
+        :loading="loading"
+        :pagination="false"
+        :scroll="{x: '100%'}"
+        :data-source="dataSource"
+        :columns="columns"
+      >
+      </a-table>
+      <div>
+        <span>对外意见归档:</span>
+      </div>
+      <div class="drawer-bootom-button">
+        <a-button @click="handleCancel">{{$t('cancel')}}</a-button>
+      </div>
+    </a-drawer>
+    <uploadFile ref="uploadFile" :isMultiple="true" @uploadSuccess="uploadSuccess"></uploadFile>
+  </div>
+</template>
+
+<script>
+  import uploadFile from '@/components/uploadFile/file'
+  import { getAction, postAction, downloadFile } from '@/api/manage'
+
+  export default {
+    name: 'evaluationResultsList',
+    components: {
+      uploadFile
+    },
+    data() {
+      return {
+        confirmLoading: false,
+        visible: false,
+        loading: false,
+        dataSource: [],
+        columns: [
+          {
+            title: this.$t('relevantSections'),
+            align: 'center',
+            dataIndex: 'relatedSection',
+            width: 180
+          },
+          {
+            title: this.$t('questionsSuggestions'),
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            dataIndex: 'issueOrSuggest'
+          },
+          {
+            title: this.$t('reason'),
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            dataIndex: 'reason'
+          },
+          {
+            title: this.$t('enclosure'),
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            dataIndex: 'accessoryFile'
+          },
+          {
+            title: this.$t('Assessor'),
+            align: 'center',
+            width: 100,
+            ellipsis: true,
+            dataIndex: 'createBy'
+          },
+          {
+            title: this.$t('proposedTime'),
+            align: 'center',
+            width: 150,
+            ellipsis: true,
+            dataIndex: 'submitTime'
+          }
+        ]
+      }
+    },
+    mounted() {
+
+    },
+    methods: {
+      clickButtonToUpload(item) {
+        this.$refs.uploadFile.perentHandleFunc()
+        this.$refs.uploadFile.visible = true
+        this.uploadName = item
+        getAction('sys/common/getFileInfos', { id: this.formInline[item] }).then((res) => {
+          if (res.success) {
+            this.$refs.uploadFile.perentHandleFunc(res.result)
+          } else {
+            this.$refs.uploadFile.perentHandleFunc()
+          }
+        })
+      },
+      /** 上传文件的回调 */
+      uploadSuccess(data) {
+        let attIdList = []
+        if (data && data.length > 0) {
+          data.map(item => {
+            attIdList.push(item.id || data.name)
+          })
+        }
+        /** 赋值给当前对应的表单文件 */
+        this.formInline[this.uploadName] = attIdList.join(',')
+        this.formInline = { ...this.formInline }
+      },
+      //导出
+      handleExport() {
+        let query = {
+          dummyInventoryBaseId: this.$route.query.id
+        }
+        downloadFile(this.url.exportData, this.$route.query.name + this.$t('VirtualList') + '.zip', query, this.Deselect)
+      },
+      getData(row) {
+        this.visible = true
+      },
+      handleCancel() {
+        this.visible = false
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    z-index: 100;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .table-operator-right {
+    text-align: right;
+    margin-bottom: 16px;
+  }
+</style>

jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue

@@ -182,24 +182,18 @@
             dataIndex: 'technology_territory'
           },
           {
-            title: this.$t('vehicleInProductionDate'),
+            title: this.$t('correspondingStandard'),
             align: 'center',
             ellipsis: true,
-            width: 210,
+            width: 170,
-            dataIndex: 'implement_time'
+            dataIndex: 'technology_territory'
           },
-          {
-            title: this.$t('ImplementationDate'),
-            align: 'center',
-            ellipsis: true,
-            width: 210,
-            dataIndex: 'xin1_che1_xing2_shi2_shi1_ri4_qi1'
-          }
         ]
       }
     },
     mounted() {
       document.title = this.$t('regulatoryEngineer') + this.$t('initiatingProcess')
+      this.getList()
     },
     methods: {
       pageOnChange(page) {
@@ -216,6 +210,9 @@
       },
       onSelectChange(value) {
         this.selectedRowKeys = value
+        if (this.selectedRowKeys.length > 1) {
+          this.selectedRowKeys.unshift()
+        }
       },
       clickButtonToUpload(item) {
         this.$refs.uploadFile.perentHandleFunc()

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>

jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue

@@ -43,7 +43,10 @@
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
         :columns="columns"
       >
-          <span slot="operation" slot-scope="text,record">
+          <span slot="language" slot-scope="text,record">
+                <span>{{text == 1?$t('chinese'):$t('English')}}</span>
+          </span>
+        <span slot="operation" slot-scope="text,record">
            <a class="text-operation"
               @click="withdraw(record)">
              {{record.issueStatus == 2 ? $t('release') : $t('withdraw')}}
@@ -107,20 +110,14 @@
             dataIndex: 'language',
             width: 170,
             ellipsis: true,
-            customRender: function(t, r, index) {
+            scopedSlots: { customRender: 'language' }
-              if (t == 1) {
-                return this.$t('chinese')
-              } else {
-                return this.$t('English')
-              }
-            }
           },
           {
             title: this.$t('releaseStatus'),
             align: 'center',
             width: 140,
             ellipsis: true,
-            dataIndex: 'issueStatus'
+            dataIndex: 'issueStatus_dictText'
           },
           {
             title: this.$t('uploadTime'),