Commit 2b8b6f04 authored by zhangyanni's avatar zhangyanni

换方法

parent 144f7303
......@@ -44,9 +44,10 @@
//是否手机端
_isMobile(){
let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone)/i)
var u = navigator.userAgent,ucFlag = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|Wechat)/i)
this.publicFun.setUserInfoCookie('ismobile',flag?1:0)
if(flag) this.appendH5();
if(flag||ucFlag) this.appendH5();
}
},
created(){
......
......@@ -278,7 +278,7 @@ export default {
//是否存在对应角色
isgetUserRoleFunc(userType){
return this.getUserRoleFunc().indexOf(userType) == 0;
return this.getUserRoleFunc().indexOf(userType) > -1;
},
//限制输入内容以字符的长度计算
......
......@@ -8,7 +8,7 @@
center>
<span class="content">{{content}}</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="handleSubmit" style="width: 130px;">{{$t("releasejson.release")}}</el-button>
<el-button type="primary" @click="handleSubmit" style="width: 130px;">{{$t("commonTitle.sendProject")}}</el-button>
<el-button plain @click="handleCancel" style="width: 130px;">{{$t("commonTips.cancel")}}</el-button>
</span>
</el-dialog>
......
......@@ -366,9 +366,9 @@
// ROLE_SALES = 5;//销售
// ROLE_ORDINARY_MEDIUM = 6;//6普通大B用户
// ROLE_VIP_MEDIUM = 7;//7vip大B用户
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
......
......@@ -251,9 +251,9 @@
if (!res.result) {
this.$router.replace("/setPassword");
}else{
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
this.timeOutReturn();
......
......@@ -134,9 +134,9 @@
// publicFunc.setUserInfoCookie(that.Base64.encode(JSON.stringify(data)));
this.publicFun.setUserInfoCookie("userInfo",that.Base64.encode(JSON.stringify(data)));
this.hasSetPassword();
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
this.timeOutReturn();
......
......@@ -148,9 +148,9 @@
if(!res.result){
this.$router.push("/setPassword");
}else{
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
this.timeOutReturn();
......
......@@ -165,9 +165,9 @@
}
this.publicFun.setUserInfoCookie("userInfo",that.Base64.encode(JSON.stringify(data)));
this.hasSetPassword();
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
that.timeOutReturn()
......
......@@ -253,7 +253,7 @@
} else {
if(res.code==499){
if(this.userInfo){
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
if(this.userInfo.auditState=="AS01"){
MessageBox({
message:this.userInfo.empType==1?this.$t("commonTips.hasLoginAndNotAuthBigBusiness"):this.$t("commonTips.hasLoginAndNotAuthSmallBusiness"),
......@@ -371,7 +371,7 @@
}else{
if(res.code==499){
if(this.userInfo){
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
if(this.userInfo.auditState=="AS01"){
MessageBox({
message:this.userInfo.empType==1?this.$t("commonTips.hasLoginAndNotAuthBigBusiness"):this.$t("commonTips.hasLoginAndNotAuthSmallBusiness"),
......
......@@ -3,6 +3,14 @@ import Vue from 'vue'
import App from './App.vue'
import router from './router'
import store from './store'
var u = navigator.userAgent,ucFlag = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools|Wechat)/i);
// 手机
if (flag||ucFlag) {
require('../public/css/phone.scss');
}else{
require('../public/css/common.scss')
}
import Element, { Message } from 'element-ui'
import Mintui from 'mint-ui';
import 'mint-ui/lib/style.css'
......@@ -38,19 +46,9 @@ Vue.use(VueI18n);
Vue.prototype.publicFun= publicFun;
var type = navigator.appName,language;
var ismobile = publicFun.getCookie('ismobile');
var u = navigator.userAgent,ucFlag = u.indexOf('Android') > -1 || u.indexOf('Linux') > -1;
let flag = navigator.userAgent.match(/(phone|pad|pod|iPhone|iPod|ios|iPad|Android|Mobile|BlackBerry|IEMobile|MQQBrowser|JUC|Fennec|wOSBrowser|BrowserNG|WebOS|Symbian|Windows Phone|MicroMessenger|miniProgram|webview|wechatdevtools)/i)
if(ismobile == null){
ismobile = flag||ucFlag ? 1 : 0
}
// 手机
if (flag||ucFlag) {
require('../public/css/phone.scss');
}else{
require('../public/css/common.scss')
}
if(!publicFun.getCookie("language")){
if(type=="Netscape"){
language =navigator.language;
......
......@@ -113,7 +113,7 @@
</div>
<div class="buttonWrapper">
<el-button type="warning" @click="handleOpreation(1)" :disabled="disabledBtnSelfFlag>0||disabledCommunicated" v-loading.fullscreen="fullscreenLoading" v-if="userInfo.empType==0&&isOneSelf&&isHasSelf">{{$t("bigBusiness.detailInfo."+isHasSelf)}}</el-button>
<el-button type="warning" @click="handleOpreation(1)" :disabled="disabledBtnSelfFlag>0||disabledCommunicated" v-loading.fullscreen="fullscreenLoading" v-if="(publicFun.isgetUserRoleFunc(8)||publicFun.isgetUserRoleFunc(4)||publicFun.isgetUserRoleFunc(7))&&isOneSelf&&isHasSelf">{{$t("bigBusiness.detailInfo."+isHasSelf)}}</el-button>
<el-button type="primary" style="width: 180px;" @click="handleEdit" v-if="isEditVisible">{{$t("saleManage.editRequire")}}</el-button>
<el-button type="primary" style="width: 100px;" plain :disabled="disabledBtnSaleFlag>0" @click="handleSold(2)" v-loading.fullscreen="fullscreenLoading" v-if="isSoldOut">{{$t("bigBusiness.detailInfo.soldOut")}}</el-button>
<el-button type="primary" style="width: 100px;" plain :disabled="disabledBtnSaleFlag>0" @click="handleSold(1)" v-loading.fullscreen="fullscreenLoading" v-if="isSoldOn">{{$t("bigBusiness.detailInfo.soldOn")}}</el-button>
......@@ -313,9 +313,10 @@
//去修改
isEdit(){
if(this.userInfo.empType==1){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
this.$router.push({path: "/require/edit", query: {id: this.$route.query.id}})
}if(this.userInfo.empType==2){
}
if(this.publicFun.isgetUserRoleFunc(5)){
this.$router.push({path: "/salerequire/edit", query: {id: this.$route.query.id}})
}
},
......@@ -767,7 +768,7 @@
this.isHasSelfFunc();
this.getRecordListFunc();
this.userInfo = userInfo;
if(userInfo.empType==0){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
this.isCollection = true;
}else{
this.isCollection = false;
......
......@@ -256,10 +256,10 @@
//去修改
isEdit(){
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
this.$router.push({path: "/require/edit", query: {id: this.$route.query.id}})
}
if(this.publicFun.getUserRoleFunc().indexOf(5)>-1){
if(this.publicFun.isgetUserRoleFunc(5)){
this.$router.push({path: "/salerequire/edit", query: {id: this.$route.query.id}})
}
},
......
......@@ -506,9 +506,9 @@
// ROLE_SALES = 5;//销售
// ROLE_ORDINARY_MEDIUM = 6;//6普通大B用户
// ROLE_VIP_MEDIUM = 7;//7vip大B用户
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
......
......@@ -162,9 +162,9 @@
this.fullscreenLoading = false;
if(res.code==0){
this.publicFun.setUserInfoCookie("userInfo",this.Base64.encode(JSON.stringify(res.result)));
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
setTimeout(function(){
......
......@@ -156,9 +156,9 @@
this.fullscreenLoading = false;
if(res.code==0){
this.publicFun.setUserInfoCookie("userInfo",this.Base64.encode(JSON.stringify(res.result)));
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
}else{
......
......@@ -159,9 +159,9 @@
if(res.code==0){
that.successVisible = true;
// that.$router.push({path:"/",query:{remind:true}})
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1) this.$router.push("/sys.user");
if(this.publicFun.isgetUserRoleFunc(1)) this.$router.push("/sys.user");
else {
if(this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1||this.publicFun.getUserRoleFunc().indexOf(8)>-1) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)) this.$router.push({path:"/seeprojectlist",query:{remind:true}});
else this.$router.push("/seeprojectlist");
}
setTimeout(function(){
......
......@@ -100,7 +100,7 @@
api.selectByEmpId(params).then(res => {
if (res.code == 0) {
this.empuser = res.result;
if(this.publicFun.getUserRoleFunc().indexOf(8)>-1||this.publicFun.getUserRoleFunc().indexOf(4)>-1||this.publicFun.getUserRoleFunc().indexOf(7)>-1){
if(this.publicFun.isgetUserRoleFunc(8)||this.publicFun.isgetUserRoleFunc(4)||this.publicFun.isgetUserRoleFunc(7)){
this.activeList.push({
id: 1,
name: "postDemand",
......@@ -142,7 +142,7 @@
}
if(this.publicFun.getUserRoleFunc().indexOf(5)>-1){
if(this.publicFun.isgetUserRoleFunc(5)){
// this.activeList.push({
// id: 1,
// name: "activityJoin",
......@@ -163,7 +163,7 @@
routerLink:"/serviceenterprise"
});
}
if(this.publicFun.getUserRoleFunc().indexOf(1)>-1||this.publicFun.getUserRoleFunc().indexOf(2)>-1){
if(this.publicFun.isgetUserRoleFunc(1)||this.publicFun.isgetUserRoleFunc(2)){
this.activeList.push({
id: 2,
name: "myComment",
......
......@@ -59,7 +59,7 @@
</p>
</div>
<div class="buttonWrap" v-if="!operationVisible">
<el-button type="primary" @click="handleToCom" v-if="publicFun.getUserRoleFunc().indexOf(8)>-1||publicFun.getUserRoleFunc().indexOf(4)>-1||publicFun.getUserRoleFunc().indexOf(7)>-1">{{$t("mobile.communicateTitle")}}</el-button>
<el-button type="primary" @click="handleToCom" v-if="publicFun.isgetUserRoleFunc(8)||publicFun.isgetUserRoleFunc(4)||publicFun.isgetUserRoleFunc(7)">{{$t("mobile.communicateTitle")}}</el-button>
<el-button type="primary" v-else @click="$router.go(-1)">{{$t("workPlace.goreturn")}}</el-button>
</div>
<p style="color: #FF5D5D;margin-bottom: .4rem;" v-if="operationVisible">{{$t('mobile.requireReminder')}}</p>
......
......@@ -56,7 +56,6 @@
</div>
<div class="buttonWrap">
<el-button type="primary" @click="handleToCom">{{$t("mobile.communicateTitle")}}</el-button>
<!--<el-button type="primary" v-if="userInfo&&userInfo.empType!=0" @click="$router.go(-1)">{{$t("workPlace.goreturn")}}</el-button>-->
</div>
</div>
......
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