Skip to content

H
hls-xcmg-vue-app
Commit fde3647a authored by 王建文's avatar 王建文
Browse files
Options

修改角色切换问题

parent c6c149fe
Show whitespace changes
Inline Side-by-side
Showing with 145 additions and 113 deletions
src/pages/choose-user.vue
View file @ fde3647a
......@@ -116,6 +116,7 @@ export default {
},
next() {
let index = this.hasChecked;
console.log('JSON.stringify(this.list[index])'+JSON.stringify(this.list[index]))
if (index > -1) {
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.list[index]));
this.$router.push('tab');
......
src/pages/contractSigning/contract-detail.vue
View file @ fde3647a
......@@ -221,7 +221,7 @@
<!-- </item>-->
<item>
<div slot="name" class="font-color">担保人类型</div>
<input slot="content" v-model="item.guarantor_type_n" readonly>
<input slot="content" v-model="item.guarantor_type_n" readonly @click="saveGuarantor(item)">
</item>
<item>
<div slot="name" class="font-color">担保人名称</div>
......@@ -931,6 +931,12 @@ export default {
vm.itemInfo = item
vm.downNum = true
},
// 更新担保人
saveGuarantor (item) {
let vm = this
vm.guarantorInfo = item
vm.guarantorFlag = true
},
saveData () {
let vm = this
let url = $config.basePath + 'zm_prj_base_info_save'
......@@ -1323,6 +1329,7 @@ export default {
hlsPopup.showLoading('请稍候')
return vm.hlsHttp.post(url, param).then(function (res) {
// vm.hlsPopup.hideLoading()
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
res.lists.forEach(item => {
item['url'] =
......@@ -1333,18 +1340,25 @@ export default {
window.localStorage.access_token
})
if (code === 'report') {
vm.upload_list_report = []
vm.dowload_list_report = res.lists
} if (code === 'product') {
} else if (code === 'product') {
vm.upload_list_product = []
vm.dowload_list_product = res.lists
} if (code === 'suggest') {
} else if (code === 'suggest') {
vm.upload_list_suggest = []
vm.dowload_list_suggest = res.lists
} if (code === 'contract') {
} else if (code === 'contract') {
vm.upload_list_contract = []
vm.dowload_list_contract = res.lists
} if (code === 'license') {
} else if (code === 'license') {
vm.upload_list_license = []
vm.dowload_list_license = res.lists
} if (code === 'credit') {
} else if (code === 'credit') {
vm.upload_list_credit = []
vm.dowload_list_credit = res.lists
} else {
vm.upload_list_mining = []
vm.dowload_list_mining = res.lists
}
}
......@@ -1736,6 +1750,8 @@ export default {
hlsPopup.showLongCenter('统一社会信用代码不能为空!')
} else if (!vm.baseInfo.registered_capital) {
hlsPopup.showLongCenter('注册资本不能为空!')
} else if (!vm.baseInfo.registered_place) {
hlsPopup.showLongCenter('注册地址不能为空!')
} else if (!vm.baseInfo.business_address) {
hlsPopup.showLongCenter('经营地址不能为空!')
} else if (!vm.baseInfo.phone) {
......@@ -1812,6 +1828,7 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.guarantorInfo={}
hlsPopup.showLongCenter('担保人保存成功')
vm.getGuarantorInfo()
} else {
......@@ -1837,6 +1854,7 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.itemInfo = {}
hlsPopup.showLongCenter('设备保存成功')
vm.getLease()
} else {
......
src/pages/contractSigning/contract-new.vue
View file @ fde3647a
......@@ -220,7 +220,7 @@
<!-- </item>-->
<item>
<div slot="name" class="font-color">担保人类型</div>
<input slot="content" v-model="item.guarantor_type_n" readonly>
<input slot="content" v-model="item.guarantor_type_n" readonly @click="saveGuarantor(item)">
</item>
<item>
<div slot="name" class="font-color">担保人名称</div>
......@@ -817,6 +817,12 @@ export default {
vm.itemInfo = item
vm.downNum = true
},
// 更新担保人
saveGuarantor (item) {
let vm = this
vm.guarantorInfo = item
vm.guarantorFlag = true
},
addRows (e) {
if (e) {
let len = 0
......@@ -1386,18 +1392,25 @@ export default {
window.localStorage.access_token
})
if (code === 'report') {
vm.upload_list_report = []
vm.dowload_list_report = res.lists
} if (code === 'product') {
} else if (code === 'product') {
vm.upload_list_product = []
vm.dowload_list_product = res.lists
} if (code === 'suggest') {
} else if (code === 'suggest') {
vm.upload_list_suggest = []
vm.dowload_list_suggest = res.lists
} if (code === 'contract') {
} else if (code === 'contract') {
vm.upload_list_contract = []
vm.dowload_list_contract = res.lists
} if (code === 'license') {
} else if (code === 'license') {
vm.upload_list_license = []
vm.dowload_list_license = res.lists
} if (code === 'credit') {
} else if (code === 'credit') {
vm.upload_list_credit = []
vm.dowload_list_credit = res.lists
} else {
vm.upload_list_mining = []
vm.dowload_list_mining = res.lists
}
}
......@@ -1462,6 +1475,8 @@ export default {
hlsPopup.showLongCenter('统一社会信用代码不能为空!')
} else if (!vm.baseInfo.registered_capital) {
hlsPopup.showLongCenter('注册资本不能为空!')
} else if (!vm.baseInfo.registered_place) {
hlsPopup.showLongCenter('注册地址不能为空!')
} else if (!vm.baseInfo.business_address) {
hlsPopup.showLongCenter('经营地址不能为空!')
} else if (!vm.baseInfo.phone) {
......@@ -1535,6 +1550,7 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.guarantorInfo={}
hlsPopup.showLongCenter('担保人保存成功')
vm.getGuarantorInfo()
} else {
......
src/pages/myInfo/my-info.vue
View file @ fde3647a
......@@ -15,10 +15,10 @@
<!-- <div :class="['top',(multipleRole!=='GUTA'&&user_bp_type!=='GUTA')?'has':'antiHas']" style="margin-top:-1px;"> -->
<div class="top" style="margin-top: -1px">
<div
class="card-top"
:style="{ height: nowBind.bp_type === 'MANAGER' ? '3.4rem' : '2.4rem' }"
class="card-top"
>
<img :src="upLoadObj" @click="checkType" />
<img :src="upLoadObj" @click="checkType" >
<div class="sign">
<span>{{ user_phone }}</span>
<div class="now-bind">
......@@ -37,7 +37,7 @@
</div>
</div>
<div class="bind-user" v-if="nowBind.bp_type !== 'MANAGER'">
<div v-if="nowBind.bp_type !== 'MANAGER'" class="bind-user">
<div class="box">
<p class="title">我绑定的用户</p>
<div v-if="!myBindUser.length" class="no-user">
......@@ -59,23 +59,23 @@
<h-content class="my-content has-footer">
<div class="content-top">
<list-item :item-height="44" class="list">
<!-- <item @click.native="goContract">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/agreement.png" class="left-icon" />-->
<!-- <div slot="name">我的合同</div>-->
<!-- </item>-->
<!-- <item-->
<!-- v-if="user_bp_type === 'TENANT' || user_bp_type === 'GUTA'"-->
<!-- @click.native="goReimburse"-->
<!-- >-->
<!-- <img slot="left-icon" src="@/assets/myInfo/repay.png" class="left-icon" />-->
<!-- <div slot="name">我的还款</div>-->
<!-- </item>-->
<!-- <item v-if="user_bp_type === 'TENANT'" @click.native="goInvoice">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/invoice.png" class="left-icon" />-->
<!-- <div slot="name">我的发票</div>-->
<!-- </item>-->
<!-- <item @click.native="goContract">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/agreement.png" class="left-icon" />-->
<!-- <div slot="name">我的合同</div>-->
<!-- </item>-->
<!-- <item-->
<!-- v-if="user_bp_type === 'TENANT' || user_bp_type === 'GUTA'"-->
<!-- @click.native="goReimburse"-->
<!-- >-->
<!-- <img slot="left-icon" src="@/assets/myInfo/repay.png" class="left-icon" />-->
<!-- <div slot="name">我的还款</div>-->
<!-- </item>-->
<!-- <item v-if="user_bp_type === 'TENANT'" @click.native="goInvoice">-->
<!-- <img slot="left-icon" src="@/assets/myInfo/invoice.png" class="left-icon" />-->
<!-- <div slot="name">我的发票</div>-->
<!-- </item>-->
<item @click.native="goMyProduct">
<img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" />
<img slot="left-icon" src="@/assets/myInfo/collect.png" class="left-icon" >
<div slot="name">我的收藏</div>
<div
v-if="productCount > 0"
......@@ -87,7 +87,7 @@
>{{ productCount > 99 ? "99+" : productCount }}</div>
</item>
<item @click.native="changeHelp">
<img slot="left-icon" src="@/assets/myInfo/help.png" class="left-icon" />
<img slot="left-icon" src="@/assets/myInfo/help.png" class="left-icon" >
<div slot="name">帮助与反馈</div>
</item>
<!-- <item @click.native="goAbout">
......@@ -95,11 +95,11 @@
<div slot="name">关于汉得</div>
</item> -->
<item @click.native="goSetting">
<img slot="left-icon" src="@/assets/myInfo/setting.png" class="left-icon" />
<img slot="left-icon" src="@/assets/myInfo/setting.png" class="left-icon" >
<div slot="name">设置</div>
</item>
<item @click.native="goContactUs">
<img slot="left-icon" src="@/assets/myInfo/contact.png" class="left-icon" />
<img slot="left-icon" src="@/assets/myInfo/contact.png" class="left-icon" >
<div slot="name">联系我们</div>
</item>
<!-- <item @click.native="updateVersion">
......@@ -112,7 +112,7 @@
<div slot="content">{{ currentVersion }}</div>
</item>-->
<item @click.native="logOut">
<img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" />
<img slot="left-icon" src="@/assets/myInfo/exit.png" class="left-icon" >
<div slot="name">退出登录</div>
</item>
</list-item>
......@@ -153,7 +153,7 @@ export default {
roleSwitch,
defaultImg,
},
data() {
data () {
return {
currentVersion: process.env.currentVersion,
// multipleRole: '',
......@@ -196,17 +196,17 @@ export default {
// },
// ],
//绑定的用户列表
// 绑定的用户列表
bindUserList: JSON.parse(window.localStorage.getItem('bind-user-list')),
nowBind: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')),
}
},
computed: {
myBindUser() {
if (this.bindUserList.length > 2) return [this.bindUserList[0], this.bindUserList[1]];
myBindUser () {
if (this.bindUserList.length > 2) return [this.bindUserList[0], this.bindUserList[1]]
return this.bindUserList;
}
return this.bindUserList
},
},
// watch: {
// user_bp_type (newVal, oldVal) {
......@@ -266,12 +266,12 @@ export default {
// }
// },
// },
mounted() {
mounted () {
this.getList()
this.getMultipleRole();
this.getHead();
this.getHead()
},
beforeRouteEnter(to, from, next) {
beforeRouteEnter (to, from, next) {
next((vm) => {
// vm.signCount = '0'
// vm.carNum = '0'
......@@ -291,62 +291,61 @@ export default {
},
methods: {
// 获取用户列表，并缓存
async getList() {
let url = process.env.basePath + 'user_bp_query';
let params = { app_user_id: window.localStorage.getItem('app_user_id') };
async getList () {
let url = process.env.basePath + 'user_bp_query'
let params = { app_user_id: window.localStorage.getItem('app_user_id') }
try {
hlsPopup.showLoading('请稍等');
let query = await this.hlsHttp.post(url, params);
hlsPopup.showLoading('请稍等')
let query = await this.hlsHttp.post(url, params)
if (query.result == 'S') {
this.hlsPopup.hideLoading();
this.hlsPopup.hideLoading()
// 自己添加认证文字
let register = {
NP_NO: "个人",
NP_YES: "个人",
ORG_YES: "企业",
ORG_NO: "企业",
ORG_L_NO: "法人",
ORG_L_YES: "法人",
ORG_AUTH_NO: "授权人",
ORG_AUTH_YES: "授权人"
NP_NO: '个人',
NP_YES: '个人',
ORG_YES: '企业',
ORG_NO: '企业',
ORG_L_NO: '法人',
ORG_L_YES: '法人',
ORG_AUTH_NO: '授权人',
ORG_AUTH_YES: '授权人',
}
query.lists = query.lists.map(item => {
item.bp_identity_name = register[item.bp_identity];
return item;
item.bp_identity_name = register[item.bp_identity]
return item
})
window.localStorage.setItem('bind-user-list', JSON.stringify(query.lists));
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(query.lists.length ? query.lists[0] : {}));
if (!query.lists.length)
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify({}));
this.bindUserList = query.lists;
window.localStorage.setItem('bind-user-list', JSON.stringify(query.lists))
// window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(query.lists.length ? query.lists[0] : {}))
if (!query.lists.length) { window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify({})) }
this.nowBind = JSON.parse(window.localStorage.getItem('now_user_bp_bind_id'))
this.bindUserList = query.lists
} else {
this.hlsPopup.hideLoading();
this.hlsPopup.showLongCenter(res.message);
this.hlsPopup.hideLoading()
this.hlsPopup.showLongCenter(res.message)
}
this.getMultipleRole()
} catch (error) {
this.hlsPopup.hideLoading();
this.hlsPopup.hideLoading()
}
},
changeUser() {
changeUser () {
this.hlsPopup.selectList({
list: this.bindUserList.map(item => ({ code_name: item.bp_name, code: item.bp_id })),
code: 'code',
object: {},
returnItem: (index, obj) => {
this.nowBind = this.bindUserList[index];
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind));
hlsPopup.showLongCenter('用户已切换成功');
this.nowBind = this.bindUserList[index]
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind))
hlsPopup.showLongCenter('用户已切换成功')
// 获取角色列表
this.getMultipleRole();
this.getMultipleRole()
},
})
},
......@@ -362,7 +361,7 @@ export default {
// },
// 查询头像
getHead() {
getHead () {
let vm = this
let url = process.env.basePath + 'app_attment_query'
let param = {
......@@ -391,12 +390,11 @@ export default {
})
},
// 选择角色后确定
roleConfirm(role) {
roleConfirm (role) {
this.roleSwitchFlag = false
this.nowBind = { ...this.nowBind, bp_type: role.bp_type, bp_type_n: role.bp_type_n };
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind));
this.nowBind = { ...this.nowBind, bp_type: role.bp_type, bp_type_n: role.bp_type_n }
window.localStorage.setItem('now_user_bp_bind_id', JSON.stringify(this.nowBind))
// window.localStorage.setItem('multipleRole', role.bp_type)
// this.multipleRole = role.bp_type // 当前的角色权限
......@@ -413,13 +411,13 @@ export default {
// }
// },
// 选择角色后取消
roleCancle() {
roleCancle () {
this.roleSwitchFlag = false
},
// typeCancle () {
// this.popSetectBox = false
// },
goContract() {
goContract () {
this.$router.push({
name: 'MyContract',
})
......@@ -452,7 +450,7 @@ export default {
// }
// },
// 我的发票
goInvoice() {
goInvoice () {
this.$router.push({
name: 'MyInvoice',
})
......@@ -495,7 +493,7 @@ export default {
// // })
// },
// 进入我的还款
goReimburse() {
goReimburse () {
if (this.nowBind.bp_id) {
this.$router.push({
name: 'ReimburseMyselfList',
......@@ -505,7 +503,7 @@ export default {
}
},
// 进入我的收藏
goMyProduct() {
goMyProduct () {
this.$router.push({
name: 'MyProductList',
})
......@@ -548,7 +546,7 @@ export default {
// hlsPopup.showLongCenter('请先进行用户绑定')
// }
// },
changeHelp() {
changeHelp () {
this.$router.push({
name: 'HelpList',
})
......@@ -589,7 +587,7 @@ export default {
// hlsPopup.showLongCenter('请先进行用户绑定')
// }
// },
updateVersion() {
updateVersion () {
if (vum.Platform.isAndroid()) {
this.hote_update_version(
'发现新版本是否更新',
......@@ -602,7 +600,7 @@ export default {
)
}
},
hote_update_version(content, url) {
hote_update_version (content, url) {
hlsPopup.showConfirm({
title: '版本更新',
content: content,
......@@ -613,7 +611,7 @@ export default {
},
})
},
logOut() {
logOut () {
let vm = this
hlsPopup.showConfirm({
title: '提示',
......@@ -713,7 +711,7 @@ export default {
// },
// })
// },
checkType() {
checkType () {
let vm = this
this.hlsPopup.showActionSheet({
buttonArray:
......@@ -745,7 +743,7 @@ export default {
},
// 角色列表 有用
getMultipleRole() {
getMultipleRole () {
let vm = this
let url = process.env.basePath + 'bp_role_query'
......@@ -758,15 +756,15 @@ export default {
vm.hlsHttp.post(url, param).then(function (res) {
if (res.result === 'S') {
let obj = {
bp_type: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type,
bp_type_n: JSON.parse(window.localStorage.getItem("now_user_bp_bind_id")).bp_type_n,
bp_type: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type,
bp_type_n: JSON.parse(window.localStorage.getItem('now_user_bp_bind_id')).bp_type_n,
}
vm.multiRoleList = [...res.lists, obj]
}
})
},
// 图片上传入口
imgUploadShow(check_id) {
imgUploadShow (check_id) {
let vm = this
// vm.upload_list = []
hlsPopup.showActionSheet({
......@@ -781,7 +779,7 @@ export default {
},
})
},
imgUploadOpenCamera(check_id) {
imgUploadOpenCamera (check_id) {
let vm = this
let obj = {
pkvalue: check_id,
......@@ -807,7 +805,7 @@ export default {
}
hlsUtil.openCamera(cameraoptions, success, error)
},
imgUploadTakePicture(check_id) {
imgUploadTakePicture (check_id) {
let vm = this
let obj = {
pkvalue: check_id,
......@@ -835,7 +833,7 @@ export default {
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
openCamera(ocrType, type) {
openCamera (ocrType, type) {
let vm = this
let cameraoptions = {
quality: 60,
......@@ -852,7 +850,7 @@ export default {
}
hlsUtil.openCamera(cameraoptions, success, error)
},
takePicture(ocrType, type) {
takePicture (ocrType, type) {
let vm = this
var cameraoptions = {
quality: 70,
......@@ -870,7 +868,7 @@ export default {
}
vm.hlsUtil.takePicture(cameraoptions, success, error)
},
save_picture(obj) {
save_picture (obj) {
if (obj) {
let success = function () {
hlsPopup.showLongCenter('头像上传成功')
......@@ -882,13 +880,12 @@ export default {
},
// 修改信息逻辑
changePageHead(item) {
if (!Object.keys(item).length) return;
changePageHead (item) {
if (!Object.keys(item).length) return
if (item.bp_status === 'APPROVING') {
this.hlsPopup.showLongCenter('您的绑定申请还在流程中');
return;
this.hlsPopup.showLongCenter('您的绑定申请还在流程中')
return
};
let params = {
......@@ -896,13 +893,13 @@ export default {
user_bp_name: item.bp_name,
bp_class: item.bp_class,
status: item.bp_status,
isAGENT: item.bp_type === 'AGENT', //是否为经销商
isMultiRole: ["GUTA", "TENANT", "AGENT"].includes(item.bp_type) // 是否为 担保人/承租人 能否为多角色
};
isAGENT: item.bp_type === 'AGENT', // 是否为经销商
isMultiRole: ['GUTA', 'TENANT', 'AGENT'].includes(item.bp_type), // 是否为 担保人/承租人 能否为多角色
}
let name = item.bp_class === "NP" ? "NPBaseInfo" : "EnterpriseNew";
let name = item.bp_class === 'NP' ? 'NPBaseInfo' : 'EnterpriseNew'
this.$router.push({ name, params });
this.$router.push({ name, params })
// let vm = this
// if (vm.bp_id) {
......@@ -1165,17 +1162,17 @@ export default {
// }
// },
goAbout() {
goAbout () {
this.$router.push({
name: 'About',
})
},
goSetting() {
goSetting () {
this.$router.push({
name: 'Setting',
})
},
goContactUs() {
goContactUs () {
this.$router.push({
name: 'ContactUs',
})
......
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