From e19874a9a89634b4f495190663527bf9bf0df957 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 11 Nov 2024 14:07:25 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8--?= =?UTF-8?q?=E9=85=8D=E4=BB=B6=E5=87=BA=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E3=80=81=E9=85=8D=E4=BB=B6=E5=87=BA=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=B1=87=E6=80=BB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/statement/mountings.js | 22 ++ .../statement/mountings/accessoryDetail.vue | 293 ++++++++++++++++++ .../statement/mountings/partsSummary.vue | 229 ++++++++++++++ 3 files changed, 544 insertions(+) create mode 100644 yxt-as-ui/src/api/statement/mountings.js create mode 100644 yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue create mode 100644 yxt-as-ui/src/views/statement/mountings/partsSummary.vue diff --git a/yxt-as-ui/src/api/statement/mountings.js b/yxt-as-ui/src/api/statement/mountings.js new file mode 100644 index 0000000000..167061ba30 --- /dev/null +++ b/yxt-as-ui/src/api/statement/mountings.js @@ -0,0 +1,22 @@ +import request from '@/utils/request' + +export default { + // 查询分页列表 -- 业务汇总表 + fittingsSummaryRecord: function(params) { + return request({ + url: '/wms/apiadmin/inventory/wmsinventory/fittingsSummaryRecord', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 业务明细表 + fittingsStorageRecord: function(params) { + return request({ + url: '/as/v1/AsBusrepairBill/fittingsStorageRecord', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + } +} diff --git a/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue b/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue new file mode 100644 index 0000000000..386d5617fe --- /dev/null +++ b/yxt-as-ui/src/views/statement/mountings/accessoryDetail.vue @@ -0,0 +1,293 @@ + + + + diff --git a/yxt-as-ui/src/views/statement/mountings/partsSummary.vue b/yxt-as-ui/src/views/statement/mountings/partsSummary.vue new file mode 100644 index 0000000000..09f6550b92 --- /dev/null +++ b/yxt-as-ui/src/views/statement/mountings/partsSummary.vue @@ -0,0 +1,229 @@ + + + + From a621cee7fe0e7a9b4b7d50d774238dcd6bf21ba1 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Mon, 11 Nov 2024 17:05:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8E=82=E5=AE=B6?= =?UTF-8?q?=E7=B4=A2=E8=B5=94=E5=8D=95=E5=BC=80=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue | 2 +- yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue | 2 +- .../src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue | 2 +- .../src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue | 2 +- .../src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue index 0e9462e59b..6de0ddc052 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingAdd.vue @@ -330,7 +330,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue index 08236638bf..fa65b1316f 100644 --- a/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue +++ b/yxt-as-ui/src/views/operation/claimbilling/claimbillingInfo.vue @@ -129,7 +129,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue index c7b40bba7f..ae3f0cadcd 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingDaiBan.vue @@ -240,7 +240,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue index 19d8d9e0ad..181867a0e9 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingEdit.vue @@ -311,7 +311,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, diff --git a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue index 594191b3a5..54a13c46bd 100644 --- a/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue +++ b/yxt-as-ui/src/views/workFlow/suopeikaipiaoFlow/claimbillingYiBan.vue @@ -164,7 +164,7 @@ export default { // 定义样式变量 let cell = '' if (!row.isUnanimous) { - cell = 'background: #ff6961;' + cell = 'color: #ff6961;' return cell } }, From c4e8f3675c2288693821fb203b4351b3ba7ae4cc Mon Sep 17 00:00:00 2001 From: fanzongzhe <285169773@qq.com> Date: Mon, 11 Nov 2024 18:01:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=94=AE=E5=90=8E=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../report/BusinessSummaryQuery.java | 30 +++ .../report/BusinessSummaryVo.java | 108 ++++++++++ .../report/DebtBusinessQuery.java | 31 +++ .../report/DebtBusinessVo.java | 70 +++++++ .../report/OutInsuranceBusinessQuery.java | 30 +++ .../report/OutInsuranceBusinessVo.java | 70 +++++++ .../AsBusrepairBillMapper.java | 9 +- .../asbusrepairbill/AsBusrepairBillMapper.xml | 143 ++++++++++++- .../asbusrepairbill/AsBusrepairBillRest.java | 30 ++- .../AsBusrepairBillService.java | 194 +++++++++++++++++- 10 files changed, 699 insertions(+), 16 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessVo.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessQuery.java create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessVo.java diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryQuery.java new file mode 100644 index 0000000000..2f79c91801 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryQuery.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 8:59 + */ +@Data +public class BusinessSummaryQuery implements Query { + + /** + * 1本日2本月3本年 + */ + private String dateType; + private String menuUrl; + private String orgPath; + /** + * 结算结束 + */ + private String settleEndTime; + /** + * 结算开始 + */ + private String settleStartTime; + private String userSid; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryVo.java new file mode 100644 index 0000000000..dc551ea91f --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/BusinessSummaryVo.java @@ -0,0 +1,108 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 8:59 + */ +@Data +public class BusinessSummaryVo implements Vo { + + + /** + * 附加项目 + */ + private String addAmount; + /** + * 退货 + */ + private String backAmount; + /** + * 涉及单数 + */ + private String billNum; + /** + * 成本 + */ + private String cost; + /** + * 门店 + */ + private String deptName; + /** + * 材料 + */ + private String goodsAmount; + /** + * 材料成本 + */ + private String goodsAmountCost; + /** + * 毛利润 + */ + private String grossProfit; + /** + * 工时 + */ + private String hourAmount; + /** + * 工时成本 + */ + private String hourAmountCost; + /** + * 其他附件项目 + */ + private String otherAmount; + /** + * 其他附加项目成本 + */ + private String otherAmountCost; + /** + * 保外用料 + */ + private String outGoodsAmount; + /** + * 保外工时 + */ + private String outHourAmount; + /** + * 保外附加 + */ + private String outOtherAmount; + /** + * 保外应收 + */ + private String outReceivable; + /** + * 三包用料 + */ + private String packsGoodsAmount; + /** + * 三包工时 + */ + private String packsHourAmount; + /** + * 三包附加 + */ + private String packsOtherAmount; + /** + * 三包应收 + */ + private String packsReceivable; + /** + * 结算时间 + */ + private String settleTime; + /** + * 营业额 + */ + private String turnover; + /** + * 分公司 + */ + private String useOrgName; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessQuery.java new file mode 100644 index 0000000000..740a17e6fa --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessQuery.java @@ -0,0 +1,31 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 11:21 + */ +@Data +public class DebtBusinessQuery implements Query { + + /** + * 1本日2本月3本年 + */ + private String dateType; + private String menuUrl; + private String orgPath; + /** + * 结算结束 + */ + private String settleEndTime; + /** + * 结算开始 + */ + private String settleStartTime; + private String userSid; + + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessVo.java new file mode 100644 index 0000000000..9f4d1baf92 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/DebtBusinessVo.java @@ -0,0 +1,70 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 11:21 + */ +@Data +public class DebtBusinessVo implements Vo { + + /** + * 附加费 + */ + private String addAmount; + /** + * 单数 + */ + private String billNum; + /** + * 维修类型 + */ + private String billType; + /** + * 当前欠款金额 + */ + private String debtAmount; + /** + * 当前欠款单数 + */ + private String debtNum; + /** + * 门店 + */ + private String deptName; + /** + * 材料费 + */ + private String goodsAmount; + /** + * 材料成本 + */ + private String goodsAmountCost; + /** + * 工时费 + */ + private String hourAmount; + /** + * 工时成本 + */ + private String hourAmountCost; + /** + * 其他附加费 + */ + private String otherAmount; + /** + * 应收合计 + */ + private String totalAmount; + /** + * 成本合计 + */ + private String totalCost; + /** + * 分公司 + */ + private String useOrgName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessQuery.java new file mode 100644 index 0000000000..c79410e739 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessQuery.java @@ -0,0 +1,30 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.query.Query; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 10:57 + */ +@Data +public class OutInsuranceBusinessQuery implements Query { + + /** + * 1本日2本月3本年 + */ + private String dateType; + private String menuUrl; + private String orgPath; + /** + * 结算结束 + */ + private String settleEndTime; + /** + * 结算开始 + */ + private String settleStartTime; + private String userSid; + +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessVo.java new file mode 100644 index 0000000000..5a9bd0a21f --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/OutInsuranceBusinessVo.java @@ -0,0 +1,70 @@ +package com.yxt.anrui.as.api.asbusrepairbill.report; + +import com.yxt.common.core.vo.Vo; +import lombok.Data; + +/** + * @author Fan + * @description + * @date 2024/11/8 10:57 + */ +@Data +public class OutInsuranceBusinessVo implements Vo { + + /** + * 附加费 + */ + private String addAmount; + /** + * 涉及单数 + */ + private String billNum; + /** + * 维修类型 + */ + private String billType; + /** + * 门店 + */ + private String deptName; + /** + * 材料费 + */ + private String goodsAmount; + /** + * 材料成本 + */ + private String goodsAmountCost; + /** + * 工时费 + */ + private String hourAmount; + /** + * 工时成本 + */ + private String hourAmountCost; + /** + * 其他附加费 + */ + private String otherAmount; + /** + * 附加成本 + */ + private String otherAmountCost; + /** + * 利润合计 + */ + private String profit; + /** + * 收入合计 + */ + private String totalAmount; + /** + * 成本合计 + */ + private String totalCost; + /** + * 分公司 + */ + private String useOrgName; +} diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java index 3e244aafb6..756b9e7d65 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.java @@ -6,8 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Constants; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; -import com.yxt.anrui.as.api.asbusrepairbill.report.BusDetailsVo; -import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryVo; +import com.yxt.anrui.as.api.asbusrepairbill.report.*; import com.yxt.anrui.as.api.asbusrepairinventorybilldetail.SitemsVo; import com.yxt.common.core.result.ResultBean; import org.apache.ibatis.annotations.Mapper; @@ -71,4 +70,10 @@ public interface AsBusrepairBillMapper extends BaseMapper { IPage Summary(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); IPage busDetailsList(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage businessSummary(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage outInsuranceBusiness(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage debtBusiness(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); } diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml index 147dad4cc5..a0ef027fd2 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillMapper.xml @@ -370,7 +370,7 @@ LEFT JOIN yxt_wms.wms_inventory AS i ON d.inventorySid = i.sid WHERE b.busTypeKey = '0' GROUP BY - a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.useOrgSid,d.inventorySid,a.billType,a.`subject`,d.billBusTypeValue,a.nodeCode + a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.deptSid,d.inventorySid,a.billType,a.`subject`,d.billBusTypeValue,a.nodeCode UNION ALL SELECT a.orgSidPath, @@ -393,7 +393,7 @@ (IFNULL(SUM(s.amount),0) - IFNULL(SUM(s.costTotal),0)) as profit FROM as_busrepair_bill_sitem as s LEFT JOIN as_busrepair_bill as a ON s.billSid = a.sid GROUP BY - a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.useOrgSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode + a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.deptSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode UNION ALL SELECT a.orgSidPath, @@ -416,7 +416,7 @@ (IFNULL(SUM(s.price),0) - IFNULL(SUM(s.costTotal),0)) as profit FROM as_busrepair_bill_aitem as s LEFT JOIN as_busrepair_bill as a ON s.billSid = a.sid GROUP BY - a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.useOrgSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode + a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.deptSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode UNION ALL SELECT a.orgSidPath, @@ -439,7 +439,7 @@ (IFNULL(SUM(s.price),0) - IFNULL(SUM(s.costTotal),0)) as profit FROM as_busrepair_bill_aitemspec as s LEFT JOIN as_busrepair_bill as a ON s.billSid = a.sid GROUP BY - a.sid,s.attachItem,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.useOrgSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode + a.sid,s.attachItem,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.deptSid,a.billType,a.`subject`,s.billBusTypeValue,a.nodeCode UNION ALL SELECT s.orgSidPath, @@ -466,7 +466,7 @@ LEFT JOIN yxt_sms.sms_sales_bill AS a ON d.billSid = a.sid LEFT JOIN anrui_portal.sys_organization AS s ON a.deptSid = s.sid GROUP BY - a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.useOrgSid,d.billBusTypeValue) as m + a.sid,date_format ( a.createTime, '%Y-%m-%d' ),date_format ( a.settleTime, '%Y-%m-%d' ),a.deptSid,d.billBusTypeValue) as m ${ew.sqlSegment} @@ -653,4 +653,137 @@ ${ew.sqlSegment} + + + diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java index fc967f16be..57d5a3506e 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java @@ -2,10 +2,7 @@ package com.yxt.anrui.as.biz.asbusrepairbill; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; -import com.yxt.anrui.as.api.asbusrepairbill.report.BusDetailsQuery; -import com.yxt.anrui.as.api.asbusrepairbill.report.BusDetailsVo; -import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryQuery; -import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryVo; +import com.yxt.anrui.as.api.asbusrepairbill.report.*; import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice; import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem; import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer; @@ -311,12 +308,35 @@ public class AsBusrepairBillRest { } @PostMapping("/busDetailsList") - @ApiOperation("业务汇总") + @ApiOperation("业务明细") ResultBean> busDetailsList(@RequestBody PagerQuery pagerQuery) { ResultBean> rb = ResultBean.fireFail(); PagerVo pv = asBusrepairBillService.busDetailsList(pagerQuery); return rb.success().setData(pv); } + @PostMapping("/businessSummary") + @ApiOperation("营业汇总表") + ResultBean> businessSummary(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.businessSummary(pq); + return rb.success().setData(pv); + } + + @PostMapping("/outInsuranceBusiness") + @ApiOperation("营业分析1(保外)") + ResultBean> outInsuranceBusiness(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.outInsuranceBusiness(pq); + return rb.success().setData(pv); + } + + @PostMapping("/debtBusiness") + @ApiOperation("营业分析2(欠款)") + ResultBean> debtBusiness(@RequestBody PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = asBusrepairBillService.debtBusiness(pq); + return rb.success().setData(pv); + } } 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 376ae93a94..276cfb3c6e 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 @@ -9,10 +9,7 @@ import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbill.app.*; -import com.yxt.anrui.as.api.asbusrepairbill.report.BusDetailsQuery; -import com.yxt.anrui.as.api.asbusrepairbill.report.BusDetailsVo; -import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryQuery; -import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryVo; +import com.yxt.anrui.as.api.asbusrepairbill.report.*; import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem; import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec; import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance; @@ -2722,4 +2719,193 @@ public class AsBusrepairBillService extends MybatisBaseService p = PagerUtil.pageToVo(pagging, null); return p; } + + public PagerVo businessSummary(PagerQuery pq) { + BusinessSummaryQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("m.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("m.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("m.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("m.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { +// qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + if (StringUtils.isNotBlank(query.getDateType())) { + String dateType = query.getDateType(); + if (dateType.equals("1")) { + //本日 + qw.apply("m.settleTime = CURDATE()"); + } else if (dateType.equals("2")) { + //本月 + qw.apply("m.settleTime >= date_add(curdate(), interval - day(curdate()) + 1 day) AND m.settleTime <= last_day(curdate())"); + } else if (dateType.equals("3")) { + //本年 + qw.apply("m.settleTime >= date_sub(curdate(), interval dayofyear(curdate())-1 day) AND m.settleTime <= concat(year(curdate()),'-12-31')"); + } + } + //结算时间 + qw.apply(StringUtils.isNotBlank(query.getSettleStartTime()), "date_format (m.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleStartTime() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getSettleEndTime()), "date_format (m.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleEndTime() + "','%Y-%m-%d')" + ); + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.businessSummary(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo outInsuranceBusiness(PagerQuery pq) { + OutInsuranceBusinessQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("m.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("m.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("m.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("m.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { +// qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + if (StringUtils.isNotBlank(query.getDateType())) { + String dateType = query.getDateType(); + if (dateType.equals("1")) { + //本日 + qw.apply("m.settleTime = CURDATE()"); + } else if (dateType.equals("2")) { + //本月 + qw.apply("m.settleTime >= date_add(curdate(), interval - day(curdate()) + 1 day) AND m.settleTime <= last_day(curdate())"); + } else if (dateType.equals("3")) { + //本年 + qw.apply("m.settleTime >= date_sub(curdate(), interval dayofyear(curdate())-1 day) AND m.settleTime <= concat(year(curdate()),'-12-31')"); + } + } + //结算时间 + qw.apply(StringUtils.isNotBlank(query.getSettleStartTime()), "date_format (m.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleStartTime() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getSettleEndTime()), "date_format (m.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleEndTime() + "','%Y-%m-%d')" + ); + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.outInsuranceBusiness(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public PagerVo debtBusiness(PagerQuery pq) { + DebtBusinessQuery query = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + PrivilegeQuery privilegeQuery = new PrivilegeQuery(); + privilegeQuery.setOrgPath(query.getOrgPath()); + privilegeQuery.setUserSid(query.getUserSid()); + privilegeQuery.setMenuUrl(query.getMenuUrl()); + ResultBean defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery); + if (StringUtils.isNotBlank(defaultIdReltBean.getData())) { + //数据权限ID(1集团、2事业部、3分公司、4部门、5个人) + String orgSidPath = query.getOrgPath(); + orgSidPath = orgSidPath + "/"; + int i1 = orgSidPath.indexOf("/"); + int i2 = orgSidPath.indexOf("/", i1 + 1); + int i3 = orgSidPath.indexOf("/", i2 + 1); + int i4 = orgSidPath.indexOf("/", i3 + 1); + String orgLevelKey = defaultIdReltBean.getData(); + if ("1".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i1); + qw.like("m.orgSidPath", orgSidPath); + } else if ("2".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i2); + qw.like("m.orgSidPath", orgSidPath); + } else if ("3".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i3); + qw.like("m.orgSidPath", orgSidPath); + } else if ("4".equals(orgLevelKey)) { + orgSidPath = orgSidPath.substring(0, i4); + qw.like("m.orgSidPath", orgSidPath); + } else if ("5".equals(orgLevelKey)) { +// qw.eq("a.createBySid", query.getUserSid()); + } else { + PagerVo p = new PagerVo<>(); + return p; + } + } else { + PagerVo p = new PagerVo<>(); + return p; + } + if (StringUtils.isNotBlank(query.getDateType())) { + String dateType = query.getDateType(); + if (dateType.equals("1")) { + //本日 + qw.apply("m.settleTime = CURDATE()"); + } else if (dateType.equals("2")) { + //本月 + qw.apply("m.settleTime >= date_add(curdate(), interval - day(curdate()) + 1 day) AND m.settleTime <= last_day(curdate())"); + } else if (dateType.equals("3")) { + //本年 + qw.apply("m.settleTime >= date_sub(curdate(), interval dayofyear(curdate())-1 day) AND m.settleTime <= concat(year(curdate()),'-12-31')"); + } + } + //结算时间 + qw.apply(StringUtils.isNotBlank(query.getSettleStartTime()), "date_format (m.settleTime,'%Y-%m-%d') >= date_format('" + query.getSettleStartTime() + "','%Y-%m-%d')"). + apply(StringUtils.isNotBlank(query.getSettleEndTime()), "date_format (m.settleTime,'%Y-%m-%d') <= date_format('" + query.getSettleEndTime() + "','%Y-%m-%d')" + ); + + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.debtBusiness(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } From 2736f805632f9263560e2f9f637e17fb3327e9c8 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 12 Nov 2024 09:50:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/api/statement/inventory.js | 27 ++ yxt-as-ui/src/router/index.js | 20 +- .../views/statement/deadStock/deadStock.vue | 8 +- .../doBusiness/businessAnalysisByFirst.vue | 4 +- .../doBusiness/businessAnalysisBySecond.vue | 8 +- .../statement/doBusiness/businessSummary.vue | 8 +- .../statement/doBusiness/operatingDetail.vue | 6 +- .../maintenanceCommissionDetails.vue | 317 ++++++++++++++++++ .../inventory/performanceSummary.vue | 215 ++++++++++++ .../inventory/salesCommissionDetails.vue | 302 +++++++++++++++++ 10 files changed, 897 insertions(+), 18 deletions(-) create mode 100644 yxt-as-ui/src/views/statement/inventory/maintenanceCommissionDetails.vue create mode 100644 yxt-as-ui/src/views/statement/inventory/performanceSummary.vue create mode 100644 yxt-as-ui/src/views/statement/inventory/salesCommissionDetails.vue diff --git a/yxt-as-ui/src/api/statement/inventory.js b/yxt-as-ui/src/api/statement/inventory.js index 5945ddd7fd..8ef661c7ff 100644 --- a/yxt-as-ui/src/api/statement/inventory.js +++ b/yxt-as-ui/src/api/statement/inventory.js @@ -9,5 +9,32 @@ export default { data: params, headers: { 'Content-Type': 'application/json' } }) + }, + // 查询分页列表 -- 业绩提成汇总表 + commissionSummary: function(params) { + return request({ + url: '/as/v1/AsBusrepairBill/commissionSummary', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 维修项目提成明细表 + commissionSitem: function(params) { + return request({ + url: '/as/v1/AsBusrepairBill/commissionSitem', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 查询分页列表 -- 配件销售提成明细表 + commissionGoods: function(params) { + return request({ + url: '/as/v1/AsBusrepairBill/commissionGoods', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) } } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index e9393c87e2..42843b4692 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -846,7 +846,7 @@ export const constantRoutes = [{ } }, { - path: '/doBusiness/businessSummary', + path: '/doBusiness/businessAnalysisByFirst', component: () => import('@/views/statement/doBusiness/businessAnalysisByFirst'), name: 'BusinessAnalysisByFirst', meta: { @@ -880,6 +880,24 @@ export const constantRoutes = [{ title: '库存查询', noCache: true } + }, + { + path: '/mountings/accessoryDetail', + component: () => import('@/views/statement/mountings/accessoryDetail'), + name: 'AccessoryDetail', + meta: { + title: '配件出入库明细', + noCache: true + } + }, + { + path: '/mountings/partsSummary', + component: () => import('@/views/statement/mountings/partsSummary'), + name: 'PartsSummary', + meta: { + title: '配件出入库汇总', + noCache: true + } } ] }, diff --git a/yxt-as-ui/src/views/statement/deadStock/deadStock.vue b/yxt-as-ui/src/views/statement/deadStock/deadStock.vue index 9a978336de..65762edf5d 100644 --- a/yxt-as-ui/src/views/statement/deadStock/deadStock.vue +++ b/yxt-as-ui/src/views/statement/deadStock/deadStock.vue @@ -52,10 +52,10 @@ - - - - + + + + diff --git a/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisByFirst.vue b/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisByFirst.vue index 82996e7514..2f1b561b39 100644 --- a/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisByFirst.vue +++ b/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisByFirst.vue @@ -36,11 +36,11 @@ - + - + diff --git a/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisBySecond.vue b/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisBySecond.vue index d1ae46a6c0..0e42ba5e4d 100644 --- a/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisBySecond.vue +++ b/yxt-as-ui/src/views/statement/doBusiness/businessAnalysisBySecond.vue @@ -36,19 +36,19 @@ - + - + - - + + diff --git a/yxt-as-ui/src/views/statement/doBusiness/businessSummary.vue b/yxt-as-ui/src/views/statement/doBusiness/businessSummary.vue index f5244b4d68..7464461be1 100644 --- a/yxt-as-ui/src/views/statement/doBusiness/businessSummary.vue +++ b/yxt-as-ui/src/views/statement/doBusiness/businessSummary.vue @@ -42,21 +42,21 @@ - + - + - + - + diff --git a/yxt-as-ui/src/views/statement/doBusiness/operatingDetail.vue b/yxt-as-ui/src/views/statement/doBusiness/operatingDetail.vue index 64a9ca05c4..48be4340be 100644 --- a/yxt-as-ui/src/views/statement/doBusiness/operatingDetail.vue +++ b/yxt-as-ui/src/views/statement/doBusiness/operatingDetail.vue @@ -79,7 +79,7 @@ - + @@ -92,11 +92,11 @@ - + - + diff --git a/yxt-as-ui/src/views/statement/inventory/maintenanceCommissionDetails.vue b/yxt-as-ui/src/views/statement/inventory/maintenanceCommissionDetails.vue new file mode 100644 index 0000000000..c57fd82ade --- /dev/null +++ b/yxt-as-ui/src/views/statement/inventory/maintenanceCommissionDetails.vue @@ -0,0 +1,317 @@ + + + + diff --git a/yxt-as-ui/src/views/statement/inventory/performanceSummary.vue b/yxt-as-ui/src/views/statement/inventory/performanceSummary.vue new file mode 100644 index 0000000000..c8af83078b --- /dev/null +++ b/yxt-as-ui/src/views/statement/inventory/performanceSummary.vue @@ -0,0 +1,215 @@ + + + + diff --git a/yxt-as-ui/src/views/statement/inventory/salesCommissionDetails.vue b/yxt-as-ui/src/views/statement/inventory/salesCommissionDetails.vue new file mode 100644 index 0000000000..2adf06e062 --- /dev/null +++ b/yxt-as-ui/src/views/statement/inventory/salesCommissionDetails.vue @@ -0,0 +1,302 @@ + + + + From 183f66e9b27ad422f2d95a726316a1ba3494b1fd Mon Sep 17 00:00:00 2001 From: myTest383
Date: Tue, 12 Nov 2024 10:35:57 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yxt-as-ui/src/router/index.js | 57 +++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 6 deletions(-) diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 42843b4692..43d0b682c0 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -1477,23 +1477,23 @@ export const constantRoutes = [{ // 调拨(一级站内) -- 编辑 { - path: '/adjustmentFlow/aodjustmentEdit', + path: '/allocationFlow/allocationEdit', component: () => - import('@/views/workFlow/adjustmentFlow/adjustmentEdit.vue'), + import('@/views/workFlow/allocationFlow/allocationEdit.vue'), name: 'AdjustmentEdit' }, // 调拨(一级站内) -- 待办 { - path: '/adjustmentFlow/adjustmentDaiBan', + path: '/allocationFlow/allocationDaiBan', component: () => - import('@/views/workFlow/adjustmentFlow/adjustmentDaiBan.vue'), + import('@/views/workFlow/allocationFlow/allocationDaiBan.vue'), name: 'AdjustmentDaiBan' }, // 调拨(一级站内) -- 已办 { - path: '/adjustmentFlow/adjustmentYiBan', + path: '/allocationFlow/allocationYiBan', component: () => - import('@/views/workFlow/adjustmentFlow/adjustmentYiBan.vue'), + import('@/views/workFlow/allocationFlow/allocationYiBan.vue'), name: 'AdjustmentYiBan' }, @@ -1592,6 +1592,51 @@ export const constantRoutes = [{ name: 'StocktakingLossYiBan' }, + // 旧件盘盈入库 -- 编辑 + { + path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit', + component: () => + import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusEdit.vue'), + name: 'OldpPartStocktakingSurplusEdit' + }, + // 旧件盘盈入库 -- 待办 + { + path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusDaiBan', + component: () => + import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusDaiBan.vue'), + name: 'OldpPartStocktakingSurplusDaiBan' + }, + // 旧件盘盈入库 -- 已办 + { + path: '/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusYiBan', + component: () => + import('@/views/workFlow/oldpPartStocktakingSurplusFlow/oldpPartStocktakingSurplusYiBan.vue'), + name: 'OldpPartStocktakingSurplusYiBan' + }, + + + // 旧件盘亏出库 -- 编辑 + { + path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit', + component: () => + import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit.vue'), + name: 'OldpPartStocktakingLossEdit' + }, + // 旧件盘亏出库 -- 待办 + { + path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossDaiBan', + component: () => + import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossDaiBan.vue'), + name: 'OldpPartStocktakingLossDaiBan' + }, + // 旧件盘亏出库 -- 已办 + { + path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossYiBan', + component: () => + import('@/views/workFlow/oldpPartStocktakingLossFlow/oldpPartStocktakingLossYiBan.vue'), + name: 'OldpPartStocktakingLossYiBan' + }, + // 404 page must be placed at the end !!!