Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

添加合作方功能

Browse Source
This commit is contained in:
huangdeliang
2021-04-15 11:59:14 +08:00
parent 7326c487d9
commit 5fe3c85e1d
6 changed files with 227 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
stdiet-ui/src/store/getters.js
View File

@ -11,6 +11,7 @@ const getters = {
roles: state => state.user.roles,
permissions: state => state.user.permissions,
userId: state => state.user.userId,
userRemark: state => state.user.remark,
permission_routes: state => state.permission.routes,
//
nutritionistIdOptions: state => state.global.nutritionistIdOptions,

127
stdiet-ui/src/store/modules/user.js
View File

@ -1,100 +1,117 @@
import { login, logout, getInfo } from '@/api/login'
import { getToken, setToken, removeToken } from '@/utils/auth'
import { login, logout, getInfo } from "@/api/login";
import { getToken, setToken, removeToken } from "@/utils/auth";
const user = {
state: {
token: getToken(),
name: '',
avatar: '',
name: "",
avatar: "",
remark: "",
roles: [],
permissions: []
},
mutations: {
SET_TOKEN: (state, token) => {
state.token = token
state.token = token;
},
SET_NAME: (state, name) => {
state.name = name
state.name = name;
},
SET_AVATAR: (state, avatar) => {
state.avatar = avatar
state.avatar = avatar;
},
SET_ROLES: (state, roles) => {
state.roles = roles
state.roles = roles;
},
SET_PERMISSIONS: (state, permissions) => {
state.permissions = permissions
state.permissions = permissions;
},
SET_USERID: (state, userId) => {
state.userId = userId
state.userId = userId;
},
SET_REMARK: (state, remark) => {
state.remark = remark;
}
},
actions: {
// 登录
Login({ commit }, userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
const code = userInfo.code
const uuid = userInfo.uuid
const username = userInfo.username.trim();
const password = userInfo.password;
const code = userInfo.code;
const uuid = userInfo.uuid;
return new Promise((resolve, reject) => {
login(username, password, code, uuid).then(res => {
setToken(res.token)
commit('SET_TOKEN', res.token)
resolve()
}).catch(error => {
reject(error)
})
})
login(username, password, code, uuid)
.then(res => {
setToken(res.token);
commit("SET_TOKEN", res.token);
resolve();
})
.catch(error => {
reject(error);
});
});
},
// 获取用户信息
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
getInfo(state.token).then(res => {
const user = res.user
const avatar = user.avatar == "" ? require("@/assets/image/profile.jpg") : process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
commit('SET_ROLES', res.roles)
commit('SET_PERMISSIONS', res.permissions)
} else {
commit('SET_ROLES', ['ROLE_DEFAULT'])
}
commit('SET_NAME', user.userName)
commit('SET_AVATAR', avatar)
commit('SET_USERID', user.userId)
resolve(res)
}).catch(error => {
reject(error)
})
})
getInfo(state.token)
.then(res => {
const user = res.user;
const avatar =
user.avatar == ""
? require("@/assets/image/profile.jpg")
: process.env.VUE_APP_BASE_API + user.avatar;
if (res.roles && res.roles.length > 0) {
// 验证返回的roles是否是一个非空数组
commit("SET_ROLES", res.roles);
commit("SET_PERMISSIONS", res.permissions);
} else {
commit("SET_ROLES", ["ROLE_DEFAULT"]);
}
commit("SET_NAME", user.userName);
commit("SET_AVATAR", avatar);
commit("SET_USERID", user.userId);
commit("SET_REMARK", user.remark);
resolve(res);
})
.catch(error => {
reject(error);
});
});
},
// 退出系统
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token).then(() => {
commit('SET_TOKEN', '')
commit('SET_ROLES', [])
commit('SET_PERMISSIONS', [])
removeToken()
resolve()
}).catch(error => {
reject(error)
})
})
logout(state.token)
.then(() => {
commit("SET_TOKEN", "");
commit("SET_ROLES", []);
commit("SET_PERMISSIONS", []);
commit("SET_USERID", "");
commit("SET_REMARK", "");
removeToken();
resolve();
})
.catch(error => {
reject(error);
});
});
},
// 前端 登出
FedLogOut({ commit }) {
return new Promise(resolve => {
commit('SET_TOKEN', '')
removeToken()
resolve()
})
commit("SET_TOKEN", "");
removeToken();
resolve();
});
}
}
}
};
export default user
export default user;

44
stdiet-ui/src/views/custom/order/index.vue
View File

@ -19,7 +19,7 @@
/>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="收款方式" prop="payTypeId">
<el-select
v-model="queryParams.payTypeId"
@ -37,10 +37,10 @@
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="收款账号" prop="accountId">
<el-form-item label="进粉渠道" prop="accountId">
<el-select
v-model="queryParams.accountId"
placeholder="请选择账号"
placeholder="请选择渠道"
clearable
size="small"
>
@ -70,7 +70,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="销售" prop="preSaleId">
<el-select
v-model="queryParams.preSaleId"
@ -88,7 +88,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="售后" prop="afterSaleId">
<el-select
v-model="queryParams.afterSaleId"
@ -106,7 +106,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="主营养师" prop="nutritionistId">
<el-select
v-model="queryParams.nutritionistId"
@ -124,7 +124,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item
label="营养师助理"
prop="nutriAssisId"
@ -147,7 +147,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="策划" prop="plannerId">
<el-select
v-model="queryParams.plannerId"
@ -165,7 +165,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="策划助理" prop="plannerAssisId">
<el-select
v-model="queryParams.plannerAssisId"
@ -183,7 +183,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="运营" prop="operatorId">
<el-select
v-model="queryParams.operatorId"
@ -201,7 +201,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="运营助理" prop="operatorAssisId">
<el-select
v-model="queryParams.operatorAssisId"
@ -235,7 +235,7 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="6">
<el-col :span="6" v-if="!isPartner">
<el-form-item label="订单金额" prop="amountFlag">
<el-select
v-model="queryParams.amountFlag"
@ -356,7 +356,7 @@
</template>
</el-table-column>
<el-table-column
label="收款账号"
label="进粉渠道"
align="center"
prop="account"
width="90"
@ -586,6 +586,9 @@ export default {
isMobile() {
return this.device === "mobile";
},
isPartner() {
return this.userRemark && this.userRemark.includes("|");
},
...mapGetters([
// 售前字典
"preSaleIdOptions",
@ -606,6 +609,8 @@ export default {
//
"userId",
//
"userRemark",
//
"device",
]),
},
@ -615,7 +620,18 @@ export default {
this.payTypeIdOptions = response.data;
});
this.getDicts("cus_account").then((response) => {
this.accountIdOptions = response.data;
if (this.userRemark && this.userRemark.includes("|")) {
const accRange = this.userRemark.split("|");
this.accountIdOptions = accRange.reduce((arr, accId) => {
const tarObj = response.data.find((obj) => obj.dictValue === accId);
if (tarObj) {
arr.push(tarObj);
}
return arr;
}, []);
} else {
this.accountIdOptions = response.data;
}
});
this.getDicts("cus_serve_time").then((response) => {
this.serveTimeIdOption = response.data;