From 5ca2f52376f38231f4ddf30a4b44b27328955c93 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 17 Jan 2022 11:33:31 +0800 Subject: [PATCH 01/11] commit --- .../processCenter/pages/creatProcess/bzjd/step1-1.vue | 11 ++++++----- .../processCenter/pages/creatProcess/bzjd/step1.vue | 10 +++++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 930e18aa2..2e198526f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -210,7 +210,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

流程发起人

@@ -221,15 +221,15 @@ - + -

标准法规部部长

+

标准法规部高级经理

@@ -241,6 +241,7 @@ - +

流程发起人

@@ -228,15 +228,15 @@ - + -

标准法规部部长

+

标准法规部高级经理

@@ -993,7 +993,7 @@ export default { if (type === 0) { this.nodeList = [] this.nodeList.push(row) - this.drawerTitle = '选择标准法规部部长' + this.drawerTitle = '选择标准法规部高级经理' this.modalshowflag = true } else { this.drawerTitle = '选择责任人' From dd77950a7b13ba442cb7c9df77faa1ab21156cd7 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 17 Jan 2022 14:53:54 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index 67ccce142..d7b32da68 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -46,6 +46,7 @@ Date: Mon, 17 Jan 2022 15:24:23 +0800 Subject: [PATCH 03/11] commit --- .../pages/creatProcess/bzjd/step3.vue | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 147e90c22..0e2256a99 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -66,7 +66,7 @@
- 批量编辑 +
- - + + Date: Mon, 17 Jan 2022 15:29:28 +0800 Subject: [PATCH 04/11] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step2.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step3.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step4.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step5.vue | 2 +- src/pages/processCenter/pages/creatProcess/bzjd/step6.vue | 2 +- src/pages/processCenter/pages/phone/bzjd/step4.vue | 2 +- src/pages/processCenter/pages/phone/bzjd/step5.vue | 2 +- src/pages/processCenter/pages/phone/bzjd/step6.vue | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue index a7ed154ae..33229bbdd 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 0e2256a99..65d7db6e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 6e2e6cfcb..1c45c181f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index aff836e6c..cb0786668 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index 32854297b..c35fce237 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/phone/bzjd/step4.vue b/src/pages/processCenter/pages/phone/bzjd/step4.vue index f8a0e0ab6..e88d99f61 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step4.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/phone/bzjd/step5.vue b/src/pages/processCenter/pages/phone/bzjd/step5.vue index 0a5aaa32a..9993f4e07 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step5.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/phone/bzjd/step6.vue b/src/pages/processCenter/pages/phone/bzjd/step6.vue index aa52f364e..7cf85e8ee 100644 --- a/src/pages/processCenter/pages/phone/bzjd/step6.vue +++ b/src/pages/processCenter/pages/phone/bzjd/step6.vue @@ -2,7 +2,7 @@
- +
基础信息
From 606de7167d26957fd0cf1cc0ffefd9fdad7c1abe Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 17 Jan 2022 15:39:59 +0800 Subject: [PATCH 05/11] commit --- .../pages/phone/bzzqyj/step2.vue | 1 - .../pages/phone/bzzqyj/step6.vue | 72 +++++++++++++++---- 2 files changed, 58 insertions(+), 15 deletions(-) diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue index 704685e2a..f39181290 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step2.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step2.vue @@ -279,7 +279,6 @@ } this.form.responUserList = idList; this.form.responUserListName = nameList; - }, choiceZRR() { this.nodeList = []; diff --git a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue index c4ac44874..e21a6823b 100644 --- a/src/pages/processCenter/pages/phone/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/phone/bzzqyj/step6.vue @@ -50,6 +50,16 @@ - -
+ + + + + +
@@ -179,6 +189,13 @@
+
@@ -230,6 +247,8 @@ textType: '', modelList: [], modelNameList: '', + user7: '', + user7Name: '', }, formRules: { responUserList: [ @@ -246,6 +265,29 @@ ProcessTitle }, methods: { + checkedRole2(data) { + var idList = ""; + var nameList = ""; + if (data.length) { + data.forEach(item => { + if (nameList.length > 0) { + nameList += ","; + idList += ","; + } + idList += item.id; + nameList += item.name; + }); + } + this.form.user7 = idList; + this.form.user7Name = nameList; + }, + choiceZRR() { + this.nodeList = []; + if (this.form.user7.length > 0) { + this.nodeList = this.form.user7.split(","); + } + this.modalshowflag = true; + }, dialogOk () { this.itermsConditionsFlag = false }, @@ -362,20 +404,22 @@ }, handleSubmit() { this.isSubmit = true; - var json = this.json; - json.hqFlag = '0'; - json.commentText = this.commentText; - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(json), - taskId: this.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - if (res.success) { - this.$message.success("提交成功"); - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); + var json = this.json; + json.hqFlag = '0'; + json.user7 = this.form.user7; + json.user7Name = this.form.user7Name; + json.commentText = this.commentText; + this.$http.post("lawss/activiti/completeTask", { + json: JSON.stringify(json), + taskId: this.taskIds, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + if (res.success) { + this.$message.success("提交成功"); + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); }, handleSubmitNo() { if (this.commentText) { From 1e4e130c13a853a04590725066ac272978ead9c5 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Mon, 17 Jan 2022 16:37:09 +0800 Subject: [PATCH 06/11] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=BA=93=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=A4=87=E6=A1=88=E6=97=A5=E6=9C=9F=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=EF=BC=8C=E9=A2=84=E8=AD=A6=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/localTool/standardWarning.vue | 36 +++++++++++++++++-- .../domesticStandardsAndRegulations/index.vue | 17 +++++++++ .../components/EnterpriseStandardDatabase.vue | 22 ++++++++++++ .../foreignStandardsAndRegulations/index.vue | 18 ++++++++++ 4 files changed, 91 insertions(+), 2 deletions(-) diff --git a/src/pages/localTool/standardWarning.vue b/src/pages/localTool/standardWarning.vue index d7b32da68..958c1cd4b 100644 --- a/src/pages/localTool/standardWarning.vue +++ b/src/pages/localTool/standardWarning.vue @@ -166,7 +166,16 @@ {{ scope.row.itemsName }} - + + + @@ -237,6 +256,8 @@ export default { name: "standardWarning", data() { return { + detailTextDialog: false, + detailText: '', selectedList: [], exportName: '', exportModelFlag: false, @@ -653,7 +674,12 @@ export default { // this.activeName === 'STANDARD' ? this.getEarlyDate() : this.getPolicyDate() // this.field = field }, - ...mapMutations(["setDetailMap"]) + ...mapMutations(["setDetailMap"]), + + openDialog(text) { + this.detailText = text + this.detailTextDialog = true + } }, props: { reload: { @@ -1049,5 +1075,11 @@ export default { margin: 24px 0; } } + .textDialog { + /deep/ .el-dialog__body { + height: 400px; + overflow-y: auto; + } + } } diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index 3c4728fe2..bc1457fca 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1545,6 +1545,15 @@ + + + + + @@ -2331,6 +2340,7 @@ export default { , TXLB: '',//体系类别 DYBXH: '',// 模块结构单元变形号 DYMC: '',//模块结构单元名称 + BARQ: '' //备案日期 }, // 树形结构 // tree function @@ -4345,6 +4355,13 @@ export default { type: 'between', value: value.join(',') }); + }else if (value !== null && value !== '' && (key === 'BARQ')){ + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'equals', + value: value + }); }else if (value !== null && value !== ''){ advanceSearchVOList.push({ connect: "and", diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index b0c5d5ea0..9234a5547 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -1067,6 +1067,17 @@ value-format="yyyy-MM-dd" clearable> + + + + + + @@ -2005,6 +2016,8 @@ export default { // 基础信息 FZRQBUSS:'', FSRQBUSS:'', + + BARQ: '', // 文本信息 FBGBUSS:'', BZSMBUSS:'', @@ -3926,6 +3939,14 @@ export default { }); } }) + if (formData.BARQ !== null){ + advanceSearchVOList.push({ + connect: "and", + field: 'BARQ', + type: 'equals', + value: formData.BARQ + }); + } } formData.advanceSearchVOStr = JSON.stringify(advanceSearchVOList); this.SarExportSearchEo = formData; @@ -3935,6 +3956,7 @@ export default { formData.endPutTime = formData.putTime ? formData.putTime[1] : null; formData.FSRQBUSS = null; formData.FZRQBUSS = null; + formData.BARQ = null formData.putTime = null; formData.issueTime = null; } diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index ec974d0bd..54e646167 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -514,6 +514,16 @@ + + + + + + @@ -1885,6 +1895,7 @@ export default { TXLB: '',//体系类别 DYMC: '', //模块结构单元名称 DYBXH: '',// 模块结构单元变形号 + BARQ: '', // 备案日期 }, // 分页查询过程中用到的对象 @@ -3831,6 +3842,13 @@ export default { type: 'between', value: value.join(',') }); + }else if (value !== null && value !== '' && (key === 'BARQ')){ + advanceSearchVOList.push({ + connect: "and", + field: key || '', + type: 'equals', + value: value + }); } else if (value !== null && value !== '') { advanceSearchVOList.push({ connect: "and", From 34dce9ef189bd5024f60fb6d6ca2e7c1df7bd067 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 17 Jan 2022 17:40:36 +0800 Subject: [PATCH 07/11] commit --- src/pages/processCenter/pages/creatProcess/bzjd/step1.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 43713ee32..187e0cd02 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -663,7 +663,7 @@ export default { getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'LEFT' + leftOrRight: 'RIGHT' }, { _this: this }, res => { @@ -677,7 +677,7 @@ export default { } this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'RIGHT' + leftOrRight: 'LEFT' }, { _this: this }, res => { @@ -800,7 +800,8 @@ export default { this.$http.get('lawss/sarStandCompareHis/page', { page: 1, pageSize: 9999, - newNumOrName: this.form.itemsNum + newNumOrName: this.form.itemsNum, + newFileType: this.form.fileType, }, { _this: this }, res => { From 0bbb9fe7dffb2b712c602446d7b8e42e0a057803 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 17 Jan 2022 18:48:01 +0800 Subject: [PATCH 08/11] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 26 +++++++--- .../pages/creatProcess/bzjd/step1.vue | 24 +++++++--- .../pages/creatProcess/bzjd/step3.vue | 48 ++++++++++++------- .../pages/creatProcess/bzjd/step4.vue | 4 ++ .../pages/creatProcess/bzjd/step5.vue | 4 ++ .../pages/creatProcess/bzjd/step6.vue | 4 ++ 6 files changed, 80 insertions(+), 30 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 2e198526f..8ba115491 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -413,7 +413,11 @@
- +
+
+
无内容
+
+ { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) { - this.itemList[a].itemsId2 = res.data[b].itemsId + if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { + this.itemList[a].itemsId = res.data[b].itemsId } } } @@ -686,6 +691,10 @@ newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { @@ -701,6 +710,7 @@ }) }, itemEdit (row, type, index) { + this.itermsConditions = row.itermsConditions let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -714,6 +724,8 @@ this.PLmodalTitle = '编辑' if (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 @@ -787,12 +799,12 @@ this.$http.get('lawss/sarStandCompareHis/page', { page: 1, pageSize: 9999, - newNumOrName: this.form.itemsNum + newNumOrName: this.form.itemsNum, + newFileType: this.form.fileType, }, { _this: this }, res => { this.standInfoList3 = res.data.list - console.log(res); }, e => { }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 187e0cd02..691223d66 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -421,6 +421,10 @@
+
+
+
无内容
+
{ for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) { - this.itemList[a].itemsId = res.data[b].itemsId - this.itemList[a].targetStand = res.data[b].targetStand + this.itemList[a].itemsId2 = res.data[b].itemsId + this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum } } } this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'LEFT' + leftOrRight: 'RIGHT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) { - this.itemList[a].itemsId2 = res.data[b].itemsId + if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { + this.itemList[a].itemsId = res.data[b].itemsId } } } @@ -699,6 +704,10 @@ export default { newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { @@ -714,6 +723,7 @@ export default { }) }, itemEdit (row, type, index) { + this.itermsConditions = row.itermsConditions let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -727,6 +737,8 @@ export default { this.PLmodalTitle = '编辑' if (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 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 65d7db6e0..3b2fd60a6 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -353,10 +353,10 @@ title="编辑" :visible.sync="modalshowflag2" :wrapperClosable="false" - :size="form.itemsNum1 ? '1200px' : '800px'"> + size="1200px">
-
+
无相似文本
比对条款: {{ editForm.itemsNum }}
@@ -367,6 +367,10 @@
+
+
+
无内容
+
{ - for (let a = 0; a < this.itemList.length; a++) { - for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].itemsNum === res.data[b].itemsNum) { - this.itemList[a].itemsId = res.data[b].itemsId - } - } - } - }, e => { - }) - this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { - standHisId: this.oldNumber, - leftOrRight: 'RIGHT' - }, { - _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) { this.itemList[a].itemsId2 = res.data[b].itemsId + this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum } } } + this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { + standHisId: this.oldNumber, + leftOrRight: 'RIGHT' + }, { + _this: this + }, res => { + for (let a = 0; a < this.itemList.length; a++) { + for (let b = 0; b < res.data.length; b++) { + if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { + this.itemList[a].itemsId = res.data[b].itemsId + } + } + } + }, e => { + }) }, e => { }) }, @@ -585,6 +591,10 @@ newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { @@ -600,6 +610,7 @@ }) }, itemEdit (row) { + this.itermsConditions = row.itermsConditions let itemsEoPage = { oldItemId: row.itemsId, newItemId: row.itemsId2, @@ -610,6 +621,8 @@ }, res => { if (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 @@ -899,6 +912,7 @@ }) this.getBDList() this.itemList = itemList + console.log(itemList); this.loading = false }).catch(e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue index 1c45c181f..a7527401d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step4.vue @@ -361,6 +361,10 @@ newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue index cb0786668..6a1a4c682 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step5.vue @@ -361,6 +361,10 @@ newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue index c35fce237..62555ab9f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6.vue @@ -359,6 +359,10 @@ newItemId: id2, flag: 1 } + if (!id || !id2) { + this.$message.warning('暂无找到相似的文本') + return + } this.$http.post('lawss/sarStandCompareHis/clauseComparison', itemsEoPage, { _this: this }, res => { From efdad74867461e8b1ad541027c8de5baf691de34 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 17 Jan 2022 23:40:29 +0800 Subject: [PATCH 09/11] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 12 ++++++------ .../processCenter/pages/creatProcess/bzjd/step1.vue | 12 ++++++------ .../processCenter/pages/creatProcess/bzjd/step3.vue | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index 8ba115491..d9b1cc81f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -655,28 +655,28 @@ getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'LEFT' + leftOrRight: 'RIGHT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) { - this.itemList[a].itemsId2 = res.data[b].itemsId - this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum + this.itemList[a].itemsId = res.data[b].itemsId + this.itemList[a].targetStand = res.data[b].targetStand } } } this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'RIGHT' + leftOrRight: 'LEFT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { - this.itemList[a].itemsId = res.data[b].itemsId + if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 691223d66..ec1945309 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -668,28 +668,28 @@ export default { getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'LEFT' + leftOrRight: 'RIGHT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) { - this.itemList[a].itemsId2 = res.data[b].itemsId - this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum + this.itemList[a].itemsId = res.data[b].itemsId + this.itemList[a].targetStand = res.data[b].targetStand } } } this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.form.oldNumber, - leftOrRight: 'RIGHT' + leftOrRight: 'LEFT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { - this.itemList[a].itemsId = res.data[b].itemsId + if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId } } } diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index 3b2fd60a6..37c218dd0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -555,28 +555,28 @@ getBDList () { this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.oldNumber, - leftOrRight: 'LEFT' + leftOrRight: 'RIGHT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { if (this.itemList[a].itemsNum === res.data[b].itemsNum) { - this.itemList[a].itemsId2 = res.data[b].itemsId - this.itemList[a].itemsDisplayNum = res.data[b].itemsDisplayNum + this.itemList[a].itemsId = res.data[b].itemsId + this.itemList[a].targetStand = res.data[b].targetStand } } } this.$http.get('lawss/sarStandItemsCompareHis/getStandItemsCompareHisList', { standHisId: this.oldNumber, - leftOrRight: 'RIGHT' + leftOrRight: 'LEFT' }, { _this: this }, res => { for (let a = 0; a < this.itemList.length; a++) { for (let b = 0; b < res.data.length; b++) { - if (this.itemList[a].itemsDisplayNum === res.data[b].targetStand) { - this.itemList[a].itemsId = res.data[b].itemsId + if (this.itemList[a].targetStand === res.data[b].itemsDisplayNum) { + this.itemList[a].itemsId2 = res.data[b].itemsId } } } From 93e462bfefd05963ab19b50c97faa04cdac04558 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Tue, 18 Jan 2022 11:44:03 +0800 Subject: [PATCH 10/11] commit --- .../pages/creatProcess/bzjd/step1-1.vue | 30 ++++++++--------- .../pages/creatProcess/bzjd/step1-6.vue | 32 +++++++++---------- .../pages/creatProcess/bzjd/step1.vue | 30 ++++++++--------- .../pages/creatProcess/bzjd/step2.vue | 30 ++++++++--------- .../pages/creatProcess/bzjd/step3.vue | 16 +++++----- .../pages/creatProcess/bzjd/step4.vue | 32 +++++++++---------- .../pages/creatProcess/bzjd/step5.vue | 32 +++++++++---------- .../pages/creatProcess/bzjd/step6.vue | 32 +++++++++---------- .../pages/creatProcess/bzzqyj/step5.vue | 17 +++++----- .../pages/creatProcess/bzzqyj/step6.vue | 7 ++-- .../pages/creatProcess/bzzqyj/step7.vue | 6 +++- .../pages/creatProcess/bzzqyj/step8.vue | 6 +++- .../pages/creatProcess/bzzqyj/step9.vue | 6 +++- 13 files changed, 145 insertions(+), 131 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue index d9b1cc81f..70855c5e0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1-1.vue @@ -132,21 +132,6 @@ show-overflow-tooltip align="center"> - - - - + + + + 查看条款内容 - - - - + + + + - - - - + + + + - - - - + + + + - - + + - - - - + + + + - - - - + + + + - - - - + + + + { let data = JSON.parse(res.mesg); - console.log(data); this.commentText5 = data.commentText5 || '' this.form.fjList = data.form ? data.form.fjList : (data.fjList ? data.fjList : [] ) this.form.modelList = data.form ? data.form.modelList : (data.modelList ? data.modelList : [] ) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue index db4ee6551..97723e319 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -105,7 +105,7 @@
{ let data = JSON.parse(res.mesg); - console.log(data); this.commentText6 = data.commentText6 || '' this.form.fjList = data.fjList || data.form.fjList this.form.cid = data.cid || data.form.cid; @@ -544,6 +546,7 @@ } }) this.json = data + this.data2 = newArr this.data = arr }).catch(e => { }); diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue index 544bed354..e30146ceb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -97,7 +97,7 @@
{ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue index 90dbad5a6..c87546e05 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -97,7 +97,7 @@
{ }) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue index 61c52caf5..a851a20d5 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -97,7 +97,7 @@
{ }); }); From ede115e1e3919d4d71bc56bbf340ed8f7473c259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 18 Jan 2022 14:38:34 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qbzxdjhgk/component/cancel.vue | 14 +++++----- .../qbzxdjhgk/component/delay.vue | 14 +++++----- .../qbzxdjhgk/component/establish.vue | 26 +++++++++---------- .../qbzxdjhgk/component/merge.vue | 26 +++++++++---------- .../qbzxdjhgk/component/rename.vue | 14 +++++----- .../pages/creatProcess/qbzxdjhgk/step1-5.vue | 14 +++++----- .../pages/creatProcess/qbzxdjhgk/step2.vue | 14 +++++----- .../pages/creatProcess/qbzxdjhgk/step3.vue | 14 +++++----- .../pages/creatProcess/qbzxdjhgk/step4.vue | 14 +++++----- .../pages/creatProcess/qbzxdjhgk/step5.vue | 14 +++++----- 10 files changed, 82 insertions(+), 82 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 6a113aacd..962c71c46 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -64,13 +64,6 @@ placeholder="请选择初稿完成时间"> - - - + + + - - - + + + + + + + + + @@ -75,19 +88,6 @@ placeholder="请选择计划标准发布时间"> - - - - - - - - - - - -