Skip to content

S
SuperMan
Commit 38e3e308 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 489dbb73 b549943f
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4495 additions and 1527 deletions
src/components/Restaurant/demesticRestaurantPackage.vue
View file @ 38e3e308
......@@ -405,7 +405,9 @@
<el-form-item label="提前预约天数" prop="MakeDay">
<el-input class="w300" type="number" v-model="addMsg.MakeDay" maxlength="200"></el-input>
</el-form-item>
<el-form-item label="最少购买份数" prop="MinBuyNum">
<el-input class="w300" type="number" v-model="addMsg.MinBuyNum" maxlength="200" min="1"></el-input>
</el-form-item>
<el-form-item label="购买须知" prop="OtherTag">
<!-- <el-input class="w300" type="text" v-model="addMsg.OtherTag" maxlength="200"></el-input> -->
<my-edit v-on:edit-value="addMsg.OtherTag = arguments[0]" v-bind:editValue="addMsg.OtherTag"
......@@ -486,6 +488,7 @@ import MyEdit from "@/components/EditTemplate.vue";
InstructionsList:"",
IsHoliday:1,
MakeDay:0,
MinBuyNum:1,
OtherTag:"",
MealPic:""
},
......
src/components/Restaurant/demesticRestaurantPrice.vue
View file @ 38e3e308
......@@ -434,10 +434,15 @@
</span>
</div>
<div class="resDiv">
<el-form-item :label="$t('hotel.hotel_CostPrice')" prop="CostPrice">
<el-form-item :label="$t('hotel.hotel_CostPrice')" prop="CostPrice">
<el-input type="text" class="w210" v-model="addMsg.CostPrice"
@keyup.native="checkPrice(addMsg,'CostPrice')"></el-input>
</el-form-item>
<el-form-item label="库存" prop="Inventory">
<el-input type="text" class="w210" v-model="addMsg.Inventory"
@keyup.native="checkPrice(addMsg,'Inventory')"></el-input>
</el-form-item>
<!-- <el-form-item label="原价" prop="SalesPrice">
<el-input type="text" class="w210" v-model="addMsg.SalesPrice"
@keyup.native="checkPrice(addMsg,'SalesPrice')"></el-input>
......@@ -553,7 +558,8 @@
CurrencyId: 1,
CurrentRate: 1,
StartDate: '',
EndDate: ''
EndDate: '',
Inventory:0
},
rules: {
//表单必填验证
......@@ -638,6 +644,7 @@
dayItem.SalesPrice = tableinfo[j].SalesPrice;
dayItem.checkState = this.$calendarUtils.checkState.hasValue;
dayItem.SupplierName = tableinfo[j].SupplierName;
dayItem.Inventory = tableinfo[j].Inventory;
dayItem.ID = tableinfo[j].ID;
dayItem.class = "class-a";
dayItem.date = tableinfo[j].Date;
......
src/components/TravelManager/Lxy/directorOrderDetails.vue
View file @ 38e3e308
<template>
<div class="directorOrderDetails">
<div class="head-title">
<span @click="CommonJump('directorOrderList')" class="blue point">订单列表</span> / 订单详情
<span @click="gobaclk()" class="blue point">订单列表</span> / 订单详情
</div>
<div class="content app-order-detail">
<el-card class="app-order-status" shadow="never">
......@@ -123,7 +123,7 @@
</button>
</div>
</div>
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList[0].CarType!=5">
<div flex="dir:left cross:center" class="item-box" v-if="dataInfo.DetailList.length>0 && dataInfo.DetailList[0].CarType!=5">
<span class="label">目的地:</span>
<div class="express-address">
{{dataInfo.OrderInfo.DestinationAddress}}
......@@ -289,7 +289,7 @@
</el-col>
</el-row>
<el-card style="margin-top:15px" shadow="never">
<el-table border :data="dataInfo.DetailList" style="width: 100%">
<el-table border :data="dataInfo.DetailList" style="width: 100%">
<el-table-column prop="Id" label="商品标题">
<template slot-scope="scope">
<div flex="dir:left cross:center">
......@@ -344,10 +344,6 @@
</el-form>
</el-card>
<div flex="dir:right" class="action-box">
<el-button v-if="(activeStep==2 || activeStep==3) && !exitState" style="margin-left: 10px;" size="small"
type="primary">打印发货单</el-button>
<el-button style="margin-left: 10px;" size="small" type="primary">打印小票</el-button>
<el-button @click="qrEnd(dataInfo,3)" v-if="activeStep==4 && !exitState" style="margin-left: 10px;" size="small"
type="primary">确认完成</el-button>
<el-button @click="qrEnd(dataInfo,2)" v-if="activeStep==3 && !exitState" style="margin-left: 10px;"
......@@ -818,6 +814,9 @@
}
})
},
gobaclk(){
this.$router.go(-1);//返回上一层
}
},
mounted() {
......
src/components/TravelManager/TravelList/RegistrationList.vue
View file @ 38e3e308
......@@ -2007,6 +2007,7 @@
<tbody v-for="(childItem,childIndex) in subItem.List" :key="childIndex+2000">
<tr>
<td rowspan="3" style="position:relative;">
<div v-if="childItem.IsApplyForCancel==1" style="color:red;">有取消订单</div>
<div class="order_union">
<div v-if="childItem.IsReturnIntermodal==1 || childItem.IsIntermodal==1" class="fl">
{{$t('Operation.Op_lian')}}</div>
......@@ -2234,6 +2235,7 @@
<div v-if="childItem.ScoreNum >= 0"
@click='goInvetig("investigationList", childItem.tcid, childItem.OrderId)'>
{{$t('salesModule.LookTourse')}}</div>
<div v-if="childItem.IsApplyForCancel==1" @click="DingdanCancel(childItem)">取消审核</div>
</div>
<el-button slot="reference" type="primary"
style='background:#297BEF; border-color:#297BEF;border-top-left-radius: 0;border-bottom-left-radius: 0;'
......@@ -3108,6 +3110,31 @@
<div slot="tip" class="el-upload__tip">{{$t('ground.znscexcel')}}</div>
</el-upload>
</el-dialog>
<el-dialog custom-class='w450' title="取消确认" :visible.sync="isShowOpSure" center>
<el-form label-width="110px">
<el-form-item label="审核状态">
<el-radio v-model="OpSureMsg.AuditState" :label="1">通过</el-radio>
<el-radio v-model="OpSureMsg.AuditState" :label="2">拒绝</el-radio>
</el-form-item>
<el-form-item label="审核备注" v-if="OpSureMsg.AuditState==2">
<el-input type="textarea" :rows="4" v-model="OpSureMsg.Remark"></el-input>
</el-form-item>
<template v-if="OpSureMsg.AuditState==1">
<el-form-item label="是否收损">
<el-radio v-model="OpSureMsg.IsLoss" :label="1">是</el-radio>
<el-radio v-model="OpSureMsg.IsLoss" :label="2">否</el-radio>
</el-form-item>
<el-form-item v-if="OpSureMsg.IsLoss==1" label="收损金额">
<el-input v-model="OpSureMsg.LossMoney" @keyup.native="checkPrice(OpSureMsg,'LossMoney')"></el-input>
</el-form-item>
</template>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="opSureAudit">{{$t('pub.saveBtn')}}</button>
<button class="hollowFixedBtn" @click="isShowOpSure=false">{{$t('pub.cancelBtn')}}</button>
</div>
</el-dialog>
</div>
</template>
......@@ -3118,6 +3145,7 @@
export default {
data() {
return {
isShowOpSure:false, //op确认弹窗
IsSupperOrderEdit: false, //获取总经理副总经理超级修改权限
IsLookOrder: false, //出纳查看订单权限
EditBtn: false, //恢复订单
......@@ -3534,6 +3562,13 @@
zhuijiaMsg: {},
SetShouSunGuestNum: 0,
RBBranchId: '',
OpSureMsg:{
OrderId:0,
AuditState:1, //1通过 2拒绝
Remark:'',
IsLoss:1, //是否受损 1是2否
LossMoney:'' //收损金额
}
};
},
components: {
......@@ -5697,6 +5732,27 @@
}
});
},
//点击取消订单
DingdanCancel(item){
this.OpSureMsg.OrderId = item.OrderId;
this.OpSureMsg.AuditState = 1, //1通过 2拒绝
this.OpSureMsg.Remark = '',
this.OpSureMsg.IsLoss = 1, //是否受损 1是2否
this.OpSureMsg.LossMoney = '' //收损金额
this.isShowOpSure=true;
},
//op确认取消
opSureAudit(){
this.apipost('sellorder_post_SetAuditUserApplyForCancel', this.OpSureMsg , res => {
if (res.data.resultCode == 1) {
this.Success(res.data.message);
this.getList();
this.isShowOpSure=false;
} else {
this.Error(res.data.message);
}
}, err => {})
}
},
mounted() {
this.GetSupperOrderEditAuth();
......
src/components/TravelManager/customizedcar/costManagement.vue 0 → 100644
View file @ 38e3e308
This diff is collapsed.
src/components/TravelManager/customizedcar/lineoffer.vue
View file @ 38e3e308
......@@ -941,6 +941,21 @@
isshow = true;
return
}
if(x.CostPrice==''){
this.Error('请输入b2b价格')
isshow = true;
return
}
if(x.B2CPrice==''){
this.Error('请输b2c价格')
isshow = true;
return
}
if(x.CostPrice==''){
this.Error('请输入成本价格')
isshow = true;
return
}
})
if(isshow == true){
return
......
src/components/TravelManager/customizedcar/travelOrders.vue 0 → 100644
View file @ 38e3e308
This diff is collapsed.
src/components/index.vue
View file @ 38e3e308
......@@ -107,11 +107,13 @@
<li style="width:65px;height:50px;line-height: 50px;padding: 0;font-size: 15px;font-family: pingfangR;"
v-if="isShowMore">
<el-dropdown trigger="hover">
<span v-if="!useRed" class="el-dropdown-link" style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span v-if="!useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #a6adb4;"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:13px"></i>更多</span>
</span>
<span v-if="useRed" class="el-dropdown-link" style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span v-if="useRed" class="el-dropdown-link"
style="cursor: pointer;display: block;height: 100%;width: 100%;">
<span style="color: #FFF;font-size:15px"><i class="iconfont icon-biaoge"
style="margin-right: 5px;font-size:12px"></i>更多</span>
</span>
......@@ -229,7 +231,8 @@
@click="IM_bodyIsShow=!IM_bodyIsShow,IM_navType=1"></i>
</li>
<li><i class="iconfont icon-banbengengxin" @click="goUrlLog()"></i></li>
<li v-if="!useRed"><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i></li>
<li v-if="!useRed"><i class="iconfont icon-gonggao" @click="IM_bodyIsShow=!IM_bodyIsShow, IM_navType=52"></i>
</li>
<li>
<el-dropdown trigger="click">
<span class="el-dropdown-link">
......@@ -251,7 +254,8 @@
<i @click="downmz=!downmz" class="el-icon-download"></i>
</li>
<li>
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''" style="color:#FFF">前往前台</a>
<a :href="`http://${b2bDomain}`" target="_blank" v-if="b2bDomain && b2bDomain!=''"
style="color:#FFF">前往前台</a>
<a href="javascript:alert('未開通B2B前端系統，請您聯繫業務員')" v-else style="color:#FFF">前往前台</a>
</li>
</ul>
......@@ -380,7 +384,8 @@
<div class='IM_contacts contact-box' v-show="IM_navType==2 && searchList.length===0">
<div class="contacts-type-box">
<div class="contacts-type-item" :class="{active:contactsType==0}" @click="changeContactGroup(0)">同事</div>
<div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)" v-if="!useRed">群聊</div>
<div class="contacts-type-item" :class="{active:contactsType==1}" @click="changeContactGroup(1)"
v-if="!useRed">群聊</div>
<el-tooltip effect="dark" content="新建群聊" placement="top-start">
<i class="plus iconfont icon-img_jiahao_big" v-if="contactsType==1" @click="createGroup"></i>
</el-tooltip>
......@@ -1215,8 +1220,8 @@
},
data() {
return {
b2bDomain:"",
useRed:false,
b2bDomain: "",
useRed: false,
//提成账单弹窗
commissionDialog: false,
//判断显示哪个组件
......@@ -1736,9 +1741,9 @@
} else {
this.isShowMore = false
}
this.b2bDomain=this.userInfo.B2BDomain
this.useRed=(this.userInfo.ThemeType?this.userInfo.ThemeType:0)==1
this.MsgBus.$emit("changeTheme",this.useRed)
this.b2bDomain = this.userInfo.B2BDomain
this.useRed = (this.userInfo.ThemeType ? this.userInfo.ThemeType : 0) == 1
this.MsgBus.$emit("changeTheme", this.useRed)
document.title = this.userInfo.GroupName
if (this.userInfo.Icon != null) {
this.userInfo.UserPhoto = this.userInfo.Icon;
......@@ -1835,6 +1840,7 @@
this.allWindowWidth = allWindowWidth - 50 - 220 - 60;
let maxLength = parseInt(allWindowWidth / 110);
this.maxLength = maxLength;
//this.testApi();
},
watch: {
filterText(val) {
......@@ -1842,6 +1848,21 @@
}
},
methods: {
testApi() {
this.apipost(
"sellorder_post_GetMiniAppTravelOrderList", {
"MiniAppUserId": 113859,
pageIndex:1,
pageSize:5,
},
res => {
console.log("res",res.data);
if (res.data.resultCode == 1) {
}
}
);
},
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.F_ContractManagement;
var F_Finance_CreateCode = this.$AuthCode.F_Finance_Create;
......@@ -4539,10 +4560,12 @@
.min-width(1366px);
background: #1f1e2e;
}
.red-theme .nav{
.red-theme .nav {
.size(100%, 58px);
background:linear-gradient(270deg,rgba(244,92,67,1),rgba(235,51,73,1));
background: linear-gradient(270deg, rgba(244, 92, 67, 1), rgba(235, 51, 73, 1));
}
.nav-left {
width: 56px;
color: #e73828;
......@@ -4584,7 +4607,7 @@
display: flex;
}
.red-theme .nav .nav-middle{
.red-theme .nav .nav-middle {
align-items: center;
}
......@@ -4607,14 +4630,17 @@
z-index: 2019128;
cursor: pointer;
}
.red-theme .nav .nav-middle ul li{
color:#fff;
padding:14px 10px;
.red-theme .nav .nav-middle ul li {
color: #fff;
padding: 14px 10px;
}
.red-theme .nav .nav-middle ul li i{
color:#fff;
.red-theme .nav .nav-middle ul li i {
color: #fff;
font-size: 0px;
}
.nav-middle ul li i {
font-size: 16px;
color: #a6adb4;
......@@ -4654,9 +4680,11 @@
overflow: hidden;
box-shadow: 0px 0px 50px 0px rgba(82, 63, 105, 0.15);
}
.red-theme .nav-middle ul li .menuList_son{
.red-theme .nav-middle ul li .menuList_son {
top: 58px;
}
.menuList_tittle_box {
line-height: 30px;
}
......@@ -4669,9 +4697,11 @@
padding: 9px 10px;
font-family: "pingfangR";
}
.red-theme .menuList_son_one_tittle{
.red-theme .menuList_son_one_tittle {
color: #333;
}
.menuList_son_two_tittle {
color: #a1aad0;
text-align: left;
......@@ -4723,15 +4753,17 @@
left: 0;
bottom: -2px;
}
.red-theme .nav .hoverNote{
background:#f5f5f5;
.red-theme .nav .hoverNote {
background: #f5f5f5;
border-radius: 2px;
}
.nav-middle ul li:hover {
background-color: #232337;
}
.red-theme .nav .nav-middle ul li:hover {
.red-theme .nav .nav-middle ul li:hover {
background-color: #c1272d;
}
......@@ -4750,10 +4782,12 @@
font-size: 15px;
font-family: 'pingfangR';
}
.red-theme .nav .big_tittle{
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;
font-size:16px;
.red-theme .nav .big_tittle {
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;
font-size: 16px;
}
.nav-middle ul li.active .big_tittle {
color: #ffffff;
cursor: pointer;
......@@ -4768,43 +4802,54 @@
position: absolute;
right: 0;
}
.red-theme .nav-right{
.red-theme .nav-right {
width: unset;
}
.nav-right ul {
display: flex;
line-height: 50px;
justify-content: flex-end;
}
.red-theme .nav .nav-right ul{
.red-theme .nav .nav-right ul {
line-height: 58px;
}
.nav-right ul li {
height: 50px;
margin-right: 20px;
text-align: center;
justify-content: flex-end;
}
.red-theme .nav .nav-right ul li{
.red-theme .nav .nav-right ul li {
height: 58px;
}
.red-theme .nav .nav-right ul li i {
.red-theme .nav .nav-right ul li i {
color: #fff;
}
.nav-right ul li i {
cursor: pointer;
.fz(18px);
color: #e4e4e4;
}
.red-theme .nav .nav-right ul li i:hover {
.red-theme .nav .nav-right ul li i:hover {
color: #e4e4e4;
}
.nav-right ul li i:hover {
color: #999;
}
.red-theme .nav .nav-right ul li i.red{
color:#FFF !important;
.red-theme .nav .nav-right ul li i.red {
color: #FFF !important;
}
.hide {
display: none;
}
......@@ -4889,11 +4934,11 @@
/* Opera */
}
.red-theme .nav .animation::before {
.red-theme .nav .animation::before {
color: #FFF;
}
#message_box .content {
width: 350px;
......@@ -5054,7 +5099,10 @@
left: 0px;
right: 0px;
}
.red-theme .temDivs {top:58px;}
.red-theme .temDivs {
top: 58px;
}
.red {
color: #e95252 !important;
......
src/router/config.js
View file @ 38e3e308
......@@ -2683,6 +2683,31 @@ export default {
title: '线路报价'
},
},
{
path: '/travelOrders', //定制包车=>订单管理
name: 'travelOrders',
component: resolve => require(['@/components/TravelManager/customizedcar/travelOrders'], resolve),
meta: {
title: '订单管理'
},
},
{
path: '/traveorderdetails', //定制包车=>订单详情
name: 'traveorderdetails',
component: resolve => require(['@/components/TravelManager/customizedcar/traveorderdetails'], resolve),
meta: {
title: '订单详情'
},
},
{
path: '/costManagement', //国内旅游=>成本管理
name: 'costManagement',
component: resolve => require(['@/components/TravelManager/customizedcar/costManagement'], resolve),
meta: {
title: '成本管理'
},
},
......
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