diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index d0cf3d48e..577c352dd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -742,12 +742,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } @@ -766,14 +766,14 @@ this.PLmodalType = type this.PLmodalIndex = index this.PLmodalTitle = '编辑' - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.BDtext = true } else if (!row.itemsId || !row.itemsId2) { this.BDtext = true } else { this.BDtext = false - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.similarityDegree = res.data.similarityDegree } this.plForm = { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue index 143e65866..d5b13c99f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-6.vue @@ -460,12 +460,12 @@ export default { this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 454d8fe42..ba75d80b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -761,12 +761,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } @@ -787,14 +787,14 @@ this.PLmodalType = type this.PLmodalIndex = index this.PLmodalTitle = '编辑' - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.BDtext = true } else if (!row.itemsId || !row.itemsId2) { this.BDtext = true } else { this.BDtext = false - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.similarityDegree = res.data.similarityDegree } this.plForm = { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index b1d76daab..54f5082f6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -645,7 +645,7 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum @@ -689,12 +689,14 @@ }else { this.leftData = res.data.leftString } + this.leftData = this.leftData.join('') this.rightData = [] if((typeof res.data.rightString) === "string"){ this.rightData.push(res.data.rightString) }else { this.rightData = res.data.rightString } + this.rightData = this.rightData.join('') this.similarityDegree = res.data.similarityDegree } this.itemId = row.id diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 5681162f3..9434e297e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -386,12 +386,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index 047ab7133..0bec88450 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -386,12 +386,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue index 9ade242ef..70ada2be0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -389,12 +389,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 902561212..3b7446bb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -388,12 +388,12 @@ this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { - if (res.data.leftString === '' && res.data.rightString === '') { + if ((res.data.leftString === '' && res.data.rightString === '') || (res.data.leftString === [] && res.data.rightString === [])) { this.$message.warning('暂无找到相似的文本') } else { this.itemsNum = itemsNum - this.leftData = res.data.leftString - this.rightData = res.data.rightString + this.leftData = Array.isArray(res.data.leftString) ? res.data.leftString.join('') : res.data.leftString + this.rightData = Array.isArray(res.data.rightString) ? res.data.rightString.join('') : res.data.rightString this.BDmodel = true this.similarityDegree = res.data.similarityDegree } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index 47a565dc2..e4de9e6cf 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -754,7 +754,7 @@ this.acceptShow = false this.submitShow = true } - this.commentForm.commentText3 = data.commentText3 || '' + this.$set(this.commentForm, 'commentText3', data.commentText3 || '') this.form.presidentUser = data.form ? data.form.presidentUser :data.presidentUser this.form.presidentUserName = data.form ? data.form.presidentUserName : data.presidentUserName this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] )