diff --git a/yxt-as-ui/src/api/operation/repairbill.js b/yxt-as-ui/src/api/operation/repairbill.js index c25fc953be..c1b1b9d469 100644 --- a/yxt-as-ui/src/api/operation/repairbill.js +++ b/yxt-as-ui/src/api/operation/repairbill.js @@ -20,9 +20,9 @@ export default { }) }, // 查询分页列表 -- 维修单出厂 -- 出厂确认 - carOutFactory: function(data) { + confirmOut: function(data) { return request({ - url: '/as/v1/AsBusrepairBill/carOutFactory', + url: '/as/v1/AsBusrepairBill/confirmOut', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } @@ -85,9 +85,9 @@ export default { }) }, // 打印出门证 - printCard: function(data) { + createPdf: function(data) { return request({ - url: '/as/v1/AsBusrepairBill/printCard', + url: '/as/v1/AsBusrepairBill/createPdf', method: 'post', params: data }) diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue index dbc703f343..caedb15b94 100644 --- a/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue +++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBYLeaveFactory.vue @@ -387,7 +387,7 @@ export default { spinner: 'el-icon-loading', background: 'rgba(0, 0, 0, 0.7)' }) - req.carOutFactory(this.sids).then((res) => { + req.confirmOut(this.sids).then((res) => { if (res.success) { this.$message({ showClose: true, type: 'success', message: '操作成功' }) this.getList() @@ -402,7 +402,7 @@ export default { toPrint() { if (this.sids.length === 1) { if (this.multipleSelection[0].isOutFactory === '是') { - req.printCard({ sid: this.sids[0] }).then((res) => { + req.createPdf({ sid: this.sids[0] }).then((res) => { if (res.success) { var xhr = new XMLHttpRequest() xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '出门证', true) diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java index f70af7a5e4..3621e11ac8 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java @@ -193,6 +193,31 @@ public class AsBusrepairBillService extends MybatisBaseService