Skip to content

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

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

parents 237dd23d 62fcdb84
Expand all Show whitespace changes
Inline Side-by-side
Showing with 3065 additions and 2632 deletions
src/assets/img/im/andoriod.png
View replaced file @ 237dd23d View file @ 835196e0
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/FinancialModule/addFinancialDocuments.vue
View file @ 835196e0
......@@ -182,14 +182,14 @@
<p class="_yewudanju" v-if="OrderSource==8">{{$t('hotel.order_Number')}}：<span @click="msg.OrderID>0?jumpPage('RegistrationList',GetDetail,8):''">{{msg.OrderID==0?$t('fnc.no'):msg.OrderID}}</span></p>
<div class="rb_top_row _r_mb5">
<el-radio-group v-model="msg.IsPublic" @change="IsPublicChange" class="_IsPublic">
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37'>{{$t('fnc.wbxianjin')}}</el-radio>
<el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===43'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43'>{{$t('fnc.szxiangdi')}}</el-radio>
<el-radio :label="1" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.gongzhang')}}</el-radio>
<el-radio :label="0" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.sizhang')}}</el-radio>
<el-radio :label="2" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.rmbxianjin')}}</el-radio>
<el-radio :label="3" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==48'>{{$t('fnc.wbxianjin')}}</el-radio>
<el-radio :label="4" v-if='msg.TemplateId===36 || msg.TemplateId===37 || msg.TemplateId===48'>{{$t('fnc.zjinchi')}}</el-radio>
<el-radio :label="5" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.ptxnzhanghu')}}</el-radio>
<el-radio :label="6" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.djxnzhanghu')}}</el-radio>
<el-radio :label="7" v-if='msg.TemplateId!==36 && msg.TemplateId!==37 && msg.TemplateId!==43 && msg.TemplateId!==48'>{{$t('fnc.szxiangdi')}}</el-radio>
<!-- <el-radio :label="3">资金池</el-radio> -->
</el-radio-group>
</div>
......
src/components/LeaderManagement/leaderManagement.vue
View file @ 835196e0
......@@ -536,6 +536,9 @@
<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-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>
<div slot="footer" class="dialog-footer">
<button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
......@@ -1110,6 +1113,7 @@ export default {
},
//修改
updateData(ID) {
console.log("updateData")
this.LanguageIdS = [];
this.apipost(
"leader_post_Get",
......@@ -1119,6 +1123,7 @@ export default {
res => {
let LanguageIdArr = [];
this.addMsg = res.data.data;
this.addMsg.LeaderGuidClass = this.addMsg.LeaderGuidClass ? this.addMsg.LeaderGuidClass : 0;
this.addMsg.Type = this.addMsg.Type.toString();
this.addMsg.Sex = this.addMsg.Sex.toString();
......@@ -1138,7 +1143,9 @@ export default {
this.LanguageIdS.push(Number(x));
});
}
this.addMsg.EmPassword="";
// this.getCityList();
console.log("this.addMsg",this.addMsg)
},
err => {}
);
......
src/components/LeaderManagement/leaderReimbursement.vue
View file @ 835196e0
......@@ -123,6 +123,7 @@
<td width="80">实际用房数</td>
<td width="">房间类型</td>
<td width="">房间数</td>
<td width="80">预定人数</td>
<td width="80">免费人数</td>
<td width="">单价/人</td>
<td width="">金额小计</td>
......@@ -172,6 +173,15 @@
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
<p v-for="childItem in subItem.OrderDetailsList">
{{childItem.BookNum}}
</p>
</div>
</div>
</td>
<td>
<div class="alcenter">
<div v-for="subItem in outItem.HotelOrderList">
......@@ -218,8 +228,9 @@
<td>
<div v-for="subItem in outItem.HotelOrderList">
<span v-if="subItem.PayStyle === 1">现付</span>
<span v-else-if="subItem.PayStyle === 2">公司结算</span>
<span v-else-if="subItem.PayStyle === 3">预付</span>
<span v-else-if="subItem.PayStyle === 2">签单</span>
<span v-else-if="subItem.PayStyle === 4">预付</span>
<span v-else-if="subItem.PayStyle === 5">实物抵扣</span>
<span v-else>暂无</span>
</div>
</td>
......@@ -239,7 +250,7 @@
{{moneyFormat(TotalNav.reimburseTotalPrice.ExpendTotalPrice)}}
</td>
<td>签单/预付/抵扣总金额</td>
<td colspan="6">
<td colspan="7">
{{moneyFormat(TotalNav.reimburseTotalPrice.BalanceTotalPrice)}}
</td>
</tr>
......@@ -509,7 +520,6 @@
});
},
goZhiDan: function (obj) {
console.log(this.TotalNav.reimburseTotalPrice.PlanPrice)
let allMoney = this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95
let totailMoney = 0
this.nav.forEach(x=>{
......@@ -530,7 +540,7 @@
Money: obj.LeaderGetPriceT,
TCNUMS: obj.TCNUMS
}
let id = [43]
let id = [43,48]
this.$router.push({
name: 'ChoiceAddFinancialDocuments',
query:{
......@@ -688,6 +698,8 @@
nav.forEach((x, i)=>{
if (i === 0) {
x.LeaderGetPriceT = (this.TotalNav.reimburseTotalPrice.PlanPrice * 0.95) - num;
} else {
x.LeaderGetPriceT = 0
}
})
this.nav = nav
......
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ 835196e0
......@@ -555,6 +555,7 @@
<tr>
<th width="100">日期</th>
<th style="border-right:1px solid #E5E5E5">酒店情况</th>
<th style="border-right:1px solid #E5E5E5">占房时间</th>
</tr>
</table>
<div>
......@@ -567,7 +568,7 @@
<template v-if="subItem.SubList">
<div v-if="subItem.SubList.length==1 && subItem.SubList[0].UseCount>0 ">
{{subItem.SubList[0].HotelName}}
<a style="color:green">【OK】</a>
<a style="color:green">{{subItem.SubList[0].RemainingInventory>-3?"【OK】":"【暂定】"}}</a>
【<a
style="color:green"> 本团使用库存：{{subItem.SubList[0].UseCount}}
{{subItem.SubList[0].CostPrice!=0?"价格:"+subItem.SubList[0].CostPrice:""}}</a>】</div>
......@@ -576,6 +577,16 @@
</template>
</template>
</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>
</table>
</div>
......@@ -1131,7 +1142,6 @@
//新获取列表数据
getControlList() {
var msg = JSON.parse(JSON.stringify(this.queryMsg))
if (msg.TeamMinNum == '') {
msg.TeamMinNum = -1
......
src/components/activity/FreelineManagement.vue
View file @ 835196e0
......@@ -700,7 +700,7 @@
//出团公司集合
OutBranchIds: [],
pageIndex: 1,
pageSize: 10,
pageSize: 5,
LineId: 0,
LineIdList: [],
LineteamId: 0,
......
src/components/activity/RegimentLabel.vue
View file @ 835196e0
......@@ -14,23 +14,23 @@
<template>
<div class="flexOne">
<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>
<table style="margin-top:10px" class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
<tr>
<th>排序</th>
<th>标签名</th>
<th>排序</th>
<th>操作</th>
</tr>
<tr v-for="item in dataList" :key="item.SNO">
<td>{{item.SNO}}</td>
<tr v-for="(item,index) in dataList" :key="index+100">
<td>{{item.Content}}</td>
<td>{{item.SNO}}</td>
<td>
<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 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>
</td>
......@@ -38,24 +38,28 @@
</table>
<!-- <el-pagination background @current-change="handleCurrentChange" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination> -->
<el-dialog custom-class='w400' title="团期标签" :visible.sync="LabelVisible">
<el-form :model="pwdMsg" label-width="100px" :rules="rulesPwd" ref="pwdMsg">
<el-form-item label="标签类型" prop="EmName">
<el-input class='w217' type="text" v-model="addMsg.EmName" :placeholder="$t('pub.pleaseImport')" readonly></el-input>
<el-dialog custom-class='w400' title="主题标签" :visible.sync="LabelVisible">
<el-form :model="pwdMsg" label-width="80px" :rules="rulesPwd" ref="pwdMsg">
<!-- <el-form-item label="标签类型" prop="Name">
<el-input class='w217' type="text" v-model="pwdMsg.Name" placeholder=""></el-input>
</el-form-item>
<el-form-item :label="$t('system.table_acc')" prop="EmAccount">
<el-input class='w217' type="text" v-model="addMsg.EmAccount" :placeholder="$t('pub.pleaseImport')" readonly></el-input>
<el-form-item label="团期类型" prop="Code">
<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 :label="$t('adm.adm_newPd')" prop="Pwd">
<el-input class='w217' type="password" v-model="pwdMsg.Pwd" :placeholder="$t('pub.pleaseImport')"></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 label="标签名" prop="Content">
<el-input class='w217' v-model="pwdMsg.Content" placeholder=""></el-input>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
<button class="hollowFixedBtn" @click="innerVisible=false,resetForm('pwdMsg')">{{$t('pub.cancelBtn')}}</button>
<button class="normalBtn" @click="submitForm1('pwdMsg')">{{$t('pub.sureBtn')}}</button>
<button class="hollowFixedBtn" @click="LabelVisible=false">取消</button>
<button class="normalBtn" @click="submitForm1('pwdMsg')">确定</button>
</div>
</el-dialog>
</div>
......@@ -71,21 +75,86 @@
},
dataList:[],
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() {
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();
}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(){},
getList(){
this.apipost('travel_get_GetTravelPriceTag',this.msg,res=>{
console.log("res",res);
if(res.data.resultCode==1){
this.dataList=res.data.data;
}else{}
......
src/components/activity/Rotationchart.vue
View file @ 835196e0
......@@ -40,8 +40,8 @@
display: block;
}
.Rotationchart .imgList ul li .img_box .zezhao i{
font-size: 28px;
margin:0 10px;
font-size: 20px;
/* margin:0 10px; */
}
.Rotationchart .imgList ul li .img_box .free {
top: 15px;
......@@ -170,8 +170,14 @@
<span v-if="item.slideStatus==1" class="free" style="background: #20bf6b;">正常</span>
<span v-if="item.slideStatus==2" class="free" style="background: #E95252;">禁用</span>
<div class="zezhao">
<i class="el-icon-edit" title="编辑" @click.stop="EditImg(item)"></i>
<i class="el-icon-printer" slot="reference" title="修改状态" @click.stop="EditStatus(item)"></i>
<el-tooltip class="item" effect="dark" content="编辑" placement="top">
<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>
</li>
......@@ -191,7 +197,8 @@
title="修改状态"
:visible.sync="changestatus"
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="2"></el-option>
<el-option label="删除" :value="3"></el-option>
......
src/components/administrative/Temporarystaff.vue 0 → 100644
View file @ 835196e0
This diff is collapsed.
src/router/config.js
View file @ 835196e0
......@@ -258,6 +258,15 @@ export default {
title: '员工管理'
},
},
{
path: '/Temporarystaff', //员工管理
name: 'Temporarystaff',
component: resolve => require(['@/components/administrative/Temporarystaff'], resolve),
meta: {
title: '临时员工'
},
},
{
path: '/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