Merge remote-tracking branch 'origin/master'

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

@@ -89,7 +89,7 @@
                     :auto-size="{ minRows: 3, maxRows: 5 }"
                   />
                   <div style="text-align: right;margin: 10px 0">
-                    <a-button type="primary" @click="modalSave(item)">
+                    <a-button type="primary" @click="modalSave(item,dataRight)">
                       提交
                     </a-button>
                   </div>
@@ -173,7 +173,7 @@
                     :auto-size="{ minRows: 3, maxRows: 5 }"
                   />
                   <div style="text-align: right;margin: 10px 0">
-                    <a-button type="primary" @click="modalSave(item)">
+                    <a-button type="primary" @click="modalSave(item,dataLeft)">
                       提交
                     </a-button>
                   </div>
@@ -264,14 +264,14 @@ export default {
     // 点击左侧文档内容
     detailLeft (num, item) {
       this.leftTreeSelectedKeys = [item.menuId]
-      this.similarityDegree = ''
-      this.textContent = ''
       this.itemLeftIndex = num
-      if (item.id === this.dataLeft.id && !this.isMatching) {
-        this.dataLeft = {}
-        this.leftHighlightMenuId = null
+      if (item.id === this.dataLeft.id) {
+        // this.dataLeft = {}
+        // this.leftHighlightMenuId = null
         return
       }
+      this.similarityDegree = ''
+      this.textContent = ''
       this.leftHighlightMenuId = item.menuId
       this.dataLeft = item
       this.dataLeft.numIndex = num
@@ -295,14 +295,14 @@ export default {
     // 点击右侧文档内容
     detailRight (num, item) {
       this.rightTreeSelectedKeys = [item.menuId]
-      this.similarityDegree = ''
-      this.textContent = ''
       this.itemRightIndex = num
-      if (item.id === this.dataRight.id && !this.isMatching) {
-        this.dataRight = {}
-        this.rightHighlightMenuId = null
+      if (item.id === this.dataRight.id) {
+        // this.dataRight = {}
+        // this.rightHighlightMenuId = null
         return
       }
+      this.similarityDegree = ''
+      this.textContent = ''
       this.dataRight = item
       this.dataRight.numIndex = num
       this.rightHighlightMenuId = item.menuId
@@ -498,11 +498,15 @@ export default {
         modalLoading.destroy()
       })
     },
-    modalSave (item) {
+    modalSave (item, data) {
       const query = {
         remark: item.remark,
         id: item.id
       }
+      if (data.id) {
+        data.remark = item.remark
+        this.modalSaveRight(data)
+      }
       postAction('/compare/sarFileCompareItem/edit', query).then((res) => {
         item.oldRemark = item.remark
         if (res.success) {
@@ -511,6 +515,20 @@ export default {
           this.$message.warning(res.message)
         }
       })
+    },
+    modalSaveRight (item) {
+      const query = {
+        remark: item.remark,
+        id: item.id
+      }
+      postAction('/compare/sarFileCompareItem/edit', query).then((res) => {
+        item.oldRemark = item.remark
+        if (res.success) {
+          // this.$message.success(res.message)
+        } else {
+          // this.$message.warning(res.message)
+        }
+      })
     }
   }
 }

jero-web/src/views/documentTool/documentSplit/modules/SplitAddForm.vue

@@ -213,6 +213,7 @@ export default {
      * @param index
      */
     handleAddClauseContent (index) {
+      console.log(index)
       if (index === -1) {
         this.isTopList = false
         this.addIndex = this.contentList.length - 1
@@ -233,8 +234,8 @@ export default {
         headerArr = this.contentList
         footerArr = []
       } else {
-        headerArr = this.contentList.splice(0, this.addIndex + 1)
-        footerArr = this.contentList.splice(-this.addIndex)
+        headerArr = this.contentList.slice(0, this.addIndex + 1)
+        footerArr = this.contentList.slice(this.addIndex + 1, this.addIndex.length)
       }
       const insertArr = []
       switch (type) {
@@ -263,7 +264,6 @@ export default {
           }
       }
       this.contentList = [...headerArr, ...insertArr, ...footerArr]
-      console.log(this.contentList)
     },
     /**
      * 表格编辑