From e32de5997ff57975e6c2eb0770f50000c63a64da Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Jun 2023 08:58:55 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=94=80=E5=94=AE?= =?UTF-8?q?=E5=8F=B0=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliangxiaoshoutaizhang.vue | 105 +++++++++--------- 1 file changed, 55 insertions(+), 50 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue index e51d9146dc..9c67189f40 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangxiaoshou/cheliangxiaoshoutaizhang.vue @@ -80,6 +80,11 @@ {{ scope.row.purchaseSystemName }} + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + From 6bfc843d28d479c2e4f6bcd349dbaf99a367937f Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Jun 2023 09:42:21 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=8E=88=E6=9D=83--=E5=8A=9F=E8=83=BD=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/RoleAdminister/RoleAdminister.vue | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue index 98886a9224..09546263bc 100644 --- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue +++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue @@ -255,9 +255,11 @@ 可操作功能列表 - - +
+ + +
From 29e3194e25405d67cb180b80fddd3d4d90e6daa0 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Jun 2023 10:43:19 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E6=8E=88=E6=9D=83--=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue index 09546263bc..986bf3271f 100644 --- a/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue +++ b/anrui-system-ui/src/views/RoleAdminister/RoleAdminister.vue @@ -291,7 +291,7 @@ - + From 5aa0b661dcc69d8659fbe8961359da763093e9ee Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Wed, 28 Jun 2023 13:50:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98--?= =?UTF-8?q?=E4=BD=9C=E5=BA=9F=E3=80=81=E7=BB=88=E6=AD=A2=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E7=A1=AE=E8=AE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheliang/cheliangcaigou/cheliangcaigou.vue | 17 ++++++++++++----- .../ruzhang/ruzhangguanli/ruzhangguanli.vue | 17 ++++++++++++----- .../changjiaxitong/manufacturers.vue | 17 ++++++++++++----- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue index 779b3d3be9..908a4b2d51 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue @@ -178,11 +178,18 @@ export default { this.$refs['divadd'].showEdit(row) }, handleCancellation(row) { - req.cancal({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } + const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancal({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.loadList() + } + }) }) }, handleLooK(row) { diff --git a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue index 4549253c07..d733998022 100644 --- a/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/ruzhang/ruzhangguanli/ruzhangguanli.vue @@ -229,11 +229,18 @@ export default { this.$refs['divinfo'].showInfo(sid, row) }, toTermination(row) { - req.cancal({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.loadList() - } + const tip = '请确认是否终止该记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancal({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.loadList() + } + }) }) }, hangleLook(row) { diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue index f2e0193cb3..79631ef3d6 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/changjiaxitong/manufacturers.vue @@ -307,11 +307,18 @@ export default { }) }, handCancellation(row) { - req.cancel({ sid: row.sid }).then((res) => { - if (res.success) { - this.$message({ showClose: true, type: 'success', message: '操作成功' }) - this.getList() - } + const tip = '请确认是否作废该记录?' + this.$confirm(tip, '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + req.cancel({ sid: row.sid }).then((res) => { + if (res.success) { + this.$message({ showClose: true, type: 'success', message: '操作成功' }) + this.getList() + } + }) }) }, handleGetCheck(row) { From 275353dd98845c79d2300530fd1031bf5ac6db85 Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Wed, 28 Jun 2023 14:00:36 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8C=85=E4=BA=A4?= =?UTF-8?q?=E6=8E=A5=E6=8E=A8=E9=80=81orgSidPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BaseDiscountpackageApplyService.java | 2 ++ .../BusDiscountpackageHandover.java | 2 ++ .../BusDiscountpackageHandoverDto.java | 1 + .../BusDiscountpackageHandoverRest.java | 6 +----- .../BusDiscountpackageHandoverService.java | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java index 274ce64a45..684b978b8f 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java @@ -486,6 +486,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService resultBean = flowableFeign.handleProsess(bv); @@ -526,6 +527,7 @@ public class BaseDiscountpackageApplyService extends MybatisBaseService