Skip to content

S
SuperMan
Commit eab260eb authored by 华国豪's avatar 华国豪 🙄
Browse files
Options

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

parents b7635d28 72007ddd
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3057 additions and 2622 deletions
src/assets/img/im/andoriod.png
View replaced file @ b7635d28 View file @ eab260eb
src/assets/img/im/andoriod.png

7.33 KB | W: | H:

src/assets/img/im/andoriod.png

6.96 KB | W: | H:

src/assets/img/im/andoriod.png
src/assets/img/im/andoriod.png
src/assets/img/im/andoriod.png
src/assets/img/im/andoriod.png
  • 2-up
  • Swipe
  • Onion skin
src/components/LeaderManagement/leaderManagement.vue
View file @ eab260eb
...@@ -536,6 +536,9 @@ ...@@ -536,6 +536,9 @@
<el-form-item :label="$t('hotel.hotel_remark')" v-if="addMsg.LeaderGuidClass==0"> <el-form-item :label="$t('hotel.hotel_remark')" v-if="addMsg.LeaderGuidClass==0">
<el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input> <el-input type="textarea" v-model="addMsg.Remarks" class="w210"></el-input>
</el-form-item> </el-form-item>
<el-form-item v-if="addMsg.LeaderGuidClass==1" label="密码">
<el-input type="password" v-model="addMsg.EmPassword" class="w210"></el-input>
</el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp; <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
...@@ -1110,6 +1113,7 @@ export default { ...@@ -1110,6 +1113,7 @@ export default {
}, },
//修改 //修改
updateData(ID) { updateData(ID) {
console.log("updateData")
this.LanguageIdS = []; this.LanguageIdS = [];
this.apipost( this.apipost(
"leader_post_Get", "leader_post_Get",
...@@ -1119,6 +1123,7 @@ export default { ...@@ -1119,6 +1123,7 @@ export default {
res => { res => {
let LanguageIdArr = []; let LanguageIdArr = [];
this.addMsg = res.data.data; this.addMsg = res.data.data;
this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0; this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
this.addMsg.Type = this.addMsg.Type.toString(); this.addMsg.Type = this.addMsg.Type.toString();
this.addMsg.Sex = this.addMsg.Sex.toString(); this.addMsg.Sex = this.addMsg.Sex.toString();
...@@ -1138,7 +1143,9 @@ export default { ...@@ -1138,7 +1143,9 @@ export default {
this.LanguageIdS.push(Number(x)); this.LanguageIdS.push(Number(x));
}); });
} }
this.addMsg.EmPassword="";
// this.getCityList(); // this.getCityList();
console.log("this.addMsg",this.addMsg)
}, },
err => {} err => {}
); );
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ eab260eb
...@@ -228,8 +228,9 @@ ...@@ -228,8 +228,9 @@
<td> <td>
<div v-for="subItem in outItem.HotelOrderList"> <div v-for="subItem in outItem.HotelOrderList">
<span v-if="subItem.PayStyle === 1">现付</span> <span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span> <span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 3">预付</span> <span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else>暂无</span> <span v-else>暂无</span>
</div> </div>
</td> </td>
......
src/components/TravelManager/TravelList/OpTripList.vue
View file @ eab260eb
...@@ -114,6 +114,10 @@ ...@@ -114,6 +114,10 @@
<div class="TCL_remarkTitle TCL-redType">{{$t('Operation.Op_TeamName')}}：</div> <div class="TCL_remarkTitle TCL-redType">{{$t('Operation.Op_TeamName')}}：</div>
<div class="TCL_Content">{{item.Title}}</div> <div class="TCL_Content">{{item.Title}}</div>
</div> </div>
<div class="clearfix" v-if="item.OpenTeamDescribe&&item.OpenTeamDescribe!=''">
<div class="TCL_remarkTitle TCL-redType">备注：</div>
<div class="TCL_Content">{{item.OpenTeamDescribe}}</div>
</div>
</div> </div>
</li> </li>
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ eab260eb
...@@ -555,6 +555,7 @@ ...@@ -555,6 +555,7 @@
<tr> <tr>
<th width="100">日期</th> <th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th> <th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th style="border-right:1px solid #E5E5E5">占房时间</th>
</tr> </tr>
</table> </table>
<div> <div>
...@@ -567,7 +568,7 @@ ...@@ -567,7 +568,7 @@
<template v-if="subItem.SubList"> <template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 "> <div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}} {{subItem.SubList[0].HotelName}}
<a style="color:green">【OK】</a> <a style="color:green">{{subItem.SubList[0].RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
【<a 【<a
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}} style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div> {{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
...@@ -576,6 +577,16 @@ ...@@ -576,6 +577,16 @@
</template> </template>
</template> </template>
</td> </td>
<td>
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].CreateDateStr}}
</div>
<template v-else v-for="childItem in subItem.SubList">
<div></div>
</template>
</template>
</td>
</tr> </tr>
</table> </table>
</div> </div>
...@@ -1131,7 +1142,6 @@ ...@@ -1131,7 +1142,6 @@
//新获取列表数据 //新获取列表数据
getControlList() { getControlList() {
var msg = JSON.parse(JSON.stringify(this.queryMsg)) var msg = JSON.parse(JSON.stringify(this.queryMsg))
if (msg.TeamMinNum == '') { if (msg.TeamMinNum == '') {
msg.TeamMinNum = -1 msg.TeamMinNum = -1
......
src/components/activity/FreelineManagement.vue
View file @ eab260eb
...@@ -700,7 +700,7 @@ ...@@ -700,7 +700,7 @@
//出团公司集合 //出团公司集合
OutBranchIds: [], OutBranchIds: [],
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 5,
LineId: 0, LineId: 0,
LineIdList: [], LineIdList: [],
LineteamId: 0, LineteamId: 0,
......
src/components/activity/RegimentLabel.vue
View file @ eab260eb
...@@ -14,23 +14,23 @@ ...@@ -14,23 +14,23 @@
<template> <template>
<div class="flexOne"> <div class="flexOne">
<div style="overflow:auto"> <div style="overflow:auto">
<input type="button" class="normalBtn" value="添加" style="float:right"/> <input type="button" class="normalBtn" value="添加" style="float:right" @click="ResetPwdForm(),LabelVisible=true"/>
</div> </div>
<table style="margin-top:10px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0"> <table style="margin-top:10px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr> <tr>
<th>排序</th>
<th>标签名</th> <th>标签名</th>
<th>排序</th>
<th>操作</th> <th>操作</th>
</tr> </tr>
<tr v-for="item in dataList" :key="item.SNO"> <tr v-for="(item,index) in dataList" :key="index+100">
<td>{{item.SNO}}</td>
<td>{{item.Content}}</td> <td>{{item.Content}}</td>
<td>{{item.SNO}}</td>
<td> <td>
<el-tooltip class="item" effect="dark" content="修改" placement="top"> <el-tooltip class="item" effect="dark" content="修改" placement="top">
<el-button type="primary" icon="el-icon-edit" circle></el-button> <el-button type="primary" icon="el-icon-edit" circle @click="Edit(item)"></el-button>
</el-tooltip> </el-tooltip>
<el-tooltip class="item" effect="dark" content="删除" placement="top"> <el-tooltip class="item" effect="dark" content="删除" placement="top">
<el-button type="primary" class='zidingyiFz' icon="iconfont icon-bangdingzhagnhuxinxi" circle></el-button> <el-button @click="Delete(item)" type="danger" class='zidingyiFz' icon="el-icon-delete" circle></el-button>
</el-tooltip> </el-tooltip>
</td> </td>
...@@ -38,24 +38,28 @@ ...@@ -38,24 +38,28 @@
</table> </table>
<!-- <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total> <!-- <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> --> </el-pagination> -->
<el-dialog custom-class='w400' title="团期标签" :visible.sync="LabelVisible"> <el-dialog custom-class='w400' title="主题标签" :visible.sync="LabelVisible">
<el-form :model="pwdMsg" label-width="100px" :rules="rulesPwd" ref="pwdMsg"> <el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
<el-form-item label="标签类型" prop="EmName"> <!-- <el-form-item label="标签类型" prop="Name">
<el-input class='w217' type="text" v-model="addMsg.EmName" :placeholder="$t('pub.pleaseImport')" readonly></el-input> <el-input class='w217' type="text" v-model="pwdMsg.Name" placeholder=""></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('system.table_acc')" prop="EmAccount"> <el-form-item label="团期类型" prop="Code">
<el-input class='w217' type="text" v-model="addMsg.EmAccount" :placeholder="$t('pub.pleaseImport')" readonly></el-input> <el-select class='w217' v-model="pwdMsg.Code" placeholder="请选择">
<el-option key="0" label="常规" value="0"></el-option>
<el-option key="1" label="小包团" value="1"></el-option>
<el-option key="2" label="一日游" value="2"></el-option>
</el-select>
</el-form-item> -->
<el-form-item label="排序">
<el-input class='w217' v-model="pwdMsg.SNO" placeholder=""></el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('adm.adm_newPd')" prop="Pwd"> <el-form-item label="标签名" prop="Content">
<el-input class='w217' type="password" v-model="pwdMsg.Pwd" :placeholder="$t('pub.pleaseImport')"></el-input> <el-input class='w217' v-model="pwdMsg.Content" placeholder=""></el-input>
</el-form-item>
<el-form-item :label="$t('adm.adm_Reinput')" prop="Pwd1">
<el-input class='w217' type="password" v-model="pwdMsg.Pwd1" :placeholder="$t('pub.pleaseImport')"></el-input>
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="innerVisible=false,resetForm('pwdMsg')">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="LabelVisible=false">取消</button>
<button class="normalBtn" @click="submitForm1('pwdMsg')">{{$t('pub.sureBtn')}}</button> <button class="normalBtn" @click="submitForm1('pwdMsg')">确定</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
...@@ -71,21 +75,86 @@ ...@@ -71,21 +75,86 @@
}, },
dataList:[], dataList:[],
LabelVisible:false, LabelVisible:false,
pwdMsg:{
ID:0,
Name:'theme',
Code:'1',
SNO:"",
Content:"",
},
rulesPwd:{
Name: [
{ required: true, message: '请输入主题', trigger: 'blur' }
],
Code: [
{ required: true, message: '请选择团期类型', trigger: 'change' }
],
Content: [
{ required: true, message: '请输入标签名称', trigger: 'blur' }
]
}
} }
}, },
mounted() { mounted() {
this.getList();
},
methods: {
Edit(item){
this.pwdMsg=Object.assign({},item);
this.LabelVisible=true;
},
Delete(item){
this.$confirm('是否删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.apipost('dict_post_Remove',{dictID:item.ID},res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
this.getList(); this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
}).catch(() => {
});
}, },
submitForm1(formName) {
this.$refs[formName].validate((valid) => {
if (valid) {
this.apipost('travel_post_SetTravelPriceTag',this.pwdMsg,res=>{
if(res.data.resultCode==1){
this.Success(res.data.message)
this.LabelVisible=false;
this.getList();
}else{
this.Error(res.data.message)
}
},err=>{})
} else {
methods: { }
});
},
ResetPwdForm(){
this.pwdMsg={
Name:'theme',
Code:'1',
SNO:"",
Content:"",
};
},
handleCurrentChange(){}, handleCurrentChange(){},
getList(){ getList(){
this.apipost('travel_get_GetTravelPriceTag',this.msg,res=>{ this.apipost('travel_get_GetTravelPriceTag',this.msg,res=>{
console.log("res",res);
if(res.data.resultCode==1){ if(res.data.resultCode==1){
this.dataList=res.data.data; this.dataList=res.data.data;
}else{} }else{}
......
src/components/activity/Rotationchart.vue
View file @ eab260eb
...@@ -40,8 +40,8 @@ ...@@ -40,8 +40,8 @@
display: block; display: block;
} }
.Rotationchart .imgList ul li .img_box .zezhao i{ .Rotationchart .imgList ul li .img_box .zezhao i{
font-size: 28px; font-size: 20px;
margin:0 10px; /* margin:0 10px; */
} }
.Rotationchart .imgList ul li .img_box .free { .Rotationchart .imgList ul li .img_box .free {
top: 15px; top: 15px;
...@@ -170,8 +170,14 @@ ...@@ -170,8 +170,14 @@
<span v-if="item.slideStatus==1" class="free" style="background: #20bf6b;">正常</span> <span v-if="item.slideStatus==1" class="free" style="background: #20bf6b;">正常</span>
<span v-if="item.slideStatus==2" class="free" style="background: #E95252;">禁用</span> <span v-if="item.slideStatus==2" class="free" style="background: #E95252;">禁用</span>
<div class="zezhao"> <div class="zezhao">
<i class="el-icon-edit" title="编辑" @click.stop="EditImg(item)"></i> <el-tooltip class="item" effect="dark" content="编辑" placement="top">
<i class="el-icon-printer" slot="reference" title="修改状态" @click.stop="EditStatus(item)"></i> <el-button type="primary" icon="el-icon-edit" circle @click.stop="EditImg(item)"></el-button>
</el-tooltip>
<!-- <i class="el-icon-edit" title="编辑" @click.stop="EditImg(item)"></i> -->
<el-tooltip class="item" effect="dark" content="修改状态" placement="top">
<el-button type="danger" icon="el-icon-printer" circle @click.stop="EditStatus(item)"></el-button>
</el-tooltip>
<!-- <i class="el-icon-printer" slot="reference" title="修改状态" @click.stop="EditStatus(item)"></i> -->
</div> </div>
</div> </div>
</li> </li>
...@@ -191,7 +197,8 @@ ...@@ -191,7 +197,8 @@
title="修改状态" title="修改状态"
:visible.sync="changestatus" :visible.sync="changestatus"
width="400px"> width="400px">
<el-select v-model="editForm.slideStatus" placeholder="请选择状态"> 状态：
<el-select style="display:inline-block" v-model="editForm.slideStatus" placeholder="请选择状态">
<el-option label="启用" :value="1"></el-option> <el-option label="启用" :value="1"></el-option>
<el-option label="禁用" :value="2"></el-option> <el-option label="禁用" :value="2"></el-option>
<el-option label="删除" :value="3"></el-option> <el-option label="删除" :value="3"></el-option>
......
src/components/administrative/Temporarystaff.vue 0 → 100644
View file @ eab260eb
This diff is collapsed.
src/components/newTravelmanager/TravelGroupControl/TravelConfig.vue
View file @ eab260eb
...@@ -127,6 +127,12 @@ ...@@ -127,6 +127,12 @@
resize="none" placeholder="本团卖点" maxlength="300"></el-input> resize="none" placeholder="本团卖点" maxlength="300"></el-input>
</el-form-item> </el-form-item>
</div> </div>
<div>
<el-form-item label="备注">
<el-input v-model="PostConfig.OpenTeamDescribe" type="textarea" :autosize="{minRows: 1, maxRows: 2 }"
resize="none" placeholder="此备注只在开团行程列表中显示" maxlength="300"></el-input>
</el-form-item>
</div>
<div class="_VideoStr_box"> <div class="_VideoStr_box">
<el-form-item label="视频地址"> <el-form-item label="视频地址">
<el-input v-model="PostConfig.VideoStr" type="textarea" :autosize="{minRows: 1, maxRows: 1 }" <el-input v-model="PostConfig.VideoStr" type="textarea" :autosize="{minRows: 1, maxRows: 1 }"
......
src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue
View file @ eab260eb
...@@ -123,7 +123,8 @@ ...@@ -123,7 +123,8 @@
fileList: [], fileList: [],
VideoStr: "", //视频地址 VideoStr: "", //视频地址
//是否更新酒店库存 //是否更新酒店库存
IsUpdateHotel:0 IsUpdateHotel:0,
OpenTeamDescribe:"",//开团备注
}, },
//行程 //行程
FeatureData: { FeatureData: {
...@@ -314,6 +315,7 @@ ...@@ -314,6 +315,7 @@
basicData.ImgCover = this.PostConfig.ImgCover; basicData.ImgCover = this.PostConfig.ImgCover;
basicData.PriceIsDirect = this.PostConfig.PriceIsDirect; basicData.PriceIsDirect = this.PostConfig.PriceIsDirect;
basicData.IsDirect = this.PostConfig.IsDirect; basicData.IsDirect = this.PostConfig.IsDirect;
basicData.OpenTeamDescribe=this.PostConfig.OpenTeamDescribe;
basicData.RemoveChild = this.PostConfig.RemoveChild; basicData.RemoveChild = this.PostConfig.RemoveChild;
basicData.TeamType = this.PostConfig.TeamType; basicData.TeamType = this.PostConfig.TeamType;
...@@ -649,6 +651,7 @@ ...@@ -649,6 +651,7 @@
this.PostConfig.CountryID = tempData.CountryID; this.PostConfig.CountryID = tempData.CountryID;
//视频地址 //视频地址
this.PostConfig.VideoStr = tempData.VideoStr; this.PostConfig.VideoStr = tempData.VideoStr;
this.PostConfig.OpenTeamDescribe=tempData.OpenTeamDescribe;
this.NoticeParameters.ConfigId = tempData.ConfigId; this.NoticeParameters.ConfigId = tempData.ConfigId;
this.NoticeParameters.CountryID = tempData.CountryID; this.NoticeParameters.CountryID = tempData.CountryID;
......
src/router/config.js
View file @ eab260eb
...@@ -258,6 +258,15 @@ export default { ...@@ -258,6 +258,15 @@ export default {
title: '员工管理' title: '员工管理'
}, },
}, },
{
path: '/Temporarystaff', //员工管理
name: 'Temporarystaff',
component: resolve => require(['@/components/administrative/Temporarystaff'], resolve),
meta: {
title: '临时员工'
},
},
{ {
path: '/empBankAccount', //员工账户管理 path: '/empBankAccount', //员工账户管理
name: 'empBankAccount', name: 'empBankAccount',
......
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