对接条款比对

jero-web/src/api/documentToolApi.js

@@ -63,6 +63,9 @@ const docComparsionConsistentAndSave = (params) => postAction('/compare/sarFileC
 const getComparisonDetail = (params) => postAction('/compare/sarFileCompareInfo/getComparisonDetail', params)
 // 文档对比-文档对比-条款对比左侧目录
 const getSplitMenusByInfo = (params) => getAction('/split/sarFileSplitMenu/getSplitMenusByInfoId', params)
+// 文档对比-文档对比-条款对比右侧展示
+const documentSplitView = (params) => postAction('/laws/DocumentTool/documentSplit/queryView', params)
+
 // 文档对比-文档对比-自动匹配
 const clauseComparison = (params) => getAction('/compare/sarFileCompareItem/clauseComparison', params)
 // 文档对比-添加全文评论
@@ -139,6 +142,7 @@ export {
   docComparsionConsistentAndSave,
   getComparisonDetail,
   getSplitMenusByInfo,
+  documentSplitView,
   clauseComparison,
   addFullTextComment,
   deleteComparisonResult,

jero-web/src/common/lang/en-us.js

@@ -473,6 +473,7 @@ module.exports = {
       newDocumentTextNumber: 'New document text number',
       newDocumentTextName: 'New document text name',
       newTextState: 'New text state',
+      comparisonType: 'Comparison Type',
       releaseSituation: 'Release situation',
       comparisonResults: 'Comparison results',
       initiateComparison: 'Initiate Comparison',

jero-web/src/common/lang/zh-cn.js

@@ -485,6 +485,7 @@ module.exports = {
       newDocumentTextNumber: '新文档文本号',
       newDocumentTextName: '新文档文本名称',
       newTextState: '新文本状态',
+      comparisonType: '比对类型',
       releaseSituation: '发布情况',
       comparisonResults: '对比结果',
       initiateComparison: '发起对比',

jero-web/src/views/documentTool/documentComparison/DocumentComparison.vue

@@ -157,18 +157,24 @@ export default {
           width: 150,
           dataIndex: 'fileTypeRight_dictText'
         },
-        // 发布情况
+        // 比对类型
         {
-          title: this.$t('docTool.comparison.releaseSituation'),
+          title: this.$t('docTool.comparison.comparisonType'),
           width: 150,
-          dataIndex: 'releaseState_dictText'
+          dataIndex: 'compareTypeShow'
         },
+        // 发布情况
+        // {
+        //   title: this.$t('docTool.comparison.releaseSituation'),
+        //   width: 150,
+        //   dataIndex: 'releaseState_dictText'
+        // },
         // 创建人
-        {
+        // {
-          title: this.$t('creator'),
+        //   title: this.$t('creator'),
-          width: 180,
+        //   width: 180,
-          dataIndex: 'createNameNo'
+        //   dataIndex: 'createNameNo'
-        },
+        // },
         // 备注
         {
           title: this.$t('remarks'),
@@ -190,36 +196,36 @@ export default {
           clickEvent: 'comparisonResultsClick'
         },
         // 发布
-        {
+        // {
-          text: this.$t('release'),
+        //   text: this.$t('release'),
-          clickEvent: 'subscribe',
+        //   clickEvent: 'subscribe',
-          show: (record) => {
+        //   show: (record) => {
-            return !record.releaseState || record.releaseState === 'draft'
+        //     return !record.releaseState || record.releaseState === 'draft'
-          }
+        //   }
-        },
+        // },
         // 撤回
-        {
+        // {
-          text: this.$t('withdraw'),
+        //   text: this.$t('withdraw'),
-          clickEvent: 'subscribe',
+        //   clickEvent: 'subscribe',
-          show: (record) => {
+        //   show: (record) => {
-            return !(!record.releaseState || record.releaseState === 'draft')
+        //     return !(!record.releaseState || record.releaseState === 'draft')
-          }
+        //   }
-        },
+        // },
         // 编辑
         {
           text: this.$t('edit'),
           clickEvent: 'edit',
-          show: (record) => {
+          // show: (record) => {
-            return !record.releaseState || record.releaseState === 'draft'
+          //   return !record.releaseState || record.releaseState === 'draft'
-          }
+          // }
         },
         // 删除
         {
           text: this.$t('delete'),
           clickEvent: 'handleDelete',
-          show: (record) => {
+          // show: (record) => {
-            return !record.releaseState || record.releaseState === 'draft'
+          //   return !record.releaseState || record.releaseState === 'draft'
-          }
+          // }
         }
       ]
     }
@@ -251,10 +257,7 @@ export default {
           const idList = []
           const selectionRows = JSON.parse(JSON.stringify(this.selectionRows))
           for (let i = 0; i < selectionRows.length; i++) {
-            if (selectionRows[i].createBy === this.userInfo.username &&
+            idList.push(selectionRows[i].id)
-              selectionRows[i].releaseState === 'draft') {
-              idList.push(selectionRows[i].id)
-            }
           }
           if (idList.length > 0) {
             postAction(this.url.deleteBatch, { ids: idList.join(',') }).then((res) => {

jero-web/src/views/documentTool/documentComparison/InitiateComparison.vue

@@ -364,7 +364,11 @@ export default {
                   query: {
                     id: res.result,
                     infoIdLeft: this.selectedRowsLeft[0].id,
-                    infoIdRight: this.selectedRowsRight[0].id
+                    infoNameLeft: this.selectedRowsLeft[0].title,
+                    infoNumberLeft: this.selectedRowsLeft[0].serialNumber,
+                    infoIdRight: this.selectedRowsRight[0].id,
+                    infoNameRight: this.selectedRowsRight[0].title,
+                    infoNumberRight: this.selectedRowsRight[0].serialNumber,
                   }
                 })
               } else {

jero-web/src/views/documentTool/documentComparison/comparisonOfTerms.vue

@@ -10,7 +10,7 @@
         <div class="detail-content-left">
           <!--左边的标准标题-->
           <div class="detail-content-left-title">
-            的撒范德萨范德萨但是
+            {{ $route.query.infoNumberLeft }} {{ $route.query.infoNameLeft }}
           </div>
           <!--左边的目录-->
           <div class="standard-catalogue part-common">
@@ -35,9 +35,9 @@
             <div class="standard-name">
               <a-tooltip placement="topLeft">
                 <template #title>
-                  {{ resultData.serialNumberLeft }} {{ resultData.fileNameLeft }}
+                  {{ $route.query.infoNumberLeft }} {{ $route.query.infoNameLeft }}
                 </template>
-                <span>{{ resultData.serialNumberLeft }} {{ resultData.fileNameLeft }}</span>
+                <span>{{ $route.query.infoNumberLeft }} {{ $route.query.infoNameLeft }}</span>
               </a-tooltip>
             </div>
             <div class="detail-content-left-scroll">
@@ -56,7 +56,7 @@
         <div class="detail-content-right">
           <!--左边的标准标题-->
           <div class="detail-content-right-title">
-            的撒范德萨范德萨但是
+            {{ $route.query.infoNumberRight }} {{ $route.query.infoNameRight }}
           </div>
           <!--右侧目录-->
           <div class="standard-catalogue part-common">
@@ -81,9 +81,9 @@
             <div class="standard-name">
               <a-tooltip placement="topLeft">
                 <template #title>
-                  {{ resultData.serialNumberRight }} {{ resultData.fileNameRight }}
+                  {{ $route.query.infoNumberRight }} {{ $route.query.infoNameRight }}
                 </template>
-                <span>{{ resultData.serialNumberRight }} {{ resultData.fileNameRight }}</span>
+                <span>{{ $route.query.infoNumberRight }} {{ $route.query.infoNameRight }}</span>
               </a-tooltip>
             </div>
             <div class="detail-content-right-scroll">
@@ -112,7 +112,7 @@
 
 <script>
 import InternalDetailPage from '../../../components/InternalDetailPage.vue'
-import { getSplitMenusByInfo } from '../../../api/documentToolApi.js'
+import { getSplitMenusByInfo, documentSplitView } from '../../../api/documentToolApi.js'
 
 export default {
   name: 'comparisonOfTerms',
@@ -125,6 +125,8 @@ export default {
       rightTreeSelectedKeys: [],
       menuRight: [],
       menuLeft: [],
+      leftData: {},
+      rightData: {}
     }
   },
   mounted () {
@@ -138,13 +140,43 @@ export default {
     // 左侧树选择
     onSelectLeft (selectedKeys, exports) {
       const node = exports.node.$vnode.data.props.dataRef
-      console.log(node)
+      this.leftData = node
-      const index = this.resultData.textLeft.findIndex(tt => tt.menuId === node.menuId)
+      this.getLeftDocumentSplitView()
+    },
+    getLeftDocumentSplitView () {
+      const query = {
+        menuId: this.leftData.id,
+        infoId: this.$route.query.infoIdLeft,
+        page: 1,
+        pageSize: 9999
+      }
+      documentSplitView(query).then((res) => {
+        if (res.success) {
+
+        }
+      })
     },
     // 右侧树选择
-    onSelectRight () {
+    onSelectRight (selectedKeys, exports) {
-
+      const node = exports.node.$vnode.data.props.dataRef
+      this.rightData = node
+      this.getRightDocumentSplitView()
     },
+
+    getRightDocumentSplitView () {
+      const query = {
+        menuId: this.rightData.id,
+        infoId: this.$route.query.infoIdRight,
+        page: 1,
+        pageSize: 9999
+      }
+      documentSplitView(query).then((res) => {
+        if (res.success) {
+
+        }
+      })
+    },
+
     detailRight () {
 
     },