From 9b2dacaf242e1b343052712af7ac8471c7fcece7 Mon Sep 17 00:00:00 2001 From: yunuo970428 <405378304@qq.com> Date: Tue, 5 Jul 2022 17:08:17 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=9C=AA=E5=94=AE=E4=B9=B0?= =?UTF-8?q?=E6=96=AD=E6=B5=81=E7=A8=8B=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/router/modules/codemenu.js | 34 +- .../weishoumaiduanguanli/unsoldAdd.vue | 19 +- .../weishoumaiduanguanli/unsoldInfo.vue | 10 +- .../weishoumaiduanguanli/unsoldguanli.vue | 16 +- .../weishoumaiduanguanli/vehicle.vue | 9 +- .../weishoumaiduanguanli/vehicle.vue | 371 ++++++++++++++++++ ...nInfo.vue => weishoumaiduanDaiBanInfo.vue} | 118 +----- .../weishoumaiduanYiBanInfo.vue | 239 +++++++++++ .../weushoumaiduanEdit.vue | 117 +++--- 9 files changed, 720 insertions(+), 213 deletions(-) create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue rename anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/{weishoumaiduanInfo.vue => weishoumaiduanDaiBanInfo.vue} (71%) create mode 100644 anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue 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 63532b4a68..5667e84914 100644 --- a/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js +++ b/anrui-scm/anrui-scm-ui/src/router/modules/codemenu.js @@ -528,14 +528,14 @@ const codemenu = [ import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaEdit.vue'), name: 'tiaojiaEdit' }, - // 调价管理详情 + // 调价管理待办详情 { path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo', component: () => import('@/views/workFlow/tiaojiaguanliFlow/tiaojiaguanli/tiaojiaDaiBanInfo.vue'), name: 'tiaojiaInfo' }, - // 调价管理详情 + // 调价管理已办详情 { path: '/tiaojiaguanliFlow/tiaojiaguanli/tiaojianYibanInfo', component: () => @@ -549,12 +549,19 @@ const codemenu = [ import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouEdit.vue'), name: 'neigouEdit' }, - // 车辆内购详情 + // 车辆内购待办详情 { - path: '/cheliangneigouFlow/neigouguanli/neigouInfo', + path: '/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo', component: () => - import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouInfo.vue'), - name: 'neigouInfo' + import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouDaiBanInfo.vue'), + name: 'neigouDaiBanInfo' + }, + // 车辆内购已办详情 + { + path: '/cheliangneigouFlow/neigouguanli/neigouYiBanInfo', + component: () => + import('@/views/workFlow/cheliangneigouFlow/neigouguanli/neigouYiBanInfo.vue'), + name: 'neigouYiBanInfo' }, // 未售买断编辑 { @@ -563,12 +570,19 @@ const codemenu = [ import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue'), name: 'maiduanEdit' }, - // 未售买断详情 + // 未售买断待办详情 + { + path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo', + component: () => + import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue'), + name: 'weishoumaiduanDaiBanInfo' + }, + // 未售买断已办详情 { - path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo', + path: '/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo', component: () => - import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue'), - name: 'maiduanInfo' + import('@/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue'), + name: 'weishoumaiduanYiBanInfo' }, // 采购退库驳回到发起人办理编辑页面 { diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue index 18bd2739b1..79daaeef7d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldAdd.vue @@ -58,22 +58,22 @@ - + - + - + - + @@ -157,15 +157,8 @@ export default { this.viewTitle = '【编辑】车辆未售买断申请' console.log('编辑回显', row.sid) req.fetchBySid(row.sid).then((resp) => { - const data = resp.data - this.formobj.applicationName = data.applicationName - this.formobj.sid = data.sid - this.formobj.reason = data.reason - this.formobj.createTime = data.createTime - this.formobj.instanceId = data.procInstId - this.formobj.userSid = data.userSid - this.formobj.taskId = data.taskId - this.formobj.detailsList = data.voList + this.formobj = resp.data + this.formobj.instanceId = resp.data.procInstId }).catch((e) => { this.formobj = row }) diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue index c2106d519c..d70f06acb2 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldInfo.vue @@ -43,24 +43,24 @@
车辆列表
- + - + - + - + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue index d4c62caf23..1b47a00784 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/unsoldguanli.vue @@ -40,21 +40,21 @@ - + - + - + @@ -64,7 +64,7 @@ {{ scope.row.reason }} - + @@ -178,12 +178,6 @@ export default { case 'doDel': this.doDel() break - case 'doImport': - this.doImport() - break - case 'doExport': - this.doExport() - break case 'doClose': this.doClose() break diff --git a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue index f0ad6a4008..d09b5557cd 100644 --- a/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/weishoumaiduan/weishoumaiduanguanli/vehicle.vue @@ -170,17 +170,13 @@ export default { vehicleAlias: '', vehicleType: '', vehicleVersion: '', - userSid: window.sessionStorage.getItem('userSid'), + userSid: '', vinNoList: [] }, total: 1 } } }, - created() { - // 初始化变量 - this.init() - }, methods: { // 搜索条件效果 clicksearchShow() { @@ -325,7 +321,8 @@ export default { } else { this.listQuery.params.vinNoList = [] } - this.getList() + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.init() }, // 添加修改返回 AddUpdateReturn() { diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue new file mode 100644 index 0000000000..6d56d4d203 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/vehicle.vue @@ -0,0 +1,371 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue similarity index 71% rename from anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue rename to anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue index 283991796e..7cd603a1e0 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanDaiBanInfo.vue @@ -7,11 +7,9 @@
车辆未售买断详情
- 同 意 - 驳 回 - 终 止 - 撤 回 - 关 闭 + 同 意 + 驳 回 + 终 止
@@ -47,24 +45,24 @@
车辆列表
- + - + - + - + - + @@ -79,7 +77,7 @@ - + 当前环节 {{ current.taskName }}->{{ nextNode.name }} @@ -105,7 +103,7 @@ import req from '@/api/weishoumaiduan/unsold' import flow from '../../../baseoutsourcingapplication/workflow/flow' export default { - name: 'maiduanInfo', + name: 'weishoumaiduanDaiBanInfo', components: { flow }, @@ -132,7 +130,6 @@ export default { // 表单数据 formobj: {}, rules: {}, - transactState: '', // 办理状态 // 环节所需参数 linkByParameter: { businessSid: '', @@ -147,29 +144,21 @@ export default { }, created() { console.log('url:' + window.location.href) - var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置 - var b = window.location.href.indexOf('#data') // 第一个#data出现的位置 - const info = window.location.href.slice(a, b) - var sid = info.substr(info.indexOf('=') + 1) - this.showInfo(sid) - // ===获取参数 - var one = window.location.href.lastIndexOf('#') + 1 - var two = window.location.href.lastIndexOf('}') + 1 - const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用 - var tar = data.substr(data.indexOf('=') + 1) - const obj = JSON.parse(tar) + var one = window.location.href.indexOf('&data') + 6 + const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用 + const obj = JSON.parse(decodeURIComponent(data)) console.log('iframe页面获取的obj:', obj) // 点击（同意、终止、驳回、驳回）操作时所需的参数 - this.linkByParameter.businessSid = sid + this.linkByParameter.businessSid = obj.businessSid this.linkByParameter.instanceId = obj.instanceId this.linkByParameter.taskId = obj.taskId this.linkByParameter.taskDefKey = obj.taskDefKey - this.linkByParameter.orgSidPath = obj.orgSidPath - this.linkByParameter.userSid = obj.userSid + this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath') + this.linkByParameter.userSid = window.sessionStorage.getItem('userSid') this.current.taskDefKey = obj.taskDefKey this.current.taskName = obj.taskName - // 办理状态 - this.transactState = obj.transactState + // 加载表单数据 + this.showInfo(obj.businessSid) // 加载流程图相关的数据 this.getModelDetail(obj.deployId) this.getFlowViewer(obj.instanceId) @@ -185,8 +174,8 @@ export default { }, '*') }, methods: { - showInfo(row) { - req.fetchBySid(row.sid).then((res) => { + showInfo(sid) { + req.fetchBySid(sid).then((res) => { if (res.success) { this.formobj = res.data } @@ -241,21 +230,6 @@ export default { this.submitdisabled = false }) }, - /** 确认撤回任务 */ - openRevoke() { - this.$confirm('是否确认执行撤回操作', '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - this.handleRevoke() - }).catch(() => { - this.$message({ - type: 'info', - message: '已取消撤回' - }) - }) - }, reject() { if (this.operation === '同意') { this.handleAgree() @@ -285,13 +259,6 @@ export default { code: 1 } }, '*') - } else { - this.$notify({ - title: '提示', - message: '执行失败', - type: 'error', - duration: 2000 - }) } }) }, @@ -315,20 +282,12 @@ export default { code: 1 } }, '*') - } else { - this.$notify({ - title: '提示', - message: '执行失败', - type: 'error', - duration: 2000 - }) } }) }, /** 终止任务 */ handleStop() { this.linkByParameter.comment = this.dialogList.comment - console.log(this.stopList, 99999) req.breakProcess(this.linkByParameter).then((response) => { if (response.success) { this.$notify({ @@ -346,43 +305,6 @@ export default { code: 1 } }, '*') - } else { - this.$notify({ - title: '提示', - message: '执行失败', - type: 'error', - duration: 2000 - }) - } - }) - }, - /** 撤回任务 */ - handleRevoke() { - this.linkByParameter.comment = this.dialogList.comment - req.revokeProcess(this.linkByParameter).then((response) => { - if (response.success) { - this.$notify({ - title: '提示', - message: '执行成功', - type: 'success', - duration: 2000 - }) - this.nodeDialogVisible = false - // 子页面向父级页面传递值 - window.parent.postMessage({ - cmd: 'returnHeight', - params: { - // 操作成功，告诉父级页面关闭弹框 - code: 1 - } - }, '*') - } else { - this.$notify({ - title: '提示', - message: '执行失败', - type: 'error', - duration: 2000 - }) } }) } diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue new file mode 100644 index 0000000000..dc9e8e6967 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weishoumaiduanYiBanInfo.vue @@ -0,0 +1,239 @@ + + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue index d530f7d276..4c55723d32 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue @@ -15,7 +15,7 @@ -
+
车辆未售买断申请
@@ -57,22 +57,22 @@ - + - + - + - + @@ -82,18 +82,18 @@
- +