Commit 92dd9170 authored by 胡's avatar

fix: 同步代码

parent acbd2cee
...@@ -293,6 +293,7 @@ export default { ...@@ -293,6 +293,7 @@ export default {
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'LEASE_ITEM', data_class: 'LEASE_ITEM',
bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
...@@ -325,7 +326,7 @@ export default { ...@@ -325,7 +326,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
......
...@@ -427,7 +427,7 @@ export default { ...@@ -427,7 +427,7 @@ export default {
return false return false
} }
}, },
async goContent(item, index) { async goContent(item, index, isJump = true) {
// 详情 // 详情
// 合同状态更新保存 // 合同状态更新保存
let vm = this let vm = this
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id bp_id:JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
...@@ -448,10 +448,12 @@ export default { ...@@ -448,10 +448,12 @@ export default {
let temp = vm.attachArray[index] let temp = vm.attachArray[index]
// let item = temp // let item = temp
temp.read_status = 'Y' temp.read_status = 'Y'
vm.$router.push({ if(isJump){
name: 'previewPdf', vm.$router.push({
params: { attachUrl: vm.attachUrl }, name: 'previewPdf',
}) params: { attachUrl: vm.attachUrl },
})
}
vm.attachArray.splice(index, 1, temp) vm.attachArray.splice(index, 1, temp)
// debugger // debugger
} else { } else {
...@@ -465,6 +467,7 @@ export default { ...@@ -465,6 +467,7 @@ export default {
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_CONFIRM', data_class: 'PRJ_CONFIRM',
bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
...@@ -484,6 +487,7 @@ export default { ...@@ -484,6 +487,7 @@ export default {
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_CONFIRM', data_class: 'PRJ_CONFIRM',
bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
...@@ -587,9 +591,12 @@ export default { ...@@ -587,9 +591,12 @@ export default {
this.hlsPopup.showConfirm({ this.hlsPopup.showConfirm({
title: '提示', title: '提示',
content: `您确认${val}吗?`, content: `您确认${val}吗?`,
onConfirm: data => { onConfirm: async data => {
if (data) { if (data) {
// 需要先校验是否认证通过 // 需要先校验是否认证通过
await vm.attachArray.forEach(async (ele, i) => {
await vm.goContent(ele, i, false);
});
vm.doConfirm(status) vm.doConfirm(status)
} }
}, },
...@@ -727,6 +734,7 @@ export default { ...@@ -727,6 +734,7 @@ export default {
master: { master: {
content_id: vm.content_id, content_id: vm.content_id,
read_status: 'Y', read_status: 'Y',
bp_id:JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
}, },
} }
vm.hlsPopup.showLoading('请稍候') vm.hlsPopup.showLoading('请稍候')
......
...@@ -32,6 +32,7 @@ ...@@ -32,6 +32,7 @@
</p> </p>
<img src="@/assets/constractSigning/righticon.png" alt class="arrow" /> <img src="@/assets/constractSigning/righticon.png" alt class="arrow" />
<img v-if="item.read_check === 'N'" src="@/assets/constractSigning/unread.png" alt class="unread" /> <img v-if="item.read_check === 'N'" src="@/assets/constractSigning/unread.png" alt class="unread" />
<img v-if="item.read_check === 'Y'" src="@/assets/constractSigning/read.png" alt class="unread" />
</div> </div>
<div class="box"> <div class="box">
<div <div
...@@ -187,9 +188,11 @@ export default { ...@@ -187,9 +188,11 @@ export default {
}, },
methods: { methods: {
signContract() { signContract() {
let list = this.showLists.filter(item => item.checked).map(item => {item.checked = false; return item}); let list = this.showLists.filter(item => item.checked);
if (!list.length) return hlsPopup.showLongCenter('请选择合同'); if (!list.length) return hlsPopup.showLongCenter('请选择合同');
if(list.findIndex(item => item.read_check === 'N') > -1) return hlsPopup.showLongCenter('选中合同中有文本未读,请先阅读'); if(list.findIndex(item => item.read_check === 'N') > -1) return hlsPopup.showLongCenter('您有授权书未阅读,请阅读后再签署');
list = list.map(item => {item.checked = false; return item});
window.localStorage.setItem('handleContact', JSON.stringify(list)); window.localStorage.setItem('handleContact', JSON.stringify(list));
this.$router.push({ path: '/batchSign', query: { name: 'contract' } }); this.$router.push({ path: '/batchSign', query: { name: 'contract' } });
}, },
......
...@@ -971,6 +971,7 @@ export default { ...@@ -971,6 +971,7 @@ export default {
let param = { let param = {
project_id: vm.project_id, project_id: vm.project_id,
data_class: 'LEASE_ITEM', data_class: 'LEASE_ITEM',
bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
......
...@@ -366,6 +366,7 @@ export default { ...@@ -366,6 +366,7 @@ export default {
let param = { let param = {
confirm_id: vm.confirm_id, confirm_id: vm.confirm_id,
data_class: 'PRJ_PREVIEW', data_class: 'PRJ_PREVIEW',
bp_id: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_id
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
vm.hlsHttp.post(url, param).then(res => { vm.hlsHttp.post(url, param).then(res => {
...@@ -446,7 +447,7 @@ export default { ...@@ -446,7 +447,7 @@ export default {
master: { master: {
content_id: item.content_id, content_id: item.content_id,
read_status: 'Y', read_status: 'Y',
bp_id: window.localStorage.bp_id bp_id: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_id
}, },
} }
hlsPopup.showLoading('请稍候') hlsPopup.showLoading('请稍候')
......
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