Skip to content

S
SuperMan
Commit 4c3754b3 authored by 吴春's avatar 吴春
Browse files
Options

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

parents ad458bbb e029f441
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1235 additions and 3855 deletions
src/components/FinancialModule/accountingWork.vue
View file @ 4c3754b3
...@@ -22,6 +22,21 @@ ...@@ -22,6 +22,21 @@
></el-option> ></el-option>
</el-select> </el-select>
</span> </span>
<span>
<em>线路</em>
<el-select class="w200"
filterable
v-model="msg.LineID"
>
<el-option :label="$t('system.ph_buxian')" value="-1"></el-option>
<el-option
v-for="(item,index) in LineList"
:label="item.LineName"
:value="item.LineID"
:key="index+60000"
></el-option>
</el-select>
</span>
</li> </li>
<li> <li>
<button class="normalBtn" @click="getList" >查询</button> <button class="normalBtn" @click="getList" >查询</button>
...@@ -42,6 +57,7 @@ ...@@ -42,6 +57,7 @@
<th>{{$t('system.query_company')}}</th> <th>{{$t('system.query_company')}}</th>
<th>{{$t('fnc.w_ywrenyuan')}}</th> <th>{{$t('fnc.w_ywrenyuan')}}</th>
<th>流程</th> <th>流程</th>
<th>线路</th>
<th>{{$t('fnc.w_fzfangxiang')}}</th> <th>{{$t('fnc.w_fzfangxiang')}}</th>
<th>{{$t('system.table_operation')}}</th> <th>{{$t('system.table_operation')}}</th>
</tr> </tr>
...@@ -54,6 +70,9 @@ ...@@ -54,6 +70,9 @@
<td> <td>
<span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span> <span v-for="(i,ix) in item.TemplateList" :key="ix+5000">{{i.Name}} <span v-if="ix!=item.TemplateList.length-1">,</span> </span>
</td> </td>
<td>
<span v-for="(i,ix) in item.LineList" :key="ix+7000">{{i.Name}} <span v-if="ix!=item.LineList.length-1">,</span> </span>
</td>
<td> <td>
<span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span> <span v-if="item.Direct==1">{{$t('fnc.shoukuan')}}</span>
<span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span> <span v-else-if="item.Direct==2">{{$t('fnc.zhikuan')}}</span>
...@@ -198,6 +217,24 @@ ...@@ -198,6 +217,24 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="5">
<el-form-item label="线路">
<el-select
v-model="addMsg.LineListArr"
filterable
multiple
collapse-tags
@change="$forceUpdate()"
:placeholder="$t('pub.pleaseImport')">
<el-option
v-for="(item,index) in LineList"
:key="index+700"
:label="item.LineName"
:value="item.LineID">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="6"> <el-col :span="6">
<el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct"> <el-form-item :label="$t('fnc.w_fzfangxiang')" prop="Direct">
<el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio> <el-radio v-model="addMsg.Direct" :label="1">{{$t('fnc.w_shou')}}</el-radio>
...@@ -245,6 +282,7 @@ export default { ...@@ -245,6 +282,7 @@ export default {
listArr:[], listArr:[],
BranchId:'', BranchId:'',
Direct:'', Direct:'',
LineList:[]
}, },
type:-1, type:-1,
addShow:false, addShow:false,
...@@ -299,6 +337,7 @@ export default { ...@@ -299,6 +337,7 @@ export default {
Status:'0', Status:'0',
}, },
SingleList:[], SingleList:[],
LineList:[],
} }
},created(){ },created(){
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -313,6 +352,7 @@ export default { ...@@ -313,6 +352,7 @@ export default {
this.tableSize = this.msg.pageSize = parseInt(cH/45); this.tableSize = this.msg.pageSize = parseInt(cH/45);
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.getSingleList(); this.getSingleList();
this.getLineList();
},methods:{ },methods:{
getSingleList(){ // 获取费用类型 getSingleList(){ // 获取费用类型
this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{ this.apipost('FinancialFlowTemplate_post_GetSingleList',{},res=>{
...@@ -321,6 +361,15 @@ export default { ...@@ -321,6 +361,15 @@ export default {
}else{} }else{}
},err=>{}) },err=>{})
}, },
getLineList(){
this.apipost("line_post_GetAllList", {}, res => {
if (res.data.resultCode == 1) {
this.LineList = res.data.data;
} else {
this.$message.error(res.data.message);
}
});
},
switchMethod(t){ switchMethod(t){
this.msg.pageIndex = 1; this.msg.pageIndex = 1;
if(t===1){ if(t===1){
...@@ -392,9 +441,22 @@ export default { ...@@ -392,9 +441,22 @@ export default {
} }
}) })
}) })
let LineListArr=this.addMsg.LineListArr;
let lineArr =[];
LineListArr.forEach(item=>{
this.LineList.forEach(val=>{
let obj={};
if(item==val.LineID){
obj.Id=val.LineID;
obj.Name=val.LineName;
lineArr.push(obj);
}
})
})
this.addMsg.emList = list4; this.addMsg.emList = list4;
this.addMsg.TemplateList = newArr; this.addMsg.TemplateList = newArr;
this.addMsg.LineList = lineArr;
this.apipost('Window_post_SetAccountant',this.addMsg,r=>{ this.apipost('Window_post_SetAccountant',this.addMsg,r=>{
if(r.data.resultCode==1){ if(r.data.resultCode==1){
this.$message.success(r.data.message); this.$message.success(r.data.message);
...@@ -478,6 +540,7 @@ export default { ...@@ -478,6 +540,7 @@ export default {
this.addMsg = data; this.addMsg = data;
this.addMsg.listArr = []; this.addMsg.listArr = [];
this.addMsg.TemplateListArr = []; this.addMsg.TemplateListArr = [];
this.addMsg.LineListArr=[];
if(data.emList&&data.emList.length>0){ if(data.emList&&data.emList.length>0){
data.emList.forEach(x=>{ data.emList.forEach(x=>{
this.remoteMethod(x.emName); this.remoteMethod(x.emName);
...@@ -489,6 +552,11 @@ export default { ...@@ -489,6 +552,11 @@ export default {
this.addMsg.TemplateListArr.push(x.Id) this.addMsg.TemplateListArr.push(x.Id)
}) })
} }
if(data.LineList&&data.LineList.length>0){
data.LineList.forEach(x=>{
this.addMsg.LineListArr.push(x.Id)
})
}
this.addMsg.accountant_list = []; this.addMsg.accountant_list = [];
this.addShow = true; this.addShow = true;
} else { } else {
...@@ -510,7 +578,9 @@ export default { ...@@ -510,7 +578,9 @@ export default {
TemplateListArr:[], TemplateListArr:[],
TemplateList:[], TemplateList:[],
BranchId:'', BranchId:'',
Direct:'' Direct:'',
LineList:[],
LineListArr:[]
} }
this.CostIdS = []; this.CostIdS = [];
this.searchList = []; this.searchList = [];
......
src/components/index.vue
View file @ 4c3754b3
...@@ -222,7 +222,7 @@ ...@@ -222,7 +222,7 @@
机票未绑团查看 机票未绑团查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true"> <el-dropdown-item v-if="ChangeThePriceList.length>0" class="clearfix _dropdown_other" @click.native="ChangeThePriceVisible=true">
<i class="iconfont icon-Newspaper" style="color:#f39c12"></i> <i class="iconfont icon-Newspaper" style="color:#f39c12"></i>
订单改价查看 订单改价查看
<i class="iconfont icon-right1"></i> <i class="iconfont icon-right1"></i>
...@@ -1247,6 +1247,7 @@ ...@@ -1247,6 +1247,7 @@
}, },
data() { data() {
return { return {
ChangeThePriceList: [],
ChangeThePriceData:[], ChangeThePriceData:[],
ChangeThePriceVisible: false,//改价提醒 ChangeThePriceVisible: false,//改价提醒
UnboundDate: {}, UnboundDate: {},
...@@ -1873,24 +1874,33 @@ ...@@ -1873,24 +1874,33 @@
} }
// 获取改价提醒 // 获取改价提醒 每月1到10号提示
if(!localStorage.getItem("ChangeThePriceDataTime")|| let DateTime = new Date();
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){ let Year = DateTime.getFullYear()
this.GetChangeThePrice() let Month = DateTime.getMonth()+1
}else{ let Months = Month>9?Month:'0'+Month
// if(localStorage.getItem("ChangeThePriceData")){ let StartDate = Year+'-'+Months+'-01'
// this.ChangeThePriceData = JSON.parse(localStorage.getItem("ChangeThePriceData")) let DateList = []
// } for(let i=0;i<10;i++){
DateList.push(this.getBeforeDate(-i, new Date(StartDate).Format("yyyy-MM-dd")))
} }
// 两小时请求一次改价提醒 this.ChangeThePriceList = DateList.filter(x=>{
setInterval(()=>{ return x==this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
if(!this.ChangeThePriceVisible){ })
if(this.ChangeThePriceList.length>0){
if(!localStorage.getItem("ChangeThePriceDataTime")||
(localStorage.getItem("ChangeThePriceDataTime")!=this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")))){
this.GetChangeThePrice() this.GetChangeThePrice()
}else{
clearInterval()
} }
},7200000) // 两小时请求一次改价提醒
setInterval(()=>{
if(!this.ChangeThePriceVisible){
this.GetChangeThePrice()
}else{
clearInterval()
}
},7200000)
}
}, },
created() { created() {
if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) { if (!localStorage.getItem("tsNumber") || localStorage.getItem("tsNumber") != this.tsNumber) {
......
src/components/myOrdersAllType/components/allListExaminePrice.vue deleted 100644 → 0
View file @ ad458bbb
<style scoped>
.groupTourOrder_count{
display: flex;
flex-wrap: wrap;
}
.groupTourOrder_count>div{
margin-right: 20px;
}
.groupTourOrder_count>div:last-child{
margin-right: 0;
}
.groupTourOrder_count_item{
max-width: 500px;
}
.groupTourOrder_count_item>p>span{
margin: 0;
}
.color_red_order{
color: red;
}
.HT_total{
display: flex;
flex-direction: column;
margin: 5px 0;
}
.HT_total p{
width: 100%;
display: block;
}
.HT_total p>span{
float: left;
display: inline-block;
/* width: 25%; */
margin-right: 20px;
}
.HT_total p>span:last-child{
margin-right: 0;
}
.TC_leftSearch>div{
padding: 5px 0;
}
.groupTourOrderByTuan_ico{
margin-left: 5px;
}
.groupTourOrderByTuan_ico>i{
display: inline-block;
margin: 0 5px 0 0;
width: 8px;
height: 8px;
border-radius: 2px;
vertical-align: middle;
}
.HotelWorkList .has-gutter tr th,
.el-table th.is-leaf {
background-color: #EAEAEA !important;
}
.HotelWorkList .HW_hotelDialog {
width: 900px;
}
.HotelWorkList .Hw_tableOne {
width: 100%;
height: 40px;
background-color: #EAEAEA;
}
.HotelWorkList .Hw_tableOne th {
text-align: center;
}
.HotelWorkList .HotelWorkInput .el-input {
width: 223px;
}
.HotelWorkList .HworkInput .el-input {
width: 210px;
}
/deep/.query-box li span>em{
min-width: 60px;
}
</style>
<template>
<div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul>
<li>
<span>
<em>审核状态</em>
<el-select v-model='msg.OrderState' class="w200">
<!-- <el-option :value="0" label="不限"></el-option> -->
<el-option v-for='item in OrderStatusList'
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option>
</el-select>
</span>
</li>
<li >
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false" />
</li>
<li style="line-height: 30px; padding-left: 30px;">
</li>
</ul>
</div>
<!-- 统计版块 -->
<OrderList :pagesTitle="Title" :OrderList="OrderList" v-loading="loading" @success="msg.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">暂无数据</div>
<el-pagination v-if="OrderList&&OrderList.length>0" background @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total=total>
</el-pagination>
</div>
</template>
<script>
import OrderList from './OrderListExaminePrice.vue';
export default {
props:['pagesTitle','dataObj'],
components: { OrderList },
data() {
return {
CommissionTypeList:[
{Name: '不限',Id:'-1'},
{Name: '出境提成',Id:'1'},
{Name: '国内提成',Id:'2'},
],
employeeMsg:{ // 员工
GroupId:'',
BranchId:-1,
DepartmentId:0,
PostId:0,
IsLeave:0,
},
showWarningSearch: false,
TotalMsg: null,
MultipleChoiceList: [ //多选项目
{
Name: '机票',
Id: '1'
}, {
Name: '签证',
Id: '2'
}, {
Name: '地接',
Id: '3'
}, {
Name: '套餐',
Id: '4'
}, {
Name: '其他',
Id: '5'
}
],
userInfo: {},
HotelList: [],
loading: false,
isShow: false,
outerVisible: false,
//订单列表
OrderList: [],
//默认高度
tableHeight: 0,
msg:{
pageIndex: 1,
pageSize: 15,
OrderId: "", //订单id
OrderState: '0', //订单状态
OrderType: "0",//订单类型
},
total: 0,
currentPage: 1,
OrderTypeList:[],
orderType:[
{Name: this.$t('OrderList.orderType.tour'),ID:'1'},
{Name: this.$t('OrderList.orderType.guest'),ID:'2'},
],
Title:'',
OrderStatusList: [
{ Name: "不限", Id: "0" },
{ Name: "待审核", Id: "1" },
{ Name: "已通过", Id: "2" },
{ Name: "已取消", Id: "3" },
]
};
},
watch: {
pagesTitle(val,oldval){
this.Title = val
},
dataObj:{
handler(val, oldVal) {
this.msg.OrderType = val.tab
this.msg.OrderId = val.OrderId
this.GetList()
},
deep: true,
}
},
methods: {
//获取酒店订单列表
GetList() {
this.loading = true
let url = "CarSingle_post_GetExaminePriceOrderPageList"
this.apipost(url, this.msg,
res => {
if (res.data.resultCode == 1) {
let data = res.data.data.pageData
this.OrderList = data;
this.total = res.data.data.count;
// this.TotalMsg = res.data.data.StatModel
}else {
this.Error(res.data.message);
}
this.loading = false
},
err => {this.loading = false}
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.GetList();
},
com_onresize() {
//clientHeight的值由DIV内容的实际高度和CSS中的padding值决定，
var contentsHeight = document.body.clientHeight;
var h = contentsHeight - 50 - 180 - 40;
if (h < 110) {
return;
}
//设置table的行高
this.tableHeight = h;
},
},
created() {
let userInfo=this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
if(this.$route.query.OrderId){
this.msg.OrderId=this.$route.query.OrderId
this.msg.OrderState = '0'
}
},
mounted() {
this.userInfo = this.getLocalStorage();
this.GetList();
//自适应高度调节
this.com_onresize();
window.onresize = () => {
this.com_onresize();
}
},
};
</script>
src/components/myOrdersAllType/erpChangePricehOrder.vue
View file @ 4c3754b3
...@@ -7,12 +7,13 @@ ...@@ -7,12 +7,13 @@
</div> </div>
</template> </template>
<script> <script>
import allList from './components/allListChangePrice.vue'; // import allList from './components/allListChangePrice.vue';
import allList from './components/allList.vue';
export default { export default {
components: { allList }, components: { allList },
data() { data() {
return { return {
pagesTitle: '销售', pagesTitle: '申请',
dataObj:{ dataObj:{
OrderId: '', OrderId: '',
} }
...@@ -20,14 +21,14 @@ ...@@ -20,14 +21,14 @@
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
}, },
}, },
methods: { methods: {
}, },
created() { created() {
}, },
mounted() { mounted() {
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
......
src/components/myOrdersAllType/erpExaminePricehOrder.vue
View file @ 4c3754b3
...@@ -7,12 +7,13 @@ ...@@ -7,12 +7,13 @@
</div> </div>
</template> </template>
<script> <script>
import allList from './components/allListExaminePrice.vue'; // import allList from './components/allListExaminePrice.vue';
import allList from './components/allList.vue';
export default { export default {
components: { allList }, components: { allList },
data() { data() {
return { return {
pagesTitle: '销售', pagesTitle: '审核',
dataObj:{ dataObj:{
OrderId: '', OrderId: '',
} }
...@@ -20,14 +21,14 @@ ...@@ -20,14 +21,14 @@
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val,oldval){
}, },
}, },
methods: { methods: {
}, },
created() { created() {
}, },
mounted() { mounted() {
if(this.$route.query.OrderId){ if(this.$route.query.OrderId){
......
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