From 02385bd805c023a9e3132c3f5eda6ff96776cf69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E9=9C=84?= <zhaoxiaox0053@163.com>
Date: Wed, 20 Sep 2023 09:38:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=96=87=E6=A1=A3=E5=AF=B9=E6=AF=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/documentToolApi.js                    |  6 +-
 .../documentComparison/ComparisonResults.vue  |  4 +-
 .../DocumentDataComparison.vue                |  5 +-
 .../documentComparison/InitiateComparison.vue | 32 ++++------
 .../modules/ComparisonAddFullComment.vue      |  4 +-
 .../modules/ComparisonResultEditModal.vue     | 63 ++++++++++---------
 6 files changed, 58 insertions(+), 56 deletions(-)
 rename src/views/documentTool/{ => documentComparison}/modules/ComparisonResultEditModal.vue (61%)

diff --git a/src/api/documentToolApi.js b/src/api/documentToolApi.js
index cf30618f..f5d6a844 100644
--- a/src/api/documentToolApi.js
+++ b/src/api/documentToolApi.js
@@ -1,5 +1,4 @@
 // 本地工具-即文档功能对应的接口
-
 import { getAction, postAction } from './manage'
 
 // 文档拆分-发布
@@ -21,6 +20,8 @@ const docComparsionConsistentAndSave = (params) => postAction('/compare/sarFileC
 const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/getComparisonDetail', params)
 // 文档对比-文档对比-自动匹配
 const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params)
