From f4056942e7b324f8d1635a232a7e466c091e2b1e Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 28 Jul 2022 15:04:09 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=96=87=E6=A1=A3=E9=97=AE=E9=A2=98=20=E8=A7=A3=E8=AF=BB?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BF=98=E6=9C=89=E6=8E=A5=E6=94=B6=E4=BB=A3?= =?UTF-8?q?=E5=8A=9E=EF=BC=9F=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzjd/step3.vue | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue index d32931ae4..475ccd070 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step3.vue @@ -277,14 +277,12 @@ { let data = JSON.parse(res.mesg) this.form.endTime = data.endTime || data.form.endTime - let commitStatus = res.commitStatus - if(commitStatus && commitStatus > 0){ - this.acceptShow = true - this.submitShow = false - }else { - this.acceptShow = false - this.submitShow = true - } + // let commitStatus = res.commitStatus + // if(commitStatus && commitStatus > 0){ + // this.acceptShow = true + // this.submitShow = false + // }else { + // this.acceptShow = false + // this.submitShow = true + // } + this.submitShow = true this.AOLIGEI = data.AOLIGEI this.commentText3 = data.commentText3 || '' this.todoId = res.id From 4b03e47c87874b60bf2dba2a5b46f0734e9ec374 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Thu, 28 Jul 2022 16:39:40 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E6=8B=86=E5=88=86=20=E8=AF=B7=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4=E9=80=89=E6=8B=A9=E6=9D=A1=E6=AC=BE=E6=98=AF=E5=90=A6?= =?UTF-8?q?=E6=9C=89=E5=AD=90=E8=8A=82=E7=82=B9=EF=BC=8C=E8=8B=A5=E6=9C=89?= =?UTF-8?q?=EF=BC=8C=E5=88=99=E6=AD=A4=E6=AC=A1=E5=88=A0=E9=99=A4=E5=B0=86?= =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=88=A0=E9=99=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localTool/standAutoSplit/pages/itemSplitInfo.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index 275984ed2..e6ef68362 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -1509,19 +1509,19 @@ export default { if (res.data) { this.batchDeleteItem() } else if(this.selectedList === null){ - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。') } else { this.deleteItemsModal = true } }, e => { }) } else { - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。') } }, batchDeleteItem () { if (this.selectedList != null && this.selectedList.length > 0) { - this.$confirm('确认删除选择数据？', '提示', { + this.$confirm('请确认选择条款是否有子节点，若有，则此次删除将全部删除。', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', @@ -1556,7 +1556,7 @@ export default { }) }).catch(() => {}) } else { - this.$message.warning('请选择要删除的数据') + this.$message.warning('请确认选择条款是否有子节点，若有，则此次删除将全部删除。') } }, // 批量复制 事件 From 97de11f62733e22474042e0703e425b33721ea42 Mon Sep 17 00:00:00 2001 From: zhangyanduan Date: Thu, 28 Jul 2022 17:58:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=E4=BC=81=E4=B8=9A=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E7=BC=96=E8=BE=91=E5=90=8E=E6=A0=87=E5=87=86=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E4=B8=AD=E8=87=AA=E5=8A=A8=E5=A2=9E=E5=8A=A0=E4=BA=86?= =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 122404ca2..ff937e6b9 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4009,7 +4009,7 @@ export default { if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') { nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss') } - nowstandinfo.standCode = nowstandinfo.standSort+" "+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort+""+ nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, { _this: this, loading: 'isSubmit' From 93f33f52f4fb0f6a7663dc1798191c5c3c926d71 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 29 Jul 2022 11:30:39 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=85=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E6=8A=8A=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=83=A8=E9=AB=98=E7=BA=A7=E7=BB=8F=E7=90=86?= =?UTF-8?q?=E9=82=A3=E4=B8=AA=E5=B1=8F=E8=94=BD=E6=8E=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 8dbd98078..b6ebd7679 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -154,22 +154,22 @@ - - - -

标准法规部高级经理、责任部门高级经理

-
- - -
- - - + + + + + + + + + + + + + + + + From 09ddb5c6844b18aa9d3f09f038ee040e5ce9b896 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 29 Jul 2022 17:27:06 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E2=80=85=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=EF=BC=8C=E5=85=88=E6=8A=8A=E9=80=89=E6=8B=A9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E6=B3=95=E8=A7=84=E9=83=A8=E9=AB=98=E7=BA=A7=E7=BB=8F=E7=90=86?= =?UTF-8?q?=20=E4=B8=8D=E8=83=BD=E5=B1=8F=E8=94=BD=E6=8E=89=20=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzzqyj/step1.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index b6ebd7679..8dbd98078 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -154,22 +154,22 @@ - - - - - - - - - - - - - - - - + + + +

标准法规部高级经理、责任部门高级经理

+
+ + +
+ + +