|
@@ -59,16 +59,16 @@
|
|
|
|
|
|
|
|
</span>
|
|
</span>
|
|
|
<span class="item inline-block" style="width: 32%;">用户UU</span>
|
|
<span class="item inline-block" style="width: 32%;">用户UU</span>
|
|
|
- <span class="item inline-block" style="width: 40%;text-align: right">用户名称</span>
|
|
|
|
|
|
|
+ <span class="item inline-block" style="width: 40%;text-align: center">用户名称</span>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="customer-modal-content-list" v-for="item in modalObj.showModalList">
|
|
|
|
|
|
|
+ <div class="customer-modal-content-list" v-for="item in modalObj.showModalList" v-if="item.userUU !== thisUser.userUU">
|
|
|
<span class="item inline-block" style="width: 28%;" @click="checkItem(item)">
|
|
<span class="item inline-block" style="width: 28%;" @click="checkItem(item)">
|
|
|
<label class="mobile-cart-check" :class="{'active': item.distribute}" v-if="modalObj.type === 'add'"></label>
|
|
<label class="mobile-cart-check" :class="{'active': item.distribute}" v-if="modalObj.type === 'add'"></label>
|
|
|
<label class="mobile-cart-check" :class="{'active': item.transfer}" v-else></label>
|
|
<label class="mobile-cart-check" :class="{'active': item.transfer}" v-else></label>
|
|
|
<!--<label class="mobile-cart-check" :class="{'active': item.distribute}"></label>-->
|
|
<!--<label class="mobile-cart-check" :class="{'active': item.distribute}"></label>-->
|
|
|
</span>
|
|
</span>
|
|
|
<span class="item inline-block" style="width: 32%;">{{item.userUU}}</span>
|
|
<span class="item inline-block" style="width: 32%;">{{item.userUU}}</span>
|
|
|
- <span class="item inline-block" style="width: 40%;">{{item.userName}}</span>
|
|
|
|
|
|
|
+ <span class="item inline-block" style="width: 40%;text-align: center;">{{item.userName}}</span>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
@@ -241,7 +241,7 @@
|
|
|
modalObjonFilter() {
|
|
modalObjonFilter() {
|
|
|
let _arr = []
|
|
let _arr = []
|
|
|
this.modalObj.originList.forEach(item => {
|
|
this.modalObj.originList.forEach(item => {
|
|
|
- if (item.userUU.toString().indexOf(this.modalObj.keyword) > -1) {
|
|
|
|
|
|
|
+ if (item.userUU.toString().indexOf(this.modalObj.keyword) > -1 || item.userName.toString().indexOf(this.modalobj.keyword)) {
|
|
|
_arr.push(item)
|
|
_arr.push(item)
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
@@ -249,13 +249,10 @@
|
|
|
},
|
|
},
|
|
|
// 分配
|
|
// 分配
|
|
|
async addUserInfo(customer) {
|
|
async addUserInfo(customer) {
|
|
|
- if (!this.enabled) {
|
|
|
|
|
- this.onMind('您没有为当前客户分配用户的权限!')
|
|
|
|
|
- }
|
|
|
|
|
this.modalObj.type = 'add'
|
|
this.modalObj.type = 'add'
|
|
|
this.modalObj.customer = customer
|
|
this.modalObj.customer = customer
|
|
|
this.$http.get(`/account/user/getEnTransfer/${customer.myEnterprise.uu}`).then(res => {
|
|
this.$http.get(`/account/user/getEnTransfer/${customer.myEnterprise.uu}`).then(res => {
|
|
|
- customer.enTransfer = res.result
|
|
|
|
|
|
|
+ customer.enTransfer = res.data.result
|
|
|
if (this.enabled || customer.enTransfer) {
|
|
if (this.enabled || customer.enTransfer) {
|
|
|
this.$http.post(`/account/user/customer/${customer.myEnterprise.uu}`).then(data => {
|
|
this.$http.post(`/account/user/customer/${customer.myEnterprise.uu}`).then(data => {
|
|
|
customer.userinfos = data.data
|
|
customer.userinfos = data.data
|
|
@@ -271,13 +268,10 @@
|
|
|
},
|
|
},
|
|
|
// 转移
|
|
// 转移
|
|
|
transferUserInfo(customer) {
|
|
transferUserInfo(customer) {
|
|
|
- if (!this.enabled) {
|
|
|
|
|
- this.onMind('您没有转移当前客户权限的权限!')
|
|
|
|
|
- }
|
|
|
|
|
this.modalObj.type = 'chance'
|
|
this.modalObj.type = 'chance'
|
|
|
this.modalObj.customer = customer
|
|
this.modalObj.customer = customer
|
|
|
this.$http.get(`/account/user/getDistribute/${customer.myEnterprise.uu}`).then(res => {
|
|
this.$http.get(`/account/user/getDistribute/${customer.myEnterprise.uu}`).then(res => {
|
|
|
- customer.enTransfer = res.result
|
|
|
|
|
|
|
+ customer.enTransfer = res.data.result
|
|
|
if (this.enabled || customer.enTransfer) {
|
|
if (this.enabled || customer.enTransfer) {
|
|
|
this.$http.get('/authentication').then(res => {
|
|
this.$http.get('/authentication').then(res => {
|
|
|
this.thisUser = res.data
|
|
this.thisUser = res.data
|