From 87cab0fa11280d603dd7c2dff3d5c49c61204b09 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 14 Jul 2022 15:56:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=B3=95=E8=A7=84=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/evaluationResultsList.vue      |  1 +
 .../RegulationMonthlyManagement.vue           |  6 +-
 .../components/monthlyReportRegulations.vue   | 97 +++++++++++++------
 .../components/feedbackInformation.vue        |  7 ++
 .../processForm/regulatoryProcess/index.vue   | 16 +--
 5 files changed, 91 insertions(+), 36 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
index 61b515122..60fa6094d 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList.vue
@@ -92,6 +92,7 @@
             title: this.$t('relevantSections'),
             align: 'center',
             dataIndex: 'relatedSection',
+            ellipsis: true,
             width: 180
           },
           {
diff --git a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
index 171c1e423..b10d4c466 100644
--- a/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
+++ b/jero-web/src/views/businessSupport/regulationReport/components/RegulationMonthlyManagement.vue
@@ -220,7 +220,11 @@
           let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
           window.open(url, '_blank')
         } else {
-          this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
         }
       },
       download(item) {
diff --git a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
index 5f005c4e8..b70c93ce8 100644
--- a/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
+++ b/jero-web/src/views/dashboard/components/monthlyReportRegulations.vue
@@ -2,60 +2,98 @@
   <div class="monthlyReportRegulations-box">
     <div class="header-text">
       <div class="header-text-left">{{this.$t('monthlyReportRegulations')}}</div>
-      <div class="header-text-right">
+      <div class="header-text-right" @click="moreClick">
         More
         <img src="../../../assets/gengduo.png" alt="">
       </div>
     </div>
-    <div class="monthlyReportRegulations-box-content">
-      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList">
+    <div class="monthlyReportRegulations-box-content" v-if="monthlyReportRegulationsList.length > 0">
+      <div class="monthlyReportRegulations-text" v-for="item in monthlyReportRegulationsList" @click="preview(item)">
         <div class="yuan"></div>
         <div class="text" :title="item.name">{{item.name}}</div>
-        <div class="time">{{item.time}}</div>
+        <div class="time">{{item.createTime}}</div>
       </div>
     </div>
+    <div v-else style="height: 300px;position: relative">
+      <JNoData/>
+    </div>
+    <JLoading :loading="loading">{{$t('dataLoading')}}</JLoading>
   </div>
 </template>
 
 <script>
+  import { getAction, postAction, deleteAction, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64'
+  import { mapGetters } from 'vuex'
+
   export default {
     name: 'monthlyReportRegulations',
     data() {
       return {
-        monthlyReportRegulationsList: [
-          {
-            name: '蔚来汽车法规月报_202201_主页面 CN.docx',
-            time: '2022-01-01 13:24:36'
-          },
-          {
-            name: '蔚来汽车法规月报_202202_主页面 CN.docx',
-            time: '2022-02-01 15:50:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202203_主页面 CN.docx',
-            time: '2022-03-01 13:56:20'
-          },
-          {
-            name: '蔚来汽车法规月报_202204_主页面 CN.docx',
-            time: '2022-04-01 16:24:45'
-          },
-          {
-            name: '蔚来汽车法规月报_202205_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
-          },
-          {
-            name: '蔚来汽车法规月报_202206_主页面 CN.docx',
-            time: '2022-06-01 17:24:06'
+        monthlyReportRegulationsList: [],
+        loading: false,
+        downLoadFileUrl: window._CONFIG['domianPreviewURL'] + '/sys/common/download',
+        url: {
+          list: '/report/lawsMonthlyReportManageEO/page'
+        }
+      }
+    },
+    mounted() {
+      this.getList()
+    },
+    methods: {
+      ...mapGetters(['userInfo']),
+      getList() {
+        let query = {
+          pageNo: 1,
+          pageSize: 6,
+          issueStatus: '1'
+        }
+        this.loading = true
+        getAction(this.url.list, query).then((res) => {
+          if (res.success) {
+            this.monthlyReportRegulationsList = res.result.records || []
+            this.loading = false
+          } else {
+            this.loading = false
           }
-        ]
+        })
+      },
+      moreClick() {
+        this.$router.push({
+          path: '/monthlyRegulationReport'
+        })
+      },
+      preview(item) {
+        let fileName = item.name
+        let index1 = fileName.lastIndexOf('.')
+        let index2 = fileName.length
+        let fileSuffix = fileName.substring(index1, index2)
+        if (fileSuffix === '.pdf') {
+          window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + item.fileId + '&userName=' + this.userInfo().username))
+        } else if (fileSuffix === '.docx') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + item.fileId + fileSuffix)
+          window.open(url, '_blank')
+        } else {
+          if (item.createBy == this.userInfo().username){
+            downloadFile('/sys/common/downLoadFile', item.name, { id: item.fileId, userName: this.userInfo().username })
+          }else{
+            this.$message.warning(this.$t('theDoesNotSupportPreview'))
+          }
+        }
       }
     }
+
   }
 </script>
 
 <style scoped lang="less">
   .monthlyReportRegulations-box {
     width: 100%;
+    position: relative;
 
     .header-text {
       width: 100%;
@@ -73,6 +111,7 @@
         font-weight: 400;
         color: #9B9DA9;
         margin-top: 6px;
+        cursor: pointer;
       }
     }
 
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 31a6c837d..8c7c98df8 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -181,6 +181,13 @@
       deleteData() {
         this.formInline.dataList.pop()
         this.formInline = { ...this.formInline }
+      },
+      submitData(callBack) {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+            callBack && callBack(this.formInline.dataList)
+          }
+        })
       }
     }
   }
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 9d30aecbb..29935870b 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -142,13 +142,13 @@
           res.lawsOpinionGatherId = this.queryProject.id
           res.actiProcInstId = this.$route.query.prcId
         })
-        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList:list }).then((res) => {
+        postAction('/lawsOpinionGather/lawsOpinionAssessmentResultEO/insertBatch', { dataList: list }).then((res) => {
           if (res.success) {
             if (num == 1) {
               this.$message.success(this.$t('OperationSuccessful'))
-              this.$router.push({
-                path: '/collectionOfRegulatoryOpinions'
-              })
+              // this.$router.push({
+              //   path: '/collectionOfRegulatoryOpinions'
+              // })
               this.loading = false
             } else {
               this.completeTask()
@@ -162,8 +162,12 @@
         })
       },
       submit() {
-        let dataList = this.$refs.feedbackInformationRef.formInline.dataList
-        this.insertBatch(dataList, 2)
+        this.$refs.feedbackInformationRef.submitData((res) => {
+          this.loading = true
+          this.insertBatch(res, 2)
+        })
+        // let dataList = this.$refs.feedbackInformationRef.formInline.dataList
+        // this.insertBatch(dataList, 2)
       },
       completeTask() {
         let query = {