+// 文档对比-添加全文评论
+const addFullTextComment = (params) => postAction('/compare/sarFileCompareInfo/editComments', params)
 
 export {
   // 文档拆分
@@ -36,5 +37,6 @@ export {
   submitInitComparsion,
   docComparsionConsistentAndSave,
   getComparisonDetail,
-  clauseComparison
+  clauseComparison,
+  addFullTextComment
 }
diff --git a/src/views/documentTool/documentComparison/ComparisonResults.vue b/src/views/documentTool/documentComparison/ComparisonResults.vue
index ac2160c6..51ea1d09 100644
--- a/src/views/documentTool/documentComparison/ComparisonResults.vue
+++ b/src/views/documentTool/documentComparison/ComparisonResults.vue
@@ -137,7 +137,7 @@ import { previewPdf } from '../../../utils/previewPdf.js'
 import { Base64 } from 'js-base64'
 import { mapGetters } from 'vuex'
 import CommentList from '../modules/CommentList.vue'
-import ComparisonResultEditModal from '../modules/ComparisonResultEditModal.vue'
+import ComparisonResultEditModal from './modules/ComparisonResultEditModal.vue'
 import InternalDetailPage from '../../../components/InternalDetailPage.vue'
 
 export default {
@@ -167,7 +167,7 @@ export default {
     }
   },
   mounted () {
-    if (this.$route.query.isDisplay === 2) {
+    if (this.$route.query.isDisplay === '2') {
       this.isDisplay = false
     } else {
       this.isDisplay = true
diff --git a/src/views/documentTool/documentComparison/DocumentDataComparison.vue b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
index 9844dc87..b46bba75 100644
--- a/src/views/documentTool/documentComparison/DocumentDataComparison.vue
+++ b/src/views/documentTool/documentComparison/DocumentDataComparison.vue
@@ -99,12 +99,15 @@
     </div>
 
     <div class="submit-button">
+      <!--一致-->
       <a-button style="margin-right: 10px" type="primary" @click="consistentAssessmentClick">{{ $t('docTool.comparison.consistentAssessment') }}
       </a-button>
+      <!--保存-->
       <a-button type="primary" @click="submit">{{ $t('preservation') }}</a-button>
     </div>
 
-    <comparison-add-full-comment ref="comparisonAddFullComment"></comparison-add-full-comment>
+    <!--全文评论-->
+    <comparison-add-full-comment ref="comparisonAddFullComment" />
   </internal-detail-page>
 </template>
 
diff --git a/src/views/documentTool/documentComparison/InitiateComparison.vue b/src/views/documentTool/documentComparison/InitiateComparison.vue
index 6c542853..ba448938 100644
--- a/src/views/documentTool/documentComparison/InitiateComparison.vue
+++ b/src/views/documentTool/documentComparison/InitiateComparison.vue
@@ -112,7 +112,7 @@
             </div>
             <a-form-model-item class="item-model" prop="remark">
               <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.remarkInfo')"
-                          :maxLength="300"
+                          :maxLength="500"
                           v-model="formInline.remark"
                           :rows="4" />
             </a-form-model-item>
@@ -200,77 +200,67 @@ export default {
       columns: [
         {
           title: this.$t('number'),
-          align: 'left',
-          width: 70,
+          width: 30,
           customRender: function (t, r, index) {
             return parseInt(index) + 1
           }
         },
         {
           title: this.$t('number'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'serialNumber',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('title'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'title',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('docTool.comparison.textStatus'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'fileType',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('fileName'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'fileName',
-          width: 79
+          width: 100
         }
       ],
       tableColumns: [
         {
           title: this.$t('number'),
-          align: 'left',
-          width: 70,
+          width: 30,
           customRender: function (t, r, index) {
             return parseInt(index) + 1
           }
         },
         {
           title: this.$t('number'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'serialNumber',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('title'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'title',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('docTool.comparison.textStatus'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'fileType',
-          width: 79
+          width: 100
         },
         {
           title: this.$t('fileName'),
-          align: 'left',
           ellipsis: true,
           dataIndex: 'fileName',
-          width: 79
+          width: 100
         }
       ],
       image: false,
diff --git a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
index ff029df3..0d918477 100644
--- a/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonAddFullComment.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script>
-import { putAction } from '../../../../api/manage.js'
+import { addFullTextComment } from '../../../../api/documentToolApi.js'
 
 export default {
   name: 'ComparisonAddFullComment',
@@ -59,7 +59,7 @@ export default {
             id: this.$route.query.id,
             comments: formInlineText.comment
           }
-          putAction('/compare/sarFileCompareInfo/editComments', query).then((res) => {
+          addFullTextComment(query).then((res) => {
             if (res.success) {
               this.$message.success(this.$t('operationSuccessful'))
               this.visible = false
diff --git a/src/views/documentTool/modules/ComparisonResultEditModal.vue b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
similarity index 61%
rename from src/views/documentTool/modules/ComparisonResultEditModal.vue
rename to src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
index eea22538..e21041c6 100644
--- a/src/views/documentTool/modules/ComparisonResultEditModal.vue
+++ b/src/views/documentTool/documentComparison/modules/ComparisonResultEditModal.vue
@@ -9,41 +9,42 @@
   >
     <template slot="footer">
       <a-button key="back" @click="visible = false">
-        {{$t('cancel')}}
+        {{ $t('cancel') }}
       </a-button>
       <a-button type="primary" :loading="confirmLoading" @click="fullTextCommentsSubmit">
-        {{$t('submit')}}
+        {{ $t('submit') }}
       </a-button>
     </template>
     <a-form-model :model="formInlineText" class="formAdd" :rules="rulesText" ref="ruleFormText">
-      <div class="box-title-text" v-if="title === $t('docTool.comparison.fullTextComments')">
-        <div class="title-text" :title="$t('docTool.comparison.fullTextComments')">
-          <span class="title-text-text">{{$t('docTool.comparison.fullTextComments')}}</span>
-        </div>
-        <a-form-model-item class="item-model" style="width: calc(100% - 113px)" prop="comment">
-          <a-textarea :placeholder="$t('pleaseEnter') + $t('docTool.comparison.fullTextComments')"
-                      v-model.trim="formInlineText.comment"
-                      :maxLength="500"
-                      :rows="4"/>
-        </a-form-model-item>
-      </div>
-      <div class="box-title-text" v-if="title === $t('docTool.comparison.comparativeComments')">
-        <div class="title-text" :title="$t('docTool.comparison.comparativeComments')">
-          <span class="title-text-text">{{$t('docTool.comparison.comparativeComments')}}</span>
-        </div>
-        <a-form-model-item class="item-model" style="width: calc(100% - 113px)" prop="comment">
-          <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comparativeComments')"
-                      v-model.trim="formInlineText.comment"
-                      :maxLength="500"
-                      :rows="4"/>
-        </a-form-model-item>
-      </div>
+      <a-form-model-item class="item-model"
+                         prop="comment"
+                         v-if="title === $t('docTool.comparison.fullTextComments')"
+                         :labelCol="labelCol"
+                         :wrapperCol="wrapperCol"
+                         :label="$t('docTool.comparison.fullTextComments')">
+        <a-textarea :placeholder="$t('pleaseEnter') + $t('docTool.comparison.fullTextComments')"
+                    v-model.trim="formInlineText.comment"
+                    :maxLength="500"
+                    :rows="4" />
+      </a-form-model-item>
+      <a-form-model-item class="item-model"
+                         prop="comment"
+                         v-if="title === $t('docTool.comparison.comparativeComments')"
+                         :labelCol="labelCol"
+                         :wrapperCol="wrapperCol"
+                         :label="$t('docTool.comparison.comparativeComments')">
+        <a-textarea :placeholder="$t('pleaseEnter')+$t('docTool.comparison.comparativeComments')"
+                    v-model.trim="formInlineText.comment"
+                    :maxLength="500"
+                    :rows="4" />
+      </a-form-model-item>
     </a-form-model>
   </a-modal>
 </template>
 
 <script>
-import { putAction } from '@/api/manage'
+import { putAction } from '../../../../api/manage.js'
+import { addFullTextComment } from '../../../../api/documentToolApi.js'
 
 export default {
   name: 'ComparisonResultEditModal',
@@ -53,7 +54,13 @@ export default {
       visible: false,
       confirmLoading: false,
       formInlineText: {},
-      rulesText: {}
+      rulesText: {},
+      labelCol: {
+        span: 5
+      },
+      wrapperCol: {
+        span: 18
+      }
     }
   },
   methods: {
@@ -86,7 +93,7 @@ export default {
         id: this.$route.query.id,
         comments: this.formInlineText.comment
       }
-      putAction('/compare/sarFileCompareInfo/editComments', query).then((res) => {
+      addFullTextComment(query).then((res) => {
         if (res.success) {
           this.$message.success(this.$t('operationSuccessful'))
           this.visible = false
@@ -123,5 +130,5 @@ export default {
 </script>
 
 <style scoped lang="less">
-@import'~@assets/less/common.less';
+@import '~../../../../assets/less/common.less';
 </style>