Skip to content

S
SuperMan
Commit fa56048f authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents ed94b25b 620b0194
Expand all Show whitespace changes
Inline Side-by-side
Showing with 15668 additions and 13251 deletions
src/App.vue
View file @ fa56048f
<template> <template>
<div id="app"> <div id="app" :class="{'red-theme':isRed}">
<keep-alive> <keep-alive>
<router-view v-if="$route.meta.keepAlive"/> <router-view v-if="$route.meta.keepAlive"/>
</keep-alive> </keep-alive>
...@@ -66,7 +66,8 @@ export default { ...@@ -66,7 +66,8 @@ export default {
timer:null, timer:null,
useTime:0, useTime:0,
showCareer:false, showCareer:false,
careerId:0 careerId:0,
isRed:false
// sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true // sessionStorage.getItem("mazip") ? sessionStorage.getItem("mazip") : true
} }
}, },
...@@ -130,6 +131,7 @@ export default { ...@@ -130,6 +131,7 @@ export default {
this.timekeeper() this.timekeeper()
this.listeneruser() this.listeneruser()
} }
this.haveOpenMode=!localStorage.openMode this.haveOpenMode=!localStorage.openMode
this.MsgBus.$on('imgpreviewoverflow',content=>{ this.MsgBus.$on('imgpreviewoverflow',content=>{
this.show(content) this.show(content)
...@@ -169,11 +171,15 @@ export default { ...@@ -169,11 +171,15 @@ export default {
this.careerId=0 this.careerId=0
this.showCareer=false this.showCareer=false
}) })
this.MsgBus.$on("changeTheme",t=>{
console.log('theme type:'+t)
this.isRed=t==1;
})
} }
} }
</script> </script>
<style> <style>
@import "//at.alicdn.com/t/font_635492_erhq7cu6ne6.css"; @import "//at.alicdn.com/t/font_635492_corysyogb8g.css";
@import "./assets/css/Semibold.css"; @import "./assets/css/Semibold.css";
@import "./assets/css/global/config.css"; @import "./assets/css/global/config.css";
@import "./assets/css/fileIcon.css"; @import "./assets/css/fileIcon.css";
...@@ -195,5 +201,8 @@ export default { ...@@ -195,5 +201,8 @@ export default {
justify-content: center; justify-content: center;
z-index: 999999999999999; z-index: 999999999999999;
} }
.red-theme{
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Helvetica Neue, Arial, Apple Color Emoji, Segoe UI Emoji, Segoe UI Symbol, Noto Color Emoji, MicrosoftJhengHeiBoldFix, "\5FAE\8EDF\6B63\9ED1\9AD4", Microsoft JhengHei;
}
</style> </style>
src/assets/css/Details.css
View file @ fa56048f
...@@ -11,9 +11,73 @@ ...@@ -11,9 +11,73 @@
transition: all linear .3s; transition: all linear .3s;
} }
.red-theme .secondMenu {
z-index: 9;
}
.secondMenu .extender {
display: none;
height: 50px;
justify-content: center;
align-items: center;
position: absolute;
left: 0;
bottom: 0;
right: 0;
cursor: pointer;
background: #f7f7f7;
}
.red-theme .el-menu-item i {
margin-right: 12px;
}
.secondMenu.big {
width: 230px;
}
.secondMenu .extender img {
width: 18px;
height: 15px;
transform: rotateY(0deg);
transition: transform 0.3s linear;
}
.secondMenu .extender img.close-extend {
transform: rotateY(180deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover img {
transform: rotateY(180deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover img.close-extend {
transform: rotateY(0deg);
transition: transform 0.3s linear;
}
.secondMenu .extender:hover {
background: #F4F4F4;
}
.red-theme .secondMenu .extender {
display: flex;
}
.red-theme .secondMenu {
background: #FBFBFB;
border-right: 1px solid #dcdcdc;
}
.secondMenu .el-submenu__title i { .secondMenu .el-submenu__title i {
color: #a3ace0; color: #a3ace0;
font-size: 18px; font-size: 18px;
margin-left: 16px;
margin-right: 16px;
min-width: 18px;
display: inline-block;
} }
.el-menu--vertical .thridMenu { .el-menu--vertical .thridMenu {
...@@ -27,11 +91,22 @@ ...@@ -27,11 +91,22 @@
margin-right: 10px; margin-right: 10px;
} }
.el-menu--vertical .thridMenu.red-theme i {
color: #787A7D !important;
font-size: 0;
}
.el-menu--vertical .thridMenu:hover, .el-menu--vertical .thridMenu:hover,
.el-menu--vertical .thridMenu:hover i { .el-menu--vertical .thridMenu:hover i {
color: #f1f1f1 !important; color: #f1f1f1 !important;
} }
.el-menu--vertical .thridMenu.red-theme:hover,
.el-menu--vertical .thridMenu.red-theme:hover i {
color: #B1B4B8 !important;
background: #F4F4F4 !important;
}
.secondMenu .el-submenu__title:hover i { .secondMenu .el-submenu__title:hover i {
color: #f1f1f1; color: #f1f1f1;
} }
...@@ -41,10 +116,46 @@ ...@@ -41,10 +116,46 @@
text-align: center; text-align: center;
} }
.menuItem .el-menu--collapse { .red-theme .menuItem .el-submenu__title {
text-align: left;
}
.red-theme .secondMenu .menuItem ul,
.red-theme .secondMenu .menuItem ul .el-submenu__title {
background: #FBFBFB !important;
border-right: none;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title i {
color: #787A7D !important;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title:hover {
background: #F4F4F4 !important;
}
.red-theme .secondMenu .menuItem ul .el-submenu__title:i {
color: #B1B4B8 !important;
}
.red-theme .secondMenu .menuItem ul li {
width: 230px;
text-align: left;
}
.red-theme .secondMenu .menuItem ul li .menuItem .el-menu--collapse {
width: 51px; width: 51px;
} }
.red-theme .secondMenu .menuItem ul .el-submenu__title i {
margin-left: 16px;
margin-right: 16px;
}
.red-theme .menuItem .el-menu--collapse {
width: 100%;
}
/* .secondMenu:hover{ /* .secondMenu:hover{
width: 200px; width: 200px;
...@@ -174,6 +285,13 @@ ...@@ -174,6 +285,13 @@
color: #333333; color: #333333;
} }
.red-theme .resource-ttop {
background: #FFF;
margin-left: -19px;
padding-left: 19px;
width: calc(100% + 38px);
}
.resource-ttop i { .resource-ttop i {
font-size: 12px; font-size: 12px;
color: #999; color: #999;
...@@ -184,6 +302,10 @@ ...@@ -184,6 +302,10 @@
width: 200px; width: 200px;
} }
.red-theme .secondMenu_l {
width: 100%;
}
.menuItem .el-menu-item-group__title { .menuItem .el-menu-item-group__title {
padding: 0; padding: 0;
} }
...@@ -192,6 +314,10 @@ ...@@ -192,6 +314,10 @@
background: #f2f2f2; background: #f2f2f2;
} }
.ren-theme .flexParent {
background: '#F0F2FA';
}
.my_maxheight { .my_maxheight {
max-height: 600px; max-height: 600px;
overflow: auto; overflow: auto;
...@@ -201,12 +327,20 @@ ...@@ -201,12 +327,20 @@
border-bottom: 1px solid #0f1522; border-bottom: 1px solid #0f1522;
} }
.my_maxheight.red .el-menu-item-group__title {
border-bottom: 1px solid #ccc;
}
.my_maxheight .el-menu-item-group__title span { .my_maxheight .el-menu-item-group__title span {
font-size: 14px; font-size: 14px;
color: #ffffff; color: #ffffff;
font-family: "PingFangSC-fine"; font-family: "PingFangSC-fine";
} }
.my_maxheight.red .el-menu-item-group__title span {
color: #787A7D;
}
.my_maxheight::-webkit-scrollbar { .my_maxheight::-webkit-scrollbar {
/*滚动条整体样式*/ /*滚动条整体样式*/
width: 4px; width: 4px;
...@@ -249,6 +383,10 @@ ...@@ -249,6 +383,10 @@
position: relative; position: relative;
} }
.red-theme .nav-tabs-box {
background: #FFF;
}
.nav-tabs-box .is-active { .nav-tabs-box .is-active {
background: #f2f2f2; background: #f2f2f2;
} }
...@@ -257,6 +395,11 @@ ...@@ -257,6 +395,11 @@
background: #f0f0f0; background: #f0f0f0;
} }
.red-theme .nav-tabs-box .el-tabs {
background: #FFF;
margin-left: 100px !important;
}
.browner-opera-box { .browner-opera-box {
position: absolute; position: absolute;
width: 100px; width: 100px;
...@@ -265,6 +408,7 @@ ...@@ -265,6 +408,7 @@
top: 0; top: 0;
display: flex; display: flex;
padding: 5px; padding: 5px;
margin-top: 1px;
} }
.browner-opera-box i { .browner-opera-box i {
......
src/assets/css/cssReset.css
View file @ fa56048f
This diff is collapsed.
src/assets/css/global/config.css
View file @ fa56048f
.secondMenu{ .secondMenu {
margin: 0px 0px 0 0 !important; margin: 0px 0px 0 0 !important;
} }
.el-pagination{
.el-pagination {
border: none !important; border: none !important;
border-top: 1px solid #dcdfe6 !important; border-top: 1px solid #dcdfe6 !important;
} }
.el-pagination { .el-pagination {
text-align: center; text-align: center;
white-space: nowrap; white-space: nowrap;
...@@ -15,9 +17,23 @@ ...@@ -15,9 +17,23 @@
font-size: 14px; font-size: 14px;
margin-top: 15px; margin-top: 15px;
} }
.el-pagination__total{
.el-pagination__total {
vertical-align: middle !important; vertical-align: middle !important;
} }
th{
font-family:PingFangSC-Semibold !important; th {
font-family: PingFangSC-Semibold !important;
}
.red-theme th {
font-family: unset !important;
font-weight: normal !important;
color: #303133 !important;
}
.red-theme .el-button--danger {
color: #fff;
background-color: #f45c43 !important;
border-color: #f45c43 !important;
} }
\ No newline at end of file
src/assets/utils/travelFeature2.js
View file @ fa56048f
...@@ -72,7 +72,7 @@ let travelFeatureTwo = { ...@@ -72,7 +72,7 @@ let travelFeatureTwo = {
let obj = { let obj = {
name: '', name: '',
MD5Sign: '', MD5Sign: '',
description: '', description: '餐厅描述',
images: [], images: [],
type:"Dinner" type:"Dinner"
}; };
...@@ -87,7 +87,10 @@ let travelFeatureTwo = { ...@@ -87,7 +87,10 @@ let travelFeatureTwo = {
obj.images.push(obj2) obj.images.push(obj2)
} }
} }
if(item.description)
{
obj.description = item.Description; obj.description = item.Description;
}
obj.name = item.DinnerName ? item.DinnerName : ''; obj.name = item.DinnerName ? item.DinnerName : '';
obj.Ename = ''; obj.Ename = '';
obj.MD5Sign = item.MD5Sign ? item.MD5Sign : ''; obj.MD5Sign = item.MD5Sign ? item.MD5Sign : '';
......
src/assets/utils/tripUtils.js
View file @ fa56048f
...@@ -619,7 +619,15 @@ var tripUtils = { ...@@ -619,7 +619,15 @@ var tripUtils = {
if (dayIndex == currentDayIndex) { if (dayIndex == currentDayIndex) {
if (dayItem.TrafficObj != null && dayItem.TrafficObj.SubTraffic != null && dayItem.TrafficObj.SubTraffic.length > 0) { if (dayItem.TrafficObj != null && dayItem.TrafficObj.SubTraffic != null && dayItem.TrafficObj.SubTraffic.length > 0) {
dayItem.TrafficObj.SubTraffic.forEach(subItem => { dayItem.TrafficObj.SubTraffic.forEach(subItem => {
cityIdStr += subItem.StartCityId + "," + subItem.ArrivalCityId + "," if(subItem.StartCityId&&subItem.StartCityId!="0")
{
cityIdStr += subItem.StartCityId + ","
}
if(subItem.ArrivalCityId&&subItem.ArrivalCityId!="0")
{
cityIdStr += subItem.ArrivalCityId + ","
}
}); });
} }
} }
...@@ -796,6 +804,19 @@ var tripUtils = { ...@@ -796,6 +804,19 @@ var tripUtils = {
); );
} }
}, },
//跳转到B2B页面
GotoB2BPage2(B2BDomain, ConfigId, tcid) {
if (B2BDomain) {
var url = "http://" + B2BDomain;
window.open(
url + "/#/details/" +
encodeURIComponent(ConfigId) +
"/" +
tcid ,
"_blank"
);
}
},
//获取B2B连接 //获取B2B连接
GetB2BUrl(B2BDomain, ConfigId, tcid) { GetB2BUrl(B2BDomain, ConfigId, tcid) {
var url = ""; var url = "";
......
src/components/Details.vue
View file @ fa56048f
This diff is collapsed.
src/components/FinancialModule/FinancialDocumentsDetail.vue
View file @ fa56048f
...@@ -1571,13 +1571,22 @@ export default { ...@@ -1571,13 +1571,22 @@ export default {
}, },
goassets(ID,OtherType){ goassets(ID,OtherType){
// var assetsDomain = 'http://www.test.com:8082/#/';//本地地址 this.$router.replace({
var assetsDomain = 'http://zcyx.oytour.com/#/';//线上地址 name: "InAndOutDdetails",
if(OtherType==15){ query: {
window.open(assetsDomain+ 'procurementDetails' +"?ID="+ID, "_blank"); //采购详情 ID: ID,
}else if(OtherType==16){ OtherType: OtherType,
window.open(assetsDomain+ 'chukudan' +"?ID="+ID+'&type=2', "_blank"); //出库详情 blank:'y'
} },
})
// var assetsDomain = 'http://www.test.com:8081/#/';//本地地址
// // var assetsDomain = 'http://zcyx.oytour.com/#/';//线上地址
// if(OtherType==15){
// window.open(assetsDomain+ 'procurementDetails' +"?ID="+ID+'&token='+token, "_blank"); //采购详情
// }else if(OtherType==16){
// window.open(assetsDomain+ 'outboundD' +"?ID="+ID+'&type=2', "_blank"); //出库详情
// // window.open(assetsDomain+ 'chukudan' +"?ID="+ID+'&type=2', "_blank"); //出库详情
// }
} }
......
src/components/FinancialModule/InAndOutDdetails.vue 0 → 100644
View file @ fa56048f
<style scoped>
.outboundD .xiangq{
padding: 15px 0;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.outboundD .topkuang{
padding: 5px 10px;
border:1px solid #e2e2e2;
background: #e2e2e2;
border-radius: 15px;
margin-right: 25px;
}
.outboundD .el-table th.is-leaf{
text-align: left !important;
}
</style>
<template>
<div class="outboundD">
<div v-if="OtherType==15" class="xiangq">
<div>
<el-tag style="margin-right: 10px;">仓库名称：{{dataList2.WareHouseName}}</el-tag>
<el-tag style="margin-right: 10px;">备注：{{dataList2.Remark}}</el-tag>
<!-- <span class="topkuang">仓库名称：{{dataList2.WareHouseName}}</span>
<span class="topkuang">备注：{{dataList2.Remark}}</span> -->
</div>
</div>
<div v-if="OtherType==16" class="xiangq">
<div>
<el-tag style="margin-right: 10px;">出库状态：{{dataList.StockOutStateStr}}</el-tag>
<el-tag style="margin-right: 10px;">出库单编码：{{dataList.StockOutNum}}</el-tag>
<el-tag style="margin-right: 10px;">出库时间：{{dataList.UpdateDate}}</el-tag>
<el-tag style="margin-right: 10px;">仓库名称：{{dataList.WareHouseName}}</el-tag>
<el-tag style="margin-right: 10px;">领取人：{{dataList.EmName}}</el-tag>
<el-tag style="margin-right: 10px;">操作人/时间：{{dataList.UpdateBy}}/{{dataList.StockOutDate}}</el-tag>
</div>
</div>
<el-table v-if="OtherType==15"
:data="dataList2.DetailList"
border
header-align='left'
style="width: 100%">
<el-table-column
prop="Id"
label="ID"
width="80">
</el-table-column>
<el-table-column
prop="ImageList"
label="封面图"
width="90">
<template slot-scope="scope">
<img :src=" scope.row.MaterialModel.ImageList[0]" alt="" style="width: 60px; height: 60px;">
</template>
</el-table-column>
<el-table-column
prop="Name"
label="商品名称"
>
<template slot-scope="scope">
<span>{{scope.row.MaterialModel.Name}}</span>
</template>
</el-table-column>
<el-table-column
prop="Name"
label="规格"
width="300"
>
<template slot-scope="scope">
<span v-for="(x,y) in scope.row.MaterialModel.GoodsSpecificationList" :key="y">{{x}} <span v-if="scope.row.MaterialModel.GoodsSpecificationList.length !== y+1"> , </span></span>
</template>
</el-table-column>
<el-table-column
prop="Number"
label="采购数量"
width="150">
</el-table-column>
<el-table-column
prop="Id"
label="已入数量"
width="150">
<template slot-scope="scope">
<span>{{scope.row.StockInNum!=null?scope.row.StockInNum:0}}</span>
</template>
</el-table-column>
</el-table>
<el-table v-if="OtherType==16"
:data="dataList.DetailList"
header-align="left"
border
style="width: 100%">
<el-table-column
prop="SuppliesName"
label="耗材名称 "
width="700"
>
</el-table-column>
<el-table-column
prop="SuppliesNum"
label="耗材编码 "
>
</el-table-column>
<el-table-column
prop="CategoryName"
label="分类名称 "
>
</el-table-column>
<el-table-column
prop="WareHouseName"
label="品牌名称 "
>
<template slot-scope="scope">
<span v-for="(x,y) in scope.row.GoodsCategoryList" :key="y">{{x}} <span v-if="scope.row.GoodsCategoryList.length !== y+1"> , </span></span>
</template>
</el-table-column>
<el-table-column
prop="InventoryNum"
label="库存 "
>
</el-table-column>
<el-table-column
prop="Number"
label="数量 "
>
</el-table-column>
</el-table>
</div>
</template>
<script>
export default {
data(){
return{
msg:{
pageIndex:1,
pageSize:10,
StockOutNum:'',
SuppliesNum:'',
SuppliesName:'',
SupplierName:'',
StartTime:'',
EndTime:'',
WarehouseId:'',
EmployeeId:'',
Id:0,
RB_Group_id:''
},
msg2:{
ProcurementId:0,
RB_Group_id:''
},
dataList:{},//出库
dataList2:{},//采购
OtherType:0,
}
},
created(){
this.OtherType = this.$route.query.OtherType
let RB_Group_id = this.getLocalStorage().RB_Group_id;
if(this.OtherType ==15){//采购单
this.msg2.ProcurementId = this.$route.query.ID;
this.msg2.RB_Group_id = RB_Group_id;
this.getList2()
}else if(this.OtherType == 16){//出库单
this.msg.Id = this.$route.query.ID;
this.msg.RB_Group_id = RB_Group_id;
this.getList()
}
},
methods:{
getList(){
this.apiJavaPostZc("/api/Warehouse/GetStockOutPageList",this.msg,
res => {
if (res.data.resultCode === 1) {
this.dataList = res.data.data.pageData[0]
} else {
this.Error(res.data.message);
}
},
null
);
},
getList2(){
this.apiJavaPostZc("/api/Warehouse/GetProcurementInfo",this.msg2,
res => {
if (res.data.resultCode === 1) {
this.dataList2 = res.data.data
} else {
this.Error(res.data.message);
}
},
null
);
}
},mounted(){
}
}
</script>
src/components/Login2019.vue
View file @ fa56048f
This diff is collapsed.
src/components/SalesModule/addPassenger.vue
View file @ fa56048f
This diff is collapsed.
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ fa56048f
...@@ -1893,7 +1893,11 @@ ...@@ -1893,7 +1893,11 @@
goB2B(ConfigId, tcid, type) { goB2B(ConfigId, tcid, type) {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
if (type == 1) { if (type == 1) {
if (this.CurrentUserInfo.RB_Group_id == 81) {
this.$tripUtils.GotoB2BPage2(B2BDomain, ConfigId, tcid);
} else {
this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid); this.$tripUtils.GotoB2BPage(B2BDomain, ConfigId, tcid);
}
} else { } else {
this.$tripUtils.GotoB2CPage(B2BDomain, ConfigId, tcid); this.$tripUtils.GotoB2CPage(B2BDomain, ConfigId, tcid);
} }
......
src/components/TravelManager/TravelNewQuotation/QuotationPrice_SWT.vue
View file @ fa56048f
...@@ -1770,6 +1770,30 @@ ...@@ -1770,6 +1770,30 @@
}, },
//保存数据 //保存数据
SaveData(type) { SaveData(type) {
if (!this.postData.DayNum) {
this.postData.DayNum = 0;
}
if (!this.postData.GuestNum) {
this.postData.GuestNum = 0;
}
if (!this.postData.FocNum) {
this.postData.FocNum = 0;
}
if (!this.postData.SalePrice) {
this.postData.SalePrice = 0;
}
if (!this.postData.SingleRoomPrice) {
this.postData.SingleRoomPrice = 0;
}
if (!this.postData.HotelDisNum) {
this.postData.HotelDisNum = 0;
}
if (!this.postData.DinnerDisNum) {
this.postData.DinnerDisNum = 0;
}
if (!this.postData.TicketDisNum) {
this.postData.TicketDisNum = 0;
}
//酒店默认值赋值 //酒店默认值赋值
if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) { if (this.postData.SWTHotelList && this.postData.SWTHotelList.length > 0) {
this.postData.SWTHotelList.forEach(item => { this.postData.SWTHotelList.forEach(item => {
...@@ -1835,6 +1859,24 @@ ...@@ -1835,6 +1859,24 @@
}) })
}) })
} }
if (this.postData.SWTBusOtherList && this.postData.SWTBusOtherList.length > 0) {
this.postData.SWTBusOtherList.forEach(rootItem => {
rootItem.SubBusList.forEach(item => {
if (!item.Kilometre) {
item.Kilometre = 0;
}
if (!item.VNDPrice) {
item.VNDPrice = 0;
}
if (!item.Times) {
item.Times = 0;
}
if (!item.Price) {
item.Price = 0;
}
})
})
}
//船票默认值赋值 //船票默认值赋值
if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) { if (this.postData.SWTShipList && this.postData.SWTShipList.length > 0) {
this.postData.SWTShipList.forEach(item => { this.postData.SWTShipList.forEach(item => {
......
src/components/WebSet/WebSiteAbout.vue
View file @ fa56048f
<style> <style>
.WebSiteAbout .WebSiteTopdiv { .WebSiteAbout {
margin: 10px 0; height: calc(100% - 15px);
width: 1080px; }
.WebSiteAbout .WebSiteTopdiv {
/* text-align: right; */
margin: 10px auto;
max-width: 1080px;
min-width: 800px;
height: calc(100% - 20px);
}
.WebSiteAbout .WebSiteTopdiv .title {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
} width: calc(100% - 270px);
padding: 10px 5px;
margin: 15px 0 0 0;
border: 1px solid #d1d1d1;
border-bottom: 1px solid #eee;
background: #fff;
}
</style> </style>
<template> <template>
<!--关于我们--> <!--关于我们-->
<div class="WebSiteAbout"> <div class="WebSiteAbout">
<div class="WebSiteTopdiv"> <div class="WebSiteTopdiv">
<div class="title">
<div>关于我们版面設定</div> <div>关于我们版面設定</div>
<div> <div>
<el-button type="primary" size="small" @click="saveData()">保存</el-button> <el-button type="primary" size="small" @click="saveData()">保存</el-button>
<el-button type="primary" size="small" @click="goAbout()">瀏覽頁面</el-button> <el-button type="primary" size="small" @click="goAbout()">瀏覽頁面</el-button>
</div> </div>
</div> </div>
<div> <WebSiteEdit
<WebSiteEdit ref="WebSiteEdit" :templateData="postMsg.HomeDataList" ref="WebSiteEdit"
v-on:getNewTemplateData="getNewTemplateData"> :templateData="postMsg.HomeDataList"
</WebSiteEdit> v-on:getNewTemplateData="getNewTemplateData"
></WebSiteEdit>
</div> </div>
</div> </div>
</template> </template>
<script> <script>
import WebSiteEdit from "../WebSet/WebSiteEdit.vue" import WebSiteEdit from "../WebSet/WebSiteEdit.vue";
export default { export default {
data() { data() {
return { return {
postMsg: { postMsg: {
Id: 0, Id: 0,
AboutDataList: [], AboutDataList: [],
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {}
} }
}; };
}, },
...@@ -42,7 +58,6 @@ ...@@ -42,7 +58,6 @@
this.getData(); this.getData();
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.CurrentUserInfo = userInfo; this.CurrentUserInfo = userInfo;
}, },
components: { components: {
WebSiteEdit WebSiteEdit
...@@ -51,7 +66,8 @@ ...@@ -51,7 +66,8 @@
//获取配置 //获取配置
getData() { getData() {
this.apipost( this.apipost(
"ws_get_GetHomeAboutTrip", {}, "ws_get_GetHomeAboutTrip",
{},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
var tempData = res.data.data; var tempData = res.data.data;
...@@ -74,7 +90,8 @@ ...@@ -74,7 +90,8 @@
//保存数据 //保存数据
saveData() { saveData() {
this.apipost( this.apipost(
"ws_post_SetAboutData", this.postMsg, "ws_post_SetAboutData",
this.postMsg,
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.getData(); this.getData();
...@@ -91,11 +108,10 @@ ...@@ -91,11 +108,10 @@
this.postMsg.AboutDataList = templateDataList; this.postMsg.AboutDataList = templateDataList;
}, },
//跳转至预览 //跳转至预览
goAbout(){ goAbout() {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
this.$tripUtils.GotoB2CAbout(B2BDomain); this.$tripUtils.GotoB2CAbout(B2BDomain);
} }
} }
} };
</script> </script>
src/components/WebSet/WebSiteCustomer.vue
View file @ fa56048f
...@@ -45,6 +45,16 @@ ...@@ -45,6 +45,16 @@
</el-table-column> </el-table-column>
<el-table-column prop="CreateTimeStr" label="新增時間" header-align="center" align="center"> <el-table-column prop="CreateTimeStr" label="新增時間" header-align="center" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="IsIndex" label="设为首页" header-align="center" align="center">
<template slot-scope="scope">
<el-switch
v-model="scope.row.IsIndex"
active-color="#13ce66"
inactive-color="#ff4949"
@change="changeIndexStatus(scope.row)">
</el-switch>
</template>
</el-table-column>
<el-table-column label="操作" header-align="center" align="center"> <el-table-column label="操作" header-align="center" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start"> <el-tooltip class="item" effect="dark" :content="$t('system.table_edit')" placement="top-start">
...@@ -102,6 +112,9 @@ ...@@ -102,6 +112,9 @@
res => { res => {
this.loading = false; this.loading = false;
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
res.data.data.pageData.forEach(x=>{
x.IsIndex=x.IsIndex==1
})
this.dataList = res.data.data.pageData; this.dataList = res.data.data.pageData;
this.total = res.data.data.count this.total = res.data.data.count
} else { } else {
...@@ -152,7 +165,22 @@ ...@@ -152,7 +165,22 @@
} }
}); });
}, },
changeIndexStatus(e){
this.loading = true;
let msg={
id:e.Id,
isindex:e.IsIndex?1:0
}
this.apipost(
"ws_get_setPageIndex",
msg,
res => {
this.loading = false;
this.getData();
},
err => {}
);
},
//跳转预览 //跳转预览
GoCustom(Id) { GoCustom(Id) {
var B2BDomain = this.CurrentUserInfo.B2BDomain; var B2BDomain = this.CurrentUserInfo.B2BDomain;
......
src/components/WebSet/WebSiteEdit.vue
View file @ fa56048f
<style> <style>
.WebSiteEdit { .WebSiteEdit {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 54px);
min-width: 0; min-width: 0;
background-color: #f3f3f3; background-color: #f3f3f3;
} }
.WebSiteContent { .WebSiteContent {
min-width: 1280px; height: 100%;
height: 725px;
display: flex; display: flex;
width: 100%;
} }
.WebSite_Left { .WebSite_Left {
background-color: rgba(34, 45, 50, .8); background-color: #dadadacc;
padding: 20px; padding: 20px;
overflow-y: auto; overflow-y: auto;
width: 250px; width: 250px;
height: 100%; height: calc(100% + 54px);
margin-top: -54px;
top: 0; top: 0;
} }
.WebSite_right { .WebSite_right {
padding-left: 2px; margin-right: 20px;
flex: 1;
position: relative; position: relative;
overflow-y: auto; overflow-y: auto;
border: 1px solid #d1d1d1;
border-top: none;
padding-top: 15px;
} }
[flex] { [flex] {
...@@ -49,12 +54,12 @@ ...@@ -49,12 +54,12 @@
} }
.WebSite_right_preview { .WebSite_right_preview {
width: 800px; width: 100%;
border: 1px solid #d2d6de; /* overflow-y: auto;
overflow-y: auto;
min-height: 725px; min-height: 725px;
height: 725px; height: 725px; */
margin: 0 20px; /* margin: 0 20px; */
height: 100%;
background-color: #ddd; background-color: #ddd;
} }
...@@ -172,23 +177,7 @@ ...@@ -172,23 +177,7 @@
</style> </style>
<template> <template>
<div class="WebSiteEdit"> <div class="WebSiteEdit">
<div flex="box:first" class="WebSiteContent"> <div class="WebSiteContent">
<div class="WebSite_Left">
<el-select v-model="templateId" @change="getTemplateDetails()">
<el-option label="请选择" :value="0" :key="0">
</el-option>
<el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
<div class="temp-list-wrap">
<div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true"
@dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)">
<img v-if="subItem.TemplateData&&subItem.TemplateData.CoverImg" :src="subItem.TemplateData.CoverImg"
:alt="subItem.SubTemplateName" />
<div class="temp-font">{{subItem.SubTemplateName}}</div>
</div>
</div>
</div>
<div class="WebSite_right" draggable="true" @drop="drop($event,0)"> <div class="WebSite_right" draggable="true" @drop="drop($event,0)">
<div class="WebSite_right_preview" @drop="drop($event,0)"> <div class="WebSite_right_preview" @drop="drop($event,0)">
<div v-for="(item,index) in dataList" draggable="true" @drop="drop($event,index)" <div v-for="(item,index) in dataList" draggable="true" @drop="drop($event,index)"
...@@ -226,6 +215,22 @@ ...@@ -226,6 +215,22 @@
</div> </div>
</div> </div>
</div> </div>
<div class="WebSite_Left">
<el-select v-model="templateId" @change="getTemplateDetails()">
<el-option label="请选择" :value="0" :key="0">
</el-option>
<el-option v-for="item in templateList" :label="item.TemplateName" :value="item.Id" :key="item.Id">
</el-option>
</el-select>
<div class="temp-list-wrap">
<div v-for="(subItem,subIndex) in detailsList" class="temp-list-item" :key="subIndex" draggable="true"
@dragstart="dragLeftStart($event,subItem)" @dragend="dragendLeft($event,subItem)">
<img v-if="subItem.TemplateData&&subItem.TemplateData.CoverImg" :src="subItem.TemplateData.CoverImg"
:alt="subItem.SubTemplateName" />
<div class="temp-font">{{subItem.SubTemplateName}}</div>
</div>
</div>
</div>
</div> </div>
<el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px"> <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
<!--视频--> <!--视频-->
......
src/components/WebSet/WebSiteIndex.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteSearch.vue
View file @ fa56048f
This diff is collapsed.
src/components/WebSet/WebSiteService.vue
View file @ fa56048f
...@@ -26,17 +26,17 @@ ...@@ -26,17 +26,17 @@
<div class="query-box"> <div class="query-box">
<ul> <ul>
<li> <li>
<label>状态</label> <label>狀態：</label>
<el-select class="wp40 accountList" v-model="msg.DemandStatus" placeholder="请选择"> <el-select class="wp40 accountList" v-model="msg.DemandStatus" placeholder="請選擇">
<el-option :key="0" label="待处理" :value="0"> </el-option> <el-option :key="0" label="待處理" :value="0"> </el-option>
<el-option :key="1" label="处理中" :value="1"> </el-option> <el-option :key="1" label="處理中" :value="1"> </el-option>
<el-option :key="2" label="已完成" :value="2"> </el-option> <el-option :key="2" label="已完成" :value="2"> </el-option>
<el-option :key="3" label="转订单" :value="3"> </el-option> <el-option :key="3" label="轉訂單" :value="3"> </el-option>
<el-option :key="4" label="已取消" :value="4"> </el-option> <el-option :key="4" label="已取消" :value="4"> </el-option>
</el-select> </el-select>
</li> </li>
<li> <li>
<label>稱呼</label> <label>稱呼：</label>
<el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.native.enter="getData" class="w210"> <el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.native.enter="getData" class="w210">
</el-input> </el-input>
</li> </li>
......
src/components/WebSet/WebSiteUpdate.vue
View file @ fa56048f
This diff is collapsed.
src/components/index.vue
View file @ fa56048f
This diff is collapsed.
src/components/personalCenter.vue
View file @ fa56048f
This diff is collapsed.
src/components/temp/websiteManager.vue 0 → 100644
View file @ fa56048f
This diff is collapsed.
src/components/work/mywork.vue
View file @ fa56048f
This diff is collapsed.
src/components/work/workDetails.vue
View file @ fa56048f
...@@ -590,6 +590,10 @@ export default { ...@@ -590,6 +590,10 @@ export default {
); );
}, },
setprogress() { setprogress() {
if(this.d.w.BeginTime.split(' ')[0]!=this.formatDate("yyyy-MM-dd")){
this.$message.error("今日事，今日毕，你已经超时，无法提交咯");
return;
}
if (this.textarea2 == "") { if (this.textarea2 == "") {
this.$message.error("请填写进度说明"); this.$message.error("请填写进度说明");
return; return;
......
src/plug/index.js
View file @ fa56048f
This diff is collapsed.
src/router/config.js
View file @ fa56048f
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