Commit b1d6e225 authored by 罗超's avatar 罗超

修改部分问题

parent c9c5d6e6
...@@ -5,59 +5,56 @@ ...@@ -5,59 +5,56 @@
</template> </template>
<script> <script>
export default { export default {
data () { data() {
return { return {};
}
}, },
mounted() { mounted() {
if (!this.getLocalStorage()) { if (!this.getLocalStorage()) {
this.$router.push({ this.$router.push({
path: '/login' path: "/login",
}) });
}else{ } else {
this.$router.push({ this.$router.push({
name: "Home" name: "Home",
}); });
} }
}, },
methods: { methods: {},
};
}
}
</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_thgo3iypqwi.css";
@import '//at.alicdn.com/t/font_1627123_thgo3iypqwi.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 './assets/css/common.css'; */
@import './assets/css/init.css'; @import "./assets/css/init.css";
body,html{ body,
html {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
font-family:'微软雅黑',' Microsoft YaHei','PingFang','PingFangR'; font-family: "微软雅黑", " Microsoft YaHei", "PingFang", "PingFangR";
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
height: 100%; height: 100%;
} }
#app{ #app {
height: 100%; height: 100%;
} }
.el-scrollbar{ .el-scrollbar {
height: 100%; height: 100%;
} }
.el-scrollbar__wrap{ .el-scrollbar__wrap {
overflow: auto !important; overflow: auto !important;
width: 100%; width: 100%;
height: 100% height: 100%;
} }
.el-scrollbar__view{ .el-scrollbar__view {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.page-component-up{ .page-component-up {
position: fixed; position: fixed;
right: calc(8.3% - 60px); right: calc(8.3% - 60px);
bottom: 150px; bottom: 150px;
...@@ -65,29 +62,39 @@ body,html{ ...@@ -65,29 +62,39 @@ body,html{
height: 90px; height: 90px;
z-index: 2000; z-index: 2000;
} }
.page-component-up img{ .page-component-up img {
width: 38px; width: 38px;
height: 38px; height: 38px;
} }
.page-component-up i{ .page-component-up i {
background-color: #fff; background-color: #fff;
cursor: pointer; cursor: pointer;
transition: .3s; transition: 0.3s;
/* box-shadow: 0 0 6px rgba(0,0,0,.12); */ /* box-shadow: 0 0 6px rgba(0,0,0,.12); */
z-index: 5; z-index: 5;
border:1px solid #ddd; border: 1px solid #ddd;
box-sizing: border-box; box-sizing: border-box;
line-height: 40px; line-height: 40px;
text-align: center; text-align: center;
display: inline-block; display: inline-block;
}
.page-component-up i {
font-size: 36px;
color: #bbb;
}
.page-component-up i:hover {
background-color: #ef4455;
border: 1px solid #ec3346;
}
.page-component-up:hover i {
color: #f1f1f1;
} }
.page-component-up i{font-size: 36px;color: #bbb;} .el-form-item .el-form-item__label {
.page-component-up i:hover{ color: #3d3b4f !important;
background-color: #EF4455;
border:1px solid #ec3346;
} }
.page-component-up:hover i{ .el-button [class*="el-icon-"] + span {
color: #F1f1f1; margin-left: 5px;
font-family: "perfectFont";
} }
</style> </style>
...@@ -48,10 +48,10 @@ ...@@ -48,10 +48,10 @@
} }
.home-nav .home-menu .home-menu-item.active > div { .home-nav .home-menu .home-menu-item.active > div {
/* font-weight: bold; */ /* font-weight: bold; */
color: #3d3b4f; color: #fff;
opacity: 1; opacity: 1;
transition: all linear 0.2s; transition: all linear 0.2s;
background-color: #f4f5f9; background-color: #409efe;
/* border-radius: 19px 0 0 19px; */ /* border-radius: 19px 0 0 19px; */
} }
.home-nav .home-menu .home-menu-item > div .iconfont { .home-nav .home-menu .home-menu-item > div .iconfont {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<template> <template>
<div class="Business"> <div class="Business">
<div class="add-Enclosure"> <div class="add-Enclosure">
<el-button icon="el-icon-plus" class="crm-btn query-btn crm-btn-mini margin-right0" @click="addBusiness">创建订单</el-button> <el-button plain icon="el-icon-plus" type="primary" size="mini" class="margin-right0" @click="addBusiness">创建订单</el-button>
</div> </div>
<el-table <el-table
v-loading="loading" v-loading="loading"
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
row-class-name="font-size-12"> row-class-name="font-size-12">
<el-table-column <el-table-column
prop="BusinessName" prop="BusinessName"
label="商机名称" label="订单号"
show-overflow-tooltip> show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.BusinessName}}</p> <p @click="openDetails(scope)" class="font-color-link cp">{{scope.row.BusinessName}}</p>
...@@ -23,17 +23,41 @@ ...@@ -23,17 +23,41 @@
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="BudgetPrice" prop="BudgetPrice"
label="商机金额" label="订单金额"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="CustomerName" prop="CustomerName"
label="客户名称" label="实收"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
prop="BusinessStatusStr" prop="BusinessStatusStr"
label="商机阶段" label="退款"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="手续费"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="待收"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="成本"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="出票状态"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="客户需求"
show-overflow-tooltip>
</el-table-column>
<el-table-column
label="操作"
show-overflow-tooltip> show-overflow-tooltip>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
<template>
</template>
<script>
export default {};
</script>
<style>
</style>
...@@ -89,6 +89,10 @@ ...@@ -89,6 +89,10 @@
<div v-if="dialogBusinessVisible"> <div v-if="dialogBusinessVisible">
<addBusinessBox :name="dialogBusinessVisibleName" :ID="BusinessId" :CustomerId="CustomerId" :ContactId="ContactId" type="1" :isGuest="isGuest"/> <addBusinessBox :name="dialogBusinessVisibleName" :ID="BusinessId" :CustomerId="CustomerId" :ContactId="ContactId" type="1" :isGuest="isGuest"/>
</div> </div>
<!-- 添加机票订单 -->
<div v-if="dialogTicketOrderVisible">
<ticketOrder :name="dialogTicketOrderVisibleName" :ID="TicketOrderID" :GuestId="GuestId" type="1"/>
</div>
<!-- 客户信息抽屉 --> <!-- 客户信息抽屉 -->
<el-drawer <el-drawer
:with-header="false" :with-header="false"
...@@ -208,6 +212,7 @@ import contractInfoBox from "../components/contractManagement/contractInfoBox"; ...@@ -208,6 +212,7 @@ import contractInfoBox from "../components/contractManagement/contractInfoBox";
import businessInfoBox from "../components/businessManagement/businessInfoBox"; import businessInfoBox from "../components/businessManagement/businessInfoBox";
import sceneBox from "../components/dialogModel/sceneBox"; import sceneBox from "../components/dialogModel/sceneBox";
import sceneEditBox from "../components/dialogModel/sceneEditBox"; import sceneEditBox from "../components/dialogModel/sceneEditBox";
import ticketOrder from "../components/guestManagement/ticketOrder";
export default { export default {
components: { components: {
HomeNavLeft, HomeNavLeft,
...@@ -226,6 +231,7 @@ export default { ...@@ -226,6 +231,7 @@ export default {
businessInfoBox, businessInfoBox,
sceneBox, sceneBox,
sceneEditBox, sceneEditBox,
ticketOrder,
}, },
data() { data() {
return { return {
...@@ -242,6 +248,8 @@ export default { ...@@ -242,6 +248,8 @@ export default {
url: "", url: "",
showViewer: false, showViewer: false,
dialogBusinessVisible: false, dialogBusinessVisible: false,
dialogTicketOrderVisibleName: "新建商机",
dialogTicketOrderVisible: false,
CustomerId: 0, CustomerId: 0,
ContactId: 0, ContactId: 0,
drawer: false, drawer: false,
...@@ -273,6 +281,8 @@ export default { ...@@ -273,6 +281,8 @@ export default {
sceneDataList: [], sceneDataList: [],
SceneName: "", SceneName: "",
SceneID: 0, SceneID: 0,
TicketOrderID: 0,
GuestId: 0,
}; };
}, },
mounted() { mounted() {
...@@ -298,6 +308,14 @@ export default { ...@@ -298,6 +308,14 @@ export default {
this.MsgBus.$on("closeBusinessDialogBox", function() { this.MsgBus.$on("closeBusinessDialogBox", function() {
$this.dialogBusinessVisible = false; $this.dialogBusinessVisible = false;
}); });
this.MsgBus.$on("addTicketOrderBoxOpen", function(GuestId) {
$this.GuestId = GuestId;
$this.dialogTicketOrderVisible = true;
this.dialogTicketOrderVisibleName = "新建订单";
});
this.MsgBus.$on("closeTicketOrderDialogBox", function() {
$this.dialogTicketOrderVisible = false;
});
this.MsgBus.$on("closeCustomerDialogBox", function() { this.MsgBus.$on("closeCustomerDialogBox", function() {
$this.dialogCustomerVisible = false; $this.dialogCustomerVisible = false;
}); });
......
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