diff --git a/yxt-as-ui/src/api/operation/salesSettlement.js b/yxt-as-ui/src/api/operation/salesSettlement.js new file mode 100644 index 0000000000..29c3b36096 --- /dev/null +++ b/yxt-as-ui/src/api/operation/salesSettlement.js @@ -0,0 +1,86 @@ +import request from '@/utils/request' + +export default { + salesbillInit: function(data) { + return request({ + url: '/as/v1/settleaccounts/salesbillInit', + method: 'post', + params: data + }) + }, + fetchBySid: function(data) { + return request({ + url: '/as/v1/settleaccounts/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + submit: function(data) { + return request({ + url: '/as/v1/settleaccounts/submitSales', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(同意) + complete: function(params) { + return request({ + url: '/as/v1/settleaccounts/completeSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(加签) + delegate: function(params) { + return request({ + url: '/as/v1/settleaccounts/delegateProcessSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(驳回) + reject: function(params) { + return request({ + url: '/as/v1/settleaccounts/rejectSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(终止) + breakProcess: function(params) { + return request({ + url: '/as/v1/settleaccounts/breakProcessSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 流程审批(撤回) + revokeProcess: function(params) { + return request({ + url: '/as/v1/settleaccounts/revokeProcessSales', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/as/v1/settleaccounts/getNextNodesForSubmitSales', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/as/v1/settleaccounts/getPreviousNodesForRejectSales', + method: 'get', + params: data + }) + } +} diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 627105b057..75c10d92e8 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -238,6 +238,15 @@ export const constantRoutes = [{ noCache: true } }, + { + path: '/salesSettlement/salesSettlement', + component: () => import('@/views/operation/salesSettlement/salesSettlement.vue'), + name: 'SalesSettlement', + meta: { + title: '销售单结算管理', + noCache: true + } + }, { path: '/merchandisereturn/merchandisereturn', component: () => import('@/views/operation/merchandisereturn/merchandisereturn.vue'), @@ -1487,7 +1496,6 @@ export const constantRoutes = [{ name: 'SecondaryCooperativeStationYiBan' }, - // 旧件处理申请 -- 编辑 { path: '/oldPartsCopeFlow/oldPartsCopeEdit', @@ -1510,7 +1518,6 @@ export const constantRoutes = [{ name: 'OldPartsCopeYiBan' }, - // 调拨(一级站内) -- 编辑 { path: '/allocationFlow/allocationEdit', @@ -1533,8 +1540,6 @@ export const constantRoutes = [{ name: 'AdjustmentYiBan' }, - - // 调拨(分公司内) -- 编辑 { path: '/allocationByBranchesFlow/allocationByBranchesEdit', @@ -1557,8 +1562,6 @@ export const constantRoutes = [{ name: 'AllocationByBranchesYiBan' }, - - // 调拨(集团内) -- 编辑 { path: '/allocationByGroupFlow/allocationByGroupEdit', @@ -1581,8 +1584,6 @@ export const constantRoutes = [{ name: 'AllocationByGroupYiBan' }, - - // 盘盈入库 -- 编辑 { path: '/stocktakingSurplusFlow/stocktakingSurplusEdit', @@ -1605,7 +1606,6 @@ export const constantRoutes = [{ name: 'StocktakingSurplusYiBan' }, - // 盘亏出库 -- 编辑 { path: '/stocktakingLossFlow/stocktakingLossEdit', @@ -1650,7 +1650,6 @@ export const constantRoutes = [{ name: 'OldpPartStocktakingSurplusYiBan' }, - // 旧件盘亏出库 -- 编辑 { path: '/oldpPartStocktakingLossFlow/oldpPartStocktakingLossEdit', @@ -1673,7 +1672,6 @@ export const constantRoutes = [{ name: 'OldpPartStocktakingLossYiBan' }, - // 销售单申请开票 -- 编辑 { path: '/salesInvoiceFlow/salesInvoiceEdit', @@ -1696,9 +1694,27 @@ export const constantRoutes = [{ name: 'SalesInvoiceYiBan' }, - - - + // 销售单结算管理 -- 编辑 + { + path: '/xiaoshoujiesuanFlow/salesSettlementEdit', + component: () => + import('@/views/workFlow/xiaoshoujiesuanFlow/salesSettlementEdit.vue'), + name: 'SalesSettlementEdit' + }, + // 销售单结算管理 -- 待办 + { + path: '/xiaoshoujiesuanFlow/salesSettlementDaiBan', + component: () => + import('@/views/workFlow/xiaoshoujiesuanFlow/salesSettlementDaiBan.vue'), + name: 'SalesSettlementDaiBan' + }, + // 销售单结算管理 -- 已办 + { + path: '/xiaoshoujiesuanFlow/salesSettlementYiBan', + component: () => + import('@/views/workFlow/xiaoshoujiesuanFlow/salesSettlementYiBan.vue'), + name: 'SalesSettlementYiBan' + } // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } diff --git a/yxt-as-ui/src/views/operation/salesSettlement/salesSettlement.vue b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlement.vue new file mode 100644 index 0000000000..011f7ec565 --- /dev/null +++ b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlement.vue @@ -0,0 +1,305 @@ + + + + + + + + + {{ searchxianshitit }} + + + + + + + + + + + + + + + + + 至 + + + + + 至 + + + + + + + + + + + 查询 + 重置 + + + + + + 销售单结算申请列表 + + + + + + + + + + 办理 + 查看 + + + + + 待提交 + {{ scope.row.nodeState }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementAdd.vue b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementAdd.vue new file mode 100644 index 0000000000..a5e884d9a0 --- /dev/null +++ b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementAdd.vue @@ -0,0 +1,254 @@ + + + + + {{ viewTitle }} + + 提交 + 关闭 + + + + + + + 申请人 + {{ formobj.createByName }} + + + 申请部门 + {{ formobj.dept }} + + + 申请日期 + {{ formobj.applyDate }} + + + + + 备注 + + + + 单据信息 + + + 单据编号 + {{ formobj.sourceBillNo }} + + + 单据日期 + {{ formobj.sourceBillDate }} + + + 配件销售人 + {{ formobj.partsSellers }} + + + + + 客户名称 + {{ formobj.customerName }} + + + 联系电话 + {{ formobj.mobile }} + + + 车牌号/车架号 + {{ formobj.vehMark }}/{{ formobj.vinNo }} + + + + + 是否开票 + {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} + + + 税率 + {{ formobj.taxRate }} + + + + + 应收金额 + {{ formobj.receivableAmount }} = 材料费:{{ formobj.goodsAmount }} + 附加费:{{ formobj.addAmount }} + + + + + 结算金额 + {{ formobj.settleAmount }} = 合计金额:{{ formobj.receivableAmount }} - 优惠:{{ formobj.discountAmount }} + + + 商品 + + + + + + + + + + + + + + + 附加项目 + + + + + + + + + + + + + + + diff --git a/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementInfo.vue b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementInfo.vue new file mode 100644 index 0000000000..fe7ad26342 --- /dev/null +++ b/yxt-as-ui/src/views/operation/salesSettlement/salesSettlementInfo.vue @@ -0,0 +1,240 @@ + + + + + {{ viewTitle }} + + 关闭 + + + + + + + 申请人 + {{ formobj.createByName }} + + + 申请部门 + {{ formobj.dept }} + + + 申请日期 + {{ formobj.applyDate }} + + + + + 备注 + {{ formobj.remarks }} + + + 单据信息 + + + 单据编号 + {{ formobj.sourceBillNo }} + + + 单据日期 + {{ formobj.sourceBillDate }} + + + 配件销售人 + {{ formobj.partsSellers }} + + + + + 客户名称 + {{ formobj.customerName }} + + + 联系电话 + {{ formobj.mobile }} + + + 车牌号/车架号 + {{ formobj.vehMark }}/{{ formobj.vinNo }} + + + + + 是否开票 + {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} + + + 税率 + {{ formobj.taxRate }} + + + + + 应收金额 + {{ formobj.receivableAmount }} = 材料费:{{ formobj.goodsAmount }} + 附加费:{{ formobj.addAmount }} + + + + + 结算金额 + {{ formobj.settleAmount }} = 合计金额:{{ formobj.receivableAmount }} - 优惠:{{ formobj.discountAmount }} + + + + + 成本合计 + {{ formobj.costAmount }} + + + 利润额 + {{ formobj.profit }} + + + 商品 + + + + + + + + + + + + + + + + + 附加项目 + + + + + + + + + + + + + + + + + diff --git a/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementDaiBan.vue b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementDaiBan.vue new file mode 100644 index 0000000000..7fe463e901 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementDaiBan.vue @@ -0,0 +1,489 @@ + + + + + {{ viewTitle }} + + 加 签 + 同 意 + 驳 回 + 终 止 + + + + + + + 申请人 + {{ formobj.createByName }} + + + 申请部门 + {{ formobj.dept }} + + + 申请日期 + {{ formobj.applyDate }} + + + + + 备注 + {{ formobj.remarks }} + + + 单据信息 + + + 单据编号 + {{ formobj.sourceBillNo }} + + + 单据日期 + {{ formobj.sourceBillDate }} + + + 配件销售人 + {{ formobj.partsSellers }} + + + + + 客户名称 + {{ formobj.customerName }} + + + 联系电话 + {{ formobj.mobile }} + + + 车牌号/车架号 + {{ formobj.vehMark }}/{{ formobj.vinNo }} + + + + + 是否开票 + {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} + + + 税率 + {{ formobj.taxRate }} + + + + + 应收金额 + {{ formobj.receivableAmount }} = 材料费:{{ formobj.goodsAmount }} + 附加费:{{ formobj.addAmount }} + + + + + 结算金额 + {{ formobj.settleAmount }} = 合计金额:{{ formobj.receivableAmount }} - 优惠:{{ formobj.discountAmount }} + + + + + 成本合计 + {{ formobj.costAmount }} + + + 利润额 + {{ formobj.profit }} + + + 商品 + + + + + + + + + + + + + + + + + 附加项目 + + + + + + + + + + + + + + + + + *加签人员: + + + + + + + + + + + + + 当前环节: + + + {{ current.taskName }}->{{ nextNode.name }} + + + + + 意见: + + + + + + + 确 定 + 取 消 + + + + + + + + + diff --git a/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementEdit.vue b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementEdit.vue new file mode 100644 index 0000000000..c4787004d4 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementEdit.vue @@ -0,0 +1,226 @@ + + + + + {{ viewTitle }} + + 提交 + + + + + + + 申请人 + {{ formobj.createByName }} + + + 申请部门 + {{ formobj.dept }} + + + 申请日期 + {{ formobj.applyDate }} + + + + + 备注 + + + + 单据信息 + + + 单据编号 + {{ formobj.sourceBillNo }} + + + 单据日期 + {{ formobj.sourceBillDate }} + + + 配件销售人 + {{ formobj.partsSellers }} + + + + + 客户名称 + {{ formobj.customerName }} + + + 联系电话 + {{ formobj.mobile }} + + + 车牌号/车架号 + {{ formobj.vehMark }}/{{ formobj.vinNo }} + + + + + 是否开票 + {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} + + + 税率 + {{ formobj.taxRate }} + + + + + 应收金额 + {{ formobj.receivableAmount }} = 材料费:{{ formobj.goodsAmount }} + 附加费:{{ formobj.addAmount }} + + + + + 结算金额 + {{ formobj.settleAmount }} = 合计金额:{{ formobj.receivableAmount }} - 优惠:{{ formobj.discountAmount }} + + + 商品 + + + + + + + + + + + + + + + 附加项目 + + + + + + + + + + + + + + + diff --git a/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementYiBan.vue b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementYiBan.vue new file mode 100644 index 0000000000..7595385851 --- /dev/null +++ b/yxt-as-ui/src/views/workFlow/xiaoshoujiesuanFlow/salesSettlementYiBan.vue @@ -0,0 +1,275 @@ + + + + + {{ viewTitle }} + + 撤回 + + + + + + + 申请人 + {{ formobj.createByName }} + + + 申请部门 + {{ formobj.dept }} + + + 申请日期 + {{ formobj.applyDate }} + + + + + 备注 + {{ formobj.remarks }} + + + 单据信息 + + + 单据编号 + {{ formobj.sourceBillNo }} + + + 单据日期 + {{ formobj.sourceBillDate }} + + + 配件销售人 + {{ formobj.partsSellers }} + + + + + 客户名称 + {{ formobj.customerName }} + + + 联系电话 + {{ formobj.mobile }} + + + 车牌号/车架号 + {{ formobj.vehMark }}/{{ formobj.vinNo }} + + + + + 是否开票 + {{ formobj.isInvoicing == '1' ? '是' : formobj.isInvoicing == '0' ? '否' : '' }} + + + 税率 + {{ formobj.taxRate }} + + + + + 应收金额 + {{ formobj.receivableAmount }} = 材料费:{{ formobj.goodsAmount }} + 附加费:{{ formobj.addAmount }} + + + + + 结算金额 + {{ formobj.settleAmount }} = 合计金额:{{ formobj.receivableAmount }} - 优惠:{{ formobj.discountAmount }} + + + + + 成本合计 + {{ formobj.costAmount }} + + + 利润额 + {{ formobj.profit }} + + + 商品 + + + + + + + + + + + + + + + + + 附加项目 + + + + + + + + + + + + + + + + +