Commit 702a83b1 authored by 786817560's avatar 786817560

Merge branch 'ren' into develop

parents 7f5fbbb0 3989e5f4
/*
* @Author: your name
* @Date: 2019-11-11 16:28:43
* @LastEditTime: 2019-12-03 18:22:07
* @LastEditTime: 2019-12-05 20:01:03
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \hls-xcmg-vue-app\config\index.js
*/
'use strict'
// Template version: 1.2.4
......
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-12-05 11:03:28
* @LastEditTime: 2019-12-05 19:09:00
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -133,7 +133,7 @@
</div>
<div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
</item> -->
<item :proportion="[4,1]">
<item :proportion="[5,1]">
<div slot="name" class="aguremrnt-list">
<img src="@/assets/constractSigning/pack.png" alt="" class="pics">
<p class="second">租赁物所有权转移及接收确认书</p>
......@@ -699,30 +699,9 @@ export default {
},
inSure () {
if (this.bank_flag) {
// hlsPopup.showLoading('请稍候')
// // this.entry_info_flag = true
// let vm = this
// let url = $config.basePath + 'con_bp_confirm'
// let param = {
// master: {
// confirm_id: vm.confirm_id,
// con_confirm_status: 'APPROVED',
// },
// }
// vm.hlsHttp.post(url, param).then(function (res) {
// hlsPopup.hideLoading()
// if (res.result === 'S') {
// vm.$router.push({
// name: 'ContractSigning',
// })
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
this.showModalValue = true
this.showModalValue = true // 审批内容框显示
} else {
this.isshow = true
// this.entry_info_flag = false
this.isshow = true // 未查到农行卡给出提示
}
},
......@@ -738,6 +717,7 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
if (res.result === 'S') {
console.log(res.info.bank_full_name === ' ')
if (res.info.bank_full_name === ' ') {
vm.bank_flag = false
vm.bankPic = vm.unRead
......@@ -1149,7 +1129,7 @@ export default {
.read {
height: 16px;
margin-top: 8px;
margin-left: 12.5px;
margin-left: 6px;
}
.second {
......
<!--
* @Author: your name
* @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-12-05 14:06:17
* @LastEditTime: 2019-12-05 19:37:21
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
-->
......@@ -121,6 +121,7 @@ export default {
computed: {},
watch: {},
activated () {
console.log('id', this.$route.params.bp_id)
this.user_bp_type = this.$route.params.user_bp_type
this.name = this.$route.params.name
this.confirm_status = this.$route.params.confirm_status
......@@ -266,14 +267,18 @@ export default {
if (res.info.bank_full_name !== ' ') {
vm.readyonlf_flag = true
vm.bank_lists = res.info
vm.bank_lists.bank_account_name = vm.$route.params.bp_name
vm.bank_lists.id_card_no = vm.$route.params.id_card_no
vm.bank_lists.project_id = vm.$route.params.project_id
// vm.bank_lists.bank_account_name = vm.$route.params.bp_name
// vm.bank_lists.id_card_no = vm.$route.params.id_card_no
// vm.bank_lists.project_id = vm.$route.params.project_id
} else {
// vm.bank_lists.bank_account_name = vm.$route.params.bp_name
// vm.bank_lists.id_card_no = vm.$route.params.id_card_no
// vm.bank_lists.project_id = vm.$route.params.project_id
}
vm.bank_lists.bank_account_name = vm.$route.params.bp_name
vm.bank_lists.id_card_no = vm.$route.params.id_card_no
vm.bank_lists.project_id = vm.$route.params.project_id
}
vm.bank_lists.bp_id = vm.$route.params.bp_id
} else {
hlsPopup.showLongCenter(res.message)
}
......
......@@ -210,6 +210,7 @@ export default {
for (var i = 0; i < list.length; i++) {
let uploadSuccess = function (res) {
if (res.result === 'S') {
hlsPopup.showLongCenter('上传成功')
alreadyUploadNum++
for (var j = 0; j < list.length; j++) {
if (list[j].filePath === res.response.filePath) {
......
......@@ -2,7 +2,7 @@
* @Description: In User Settings Edit
* @Author: your name
* @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-11-26 17:23:54
* @LastEditTime: 2019-12-05 18:21:59
* @LastEditors: Please set LastEditors
*/
import Vue from 'vue'
......@@ -228,7 +228,7 @@ export default new Router({
// 帮助与反馈
{path: '/help-list', component: HelpList, name: 'HelpList', meta: {keepAlive: true}},
{path: '/help-detail', component: HelpDetail, name: 'HelpDetail', meta: {keepAlive: true}},
{path: '/help-feedback', component: HelpFeedback, name: 'HelpFeedback', meta: {keepAlive: true}},
{path: '/help-feedback', component: HelpFeedback, name: 'HelpFeedback', meta: {keepAlive: false}},
// 我的还款
{path: '/reimburse-myself-list', component: ReimburseMyselfList, name: 'ReimburseMyselfList', meta: {keepAlive: true}},
{path: '/reimburse-detail', component: ReimburseDetail, name: 'ReimburseDetail', meta: {keepAlive: false}},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment