Commit 3f67c6fa authored by 李晓兵's avatar 李晓兵

Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

parents 5bec80d3 1e930b72
...@@ -113,8 +113,8 @@ ...@@ -113,8 +113,8 @@
<list-item :item-height="76"> <list-item :item-height="76">
<item v-for="(item,index) in bondsInfo" :key="index"> <item v-for="(item,index) in bondsInfo" :key="index">
<div slot="name"> <div slot="name">
<span class="name-box">{{ index }}</span> <span class="name-box">{{ index+1 }}</span>
<span class="name">担保人{{ index }}姓名</span> <span class="name">担保人{{ index+1 }}姓名</span>
<span class="card-num">证件号</span> <span class="card-num">证件号</span>
</div> </div>
<div slot="content" class="right"> <div slot="content" class="right">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</div> </div>
</div> </div>
</div> </div>
<RentInfo v-show="tabNum==1"/> <RentInfo v-show="tabNum==1" />
<AccessoryInfo v-show="tabNum==2" @down="getDown" /> <AccessoryInfo v-show="tabNum==2" @down="getDown" />
</h-content> </h-content>
<bottom-tab class="footer-button"> <bottom-tab class="footer-button">
...@@ -251,14 +251,14 @@ ...@@ -251,14 +251,14 @@
审批意见 审批意见
<img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" > <img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
</span> </span>
<textarea cols="8" rows="20" placeholder="请输入" /> <textarea v-model="confirm_note" cols="8" rows="20" placeholder="请输入" />
</div> </div>
</h-content> </h-content>
<bottom-tab> <bottom-tab>
<tab-button class="reject" @click.native="showModalValue=true"> <tab-button class="reject" @click.native="showModalValue=true;confirm_status='REJECTED';charge()">
<img src="@/assets/intoApproval/reject.png" >拒绝 <img src="@/assets/intoApproval/reject.png" >拒绝
</tab-button> </tab-button>
<tab-button class="same" @click.native="showModalValue=true"> <tab-button class="same" @click.native="showModalValue=true;confirm_status='APPROVED';charge()">
<img src="@/assets/intoApproval/approve.png" >同意 <img src="@/assets/intoApproval/approve.png" >同意
</tab-button> </tab-button>
</bottom-tab> </bottom-tab>
...@@ -285,11 +285,13 @@ export default { ...@@ -285,11 +285,13 @@ export default {
ischecked: false, ischecked: false,
isConfirm: false, isConfirm: false,
baseInfo: {}, baseInfo: {},
confirm_status: '',
checkedImg: checkedImg, checkedImg: checkedImg,
isDown: false, isDown: false,
bp_class: window.sessionStorage.bp_class, bp_class: window.sessionStorage.bp_class,
rentInfo: {}, rentInfo: {},
bondsInfo: [], bondsInfo: [],
confirm_note: '',
personInfo: { personInfo: {
bp_name_sp: '', bp_name_sp: '',
id_card_no: '', id_card_no: '',
...@@ -387,7 +389,7 @@ export default { ...@@ -387,7 +389,7 @@ export default {
let vm = this let vm = this
let url = process.env.basePath + 'prj_guarantor_list_query' let url = process.env.basePath + 'prj_guarantor_list_query'
let param = { let param = {
project_id: '46002', project_id: window.sessionStorage.project_id,
} }
vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
...@@ -407,6 +409,23 @@ export default { ...@@ -407,6 +409,23 @@ export default {
} }
}, 10) }, 10)
}, },
charge () {
let vm = this
let url = process.env.basePath + 'do_confrim_bp'
let param = {
'master': {
confirm_id: window.sessionStorage.confirm_id,
confirm_status: this.confirm_status,
confirm_note: this.confirm_note,
},
}
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.bondsInfo = res.lists
}
})
},
}, },
} }
</script> </script>
......
...@@ -207,6 +207,8 @@ export default { ...@@ -207,6 +207,8 @@ export default {
font-size: 14px; font-size: 14px;
color: #383f45; color: #383f45;
letter-spacing: 0; letter-spacing: 0;
display:fixed;
top:0px;
} }
th:first-child { th:first-child {
width: 15%; width: 15%;
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
</div> </div>
</div> </div>
<h-content> <h-content>
<div v-for="(item,index) in contractMsg" :key="index" class="contract-list" @click="goDetails (item)"> <div v-for="(item,index) in showList" :key="index" class="contract-list" @click="goDetails (item)">
<div class="item"> <div class="item">
<img src="@/assets/distributorSign/icon-进件合同.png" alt=""> <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
<p class="incoming-num">进件号</p> <p class="incoming-num">进件号</p>
...@@ -50,9 +50,24 @@ export default { ...@@ -50,9 +50,24 @@ export default {
data () { data () {
return { return {
tabNum: 0, tabNum: 0,
keyWords: '',
contractMsg: [], contractMsg: [],
showList: [],
unConfirm: [],
confirm: [],
} }
}, },
watch: {
'tabNum': function (newVal, oldVal) {
if (newVal === 0) {
// this.showList = this.unConfirm
this.showList = this.contractMsg
} else if (newVal === 1) {
// this.showList = this.confirm
this.showList = this.contractMsg
}
},
},
created () { created () {
this.getList() this.getList()
}, },
...@@ -67,13 +82,29 @@ export default { ...@@ -67,13 +82,29 @@ export default {
vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
if (res.result === 'S') { if (res.result === 'S') {
vm.contractMsg = res.lists vm.contractMsg = res.lists
vm.showList = res.lists
// vm.showList = res.lists.filter(item => {
// return item.confirm_status === 'SUBMIT'
// })
} }
}) })
}, },
selectUnConfirm () {
let vm = this
let list = vm.contractMsg.filter(item => {
return item.confirm_status === 'SUBMIT'
})
vm.unConfirm = list
let list1 = vm.contractMsg.filter(item => {
return item.confirm_status === 'APPROVED'
})
vm.confirm = list1
},
getTabNum (i) { getTabNum (i) {
this.tabNum = i this.tabNum = i
}, },
goDetails (item) { goDetails (item) {
window.sessionStorage.setItem('confirm_id', item.confirm_id)
window.sessionStorage.setItem('bp_class', item.bp_class) window.sessionStorage.setItem('bp_class', item.bp_class)
window.sessionStorage.setItem('project_id', item.project_id) window.sessionStorage.setItem('project_id', item.project_id)
this.$router.push({ this.$router.push({
......
...@@ -307,6 +307,7 @@ export default { ...@@ -307,6 +307,7 @@ export default {
methods: { methods: {
verified () { verified () {
this.saveWord() this.saveWord()
this.getBankInfo()
}, },
saveProtocol () { saveProtocol () {
let vm = this let vm = this
......
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