1.修改三期优化点

jero-web/src/components/layouts/TabLayout.vue

@@ -98,6 +98,7 @@
           this.$route.path == '/problemKnowledgeBaseRelease' ||
           this.$route.path == '/problemKnowledgeBaseView' ||
           this.$route.path == '/regulatoryInitiatingProcess' ||
+          this.$route.path == '/regulatoryEvaluationResults' ||
           this.$route.path == '/regulatoryProcessReview' ||
           this.$route.path == '/handshakeProcess' ||
           this.$route.path == '/projectStatusAndProgress' ||

jero-web/src/config/router.config.js

@@ -342,6 +342,11 @@ export const constantRouterMap = [
     name: 'initiatingProcess',
     component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess')
   },
+  {
+    path: '/regulatoryEvaluationResults',
+    name: 'evaluationResultsList',
+    component: () => import(/* webpackChunkName: "user" */ '@/views/businessSupport/collectionOfRegulatoryOpinions/components/evaluationResultsList')
+  },
   {
     path: '/evaluationInitiationProcess',
     name: 'evaluationInitiationProcess',

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

@@ -1,64 +1,65 @@
 <template>
-  <div>
+  <div class="doc-detail">
-    <a-drawer
+    <div class="doc-detail-wrap">
-      :title="$t('evaluationResults')"
+      <div class="doc-detail-header" style="position: fixed;top: 0">
-      :maskClosable="false"
+        <div class="doc-detail-title">
-      :width="1080"
+          <!--          <span style="line-height: 66px;display: inline-block;float: left">-->
-      placement="right"
+          <!--            <a-icon type="home" style="margin-right: 6px;"/>-->
-      :closable="true"
+          <!--          </span>-->
-      @close="handleCancel"
+          {{$route.query.serialNumber +' '+$t('evaluationResults')}}
-      :visible="visible"
-      style="height: 100%;overflow: auto;padding-bottom: 53px;">
-      <div class="table-operator-right">
-        <div @click="handleExport" v-if="formInline.createBy == userInfoQuery.username" class="operator-text">
-          <a-icon type="export" :rotate="-90"/>
-          {{$t('export')}}
         </div>
       </div>
-      <a-table
+      <div style="padding-top: 68px;background: #fff">
-        ref="table"
+        <div class="detail-content" style="padding:12px 24px">
-        size="middle"
+          <div class="table-operator-right">
-        :loading="loading"
+            <div @click="handleExport" v-if="formInline.createBy == userInfoQuery.username" class="operator-text">
-        :pagination="false"
+              <a-icon type="export" :rotate="-90"/>
-        :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
+              {{$t('export')}}
-        :data-source="dataSource"
+            </div>
-        :columns="columns"
+          </div>
-      >
+          <a-table
+            ref="table"
+            size="middle"
+            :loading="loading"
+            :pagination="false"
+            :scroll="{x: '100%',y:'calc(100vh - 320px)'}"
+            :data-source="dataSource"
+            :columns="columns"
+          >
         <span slot="accessoryFile" slot-scope="text,record">
             <a @click="seeFileClick(text)" v-if="text">
               {{$t('viewFile')}}
             </a>
             <span v-else>--</span>
         </span>
-      </a-table>
+          </a-table>
-      <div class="page" v-if="dataSource && dataSource.length > 0">
+          <div class="page" v-if="dataSource && dataSource.length > 0">
-        <a-pagination
+            <a-pagination
-          :show-total="total => $t('total')+` ${total} `+$t('strip')"
+              :show-total="total => $t('total')+` ${total} `+$t('strip')"
-          show-quick-jumper
+              show-quick-jumper
-          show-size-changer
+              show-size-changer
-          :page-size.sync="pageSize"
+              :page-size.sync="pageSize"
-          :total="total"
+              :total="total"
-          :current="pageNo"
+              :current="pageNo"
-          @change="pageOnChange"
+              @change="pageOnChange"
-          @showSizeChange="SizeChange"
+              @showSizeChange="SizeChange"
-        />
+            />
-      </div>
+          </div>
-      <div>
+          <div style="margin-top: 20px">
-        <span class="text">{{$t('filingExternalOpinions')}}:</span>
+            <span class="text">{{$t('filingExternalOpinions')}}:</span>
-        <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
+            <div @click="clickButtonToUpload('opinionArchiveId')" style="color: #21c9cc"
-             v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
+                 v-if="formInline.createBy == this.userInfoQuery.username" class="operator-text">
-          <a-icon type="cloud-upload"/>
+              <a-icon type="cloud-upload"/>
-          {{$t('clickUpload')}}
+              {{$t('clickUpload')}}
-        </div>
+            </div>
-        <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
+            <div @click="seeFileClick(formInline.opinionArchiveId)" style="color: #21c9cc" class="operator-text">
-          <a-icon type="eye"/>
+              <a-icon type="eye"/>
-          {{$t('viewFile')}}
+              {{$t('viewFile')}}
+            </div>
+          </div>
         </div>
       </div>
-      <div class="drawer-bootom-button">
+    </div>
-        <a-button @click="handleCancel">{{$t('cancel')}}</a-button>
-      </div>
-    </a-drawer>
     <uploadFile ref="uploadFile" @uploadSuccess="uploadSuccess"></uploadFile>
     <viewFileModel ref="viewFileModelRef"/>
   </div>
@@ -78,8 +79,6 @@
     },
     data() {
       return {
-        confirmLoading: false,
-        visible: false,
         loading: false,
         total: 0,
         pageSize: 10,
@@ -109,6 +108,13 @@
             ellipsis: true,
             dataIndex: 'reason'
           },
+          {
+            title: this.$t('clauseContent'),
+            align: 'center',
+            width: 180,
+            ellipsis: true,
+            dataIndex: 'clauseContent'
+          },
           {
             title: this.$t('enclosure'),
             align: 'center',
@@ -136,6 +142,7 @@
     },
     mounted() {
       this.userInfoQuery = this.userInfo()
+      this.getData()
     },
     methods: {
       ...mapGetters(['userInfo']),
@@ -186,12 +193,10 @@
         downloadFile('/lawsOpinionGather/lawsOpinionAssessmentResultEO/exportXls',
           this.$t('evaluationResults') + '.zip', query)
       },
-      getData(row) {
+      getData() {
-        this.visible = true
+        this.formInline = JSON.parse(JSON.stringify(this.$route.query))
-        this.formInline = JSON.parse(JSON.stringify(row))
+        this.actiProcInstId = this.$route.query.actiProcInstId
-        this.actiProcInstId = row.actiProcInstId
+        this.lawsOpinionGatherId = this.$route.query.id
-        this.lawsOpinionGatherId = row.id
-        console.log(row)
         this.getList()
       },
       handleCancel() {
@@ -232,19 +237,71 @@
   }
 </script>
 
-<style scoped>
+<style scoped lang="less">
-
+  @import '~@assets/less/common.less';
-  .drawer-bootom-button {
+  .doc-detail {
-    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;
+    height: 100%;
+
+    .doc-detail-wrap {
+      .doc-detail-header {
+        width: 100%;
+        height: 68px;
+        line-height: 68px;
+        padding: 0 0 0 32px;
+        box-sizing: border-box;
+        display: flex;
+        justify-content: space-between;
+        border-bottom: 2px #eff1f3 solid;
+        z-index: 1000;
+        background: #fff;
+
+        .doc-detail-title {
+          display: inline-block;
+          text-overflow: ellipsis;
+          white-space: nowrap;
+          overflow: hidden;
+          font-size: 20px;
+          font-weight: 400;
+          color: #040B29;
+          line-height: 68px;
+        }
+
+        .doc-detail-right {
+          width: 800px;
+          line-height: 68px;
+          display: flex;
+
+          .doc-detail-btn {
+            margin-left: 10px;
+          }
+        }
+      }
+
+      .content-box {
+        padding: 0 32px;
+        box-sizing: border-box;
+      }
+
+      .header-text {
+        font-size: 16px;
+        font-weight: 400;
+        height: 80px;
+        color: #000F16;
+        line-height: 80px;
+      }
+
+      .processBackground-text {
+        font-size: 16px;
+        color: #000F16;
+      }
+    }
+  }
+
+  .box-button-top {
+    float: right;
+    margin-top: 28px;
+    height: 38px;
   }
 
   .table-operator-right {
@@ -263,12 +320,13 @@
     color: #040B29;
     margin-right: 4px;
   }
+
   ::v-deep .ant-table-row:first-child {
-    background: #fff!important;
+    background: #fff !important;
     opacity: 0.9;
   }
 
   ::v-deep .ant-table-body {
-    background: transparent!important;
+    background: transparent !important;
   }
 </style>

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

@@ -91,7 +91,7 @@
         size="middle"
         :loading="loading"
         :pagination="false"
-        :scroll="{x: '100%',y:'calc(100vh - 160px)'}"
+        :scroll="{x: '100%',y:'calc(100vh - 260px)'}"
         rowKey="id"
         :data-source="dataSource"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
@@ -124,20 +124,15 @@
         />
       </div>
     </div>
-    <evaluationResultsList ref="evaluationResultsListRef"/>
   </a-card>
 </template>
 
 <script>
-  import evaluationResultsList from './components/evaluationResultsList'
   import { getAction, postAction, deleteAction } from '@/api/manage'
   import { mapGetters } from 'vuex'
 
   export default {
     name: 'index',
-    components: {
-      evaluationResultsList
-    },
     data() {
       return {
         //url传参严格按照当前命名
@@ -374,7 +369,12 @@
         window.open(newUrl.href, '_blank')
       },
       evaluationResultsClick(row) {
-        this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
+        let newUrl = this.$router.resolve({
+          path: '/regulatoryEvaluationResults',
+          query:JSON.parse(JSON.stringify(row))
+        })
+        window.open(newUrl.href, '_blank')
+        // this.$refs.evaluationResultsListRef.getData(JSON.parse(JSON.stringify(row)))
       }
     }
   }

jero-web/src/views/processCenter/components/feedbackInformation.vue

@@ -91,6 +91,24 @@
               </div>
             </a-col>
           </a-row>
+          <a-row :gutter="24">
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="title-text-text" :title="$t('clauseContent')">{{$t('clauseContent')}}</span>
+                </div>
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.clauseContent'"
+                                   :rules="[
+                                     {max: 300,message: $t('clauseContent') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('clauseContent')"
+                              :disabled="disabled"
+                              v-model="item.clauseContent" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
+          </a-row>
         </div>
       </a-form-model>
     </div>