From 5bf848e32fd8458101e7d0293d864f71220fb003 Mon Sep 17 00:00:00 2001
From: qq787203167 <787203167@qq.com>
Date: Fri, 29 Apr 2022 13:34:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=97=A0=E6=B3=95=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B8=85=E5=8D=95=E7=A1=AE=E8=AE=A4=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             |   1 +
 jero-web/src/common/lang/zh-cn.js             |   1 +
 .../ProjectDetails/index.vue                  |  13 +-
 .../components/commentList.vue                | 270 ++++++++++++++++++
 .../components/listEditModel.vue              |   2 +-
 .../components/listOfRegulations.vue          |   4 +-
 .../components/transferList.vue               |   2 +-
 7 files changed, 285 insertions(+), 8 deletions(-)
 create mode 100644 jero-web/src/views/projectManagement/components/commentList.vue

diff --git a/jero-web/src/common/lang/en-us.js b/jero-web/src/common/lang/en-us.js
index 38d1c1657..5a30ac0b3 100644
--- a/jero-web/src/common/lang/en-us.js
+++ b/jero-web/src/common/lang/en-us.js
@@ -734,4 +734,5 @@ module.exports = {
   Submitting:'Submitting',
   Returning:'Returning',
   terminationProcessing:'Termination process',
+  publishComment:'publish comment',
 }
\ 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 2a5a74c2a..131e8d78a 100644
--- a/jero-web/src/common/lang/zh-cn.js
+++ b/jero-web/src/common/lang/zh-cn.js
@@ -739,4 +739,5 @@ module.exports = {
   Submitting:'提交中...',
   Returning:'退回中',
   terminationProcessing:'终止流程中',
+  publishComment:'发表评论',
 }
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/ProjectDetails/index.vue b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
index 240cc8cf9..5e08d107f 100644
--- a/jero-web/src/views/projectManagement/ProjectDetails/index.vue
+++ b/jero-web/src/views/projectManagement/ProjectDetails/index.vue
@@ -10,7 +10,7 @@
         </span>
       </div>
       <div class="Virtual-detail-text-right" v-if="textTitle === '法规清单'">
-        <div class="operator-text">
+        <div class="operator-text" @click="commentClick">
           <a-icon type="message"/>
           {{$t('comment')}}
         </div>
@@ -59,6 +59,7 @@
     </div>
     <updateLog :url="url" ref="updateLogRef"/>
     <historicalVersionList :url="url" ref="historicalVersionListRef"/>
+    <commentList :url="url" ref="commentListRef"/>
   </div>
 </template>
 
@@ -70,7 +71,7 @@
   import nonConformance from '../components/nonConformance'
   import updateLog from '@/components/UpdateLog/index'
   import historicalVersionList from '../components/historicalVersionList'
-
+  import commentList from '../components/commentList'
   export default {
     name: 'ProjectDetails',
     components: {
@@ -80,7 +81,8 @@
       TaskParameterCollection,
       nonConformance,
       updateLog,
-      historicalVersionList
+      historicalVersionList,
+      commentList
     },
     data() {
       return {
@@ -120,7 +122,10 @@
       },
       historicalVersionClick() {
         this.$refs.historicalVersionListRef.getList()
-      }
+      },
+      commentClick(){
+        this.$refs.commentListRef.getData()
+      },
     }
   }
 </script>
