diff --git a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/price.js b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/price.js index 1358fdcb77..f1ab73bc2a 100644 --- a/anrui-scm/anrui-scm-ui/src/api/kucunguanli/price.js +++ b/anrui-scm/anrui-scm-ui/src/api/kucunguanli/price.js @@ -39,7 +39,7 @@ export default { // 提交流程 submitVehicleApply: function(params) { return request({ - url: '/scm/v1/scmapplyinbound/submitRecordApplication', + url: '/base/v1/basemodelmodprice/submitBaseModelModPrice', method: 'post', data: params, headers: { 'Content-Type': 'application/json' } @@ -52,48 +52,66 @@ export default { method: 'get' }) }, - // 代办任务同意办理 - businessAgree: function(params) { + // 流程审批(同意) + complete: function(params) { return request({ - url: '/scm/v1/scmapplyinbound/complete', + url: '/base/v1/basemodelmodprice/complete', method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + data: params }) }, - // 代办任务驳回任务 - rejectTask: function(params) { + // 流程审批(驳回) + reject: function(params) { return request({ - url: '/scm/v1/scmapplyinbound/reject/' + params.businessSid, + url: '/base/v1/basemodelmodprice/reject', method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + data: params }) }, - // 代办任务终止任务 - breakTask: function(params) { + // 流程审批(终止) + breakProcess: function(params) { return request({ - url: '/scm/v1/scmapplyinbound/breakProcess/' + params.businessSid, + url: '/base/v1/basemodelmodprice/breakProcess', method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + data: params }) }, - // 代办任务撤回任务 - revokeTask: function(params) { + // 流程审批(撤回) + revokeProcess: function(params) { return request({ - url: '/scm/v1/scmapplyinbound/revokeProcess/' + params.userSid + '/' + params.businessSid, + url: '/base/v1/basemodelmodprice/revokeProcess', method: 'post', - data: params, - headers: { - 'Content-Type': 'application/json' - } + data: params + }) + }, + // 审批流程(驳回)获取下一环节 + getNextNodesForSubmit: function(data) { + return request({ + url: '/base/v1/basemodelmodprice/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + // 审批流程(驳回)获取上一环节 + getPreviousNodesForReject: function(data) { + return request({ + url: '/base/v1/basemodelmodprice/getPreviousNodesForReject', + method: 'get', + params: data + }) + }, + // 读取xml文件 + readXml: function(deployId) { + return request({ + url: '/flowable/v1/flowable/task/readXml/' + deployId, + method: 'get' + }) + }, + // 读取image文件 + getFlowViewer: function(procInsId) { + return request({ + url: '/flowable/v1/flowable/task/flowViewer/' + procInsId, + method: 'get' }) } } diff --git a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js index 0857a9af9e..9ddc14c8b7 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -514,6 +514,20 @@ const codemenu = [ import('@/views/workFlow/paichanguanliFlow/paichanguanli/cheliangpaichanInfo.vue'), name: 'cheliangpaichandetails' }, + // 调价管理编辑 + { + path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit', + component: () => + import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue'), + name: 'tiaojiaEdit' + }, + // 调价管理详情 + { + path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaInfo', + component: () => + import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaInfo.vue'), + name: 'tiaojiaInfo' + }, // 采购退库驳回到发起人办理编辑页面 { path: '/caigoutuikuFlow/caigoutuikuEdit', diff --git a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue index 8f3c361155..72ed78cf0c 100644 --- a/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue +++ b/anrui-scm/anrui-scm-ui/src/views/kucunguanli/tiaojiaguanli/chexingbyconfiguration.vue @@ -55,6 +55,7 @@ + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue new file mode 100644 index 0000000000..3d61b8ea90 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue @@ -0,0 +1,321 @@ + + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaInfo.vue new file mode 100644 index 0000000000..d33b39517e --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaInfo.vue @@ -0,0 +1,430 @@ + + + + + + diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index d7cc8f53b5..bee501b37b 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -297,7 +297,8 @@ deployId: row.deployId, taskDefKey: row.taskDefKey, transactState: '00', // 待办任务状态 - userSid: this.loginInfo.sid + userSid: this.loginInfo.sid, + orgSidPath: this.loginInfo.orgSidPath } selectUrl(this.selectUrl_list).then((response) => { if (response.code === '200') {