From 256b92f23c6f6f0c792793e983b9c45aa7d61dc1 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 29 Apr 2022 13:59:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=82=B9=E5=87=BB=E6=B8=85?=
 =?UTF-8?q?=E7=A9=BA=E6=97=A0=E6=B3=95=E6=B8=85=E7=A9=BA=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E6=A3=80=E7=B4=A2=E7=9A=84=E5=AD=97=E6=AE=B5=20=E5=B8=83?=
 =?UTF-8?q?=E5=B1=80=E8=AF=84=E8=AE=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/common/lang/en-us.js             |  2 +
 jero-web/src/common/lang/zh-cn.js             |  2 +
 .../components/virtualListDetails.vue         |  9 +++--
 .../components/commentList.vue                | 40 ++++++++++++++-----
 .../components/listOfRegulations.vue          |  2 +
 5 files changed, 41 insertions(+), 14 deletions(-)

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 5a30ac0b3..98c6173da 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -735,4 +735,6 @@ module.exports = {
   Returning:'Returning',
   terminationProcessing:'Termination process',
   publishComment:'publish comment',
+  record:'record',
+  replyToComments:'Reply to comments',
 }
\ No newline at end of file
diff --git a/jero-web/src/common/lang/zh-cn.js b/jero-web/src/common/lang/zh-cn.js
index 131e8d78a..aa408f099 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -740,4 +740,6 @@ module.exports = {
   Returning:'退回中',
   terminationProcessing:'终止流程中',
   publishComment:'发表评论',
+  record:'记录',
+  replyToComments:'回复评论',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
index ae7e9838a..6af68867a 100644
--- a/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
+++ b/jero-web/src/views/documentTools/virtualList/components/virtualListDetails.vue
@@ -88,7 +88,8 @@
               {{$t('DocumentStandard')}}
             </div>
             <div class="operator-text" v-has="'document:importZip'" v-if="isTrue">
-              <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" @getList="getPersonnelList" :accept="'.zip'"/>
+              <ImportFile :url="url" :dummyInventoryBaseId="$route.query.id" :isTrue="true" @getList="getPersonnelList"
+                          :accept="'.zip'"/>
             </div>
             <!--            模板下载-->
             <div @click="handleModule" class="operator-text" v-if="isTrue">
@@ -560,6 +561,8 @@
         this.getList()
       },
       searchReset() {
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
         this.queryParam = {}
         this.getList()
       },
@@ -625,8 +628,8 @@
           }
         })
       },
-      getPersonnelList(){
-         this.getList()
+      getPersonnelList() {
+        this.getList()
       },
       batSettingList() {
         this.getList()
diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue
index b3ec76b66..7c037b754 100644
--- a/jero-web/src/views/projectManagement/components/commentList.vue
+++ b/jero-web/src/views/projectManagement/components/commentList.vue
@@ -13,7 +13,7 @@
       </div>
       <div class="comment-box">
         <div class="comment-box-top-box" v-for="(item,index) in 3">
-          <div class="title-text">记录{{(index + 1)}}</div>
+          <div class="title-text">{{$t('record')+(index + 1)}}</div>
           <div class="box-content">
             <div class="img-box">
               <img src="../../../assets/daiban.png" class="img" alt="">
@@ -25,7 +25,7 @@
             <div class="box-text-text">
               法规清单缺少标准’’GB 7258“，注意补充
             </div>
-            <div class="box-icon">
+            <div class="box-icon" @click="messageClick()">
               <a-icon type="message"/>
             </div>
           </div>
@@ -41,7 +41,7 @@
               <div class="box-text-text">
                 法规清单缺少标准’’GB 7258“，注意补充
               </div>
-              <div class="box-icon">
+              <div class="box-icon" @click="messageClick()">
                 <a-icon type="message"/>
               </div>
             </div>
@@ -50,7 +50,7 @@
       </div>
     </a-drawer>
     <a-modal
-      :title="$t('publishComment')"
+      :title="title"
       :width="500"
       :visible="visibleComment"
       :confirm-loading="confirmLoading"
@@ -63,13 +63,13 @@
           <a-col :span="24">
             <div class="box-title-text">
               <div class="title-text">
-                <span class="title-text-text" :title="$t('publishComment')">{{$t('publishComment')}}</span>
+                <span class="title-text-text" :title="title">{{title}}</span>
               </div>
-              <a-form-model-item class="itemModel" :prop="'remarks'">
+              <a-form-model-item class="itemModel" :prop="'publishComment'">
                 <a-textarea
-                  :placeholder="$t('PleaseEnter')+$t('publishComment')"
+                  :placeholder="$t('PleaseEnter')+title"
                   :disabled="false"
-                  v-model="formInline.remark" :rows="4"/>
+                  v-model="formInline.publishComment" :rows="4"/>
               </a-form-model-item>
             </div>
           </a-col>
@@ -87,9 +87,18 @@
       return {
         visible: false,
         formInline: {},
+        title: this.$t('comment'),
         confirmLoading: false,
         visibleComment: false,
-        rules: {}
+        rules: {
+          publishComment: [
+            {
+              required: true,
+              message: this.$t('publishComment') + this.$t('cannotEmpty'),
+              trigger: 'blur'
+            }
+          ]
+        }
       }
     },
     mounted() {
@@ -102,15 +111,24 @@
         this.visible = true
       },
       handleSubmit() {
+        this.title = this.$t('publishComment')
         this.visibleComment = true
       },
       handleOkComment() {
+        this.$refs.ruleForm.validate(valid => {
+          if (valid) {
+
+          }
+        })
         this.visibleComment = false
       },
       handleCancelComment() {
         this.visibleComment = false
+      },
+      messageClick() {
+        this.title = this.$t('replyToComments')
+        this.visibleComment = true
       }
-
     }
   }
 </script>
@@ -233,7 +251,7 @@
   }
 
   .title-text {
-    width: 44px;
+    width: 64px;
     text-align: right;
     display: inline-block;
     font-weight: 500;
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 85b8147c4..ccd2f2397 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -689,6 +689,8 @@
         this.getList()
       },
       searchReset() {
+        this.$refs.globalAdvancedQueryRef.resetLine()
+        this.$refs.globalAdvancedQueryRef.emitCallback()
         this.queryParam = {}
         this.getList()
       },