diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js index 39e656a779..da23ce9c0e 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js @@ -1,59 +1,137 @@ -import request from "@/utils/request"; +import request from '@/utils/request' // ----------------------------------- 订单管理 -// 销售订单管理列表 已改 +// 销售订单管理列表 export function getListPage(data) { return request({ - url: "/buscenter/v1/bussalesorder/listPage", - method: "post", + url: '/buscenter/v1/bussalesorder/listPage', + method: 'post', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } - }); + }) } -// 销售订单批量删除销售订单 已改 +// 销售订单批量删除销售订单 export function delBySids(data) { return request({ - url: "/buscenter/v1/bussalesorder/delBySids", - method: "delete", + url: '/buscenter/v1/bussalesorder/delBySids', + method: 'delete', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } }); } -// 销售订单新增保存 已改 +// 销售订单新增保存 export function saveOrderForm(data) { return request({ - url: "/buscenter/v1/bussalesorder/saveOrUpdate", - method: "post", + url: '/buscenter/v1/bussalesorder/saveOrUpdate', + method: 'post', data: data, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } }); } -// 编辑、详情初始化 已改(8.9修改后) -export function fetchDetailsBySid(params) { +// 编辑、详情初始化 +export function fetchDetailsBySid(data) { return request({ - url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + params.sid, - method: "get", - params: params, - }); + url: '/buscenter/v1/bussalesorder/fetchDetailsBySid/' + data, + method: 'get' + }) } + // 销售订单提交接口 (8.9修改后) export function submitOrderForm(params) { return request({ - url: "/buscenter/v1/bussalesorder/submit", - method: "post", + url: '/buscenter/v1/bussalesorder/submit', + method: 'post', data: params, headers: { - "Content-Type": "application/json" + 'Content-Type': 'application/json' } - }); + }) +} + +// 流程审批(同意) +export function complete(params) { + return request({ + url: '/buscenter/v1/bussalesorder/complete', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批(同意--可选择采购系统) +export function completeBy(params) { + return request({ + url: '/buscenter/v1/bussalesorder/completeBy', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批(终止) +export function breakProcess(params) { + return request({ + url: '/buscenter/v1/bussalesorder/breakProcess', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批(驳回) +export function reject(params) { + return request({ + url: '/buscenter/v1/bussalesorder/reject', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批(撤回) +export function revokeProcess(params) { + return request({ + url: '/buscenter/v1/bussalesorder/revokeProcess', + method: 'put', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 流程审批(获取下一环节) +export function getNextNodesForSubmit(data) { + return request({ + url: '/buscenter/v1/bussalesorder/getNextNodesForSubmit', + method: 'get', + params: data + }) +} + +// 流程审批(获取上一环节) +export function getPreviousNodesForReject(data) { + return request({ + url: '/buscenter/v1/bussalesorder/getPreviousNodesForReject', + method: 'get', + params: data + }) } // 外联表接口 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js index 049db637ea..9c7670bc52 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/router/index.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/router/index.js @@ -217,6 +217,15 @@ export const constantRoutes = [ title: '销售让价权限管理' } }, + { + path: '/xiaoshouguanli/dingdanchaxun', + component: () => + import('@/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue'), + name: 'XiaoShouDingDanChaXun', + meta: { + title: '销售订单查询', noCache: true + } + }, { path: '/xiaoshouguanli/guachepeizhixinxi', component: () => @@ -487,14 +496,21 @@ export const constantRoutes = [ path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdan', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue'), - name: 'xiaoshoudingdanFlow' + name: 'XiaoShouDingDanDaiBanInfo' }, // 销售管理已办详情 { path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanInfo', component: () => import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue'), - name: 'xiaoshoudingdanFlowInfo' + name: 'XiaoShouDingDanYiBanInfo' + }, + // 销售管理已办详情--销售支出部经理审批环节--选择采购系统 + { + path: '/xiaoshouguanliFlow/xiaoshoudingdan/xiaoshoudingdanByCaiGou', + component: () => + import('@/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue'), + name: 'xiaoshoudingdanByCaiGou' }, // 销售管理驳回到发起人办理 { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue index d27127d41d..afa984f3ae 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehudangan/kehudanganAdd.vue @@ -547,7 +547,8 @@ export default { visitWay: '', // 见面方式 visitWayKey: '', userSid: '', - orgSid: '' + orgSid: '', + orgPath: '' }, // 添加和修改 templooke: {}, dialogFormVisible: false, @@ -945,6 +946,7 @@ export default { this.$message({ showClose: true, type: 'error', message: '因客户类型为企业,客户名称的长度应不少于5个汉字' }) return } + this.temp.orgPath = window.sessionStorage.getItem('defaultOrgPath') if (this.stateId === '0') { const tip = '客户名称、联系电话一经保存,无法修改,是否继续保存' this.$confirm(tip, '提示', { diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue new file mode 100644 index 0000000000..33620dc485 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/relation/financialscheme.vue @@ -0,0 +1,305 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue index 05a8aec9e9..188117e00d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdan.vue @@ -1,1015 +1,681 @@ - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue new file mode 100644 index 0000000000..98b7ba8c23 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanByCaiGou.vue @@ -0,0 +1,752 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue index 1df29441c4..4431249871 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshoudingdanFlow/xiaoshoudingdanInfo.vue @@ -1,717 +1,473 @@ - - diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue new file mode 100644 index 0000000000..44978eb033 --- /dev/null +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/relation/financialscheme.vue @@ -0,0 +1,305 @@ + + + + diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue index 461308b4b7..0274505960 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdan.vue @@ -316,7 +316,7 @@ export default { // 打开查看详情 toInfo(row) { this.viewState = 4 - this.$refs['dingdanxinxiinfo'].showInfo(row.sid) + this.$refs['dingdanxinxiinfo'].showInfo(row) }, xiaoshouhetong(row) { this.$refs['hetongdanganguanli-Info'].showOrderHeTong(row.sid) diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue index ab48d26391..42a8a588bb 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo.vue @@ -1,673 +1,440 @@ -