diff --git a/jero-web/src/views/projectManagement/components/commentList.vue b/jero-web/src/views/projectManagement/components/commentList.vue
new file mode 100644
index 000000000..b3ec76b66
--- /dev/null
+++ b/jero-web/src/views/projectManagement/components/commentList.vue
@@ -0,0 +1,270 @@
+<template>
+  <div>
+    <a-drawer
+      :title="$t('comment')"
+      :maskClosable="false"
+      :width="482"
+      placement="right"
+      :closable="true"
+      @close="handleCancel"
+      :visible="visible">
+      <div class="button-box">
+        <a-button @click="handleSubmit" type="primary">{{$t('publishComment')}}</a-button>
+      </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="box-content">
+            <div class="img-box">
+              <img src="../../../assets/daiban.png" class="img" alt="">
+            </div>
+            <div class="box-text">
+              <span class="box-text-name">张三</span>
+              <span calss="box-text-time">2012-45-45 12:00:00</span>
+            </div>
+            <div class="box-text-text">
+              法规清单缺少标准’’GB 7258“，注意补充
+            </div>
+            <div class="box-icon">
+              <a-icon type="message"/>
+            </div>
+          </div>
+          <div class="inside-box">
+            <div class="box-content-inside" v-for="item in 2">
+              <div class="img-box">
+                <img src="../../../assets/daiban.png" class="img" alt="">
+              </div>
+              <div class="box-text">
+                <span class="box-text-name">张三</span>
+                <span calss="box-text-time">2012-45-45 12:00:00</span>
+              </div>
+              <div class="box-text-text">
+                法规清单缺少标准’’GB 7258“，注意补充
+              </div>
+              <div class="box-icon">
+                <a-icon type="message"/>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </a-drawer>
+    <a-modal
+      :title="$t('publishComment')"
+      :width="500"
+      :visible="visibleComment"
+      :confirm-loading="confirmLoading"
+      :maskClosable="false"
+      @ok="handleOkComment"
+      @cancel="handleCancelComment"
+    >
+      <a-form-model :model="formInline" class="formAdd" :rules="rules" ref="ruleForm">
+        <a-row :gutter="24">
+          <a-col :span="24">
+            <div class="box-title-text">
+              <div class="title-text">
+                <span class="title-text-text" :title="$t('publishComment')">{{$t('publishComment')}}</span>
+              </div>
+              <a-form-model-item class="itemModel" :prop="'remarks'">
+                <a-textarea
+                  :placeholder="$t('PleaseEnter')+$t('publishComment')"
+                  :disabled="false"
+                  v-model="formInline.remark" :rows="4"/>
+              </a-form-model-item>
+            </div>
+          </a-col>
+        </a-row>
+      </a-form-model>
+    </a-modal>
+  </div>
+
+</template>
+
+<script>
+  export default {
+    name: 'commentList',
+    data() {
+      return {
+        visible: false,
+        formInline: {},
+        confirmLoading: false,
+        visibleComment: false,
+        rules: {}
+      }
+    },
+    mounted() {
+    },
+    methods: {
+      handleCancel() {
+        this.visible = false
+      },
+      getData() {
+        this.visible = true
+      },
+      handleSubmit() {
+        this.visibleComment = true
+      },
+      handleOkComment() {
+        this.visibleComment = false
+      },
+      handleCancelComment() {
+        this.visibleComment = false
+      }
+
+    }
+  }
+</script>
+
+<style scoped lang="less">
+  .comment-box {
+    position: absolute;
+    left: 0;
+    height: calc(100% - 140px);
+    width: 100%;
+    overflow: auto;
+    padding: 0 24px 24px 24px;
+    box-sizing: border-box;
+  }
+
+  .comment-box-top-box {
+    padding: 30px 24px 24px 24px;
+    box-sizing: border-box;
+    border: 1px solid #F1F2F4;
+    border-radius: 4px;
+    margin-bottom: 24px;
+  }
+
+  .img-box {
+    width: 32px;
+    height: 32px;
+    border-radius: 50%;
+    display: inline-block;
+    margin-right: 8px;
+    position: absolute;
+
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+
+  .box-text {
+    display: inline-block;
+    position: absolute;
+    margin-left: 40px;
+
+    .box-text-name {
+      font-size: 14px;
+      font-weight: bold;
+      color: #040B29;
+      margin-right: 8px;
+    }
+
+    .box-text-time {
+      font-size: 14px;
+      font-weight: 400;
+      color: #6F7385;
+    }
+  }
+
+  .box-text-text {
+    font-size: 14px;
+    font-weight: 400;
+    color: #040B29;
+    display: inline-block;
+    margin-top: 22px;
+    margin-left: 40px;
+  }
+
+  .title-text {
+    font-size: 16px;
+    font-weight: 400;
+    color: #040B29;
+    margin-bottom: 18px;
+  }
+
+  .box-content {
+    position: relative;
+  }
+
+  .box-content-inside {
+    position: relative;
+    margin-bottom: 15px;
+  }
+
+  .box-icon {
+    position: absolute;
+    right: 0;
+    top: 0;
+    cursor: pointer;
+  }
+
+  .inside-box {
+    background: #F6F7FA;
+    border-radius: 4px;
+    margin-left: 40px;
+    width: calc(100% - 40px);
+    padding: 18px;
+    box-sizing: border-box;
+    margin-top: 15px;
+  }
+
+  .button-box {
+    text-align: right;
+    margin-bottom: 24px;
+  }
+
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
+
+  .box-title-text {
+    line-height: 1.4;
+    display: flex;
+    /*align-items: center;*/
+  }
+
+  .title-text {
+    width: 44px;
+    text-align: right;
+    display: inline-block;
+    font-weight: 500;
+    font-size: 14px;
+    margin-right: 16px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+    height: 42px;
+    line-height: 48px;
+  }
+
+  .box-input {
+    display: inline-block;
+    height: 38px;
+    width: 100%;
+  }
+
+  .itemModel {
+    width: calc(100% - 64px);
+    display: inline-block;
+    margin-top: 2px;
+  }
+
+  .Required {
+    color: red;
+    margin-right: 4px;
+  }
+
+  .title-text-text {
+    margin-top: 9px;
+  }
+
+</style>
\ No newline at end of file
diff --git a/jero-web/src/views/projectManagement/components/listEditModel.vue b/jero-web/src/views/projectManagement/components/listEditModel.vue
index e648d61e4..a0578483c 100644
--- a/jero-web/src/views/projectManagement/components/listEditModel.vue
+++ b/jero-web/src/views/projectManagement/components/listEditModel.vue
@@ -1,6 +1,6 @@
 <template>
   <a-drawer
-    :title="'编辑'"
+    :title="$t('edit')"
     :maskClosable="false"
     :width="900"
     placement="right"
diff --git a/jero-web/src/views/projectManagement/components/listOfRegulations.vue b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
index 848bea599..85b8147c4 100644
--- a/jero-web/src/views/projectManagement/components/listOfRegulations.vue
+++ b/jero-web/src/views/projectManagement/components/listOfRegulations.vue
@@ -735,8 +735,8 @@
           for (let i = 0; i < this.dataSource.length; i++) {
             for (let j = 0; j < selectedRowKeys.length; j++) {
               if (this.dataSource[i].id == selectedRowKeys[j]) {
-                if ((this.dataSource.inventoryAffirmStatus == 'Not started' || this.dataSource.inventoryAffirmStatus == 'rejected') &&
-                  this.dataSource.homologationEngineerId && this.dataSource.regulationOwnerId) {
+                if ((this.dataSource[i].inventoryAffirmStatus == 'Not started' || this.dataSource[i].inventoryAffirmStatus == 'rejected') &&
+                  this.dataSource[i].homologationEngineerId && this.dataSource[i].regulationOwnerId) {
                   isTrue = true
                 } else {
                   this.$message.warning(this.$t('dataConfirmation'))
diff --git a/jero-web/src/views/projectManagement/components/transferList.vue b/jero-web/src/views/projectManagement/components/transferList.vue
index 790eaa136..102b1d168 100644
--- a/jero-web/src/views/projectManagement/components/transferList.vue
+++ b/jero-web/src/views/projectManagement/components/transferList.vue
@@ -92,7 +92,7 @@
           },
           {
             title: this.$t('creater'),
-            dataIndex: 'createByCn',
+            dataIndex: 'createBy',
             align: 'center',
             ellipsis: true
           }