Commit dba7464a authored by zhengke's avatar zhengke

no message

parents 201dde7f 40fc3caf
...@@ -4,147 +4,149 @@ ...@@ -4,147 +4,149 @@
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return {}; return {};
}, },
ceated() { ceated() {},
mounted() {
}, let getData;
mounted() { if (this.$route.query) {
let getData getData = JSON.stringify(this.$route.query);
if (this.$route.query) { getData = JSON.parse(getData);
getData = JSON.stringify(this.$route.query) if (getData.erpOrderObj) {
getData = JSON.parse(getData) getData = JSON.parse(getData.erpOrderObj);
if (getData.erpOrderObj) { }
getData = JSON.parse(getData.erpOrderObj) }
} if (!this.getLocalStorage() && !getData) {
} this.$router.push({
if (!this.getLocalStorage() && !getData) { path: "/login",
this.$router.push({ });
path: "/login", } else if (getData && getData.path) {
}); // erp自动登陆传过来的参数
} else if (getData && getData.path) { // erp自动登陆传过来的参数 let parameter = getData;
let parameter = getData this.$router.push({
this.$router.push({ path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(
path: `/automaticLogin?toke=${data.token}&data=${JSON.stringify(parameter)}`, parameter
}) )}`,
} else { });
this.$router.push({ } else {
name: "Home", this.$router.push({
}); name: "Home",
} });
setTimeout(() => { }
this.getUserInfo() setTimeout(() => {
}, 100) this.getUserInfo();
}, }, 100);
methods: { },
// 获取用户权限信息 methods: {
getUserInfo() { // 获取用户权限信息
this.apipost("/api/AutoLogin/GetCRMLoginMenu", {}, (res) => { getUserInfo() {
var jsonData = res.data; this.apipost("/api/AutoLogin/GetCRMLoginMenu", {}, (res) => {
if (jsonData.resultCode == 1) { var jsonData = res.data;
var userData = jsonData.data if (jsonData.resultCode == 1) {
var userJson = userData; var userData = jsonData.data;
var userInfo = JSON.parse(localStorage.userInfo) var userJson = userData;
userInfo.UserMenu = userJson var userInfo = JSON.parse(localStorage.userInfo);
localStorage.userInfo = JSON.stringify(userInfo) userInfo.UserMenu = userJson;
} else { localStorage.userInfo = JSON.stringify(userInfo);
this.$message({ } else {
message: res.data.message, this.$message({
type: "error", message: res.data.message,
}); type: "error",
this.loginState = 0; });
} this.loginState = 0;
}); }
}, });
}, },
}; },
};
</script> </script>
<style> <style>
@import "./assets/css/tablevoerride.css"; @import "./assets/css/tablevoerride.css";
@import "./assets/global/font.css"; @import "./assets/global/font.css";
@import "//at.alicdn.com/t/font_1627123_xio004ni8y.css"; @import "//at.alicdn.com/t/font_1627123_xio004ni8y.css";
@import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css"); @import url("//at.alicdn.com/t/font_1627123_grz80mbm3sv.css");
/* @import './assets/css/common.css'; */ @import url("//at.alicdn.com/t/font_635492_63x5920i6sn.css");
/* @import './assets/css/common.css'; */
@import "./assets/css/init.css";
body, @import "./assets/css/init.css";
html { body,
padding: 0px; html {
margin: 0px; padding: 0px;
font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR"; margin: 0px;
-webkit-font-smoothing: antialiased; font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR";
height: 100%; -webkit-font-smoothing: antialiased;
} height: 100%;
}
#app {
height: 100%; #app {
} height: 100%;
}
.el-scrollbar {
height: 100%; .el-scrollbar {
} height: 100%;
}
.el-scrollbar__wrap {
overflow: auto !important; .el-scrollbar__wrap {
width: 100%; overflow: auto !important;
height: 100%; width: 100%;
} height: 100%;
}
.el-scrollbar__view {
width: 100%; .el-scrollbar__view {
height: 100%; width: 100%;
} height: 100%;
}
.page-component-up {
position: fixed; .page-component-up {
right: calc(8.3% - 60px); position: fixed;
bottom: 150px; right: calc(8.3% - 60px);
width: 40px; bottom: 150px;
height: 90px; width: 40px;
z-index: 2000; height: 90px;
} z-index: 2000;
}
.page-component-up img {
width: 38px; .page-component-up img {
height: 38px; width: 38px;
} height: 38px;
}
.page-component-up i {
background-color: #fff; .page-component-up i {
cursor: pointer; background-color: #fff;
transition: 0.3s; cursor: pointer;
/* box-shadow: 0 0 6px rgba(0,0,0,.12); */ transition: 0.3s;
z-index: 5; /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
border: 1px solid #ddd; z-index: 5;
box-sizing: border-box; border: 1px solid #ddd;
line-height: 40px; box-sizing: border-box;
text-align: center; line-height: 40px;
display: inline-block; text-align: center;
} display: inline-block;
}
.page-component-up i {
font-size: 36px; .page-component-up i {
color: #bbb; font-size: 36px;
} color: #bbb;
}
.page-component-up i:hover {
background-color: #ef4455; .page-component-up i:hover {
border: 1px solid #ec3346; background-color: #ef4455;
} border: 1px solid #ec3346;
}
.page-component-up:hover i {
color: #f1f1f1; .page-component-up:hover i {
} color: #f1f1f1;
}
.el-form-item .el-form-item__label {
color: #3d3b4f !important; .el-form-item .el-form-item__label {
} color: #3d3b4f !important;
}
.el-button [class*="el-icon-"]+span {
margin-left: 5px; .el-button [class*="el-icon-"] + span {
font-family: "perfectFont"; margin-left: 5px;
} font-family: "perfectFont";
</style> }
\ No newline at end of file </style>
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
} }
.orderDetails-body { .orderDetails-body {
height: calc(100% - 83px); height: calc(100% - 83px);
display: flex;
flex-direction: column;
} }
.orderDetails-body .order-info { .orderDetails-body .order-info {
padding: 30px; padding: 30px;
...@@ -27,14 +29,22 @@ ...@@ -27,14 +29,22 @@
justify-content: space-between; justify-content: space-between;
color: #999999; color: #999999;
} }
.order-lable-box:last-child{ .orderDetails-content {
flex: 1;
position: relative;
padding: 0 20px;
}
.no-relative .el-tabs__content {
position: unset !important;
}
.order-lable-box:last-child {
margin-top: 20px; margin-top: 20px;
} }
.order-lable{ .order-lable {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.order-lable span:last-child{ .order-lable span:last-child {
font-size: 18px; font-size: 18px;
font-weight: bold; font-weight: bold;
color: #333; color: #333;
...@@ -65,7 +75,7 @@ ...@@ -65,7 +75,7 @@
</div> </div>
</div> </div>
<div class="orderDetails-content"> <div class="orderDetails-content">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName" class="no-relative" @tab-click="handleClick">
<el-tab-pane label="产品详情" name="1"> <el-tab-pane label="产品详情" name="1">
</el-tab-pane> </el-tab-pane>
......
This diff is collapsed.
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