|
|
@@ -76,12 +76,21 @@
|
|
|
</div>
|
|
|
<div class="form-group row">
|
|
|
<label class="col-md-3"></label>
|
|
|
- <div class="col-md-7">
|
|
|
+ <div class="col-md-4">
|
|
|
<input name="role" hidden v-model="roles" >
|
|
|
- <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
|
|
|
+ <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
|
|
|
<ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
|
|
|
- <li :title="role.style ? '双击删除权限' : '双击添加权限'" v-for="role in rolesAll" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
|
|
|
- @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" :id="role.name"> @{{ role.name }} </span></li>
|
|
|
+ <li :data-original-title="role.style ? '双击删除角色' : '双击添加角色'" v-for="role in rolesAll" :id="role.name"
|
|
|
+ class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
|
|
|
+ @dblclick="selectedRole(role)" :class="role.style ? 'active' :''"><span style="cursor: default;" > @{{ role.name }} </span></li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-3">
|
|
|
+ <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
|
|
|
+ <ul class="list-group" style="width: 100%" onselectstart="return false;">
|
|
|
+ <li title="双击删除角色" v-for="role in rolesList" :id="role.name" class="list-group-item list-group-item-action pt-0 pb-0"
|
|
|
+ @dblclick="selectedRole(role)" ><span style="cursor: default;" > @{{ role.name }} </span></li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -94,12 +103,22 @@
|
|
|
</div>
|
|
|
<div class="form-group row">
|
|
|
<label class="col-md-3"></label>
|
|
|
- <div class="col-md-7">
|
|
|
+ <div class="col-md-4">
|
|
|
<input name="carrier" hidden v-model="carriers" >
|
|
|
- <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.8;text-align: center;">
|
|
|
+ <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;opacity:0.5;text-align: center;">
|
|
|
<ul class="list-group tooltipTarget" style="width: 100%" onselectstart="return false;">
|
|
|
- <li :title="carrier.style ? '双击删除承运商' : '双击添加承运商'" v-for="carrier in carriersAll" :id="carrier.name" class="list-group-item list-group-item-action pt-0 pb-0"
|
|
|
- @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" :id="carrier.name"> @{{ carrier.name }} </span></li>
|
|
|
+ <li :data-original-title="carrier.style ? '双击删除承运商' : '双击添加承运商'" v-for="carrier in carriersAll" :id="carrier.name"
|
|
|
+ class="tooltipTarget list-group-item list-group-item-action pt-0 pb-0"
|
|
|
+ @dblclick="selectedCarrier(carrier)" :class="carrier.style ? 'active' :''"><span style="cursor: default;" > @{{ carrier.name }} </span></li>
|
|
|
+ </ul>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="col-md-3">
|
|
|
+ <input name="carrier" hidden v-model="carriers" >
|
|
|
+ <div class="input-group" style="max-height: 150px; overflow-y: scroll;border-radius:5px;text-align: center;">
|
|
|
+ <ul class="list-group" style="width: 100%" onselectstart="return false;">
|
|
|
+ <li title="双击删除承运商" v-for="carrier in carriersList" class="list-group-item list-group-item-action pt-0 pb-0"
|
|
|
+ @dblclick="selectedCarrier(carrier)" ><span style="cursor: default;" > @{{ carrier.name }} </span></li>
|
|
|
</ul>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -132,22 +151,26 @@
|
|
|
@endforeach
|
|
|
],
|
|
|
roles:[{{old('role')}}],
|
|
|
+ rolesList:[],
|
|
|
carriersAll:[
|
|
|
@foreach($carriers as $carrier)
|
|
|
{id:'{{$carrier->id}}',name:'{{$carrier->name}}',style:false},
|
|
|
@endforeach
|
|
|
],
|
|
|
carriers:[{{old('carrier')}}],
|
|
|
+ carriersList:[],
|
|
|
},
|
|
|
mounted:function(){
|
|
|
$(".tooltipTarget").tooltip({'trigger':'hover'});
|
|
|
if (this.roles.length>0){
|
|
|
let rolesAll=this.rolesAll;
|
|
|
let roles=this.roles;
|
|
|
+ let rolesList=this.rolesList;
|
|
|
for (let i = 0; i < roles.length; i++) {
|
|
|
rolesAll.every(function (roleAll) {
|
|
|
if (roleAll.id == roles[i]) {
|
|
|
roleAll.style = true;
|
|
|
+ rolesList.push({'id':roleAll.id,'name':roleAll.name});
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
|
@@ -157,10 +180,12 @@
|
|
|
if (this.carriers.length>0){
|
|
|
let carriersAll=this.carriersAll;
|
|
|
let carriers=this.carriers;
|
|
|
+ let carriersList=this.carriersList;
|
|
|
for (let i = 0; i < carriers.length; i++) {
|
|
|
carriersAll.every(function (carrierAll) {
|
|
|
if (carrierAll.id == carriers[i]) {
|
|
|
carrierAll.style = true;
|
|
|
+ carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
|
@@ -172,6 +197,7 @@
|
|
|
selectedCarrier:function (e) {
|
|
|
let carriers=this.carriers;
|
|
|
let carriersAll=this.carriersAll;
|
|
|
+ let carriersList=this.carriersList;
|
|
|
let isCarrier=true;
|
|
|
if (carriers&&carriersAll) {
|
|
|
for (let i = 0; i < carriers.length; i++) {
|
|
|
@@ -184,6 +210,13 @@
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
|
+ carriersList.every(function (carrier,i) {
|
|
|
+ if (carrier.id==e.id){
|
|
|
+ carriersList.splice(i,1);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ });
|
|
|
isCarrier= false;
|
|
|
break;
|
|
|
}
|
|
|
@@ -195,11 +228,15 @@
|
|
|
carriersAll.every(function (carrierAll) {
|
|
|
if (carrierAll.id==e.id){
|
|
|
carrierAll.style=true;
|
|
|
+ carriersList.push({'id':carrierAll.id,'name':carrierAll.name});
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
|
}
|
|
|
+ setTimeout(function(){
|
|
|
+ $(".tooltipTarget").tooltip({'trigger':'hover'});
|
|
|
+ },10)
|
|
|
},
|
|
|
seekCarrier:function (e) {
|
|
|
let $val=e.target.value;
|
|
|
@@ -217,6 +254,7 @@
|
|
|
selectedRole:function (e) {
|
|
|
let roles=this.roles;
|
|
|
let rolesAll=this.rolesAll;
|
|
|
+ let rolesList=this.rolesList;
|
|
|
let isRole=true;
|
|
|
if (roles&&rolesAll) {
|
|
|
for (let i = 0; i < roles.length; i++) {
|
|
|
@@ -229,6 +267,13 @@
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
|
+ rolesList.every(function (role,i) {
|
|
|
+ if (role.id==e.id){
|
|
|
+ rolesList.splice(i,1);
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ return true;
|
|
|
+ });
|
|
|
isRole= false;
|
|
|
break;
|
|
|
}
|
|
|
@@ -240,11 +285,15 @@
|
|
|
rolesAll.every(function (roleAll) {
|
|
|
if (roleAll.id==e.id){
|
|
|
roleAll.style=true;
|
|
|
+ rolesList.push({'id':roleAll.id,'name':roleAll.name});
|
|
|
return false;
|
|
|
}
|
|
|
return true;
|
|
|
});
|
|
|
}
|
|
|
+ setTimeout(function(){
|
|
|
+ $(".tooltipTarget").tooltip({'trigger':'hover'});
|
|
|
+ },10)
|
|
|
},
|
|
|
seekRole:function (e) {
|
|
|
let $val=e.target.value;
|