From 06048f7d93f07f34a4cbda21467ea31144b1132e Mon Sep 17 00:00:00 2001 From: xd <844539747@qq.com> Date: Wed, 3 Jul 2024 09:52:21 +0800 Subject: [PATCH] '123' --- ABAP_AS_WITH_POOL.jcoDestination | 11 ---------- .../web/controller/quot/QuotController.java | 20 ++++++++++--------- ruoyi-ui/src/views/quot/quot/index.vue | 6 +++--- 3 files changed, 14 insertions(+), 23 deletions(-) delete mode 100644 ABAP_AS_WITH_POOL.jcoDestination diff --git a/ABAP_AS_WITH_POOL.jcoDestination b/ABAP_AS_WITH_POOL.jcoDestination deleted file mode 100644 index 0c8dc36..0000000 --- a/ABAP_AS_WITH_POOL.jcoDestination +++ /dev/null @@ -1,11 +0,0 @@ -#for tests only ! -#Wed Jun 26 10:28:59 CST 2024 -jco.destination.pool_capacity=10 -jco.client.lang=ZH -jco.client.ashost=172.19.0.125 -jco.client.saprouter= -jco.client.user=RFC -jco.client.sysnr=00 -jco.destination.peak_limit=10 -jco.client.passwd=654321 -jco.client.client=800 diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java index 872b730..56866f0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/quot/QuotController.java @@ -168,17 +168,19 @@ public class QuotController extends BaseController * 获取报价详细信息-整单通过 */ @PreAuthorize("@ss.hasPermi('quot:quot:allPass')") - @GetMapping(value = "/allPass/{quotId}") + @GetMapping(value = "/allPass/{quotIds}") @Log(title = "报价单-手动更新状态为通过", businessType = BusinessType.UPDATE) - public AjaxResult getAllPassInfo(@PathVariable("quotId") String quotId) + public AjaxResult getAllPassInfo(@PathVariable("quotIds") String[] quotIds) { - Quot quot = new Quot(); - quot.setQuotId(quotId); - quot.setQuotApprovalStatus("2");// 提交状态设置为 通过 - quot.setQuotQuotationDate(DateUtils.getNowDate());//报价单-报价日期设置为 当前日期 - quot.setQuotCheckUserName(getUsername()); - quotService.updateQuotAllPassInfo(quot); - return success(quot); + for(String quotId:quotIds){ + Quot quot = new Quot(); + quot.setQuotId(quotId); + quot.setQuotApprovalStatus("2");// 提交状态设置为 通过 + quot.setQuotQuotationDate(DateUtils.getNowDate());//报价单-报价日期设置为 当前日期 + quot.setQuotCheckUserName(getUsername()); + quotService.updateQuotAllPassInfo(quot); + } + return success(); } /** diff --git a/ruoyi-ui/src/views/quot/quot/index.vue b/ruoyi-ui/src/views/quot/quot/index.vue index 41e7048..7b00638 100644 --- a/ruoyi-ui/src/views/quot/quot/index.vue +++ b/ruoyi-ui/src/views/quot/quot/index.vue @@ -129,7 +129,7 @@ plain icon="el-icon-edit" size="mini" - :disabled="single" + :disabled="multiple" @click="handleAllPass" v-hasPermi="['quot:quot:allPass']" >整单通过 @@ -1369,10 +1369,10 @@ export default { // 整单通过 handleAllPass(row) { this.reset(); - const quotId = row.quotId || this.ids + const quotIds = row.quotId || this.ids this.$modal.confirm('是否确认修订所选报价单且更新状态为通过?').then(function() { }).then(() => { - getAllPass(quotId).then(response => { + getAllPass(quotIds).then(response => { this.$modal.msgSuccess("更改成功"); this.getList(); });