From f155267650e61335857cb8073d24e4d23c7b71bc Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Sat, 3 Sep 2022 17:09:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=8D=95=E8=BD=A6=E8=BF=94?= =?UTF-8?q?=E5=88=A9=E6=A0=B8=E5=AF=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/bikerebate/bicyclerebatecheck.js | 56 ++ .../bicyclerebatecheck/bicyclerebatecheck.vue | 54 +- .../bicyclerebatecheckAdd.vue | 29 +- .../bicyclerebatecheckInfo.vue | 41 +- .../bicyclerebatetobechecked.vue | 2 +- .../relation/bicyclerebatetobecheckedInfo.vue | 109 +--- .../relation/yiheduidanchefanli.vue | 205 +++++-- .../danchefanliheduiDaiBanInfo.vue | 400 +++++++++++++ .../danchefanliheduiEdit.vue | 558 ++++++++++++++++++ .../danchefanliheduiYiBanInfo.vue | 276 +++++++++ .../relation/bicyclerebatetobecheckedAdd.vue | 198 +++++++ .../relation/bicyclerebatetobecheckedInfo.vue | 155 +++++ .../relation/yiheduidanchefanli.vue | 356 +++++++++++ 13 files changed, 2279 insertions(+), 160 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiDaiBanInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiEdit.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/danchefanliheduiYiBanInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedAdd.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/bicyclerebatetobecheckedInfo.vue create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliheduiFlow/relation/yiheduidanchefanli.vue diff --git a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js index de8c1a49cd..866236389b 100644 --- a/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js +++ b/anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatecheck.js @@ -78,4 +78,60 @@ export default { method: 'get' }) }, + // 提交流程 + submitVehicleApply: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/submitVehRebateCheckApply', + method: 'post', + data: params, + headers: { 'Content-Type': 'application/json' } + }) + }, + // 代办任务同意办理 + complete: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/complete', + method: 'post', + data: params + }) + }, + // 代办任务驳回任务 + reject: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/reject', + method: 'post', + data: params + }) + }, + // 代办任务终止任务 + breakProcess: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/breakProcess', + method: 'post', + data: params + }) + }, + // 代办任务撤回任务 + revokeProcess: function(params) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/revokeProcess', + method: 'post', + data: params + }) + }, + + getNextNodesForSubmit: function(data) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/getNextNodesForSubmit', + method: 'get', + params: data + }) + }, + getPreviousNodesForReject(data) { + return request({ + url: '/scm/v1/scmvehrebatecheckapply/getPreviousNodesForReject', + method: 'get', + params: data + }) + } } diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue index e1902aa119..135962bb67 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheck.vue @@ -42,13 +42,14 @@ - + @@ -110,6 +111,10 @@ + + + + @@ -120,6 +125,8 @@ import pageye from '@/components/pagination/pageye' import ButtonBar from '@/components/ButtonBar' import { brandDown, getPathSidByUserSid } from '@/api/cheliang/dictcommons' import bicyclerebatecheckAdd from './bicyclerebatecheckAdd' +import bicyclerebatecheckInfo from './bicyclerebatecheckInfo' +import {getStorage} from "@/utils/auth"; export default { name: 'bicyclerebatecheck', @@ -127,10 +134,14 @@ export default { Pagination, pageye, ButtonBar, - bicyclerebatecheckAdd + bicyclerebatecheckAdd, + bicyclerebatecheckInfo }, data() { return { + url: '', + dialogHeight: '80%', + centerDialogVisible: false, btndisabled: false, btnList: [ { @@ -178,9 +189,40 @@ export default { this.init() }, mounted() { + // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage + window.addEventListener('message', this.handleMessage) this.$refs['btnbar'].setButtonList(this.btnList) }, methods: { + async handleMessage(event) { + var code = '' + if (event.data.params !== null && event.data.params !== undefined) { + code = event.data.params.code + } + if (code === 1) { + this.init() + this.centerDialogVisible = false + } else if (code === 2) { + this.dialogHeight = event.data.params.data + this.setIframeHeight(document.getElementById('iframe')) + } + }, + closeIt() { + this.url = '' + this.centerDialogVisible = false + }, + setIframeHeight(iframe) { + iframe.height = this.dialogHeight + }, + flowRecord(row) { + this.centerDialogVisible = true + var params = { + deployId: row.procDefId, + procInsId: row.procInstId, + token: getStorage() + } + this.url = 'http://localhost:9530/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params))) + }, init() { getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((resp) => { if (resp.success) { @@ -263,7 +305,7 @@ export default { size: 5, total: 0 } - this.getList() + this.init() }, handleClick() { this.$parent.resetState() @@ -273,7 +315,7 @@ export default { this.$refs['divAdd'].showEdit(row) }, toInfo(row) { - this.viewState = 4 + this.viewState = 3 this.$refs['divInfo'].showInfo(row) }, doDel() { diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue index c2b5166932..f8bf8fc3f7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckAdd.vue @@ -9,6 +9,8 @@
保存 + 提交 + 关闭
@@ -220,6 +222,7 @@ export default { formobj: { sid: '', createByName: '', + createBySid: '', brandName: '', brandSid: '', checkApply: '', @@ -238,7 +241,6 @@ export default { } }, methods: { - // 获取制单日期 newDate() { let date = new Date() @@ -269,6 +271,7 @@ export default { this.formobj.createOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid this.formobj.createByName = window.sessionStorage.getItem('name') + this.formobj.createBySid = window.sessionStorage.getItem('userSid') this.viewTitle = '【新增】单车返利核对审核申请' }, showEdit(row) { @@ -280,6 +283,7 @@ export default { console.log('编辑回显', row.sid) req.fetchDetailsBySid(row.sid).then((resp) => { this.formobj = resp.data + this.formobj.createBySid = window.sessionStorage.getItem('userSid') }).catch((e) => { this.formobj = row }) @@ -491,6 +495,28 @@ export default { } }) }, + submit() { + this.$refs['form_obj'].validate((valid) => { + if (valid) { + this.submitdisabled = true + req.submitVehicleApply(this.formobj).then((resp) => { + this.submitdisabled = false + if (resp.success) { + this.$message({ + showClose: true, + type: 'success', + message: resp.msg + }) + this.handleReturn('true') + } + }).catch(() => { + this.submitdisabled = false + }) + } else { + return false + } + }) + }, // 返回（===既判断） handleReturn(isreload) { if (isreload === 'true') this.$emit('reloadlist') @@ -498,6 +524,7 @@ export default { this.formobj = { sid: '', createByName: '', + createBySid: '', brandName: '', brandSid: '', checkApply: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue index e0704b25f5..b218ad9d85 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatecheckInfo.vue @@ -15,10 +15,18 @@
单车返利核对审核申请
+ + + 品牌: + + + {{ formobj.brandName }} + +
本月各项返利核对情况
- +