From ed5ed2923340a2de080b3a78b3f8cf0aadbd6284 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Thu, 4 Aug 2022 17:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E5=B7=B2?=
 =?UTF-8?q?=E7=9F=A5bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/PersonnelSelection/index.vue   |  1 +
 .../components/initiatingProcess.vue          | 11 ++++
 .../components/feedbackInformation.vue        |  7 ++-
 .../components/standardContent.vue            | 54 +++++++++++++++----
 .../processForm/regulatoryProcess/index.vue   |  3 +-
 5 files changed, 64 insertions(+), 12 deletions(-)

diff --git a/jero-web/src/components/PersonnelSelection/index.vue b/jero-web/src/components/PersonnelSelection/index.vue
index 59a15eb92..476db1404 100644
--- a/jero-web/src/components/PersonnelSelection/index.vue
+++ b/jero-web/src/components/PersonnelSelection/index.vue
@@ -15,6 +15,7 @@
     <div class="box-title-text" v-if="isInput">
       <a-input :class="{'box-input':!isClass}" :value="value"
                readonly
+               :title="value"
                @click.native="standardClick"
                :placeholder="$t('PleaseSelect')+query.db_field_txt"/>
     </div>
diff --git a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
index 6fdb2362f..8201e8ed5 100644
--- a/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
+++ b/jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
@@ -43,6 +43,7 @@
                 </div>
                 <a-form-model-item class="itemModel" prop="endTime">
                   <a-date-picker class="box-input"
+                                 :disabledDate="disabledDate"
                                  :placeholder="$t('PleaseSelect')+$t('closingDate')"
                                  @change="dateChange('endTime')"
                                  :getCalendarContainer="(trigger) => trigger.parentNode"
@@ -162,6 +163,13 @@
               message: this.$t('Assessor') + this.$t('cannotEmpty'),
               trigger: 'change'
             }
+          ],
+          taskExplain: [
+            {
+              max: 300,
+              message: this.$t('taskDescription') + this.$t('cannotExceed') + 300 + this.$t('Characters'),
+              trigger: 'blur'
+            }
           ]
         },
         searchParmes: {},
@@ -230,6 +238,9 @@
     },
     methods: {
       ...mapGetters(['userInfo']),
+      disabledDate(current) {
+        return current && current < moment().subtract(1, 'day')
+      },
       pageOnChange(page) {
         this.pageNo = page
         this.getList()
diff --git a/jero-web/src/views/processCenter/components/feedbackInformation.vue b/jero-web/src/views/processCenter/components/feedbackInformation.vue
index 8c7c98df8..c8e8a146f 100644
--- a/jero-web/src/views/processCenter/components/feedbackInformation.vue
+++ b/jero-web/src/views/processCenter/components/feedbackInformation.vue
@@ -5,7 +5,7 @@
         {{title}}
       </div>
     </div>
-    <div class="content-text">
+    <div class="content-text-text">
       <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
         <div v-for="(item,index) in formInline.dataList" :key="index">
           <div class="feedbackPoint">
@@ -63,7 +63,10 @@
                 <div class="title-text">
                   <span class="title-text-text" :title="$t('reason')">{{$t('reason')}}</span>
                 </div>
-                <a-form-model-item class="itemModel">
+                <a-form-model-item class="itemModel"
+                                   :prop="'dataList.'+index+'.reason'"
+                                   :rules="[{max: 300,message: $t('reason') + $t('cannotExceed') + 300 + $t('Characters'),trigger: 'blur'
+                                    }]">
                   <a-input class="box-input"
                            :disabled="disabled"
                            v-model="item.reason"
diff --git a/jero-web/src/views/processCenter/components/standardContent.vue b/jero-web/src/views/processCenter/components/standardContent.vue
index 84a15c57f..44ddc7ec6 100644
--- a/jero-web/src/views/processCenter/components/standardContent.vue
+++ b/jero-web/src/views/processCenter/components/standardContent.vue
@@ -9,7 +9,8 @@
       </div>
     </div>
     <div class="content-text">
-      <div class="text-field" v-for="(item,index) in standardContentList" :key="index">
+      <div class="text-field" :class="{'text-content-button-one':item.type == 4 ? true :false}"
+           v-for="(item,index) in standardContentList" :key="index">
         <span class="text-field-left" :title="item.title">{{item.title}}</span>
         <span class="text-field-right text-field-right-url"
               :title="queryForm[item.value]"
@@ -21,7 +22,6 @@
               @click="clickButtonToUpload(queryForm[item.value])"
               v-if="item.type == 2 && queryForm[item.value]"
         >{{ $t('viewFile') }}</span>
-
         <span class="text-field-right"
               :title="queryForm[item.value]" v-else
         >{{queryForm[item.value]}}</span>
@@ -58,14 +58,14 @@
         type: Object,
         default: {}
       },
-      title:{
-        type:String,
-        default:'',
-      },
-      isConfirmationDeadline:{
-        type:Boolean,
-        default:false,
+      title: {
+        type: String,
+        default: ''
       },
+      isConfirmationDeadline: {
+        type: Boolean,
+        default: false
+      }
     },
     components: {
       viewFileModel
@@ -77,6 +77,7 @@
     },
     mounted() {
       this.queryForm = this.standardContentQuery
+      this.queryForm.taskExplain = 'sdf dsjf;l sdf;ldsf ;lsdfkj d;lsfkds;lfdksf第三方是德国搞定过分乐观看待给对方；公开地方领导反馈给东丽的反馈给管库给的给'
     },
     methods: {
       urlClick(val) {
@@ -147,5 +148,40 @@
         cursor: pointer;
       }
     }
+
+    .text-content-button-one {
+      width: 100%;
+
+      .text-field-left {
+        width: 124px;
+        display: inline-block;
+        font-size: 14px;
+        font-weight: 400;
+        color: #6F7385;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+        overflow: hidden;
+        margin-right: 24px;
+        float: left;
+        margin-top: 3px;
+      }
+
+      .text-field-right {
+        width: calc(100% - 200px);
+        display: inline-block;
+        font-size: 16px;
+        text-overflow: ellipsis;
+        white-space: pre-wrap;
+        overflow: visible;
+        float: left;
+        color: #040B29;
+        font-weight: 400;
+      }
+
+      .text-field-right-url {
+        color: #00B3BE !important;
+        cursor: pointer;
+      }
+    }
   }
 </style>
\ No newline at end of file
diff --git a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
index 29935870b..503b8409d 100644
--- a/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
+++ b/jero-web/src/views/processCenter/processForm/regulatoryProcess/index.vue
@@ -88,7 +88,8 @@
           {},
           {
             title: this.$t('taskDescription'),
-            value: 'taskExplain'
+            value: 'taskExplain',
+            type:4,
           }
           // {
           //   title: this.$t('remarks'),