diff --git a/yxt-as-ui/src/api/Common/dictcommons.js b/yxt-as-ui/src/api/Common/dictcommons.js index ba4f476b37..fd8f62172f 100644 --- a/yxt-as-ui/src/api/Common/dictcommons.js +++ b/yxt-as-ui/src/api/Common/dictcommons.js @@ -34,7 +34,6 @@ export function selectOrgList(data) { }) } - // 当前用户创建申请时判断该用户是否有该菜单的操作权限 export function selectHaveMessage(data) { return request({ @@ -94,7 +93,7 @@ export function getGroupList(data) { // 查询分页列表 -- 客户列表 export function customerListPage(params) { return request({ - url: '/v1/crmcustomer/customerListPage', + url: '/yxtcrm/apiadmin/v1/crmcustomer/customerListPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -124,3 +123,22 @@ export function getCounty(data) { params: data }) } + +// 获取售后服务--基础信息--供应商信息 +export function choiceSupplierInfo(data) { + return request({ + url: '/pms/v1/pmssupplierinfo/choiceSupplierInfo', + method: 'post', + params: data + }) +} + +// 查询分页列表 -- 商品列表 +export function chooseproducts(params) { + return request({ + url: '/yxtbase/apiadmin/base/basegoodssku/getGoodsListPage', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) +} diff --git a/yxt-as-ui/src/api/purchase/procurement.js b/yxt-as-ui/src/api/purchase/procurement.js index 9f09f37306..140960fefd 100644 --- a/yxt-as-ui/src/api/purchase/procurement.js +++ b/yxt-as-ui/src/api/purchase/procurement.js @@ -4,69 +4,103 @@ export default { // 查询分页列表 listPage: function(params) { return request({ - url: '/pms/pmspurchasebill/listPage', + url: '/pms/v1/pmspurchasebill/listPage', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, - // 查询分页列表 -- 供应商 - supplierListPage: function(params) { + // 初始化 + fetchDetailsBySid: function(data) { + return request({ + url: '/pms/v1/pmspurchasebill/fetchDetailsBySid/' + data, + method: 'get' + }) + }, + saveOrUpdate: function(data) { return request({ - url: '/base/basesupplierinfo/listPage', + url: '/pms/v1/pmspurchasebill/save', method: 'post', - data: params, + data: data, + headers: { 'Content-Type': 'application/json' } + }) + }, + deleteBySids: function(data) { + return request({ + url: '/pms/v1/pmspurchasebill/delBySids', + method: 'DELETE', + data: data, headers: { 'Content-Type': 'application/json' } }) }, - // 查询分页列表 -- 商品列表 - purGoodsListPage: function(params) { + // 提交流程 + submit: function(params) { return request({ - url: '/base/basegoodssku/purGoodsListPage', + url: '/pms/v1/pmspurchasebill/submit', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } }) }, - // 初始化 - fetchDetailsBySid: function(data) { + // 流程审批(同意) + complete: function(params) { return request({ - url: '/pms/pmspurchasebillsettle/fetchDetailsBySid/' + data, - method: 'get' + url: '/pms/v1/pmspurchasebill/complete', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } }) }, - saveOrUpdate: function(data) { + // 流程审批(加签) + delegate: function(params) { return request({ - url: '/pms/pmspurchasebill/save', + url: '/pms/v1/pmspurchasebill/delegate', method: 'post', - data: data, + data: params, headers: { 'Content-Type': 'application/json' } }) }, - settlement: function(data) { + // 流程审批(驳回) + reject: function(params) { return request({ - url: '/pms/pmspurchasebillsettle/save', + url: '/pms/v1/pmspurchasebill/reject', method: 'post', - data: data, + data: params, headers: { 'Content-Type': 'application/json' } }) }, - deleteBySids: function(data) { + // 流程审批(终止) + breakProcess: function(params) { return request({ - url: '/pms/pmspurchasebill/delBySids', - method: 'DELETE', - data: data, + url: '/pms/v1/pmspurchasebill/breakProcess', + method: 'post', + data: params, headers: { 'Content-Type': 'application/json' } }) }, - // 导出 - exportExcel: function(data) { + // 流程审批(撤回) + revokeProcess: function(params) { return request({ - url: '/pms/pmspurchasebill/exportExcel', + url: '/pms/v1/pmspurchasebill/revokeProcess', method: 'post', - responseType: 'blob', // 表明返回服务器返回的数据类型 - data: data, + data: params, headers: { 'Content-Type': 'application/json' } }) + }, + // 审批流程(同意)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/pms/v1/pmspurchasebill/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/pms/v1/pmspurchasebill/getPreviousNodesForReject', + method: 'get', + params: data + }) } } diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js index 8863779665..2d5c3736bd 100644 --- a/yxt-as-ui/src/router/index.js +++ b/yxt-as-ui/src/router/index.js @@ -419,7 +419,29 @@ export const constantRoutes = [{ meta: { title: '供应商管理', noCache: true } } ] - } + }, + + // 采购申请管理--编辑 + { + path: '/caigouFlow/procurementEdit', + component: () => + import('@/views/workFlow/caigouFlow/procurementEdit.vue'), + name: 'ProcurementEdit' + }, + // 采购申请管理--待办 + { + path: '/caigouFlow/procurementDaiBan', + component: () => + import('@/views/workFlow/caigouFlow/procurementDaiBan.vue'), + name: 'ProcurementDaiBan' + }, + // 采购申请管理--已办 + { + path: '/caigouFlow/procurementYiBan', + component: () => + import('@/views/workFlow/caigouFlow/procurementYiBan.vue'), + name: 'ProcurementYiBan' + }, // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue index 60c8b26fb5..019d21e9c6 100644 --- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue +++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue @@ -2,30 +2,57 @@