diff --git a/src/views/ebiz/agentEenter/EntryProcess.vue b/src/views/ebiz/agentEenter/EntryProcess.vue index 4a1005de1..66f2e5908 100644 --- a/src/views/ebiz/agentEenter/EntryProcess.vue +++ b/src/views/ebiz/agentEenter/EntryProcess.vue @@ -28,8 +28,20 @@
-
- +
+
- - + + @@ -123,15 +123,6 @@ export default { result: this.approvalResult, //审批结果 0-拒绝审批 1-通过 msg: this.approvalMsg //审批原因 } - // this.$jump({ - // flag: 'h5', - // extra: { - // url: location.origin + `/#/agentEenter/approve/SubmitSuccess`, - // forbidSwipeBack: '1', //1:禁止右滑返回 - // backToFirst: '1' //1:点击左上角,返回到入口第一个webview - // }, - // routerInfo: { path: `/agentEenter/approve/SubmitSuccess` } - // }) console.log('审批结果==', params) agentAddApproval(params).then(res => { console.log('res ==', res) diff --git a/src/views/ebiz/agentEenter/approve/ApproveList.vue b/src/views/ebiz/agentEenter/approve/ApproveList.vue index e0c6c6c6f..981d5f6fb 100644 --- a/src/views/ebiz/agentEenter/approve/ApproveList.vue +++ b/src/views/ebiz/agentEenter/approve/ApproveList.vue @@ -76,11 +76,7 @@ export default { message: '加载中……' }) let data = { - types: ['01'], - userModel: { - //线上去掉 - id: 'A864501000001' //审批人工号 - } + types: ['01'] } agentAddApproval(data).then(res => { this.$toast.clear() @@ -91,7 +87,7 @@ export default { this.isSuccess = true resData.forEach(ele => { obj = {} - obj.name = ele.createdUser //申请人姓名 + obj.name = ele.name //申请人姓名 obj.referName = ele.referName //推荐人姓名 obj.team = ele.team //所属团队 obj.createdDate = ele.createdDate //申请时间 diff --git a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue index f3da879b3..be00abb24 100644 --- a/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue +++ b/src/views/ebiz/agentEenter/approve/SubmitSuccess.vue @@ -24,7 +24,8 @@ export default { this.$jump({ flag: 'h5', extra: { - url: location.origin + `/#/agentEenter/approve/ApproveList` + url: location.origin + `/#/agentEenter/approve/ApproveList`, + backToFirst: '1' }, routerInfo: { path: '/agentEenter/approve/ApproveList'