From d716e9c7223464d677622a2f6e58947b65a95fda Mon Sep 17 00:00:00 2001
From: sunFlower <787203167@qq.com>
Date: Wed, 21 Sep 2022 11:22:30 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E4=B8=89=E6=9C=9F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../collectionOfRegulatoryOpinions/index.vue  | 15 +++++----
 .../externalReports/components/addModel.vue   |  2 +-
 jero-web/src/views/externalReports/index.vue  |  8 ++---
 .../components/feedbackInformation.vue        | 33 ++++++++++---------
 .../components/standardContent.vue            | 16 +++++++--
 .../processForm/regulatoryProcess/index.vue   |  3 +-
 6 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
index 348304131..a6bcb5491 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/index.vue
@@ -101,8 +101,9 @@
               <span>{{text}}</span>
          </span>
         <span slot="operation" slot-scope="text,record">
-           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>
-           <a class="text-operation" v-if="record.gatherResult == 'Completed'"
+<!--           <a class="text-operation" @click="viewProcessClick(record)">{{$t('viewProcess')}}</a>-->
+<!--           v-if="record.gatherResult == 'Completed'"-->
+           <a class="text-operation"
               @click="evaluationResultsClick(record)">{{$t('evaluationResults')}}</a>
           <a class="text-operation"
              v-if="(record.gatherResult == 'Completed' && userInfoQuery.username == record.createBy) || administrators"
@@ -181,7 +182,7 @@
             align: 'center',
             dataIndex: 'title',
             ellipsis: true,
-            width: 170
+            width: 280
           },
           {
             title: this.$t('technicalField'),
@@ -193,7 +194,7 @@
           {
             title: this.$t('collectResults'),
             align: 'center',
-            width: 170,
+            width: 140,
             ellipsis: true,
             dataIndex: 'gatherResultShow'
           },
@@ -201,21 +202,21 @@
             title: this.$t('dateOfInitiation'),
             align: 'center',
             ellipsis: true,
-            width: 170,
+            width: 140,
             dataIndex: 'startTime'
           },
           {
             title: this.$t('closingDate'),
             align: 'center',
             ellipsis: true,
-            width: 170,
+            width: 140,
             dataIndex: 'endTime'
           },
           {
             title: this.$t('operation'),
             align: 'center',
             fixed: 'right',
-            width: 320,
+            width: 210,
             scopedSlots: { customRender: 'operation' }
           }
         ],
diff --git a/jero-web/src/views/externalReports/components/addModel.vue b/jero-web/src/views/externalReports/components/addModel.vue
index 4a8800e9a..c1b3cc2f3 100644
--- a/jero-web/src/views/externalReports/components/addModel.vue
+++ b/jero-web/src/views/externalReports/components/addModel.vue
@@ -18,7 +18,7 @@
                     <div class="title-text">
                       <span class="Required">*</span>
                       <span class="title-text-text"
-                            :title="$t('fileName')">{{$t('fileName')}}</span>
+                            :title="$t('file')">{{$t('file')}}</span>
                     </div>
                     <a-form-model-item class="itemModel" prop="fileKey">
                       <a-button type="primary" class="button-text"
diff --git a/jero-web/src/views/externalReports/index.vue b/jero-web/src/views/externalReports/index.vue
index 5521247db..43b27c88f 100644
--- a/jero-web/src/views/externalReports/index.vue
+++ b/jero-web/src/views/externalReports/index.vue
@@ -61,10 +61,10 @@
                   <a-row :gutter="24">
                     <a-col :md="6" :sm="8">
                       <div class="box-title-text">
-                        <div class="title-text" :title="$t('fileName')">
-                          <span>{{ $t('fileName') }}</span>
+                        <div class="title-text" :title="$t('file')">
+                          <span>{{ $t('file') }}</span>
                         </div>
-                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('fileName')"
+                        <a-input class="box-input" :placeholder="$t('PleaseEnter')+$t('file')"
                                  v-model="queryParams.fileName"></a-input>
                       </div>
                     </a-col>
@@ -355,7 +355,7 @@ export default {
       ],
       columns: [
         {
-          title: this.$t('fileName'),
+          title: this.$t('file'),
           align: 'center',
           dataIndex: 'fileName',
           scopedSlots: { customRender: 'fileName' },
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index b237e6c53..81706b645 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -55,21 +55,6 @@
             </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('reason')">{{$t('reason')}}</span>
-                </div>
-                <a-form-model-item class="itemModel"
-                                   :prop="'dataList.'+index+'.reason'"
-                                   :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
-                                    }]">
-                  <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
-                              :disabled="disabled"
-                              v-model="item.reason" :rows="4"/>
-                </a-form-model-item>
-              </div>
-            </a-col>
             <a-col :span="12">
               <div class="box-title-text">
                 <div class="title-text">
@@ -87,6 +72,24 @@
                 </a-form-model-item>
               </div>
             </a-col>
+            <a-col :span="12">
+              <div class="box-title-text">
+                <div class="title-text">
+                  <span class="Required">*</span>
+                  <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
+                </div>
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.reason'"
+                                   :rules="[
+                                     { required: true, message: $t('reason') + $t('cannotEmpty'), trigger: 'blur'},
+                                     {max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
+                  <a-textarea :placeholder="$t('PleaseEnter')+$t('reason')"
+                              :disabled="disabled"
+                              v-model="item.reason" :rows="4"/>
+                </a-form-model-item>
+              </div>
+            </a-col>
           </a-row>
         </div>
       </a-form-model>
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue
index b90e95627..846990863 100644
--- a/jero-web/src/views/processCenter/components/standardContent.vue
+++ b/jero-web/src/views/processCenter/components/standardContent.vue
@@ -17,10 +17,13 @@
               @click="urlClick(queryForm[item.value])"
               v-if="item.type == 1"
         >{{queryForm[item.value]}}</span>
-
+        <span class="text-field-right text-field-right-url"
+              @click="standardClick(queryForm)"
+              v-else-if="item.type == '5'" :title="queryForm[item.value]"
+        >{{queryForm[item.value]}}</span>
         <span class="text-field-right text-field-right-url"
               @click="clickButtonToUpload(queryForm[item.value])"
-              v-if="item.type == 2 && queryForm[item.value]"
+              v-else-if="item.type == 2 && queryForm[item.value]"
         >{{ $t('viewFile') }}</span>
         <span class="text-field-right"
               :title="queryForm[item.value]" v-else
@@ -84,6 +87,15 @@
           window.open(val)
         }
       },
+      standardClick(row) {
+        let newUrl = this.$router.resolve({
+          path: '/docManage/library/detail',
+          query: {
+            id: row.standId
+          }
+        })
+        window.open(newUrl.href, '_blank')
+      },
       clickButtonToUpload(item) {
         this.$refs.viewFileModelRef.clickButtonToUpload(item)
       }
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 43ad09a5c..1695db0be 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -66,7 +66,8 @@
         standardContentList: [
           {
             title: this.$t('standard'),
-            value: 'serial_number'
+            value: 'serial_number',
+            type: 5
           },
           {
             title: this.$t('title'),