Commit 8b49b5e6 authored by 786817560's avatar 786817560

''解决冲突

parents 3a738ca6 c2e93b4c
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2019-09-29 10:02:11 * @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 13:51:34 * @LastEditTime: 2019-10-23 17:25:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
--> -->
...@@ -178,6 +178,7 @@ export default { ...@@ -178,6 +178,7 @@ export default {
uncheck1: unCheck1, uncheck1: unCheck1,
uncheck2: unCheck2, uncheck2: unCheck2,
confirm_status: '', confirm_status: '',
entry_info_flag: false,
} }
}, },
computed: {}, computed: {},
...@@ -194,6 +195,11 @@ export default { ...@@ -194,6 +195,11 @@ export default {
}, },
activated () { activated () {
// console.log('...........', this.$route.params.confirm_status) // console.log('...........', this.$route.params.confirm_status)
if (window.sessionStorage.getItem('add_status') === 'true') { // 根据add_status值改变entry_info_flag,传入银行卡录入页面,负责重置数据与否
this.entry_info_flag = true
} else {
this.entry_info_flag = false
}
}, },
methods: { methods: {
// 合同商务条件查询 // 合同商务条件查询
...@@ -236,11 +242,31 @@ export default { ...@@ -236,11 +242,31 @@ export default {
name: 'EntryInfo', name: 'EntryInfo',
params: { params: {
project_id: this.project_id, project_id: this.project_id,
entry_info_flag: this.entry_info_flag,
}, },
}) })
}, },
inSure () { inSure () {
console.log(typeof window.sessionStorage.getItem('add_status'))
if (window.sessionStorage.getItem('add_status') === 'true') {
// this.entry_info_flag = true
// let vm = this
// let url = $config.basePath + 'con_bp_confirm'
// let param = {
// project_id: this.$route.params.project_id,
// }
// vm.hlsHttp.post(url, param).then(function (res) {
// console.log('商务条件', res)
// if (res.result === 'S') {
// vm.conditionInfo = res.info
// } else {
// hlsPopup.showLongCenter(res.message)
// }
// })
} else {
this.isshow = true this.isshow = true
// this.entry_info_flag = false
}
}, },
}, },
} }
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2019-09-29 10:02:11 * @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 11:01:35 * @LastEditTime: 2019-10-23 16:59:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
--> -->
...@@ -126,7 +126,8 @@ export default { ...@@ -126,7 +126,8 @@ export default {
}) })
}, },
// val: project_id, status: confirm_status // val: project_id, status: confirm_status
goDetails (val, status) { goDetails (val, status) { // 银行卡录入页面keep alive为true,根据project_id和add_status重置页面
window.sessionStorage.setItem('add_status', false)
this.$router.push({ this.$router.push({
name: 'ContractDetail', name: 'ContractDetail',
params: { params: {
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2019-09-29 10:02:11 * @Date: 2019-09-29 10:02:11
* @LastEditTime: 2019-10-23 13:47:58 * @LastEditTime: 2019-10-23 17:33:47
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
--> -->
...@@ -64,17 +64,19 @@ import unCheck1 from '@/assets/distributorSign/conditionUncheck.png' ...@@ -64,17 +64,19 @@ import unCheck1 from '@/assets/distributorSign/conditionUncheck.png'
import unCheck2 from '@/assets/distributorSign/textUncheck.png' import unCheck2 from '@/assets/distributorSign/textUncheck.png'
export default { export default {
name: 'ContractDetail', name: 'EntryInfo',
components: { components: {
}, },
data () { data () {
return { return {
num: 1, num: 1,
bankImg: '', // 银行卡图片 bankImg: '', // 银行卡图片
project_id: '',
check1: Check1, check1: Check1,
check2: Check2, check2: Check2,
uncheck1: unCheck1, uncheck1: unCheck1,
uncheck2: unCheck2, uncheck2: unCheck2,
bank_card_flag: false,
res: '', res: '',
name: '', name: '',
// bank_lists: { // bank_lists: {
...@@ -97,6 +99,18 @@ export default { ...@@ -97,6 +99,18 @@ export default {
watch: {}, watch: {},
activated () { activated () {
this.name = this.$route.params.name this.name = this.$route.params.name
if (this.project_id !== this.$route.params.project_id || !this.$route.params.entry_info_flag) {
this.project_id = this.$route.params.project_id
this.bankImg = ''
this.bank_lists = [
{
bank_full_name: '', // 银行名称
bank_account_num: '', // 卡号
bank_account_name: '',
bank_branch_name: '',
},
]
}
}, },
methods: { methods: {
// ocr识别入口 // ocr识别入口
...@@ -169,6 +183,21 @@ export default { ...@@ -169,6 +183,21 @@ export default {
}) })
}, },
cardAdd () { cardAdd () {
for (var key in this.bank_lists[0]) {
if (!this.bank_lists[0][key]) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('银行信息不完整!')
return
} else {
this.bank_card_flag = true
}
}
if (this.hlsUtil.isBankAccount(this.bank_lists[0].bank_account_num)) {
this.bank_card_flag = false
this.hlsPopup.showLongCenter('请输入正确银行卡号!')
}
if (this.bank_card_flag) {
let vm = this let vm = this
let url = $config.basePath + 'con_bank_save' let url = $config.basePath + 'con_bank_save'
let param = { let param = {
...@@ -179,12 +208,21 @@ export default { ...@@ -179,12 +208,21 @@ export default {
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
console.log('银行信息录入', res) console.log('银行信息录入', res)
// if (res.result === 'S') { if (res.result === 'S') {
// vm.conditionInfo = res.info vm.hlsPopup.showSuccess('保存成功')
// } else { window.sessionStorage.setItem('add_status', true)
// hlsPopup.showLongCenter(res.message) vm.$routeGo()
// } // vm.$router.push({
// name: 'ContractDetail',
// // params: {
// // add_status: true,
// // },
// })
} else {
hlsPopup.showLongCenter(res.message)
}
}) })
}
}, },
}, },
} }
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @Author: your name * @Author: your name
* @Date: 2019-09-24 12:34:06 * @Date: 2019-09-24 12:34:06
* @LastEditTime: 2019-10-22 14:52:22 * @LastEditTime: 2019-10-23 14:56:38
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
*/ */
import Vue from 'vue' import Vue from 'vue'
......
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