|
|
@@ -14,23 +14,49 @@
|
|
|
|
|
|
<div class="right-menu">
|
|
|
<div class="right-menu-item">
|
|
|
- <company-select ref="companySelect" select-all global placeholder="请选择供应商" :style="{width:device === 'mobile' ? '200px' : '400px'}" />
|
|
|
+ <company-select
|
|
|
+ ref="companySelect"
|
|
|
+ select-all
|
|
|
+ global
|
|
|
+ placeholder="请选择供应商"
|
|
|
+ :style="{ width: device === 'mobile' ? '200px' : '400px' }"
|
|
|
+ />
|
|
|
</div>
|
|
|
|
|
|
<el-tooltip placement="bottom" :content="switchAccountModeText">
|
|
|
<i
|
|
|
v-if="isSupertube"
|
|
|
- class="el-icon-sort right-menu-item hover-effect "
|
|
|
- style="height: 50px; width: 35px; line-height: 52px; font-size: 22px;transform: rotate(90deg)"
|
|
|
+ class="el-icon-sort right-menu-item hover-effect"
|
|
|
+ style="
|
|
|
+ height: 50px;
|
|
|
+ width: 35px;
|
|
|
+ line-height: 52px;
|
|
|
+ font-size: 22px;
|
|
|
+ transform: rotate(90deg);
|
|
|
+ "
|
|
|
@click="onSwitchCompanyMode"
|
|
|
/>
|
|
|
</el-tooltip>
|
|
|
-
|
|
|
- <el-tooltip v-if="device !== 'mobile'" placement="bottom" content="登录采销结算平台">
|
|
|
+ <el-tooltip
|
|
|
+ v-if="device !== 'mobile'"
|
|
|
+ placement="bottom"
|
|
|
+ content="登录工单管理系统"
|
|
|
+ >
|
|
|
<i
|
|
|
- class="el-icon-s-promotion right-menu-item hover-effect "
|
|
|
- style="height: 50px; width: 40px; line-height: 52px; font-size: 22px;"
|
|
|
- @click="openSettlementSystem"
|
|
|
+ class="el-icon-s-management right-menu-item hover-effect"
|
|
|
+ style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
|
|
|
+ @click="openSettlementSystem(GDurl)"
|
|
|
+ />
|
|
|
+ </el-tooltip>
|
|
|
+ <el-tooltip
|
|
|
+ v-if="device !== 'mobile'"
|
|
|
+ placement="bottom"
|
|
|
+ content="登录采销结算平台"
|
|
|
+ >
|
|
|
+ <i
|
|
|
+ class="el-icon-s-promotion right-menu-item hover-effect"
|
|
|
+ style="height: 50px; width: 40px; line-height: 52px; font-size: 22px"
|
|
|
+ @click="openSettlementSystem(JSurl)"
|
|
|
/>
|
|
|
</el-tooltip>
|
|
|
|
|
|
@@ -59,7 +85,12 @@
|
|
|
</template>
|
|
|
|
|
|
<template v-if="userInfo.nickname && userInfo.nickname.length > 3">
|
|
|
- <el-tooltip class="item" effect="dark" :content="userInfo.nickname" placement="left-start">
|
|
|
+ <el-tooltip
|
|
|
+ class="item"
|
|
|
+ effect="dark"
|
|
|
+ :content="userInfo.nickname"
|
|
|
+ placement="left-start"
|
|
|
+ >
|
|
|
<div class="username">
|
|
|
{{ getUserName(userInfo.nickname) }}
|
|
|
<i class="el-icon-caret-bottom" />
|
|
|
@@ -160,17 +191,11 @@
|
|
|
</el-form-item>
|
|
|
</el-col>
|
|
|
<el-col :span="24" style="text-align: right">
|
|
|
- <el-checkbox
|
|
|
- v-model="checked"
|
|
|
- class="fl"
|
|
|
- style="padding-top: 5px"
|
|
|
- >我已知晓，后续不再提示！</el-checkbox>
|
|
|
- <el-button
|
|
|
- type="primary"
|
|
|
- plain
|
|
|
- :size="'mini'"
|
|
|
- @click="submit"
|
|
|
- >关闭
|
|
|
+ <el-checkbox v-model="checked" class="fl" style="padding-top: 5px"
|
|
|
+ >我已知晓，后续不再提示！</el-checkbox
|
|
|
+ >
|
|
|
+ <el-button type="primary" plain :size="'mini'" @click="submit"
|
|
|
+ >关闭
|
|
|
</el-button>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
@@ -183,40 +208,52 @@
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
-import { mapGetters } from 'vuex'
|
|
|
-import asyncRequest from '@/apis/service/system/updates'
|
|
|
-import resToken from '@/mixins/resToken'
|
|
|
-import CompanySelect from './company-select/index.vue'
|
|
|
-import PasswordModal from '@/layout/components/password-modal/index.vue'
|
|
|
-import config from '@/config/index'
|
|
|
+import { mapGetters } from "vuex";
|
|
|
+import asyncRequest from "@/apis/service/system/updates";
|
|
|
+import resToken from "@/mixins/resToken";
|
|
|
+import CompanySelect from "./company-select/index.vue";
|
|
|
+import PasswordModal from "@/layout/components/password-modal/index.vue";
|
|
|
+import config from "@/config/index";
|
|
|
|
|
|
import {
|
|
|
getNotice,
|
|
|
setNotice,
|
|
|
get_business_companyNo,
|
|
|
get_business_company,
|
|
|
- getToken
|
|
|
-} from '@/utils/auth'
|
|
|
+ getToken,
|
|
|
+} from "@/utils/auth";
|
|
|
|
|
|
-import CryptoJS from 'crypto-js'
|
|
|
-import { userStoreActions } from '@/store/modules/user'
|
|
|
-import { accountLevels } from '@/assets/js/statusList'
|
|
|
-import { userInfo } from 'os'
|
|
|
+import CryptoJS from "crypto-js";
|
|
|
+import { userStoreActions } from "@/store/modules/user";
|
|
|
+import { accountLevels } from "@/assets/js/statusList";
|
|
|
+import { userInfo } from "os";
|
|
|
|
|
|
export default {
|
|
|
computed: {
|
|
|
- ...mapGetters(['sidebar', 'avatar', 'device', 'userInfo', 'currentLevel', 'navList', 'isSupertube']),
|
|
|
- switchAccountModeText() { return this.currentLevel === '3' ? '切换到业务公司' : '切换到供应商' }
|
|
|
+ ...mapGetters([
|
|
|
+ "sidebar",
|
|
|
+ "avatar",
|
|
|
+ "device",
|
|
|
+ "userInfo",
|
|
|
+ "currentLevel",
|
|
|
+ "navList",
|
|
|
+ "isSupertube",
|
|
|
+ ]),
|
|
|
+ switchAccountModeText() {
|
|
|
+ return this.currentLevel === "3" ? "切换到业务公司" : "切换到供应商";
|
|
|
+ },
|
|
|
},
|
|
|
components: {
|
|
|
CompanySelect,
|
|
|
- PasswordModal
|
|
|
+ PasswordModal,
|
|
|
},
|
|
|
mixins: [resToken],
|
|
|
data() {
|
|
|
return {
|
|
|
- companyNo: '',
|
|
|
- companyNoName: '',
|
|
|
+ JSurl: config.settlementPlatformUrl + "/#/accept?t=",
|
|
|
+ GDurl: config.GDUrl + "#/demand/index?t=",
|
|
|
+ companyNo: "",
|
|
|
+ companyNoName: "",
|
|
|
showModel: false,
|
|
|
loading: false,
|
|
|
isShow: true,
|
|
|
@@ -226,52 +263,56 @@ export default {
|
|
|
visible: false,
|
|
|
lastNotice: null, // 最后一次提示时间
|
|
|
parmValue: {
|
|
|
- type: '',
|
|
|
+ type: "",
|
|
|
page: 1, // 页码
|
|
|
- size: 15 // 每页显示条数
|
|
|
+ size: 15, // 每页显示条数
|
|
|
},
|
|
|
- activeMsg: null // 消息展示对象
|
|
|
- }
|
|
|
+ activeMsg: null, // 消息展示对象
|
|
|
+ };
|
|
|
},
|
|
|
mounted() {
|
|
|
- this.companyNo = get_business_companyNo() || ''
|
|
|
- this.companyNoName = get_business_company() || ''
|
|
|
- this.openNotice(true)
|
|
|
+ this.companyNo = get_business_companyNo() || "";
|
|
|
+ this.companyNoName = get_business_company() || "";
|
|
|
+ this.openNotice(true);
|
|
|
},
|
|
|
methods: {
|
|
|
getUserName(username) {
|
|
|
- const chunks = username.split('')
|
|
|
- return chunks[0] + chunks[1] + '...'
|
|
|
+ const chunks = username.split("");
|
|
|
+ return chunks[0] + chunks[1] + "...";
|
|
|
},
|
|
|
- openSettlementSystem: function() {
|
|
|
+ openSettlementSystem: function (url) {
|
|
|
// 加密token
|
|
|
- const encJson = CryptoJS.AES.encrypt(JSON.stringify({ token: getToken() }), config.secretKey)
|
|
|
- const encData = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encJson))
|
|
|
+ const encJson = CryptoJS.AES.encrypt(
|
|
|
+ JSON.stringify({ token: getToken() }),
|
|
|
+ config.secretKey
|
|
|
+ );
|
|
|
+ const encData = CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(encJson));
|
|
|
// 跳转至结算平台携带加密后的token
|
|
|
- window.open(config.settlementPlatformUrl + '/#/accept?t=' + encData)
|
|
|
+ console.log(url + encData);
|
|
|
+ window.open(url + encData);
|
|
|
},
|
|
|
async openNotice(is) {
|
|
|
if (getNotice() && getNotice().length > 0) {
|
|
|
- this.lastNotice = JSON.parse(getNotice())
|
|
|
+ this.lastNotice = JSON.parse(getNotice());
|
|
|
} else {
|
|
|
- this.lastNotice = null
|
|
|
+ this.lastNotice = null;
|
|
|
}
|
|
|
- const { code, count, item, message } = await this.initData()
|
|
|
+ const { code, count, item, message } = await this.initData();
|
|
|
if (code === 0) {
|
|
|
if (count != 0) {
|
|
|
- this.activeMsg = item
|
|
|
+ this.activeMsg = item;
|
|
|
if (is) {
|
|
|
- this.typeShow()
|
|
|
+ this.typeShow();
|
|
|
} else {
|
|
|
- this.showModel = true
|
|
|
+ this.showModel = true;
|
|
|
}
|
|
|
} else {
|
|
|
- this.$message.warning('暂无系统消息！')
|
|
|
+ this.$message.warning("暂无系统消息！");
|
|
|
}
|
|
|
} else if (code >= 100 && code <= 104) {
|
|
|
- await this.logout()
|
|
|
+ await this.logout();
|
|
|
} else {
|
|
|
- this.$message.warning(message)
|
|
|
+ this.$message.warning(message);
|
|
|
}
|
|
|
},
|
|
|
business_companyNo_change(e) {
|
|
|
@@ -293,107 +334,110 @@ export default {
|
|
|
code: 0,
|
|
|
count: 0,
|
|
|
item: {},
|
|
|
- message: ''
|
|
|
- }
|
|
|
-
|
|
|
- this.loading = true
|
|
|
- const { code, data, message } = await asyncRequest.list(this.parmValue)
|
|
|
- this.loading = false
|
|
|
- res.code = code
|
|
|
- res.message = message
|
|
|
+ message: "",
|
|
|
+ };
|
|
|
+
|
|
|
+ this.loading = true;
|
|
|
+ const { code, data, message } = await asyncRequest.list(this.parmValue);
|
|
|
+ this.loading = false;
|
|
|
+ res.code = code;
|
|
|
+ res.message = message;
|
|
|
if (code === 0) {
|
|
|
- const { list, count } = data
|
|
|
- res.count = count
|
|
|
+ const { list, count } = data;
|
|
|
+ res.count = count;
|
|
|
if (count !== 0) {
|
|
|
- res.item = JSON.parse(JSON.stringify(list[0]))
|
|
|
+ res.item = JSON.parse(JSON.stringify(list[0]));
|
|
|
}
|
|
|
}
|
|
|
- return res
|
|
|
+ return res;
|
|
|
},
|
|
|
typeShow() {
|
|
|
- const is = this.is_Tips()
|
|
|
+ const is = this.is_Tips();
|
|
|
if (!is) {
|
|
|
- return
|
|
|
+ return;
|
|
|
}
|
|
|
- if (this.lastNotice + '' === 'null' && is) {
|
|
|
- this.showModel = true
|
|
|
+ if (this.lastNotice + "" === "null" && is) {
|
|
|
+ this.showModel = true;
|
|
|
} else {
|
|
|
- const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice
|
|
|
- const { sys_type, addtime } = this.activeMsg
|
|
|
+ const { addtime: laddtime, type: ltype, sys_type: lsys_type } = this.lastNotice;
|
|
|
+ const { sys_type, addtime } = this.activeMsg;
|
|
|
|
|
|
if (laddtime === addtime && lsys_type === sys_type) {
|
|
|
- if (ltype + '' === '1') {
|
|
|
- this.showModel = false
|
|
|
+ if (ltype + "" === "1") {
|
|
|
+ this.showModel = false;
|
|
|
} else {
|
|
|
- this.showModel = true
|
|
|
+ this.showModel = true;
|
|
|
}
|
|
|
} else {
|
|
|
- this.showModel = true
|
|
|
+ this.showModel = true;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
is_Tips() {
|
|
|
- const nowtime = new Date().valueOf()
|
|
|
- const { sys_type, addtime } = this.activeMsg
|
|
|
- const timeV = new Date(addtime).valueOf()
|
|
|
- if (sys_type === 'VER') {
|
|
|
- this.statsTime = timeV
|
|
|
- this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7
|
|
|
+ const nowtime = new Date().valueOf();
|
|
|
+ const { sys_type, addtime } = this.activeMsg;
|
|
|
+ const timeV = new Date(addtime).valueOf();
|
|
|
+ if (sys_type === "VER") {
|
|
|
+ this.statsTime = timeV;
|
|
|
+ this.endTime = this.statsTime + 1000 * 60 * 60 * 24 * 7;
|
|
|
if (nowtime >= this.statsTime && nowtime <= this.endTime) {
|
|
|
- return true
|
|
|
+ return true;
|
|
|
} else {
|
|
|
- return false
|
|
|
+ return false;
|
|
|
}
|
|
|
} else {
|
|
|
- this.statsTime = 0
|
|
|
- this.endTime = timeV
|
|
|
+ this.statsTime = 0;
|
|
|
+ this.endTime = timeV;
|
|
|
if (nowtime <= this.endTime) {
|
|
|
- return true
|
|
|
+ return true;
|
|
|
} else {
|
|
|
- return false
|
|
|
+ return false;
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
toggleSideBar() {
|
|
|
- this.$store.dispatch('app/toggleSideBar')
|
|
|
+ this.$store.dispatch("app/toggleSideBar");
|
|
|
},
|
|
|
async logout() {
|
|
|
- await this.$store.dispatch('user/logout')
|
|
|
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
|
|
|
+ await this.$store.dispatch("user/logout");
|
|
|
+ this.$router.push(`/login?redirect=${this.$route.fullPath}`);
|
|
|
},
|
|
|
submit() {
|
|
|
- this.page_set_notice()
|
|
|
- this.showModel = false
|
|
|
+ this.page_set_notice();
|
|
|
+ this.showModel = false;
|
|
|
},
|
|
|
// 保存提交结果
|
|
|
page_set_notice() {
|
|
|
- const { sys_type, addtime } = this.activeMsg
|
|
|
+ const { sys_type, addtime } = this.activeMsg;
|
|
|
const model = {
|
|
|
- type: this.checked ? '1' : '0',
|
|
|
+ type: this.checked ? "1" : "0",
|
|
|
sys_type: sys_type,
|
|
|
- addtime: addtime
|
|
|
- }
|
|
|
- setNotice(JSON.stringify(model))
|
|
|
+ addtime: addtime,
|
|
|
+ };
|
|
|
+ setNotice(JSON.stringify(model));
|
|
|
},
|
|
|
|
|
|
// 切换以供应商或业务公司视角
|
|
|
async onSwitchCompanyMode() {
|
|
|
- const level = this.currentLevel === accountLevels.supplier ? accountLevels.super : accountLevels.supplier
|
|
|
- this.$refs.companySelect && this.$refs.companySelect.selectAllCompany()
|
|
|
- this.$store.commit(userStoreActions.setCompanyList, [])
|
|
|
- this.$store.commit(userStoreActions.setCurrentLevel, level)
|
|
|
- await this.$store.dispatch(userStoreActions.reloadMenu, level)
|
|
|
-
|
|
|
- const parentRoute = this.navList[0]
|
|
|
- if (!parentRoute) return
|
|
|
- const toRoute = parentRoute.children[0]
|
|
|
- if (!toRoute) return
|
|
|
- const { url } = toRoute
|
|
|
-
|
|
|
- this.$router.replace('/reload?redirect=' + url.split('/index')[0])
|
|
|
- }
|
|
|
- }
|
|
|
-}
|
|
|
+ const level =
|
|
|
+ this.currentLevel === accountLevels.supplier
|
|
|
+ ? accountLevels.super
|
|
|
+ : accountLevels.supplier;
|
|
|
+ this.$refs.companySelect && this.$refs.companySelect.selectAllCompany();
|
|
|
+ this.$store.commit(userStoreActions.setCompanyList, []);
|
|
|
+ this.$store.commit(userStoreActions.setCurrentLevel, level);
|
|
|
+ await this.$store.dispatch(userStoreActions.reloadMenu, level);
|
|
|
+
|
|
|
+ const parentRoute = this.navList[0];
|
|
|
+ if (!parentRoute) return;
|
|
|
+ const toRoute = parentRoute.children[0];
|
|
|
+ if (!toRoute) return;
|
|
|
+ const { url } = toRoute;
|
|
|
+
|
|
|
+ this.$router.replace("/reload?redirect=" + url.split("/index")[0]);
|
|
|
+ },
|
|
|
+ },
|
|
|
+};
|
|
|
</script>
|
|
|
|
|
|
<style lang="scss" scoped>
|
|
|
@@ -436,28 +480,28 @@ export default {
|
|
|
display: flex;
|
|
|
justify-content: space-between;
|
|
|
|
|
|
- .left-menu{
|
|
|
+ .left-menu {
|
|
|
display: flex;
|
|
|
max-width: 1300px;
|
|
|
- .hamburger-container {
|
|
|
- line-height: 46px;
|
|
|
- height: 100%;
|
|
|
- cursor: pointer;
|
|
|
- transition: background 0.3s;
|
|
|
- -webkit-tap-highlight-color: transparent;
|
|
|
+ .hamburger-container {
|
|
|
+ line-height: 46px;
|
|
|
+ height: 100%;
|
|
|
+ cursor: pointer;
|
|
|
+ transition: background 0.3s;
|
|
|
+ -webkit-tap-highlight-color: transparent;
|
|
|
|
|
|
- &:hover {
|
|
|
- background: rgba(0, 0, 0, 0.025);
|
|
|
+ &:hover {
|
|
|
+ background: rgba(0, 0, 0, 0.025);
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- .breadcrumb-container {
|
|
|
- display: flex;
|
|
|
- flex-wrap: nowrap;
|
|
|
- overflow:hidden;
|
|
|
- // width: 500px;
|
|
|
- //min-width: calc(1200px - 200px - 150px);
|
|
|
- }
|
|
|
+ .breadcrumb-container {
|
|
|
+ display: flex;
|
|
|
+ flex-wrap: nowrap;
|
|
|
+ overflow: hidden;
|
|
|
+ // width: 500px;
|
|
|
+ //min-width: calc(1200px - 200px - 150px);
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
.errLog-container {
|
