Skip to content

S
SuperMan
Commit f654874c authored by 黄奎's avatar 黄奎
Browse files
Options

前端调整

parent a57312e0
Show whitespace changes
Inline Side-by-side
Showing with 1216 additions and 1160 deletions
src/components/FinancialModule/ServiceCommission/ServiceTheRules.vue
View file @ f654874c
...@@ -111,21 +111,10 @@ ...@@ -111,21 +111,10 @@
<template slot="append">%</template> <template slot="append">%</template>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item :label="$t('objFill.v101.FinancialModule.jietuanshr')" prop="AuditEmpId" > <el-form-item :label="$t('objFill.v101.FinancialModule.jietuanshr')" prop="AuditEmpId">
<el-select <el-select v-model="addMsg.AuditEmpId" filterable remote reserve-keyword :placeholder="$t('pub.pleaseImport')"
v-model="addMsg.AuditEmpId" :remote-method="remoteMethod" @change="getpersonnel">
filterable <el-option v-for="item in searchList" :key="item.empId" :label="item.name" :value="item.empId">
remote
reserve-keyword
:placeholder="$t('pub.pleaseImport')"
:remote-method="remoteMethod"
@change="getpersonnel"
>
<el-option
v-for="item in searchList"
:key="item.empId"
:label="item.name"
:value="item.empId">
<span style="float: left">{{ item.name }}</span> <span style="float: left">{{ item.name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span> <span style="float: right; color: #8492a6; font-size: 13px">{{ item.postName }}</span>
</el-option> </el-option>
...@@ -142,8 +131,8 @@ ...@@ -142,8 +131,8 @@
</div> </div>
</template> </template>
<script> <script>
import Vue from "vue"; import Vue from "vue";
const addobj = { const addobj = {
Id: 0, Id: 0,
...@@ -173,7 +162,7 @@ ...@@ -173,7 +162,7 @@
// RuleName: '', // RuleName: '',
// LineId: 0, // LineId: 0,
}, },
searchList:[],//人员 searchList: [], //人员
loading: false, //加载层 loading: false, //加载层
DataList: [], DataList: [],
total: 0, total: 0,
...@@ -332,17 +321,19 @@ ...@@ -332,17 +321,19 @@
}, },
remoteMethod(query) { // 审核人模糊查询 remoteMethod(query) { // 审核人模糊查询
if (query !== '') { if (query !== '') {
this.apipost("admin_Get_Chat_All_SelectEmpName",{ EmName:query },res => { this.apipost("admin_Get_Chat_All_SelectEmpName", {
EmName: query
}, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.searchList = res.data.data; this.searchList = res.data.data;
} }
},err => {}); }, err => {});
} else { } else {
this.searchList = []; this.searchList = [];
} }
}, },
getpersonnel(){ getpersonnel() {
for(let i = 0;i<this.searchList.length;i++){ for (let i = 0; i < this.searchList.length; i++) {
// let x = this.searchList[i] // let x = this.searchList[i]
// if(x.empId == this.addMsg.AuditEmpId){ // if(x.empId == this.addMsg.AuditEmpId){
// this.addMsg.TempTypeList[y].Name = x.name; // this.addMsg.TempTypeList[y].Name = x.name;
...@@ -357,20 +348,22 @@ ...@@ -357,20 +348,22 @@
} }
}; };
</script> </script>
<style scoped> <style scoped>
/* .rule-box .el-select__tags{ /* .rule-box .el-select__tags{
top: 100%; top: 100%;
} */ } */
.domesticCommissionRule .query-box input { .domesticCommissionRule .query-box input {
height: 34px !important; height: 34px !important;
} }
.tdOne{
.tdOne {
border-bottom: 1px solid #eeeeee; border-bottom: 1px solid #eeeeee;
line-height: 25px; line-height: 25px;
} }
.tdTwo{
.tdTwo {
line-height: 25px; line-height: 25px;
} }
</style> </style>
src/components/WebSet/WebSiteEdit.vue
View file @ f654874c
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
</div> </div>
</div> </div>
<el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px"> <el-dialog :title="commonTitle" :visible.sync="isShowDialog" width="1000px">
{{currentEditItem}}
<!--视频--> <!--视频-->
<plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog> <plugvideodialog v-if="currentEditItem.Id=='white_label_video'" :plugData="currentEditItemData"></plugvideodialog>
<!--轮播图--> <!--轮播图-->
......
src/components/WebSet/classification.vue
View file @ f654874c
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
<el-input v-model='msg.CategoryName' class="permiss-input" :placeholder="$t('fnc.qsrneirong')"></el-input> <el-input v-model='msg.CategoryName' class="permiss-input" :placeholder="$t('fnc.qsrneirong')"></el-input>
</span> </span>
</li> </li>
<li> <li>
<span><em>{{$t('objFill.cengji')}}</em> <span><em>{{$t('objFill.cengji')}}</em>
<el-select v-model="msg.Level" :placeholder="$t('pub.pleaseSel')"> <el-select v-model="msg.Level" :placeholder="$t('pub.pleaseSel')">
...@@ -43,12 +42,11 @@ ...@@ -43,12 +42,11 @@
<input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')" <input type="button" class="hollowFixedBtn" name="" id="" :value="$t('pub.searchBtn')"
@click="resetPageIndex(),getList()" /> @click="resetPageIndex(),getList()" />
<input type="button" <input type="button"
@click="outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage(),getLineList(),getAllAreaTreeList(0),getLineTeamList();" @click="outerVisible = true,dialogTitle=$t('objFill.v101.xinzengfl'),clearMessage() ,getAllAreaTreeList(0),getLineTeamList();"
class="normalBtn" :value="$t('pub.addBtn')" /> class="normalBtn" :value="$t('pub.addBtn')" />
</li> </li>
</ul> </ul>
</div> </div>
<el-table :data="DataList" style="width:100%" v-loading='loading'> <el-table :data="DataList" style="width:100%" v-loading='loading'>
<el-table-column fixed :label="$t('ground.fenleimc')"> <el-table-column fixed :label="$t('ground.fenleimc')">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -85,23 +83,21 @@ ...@@ -85,23 +83,21 @@
<template slot-scope="scope"> <template slot-scope="scope">
<template v-if="scope.row.AreaList&&scope.row.AreaList.length>0"> <template v-if="scope.row.AreaList&&scope.row.AreaList.length>0">
<div> <div>
<span v-for="(file,fIndex) in scope.row.AreaList"> <span v-for="(file,fIndex) in scope.row.AreaList" :key="`d_`+scope.row.Id+`_a_`+fIndex">
{{file.Name}}{{(fIndex== (scope.row.AreaList.length-1)&&scope.row.AreaList.length>1)?"":","}} {{file.Name}}{{(fIndex== (scope.row.AreaList.length-1)&&scope.row.AreaList.length>1)?"":","}}
</span> </span>
</div> </div>
</template> </template>
<template v-if="scope.row.LineList&&scope.row.LineList.length>0"> <template v-if="scope.row.LineList&&scope.row.LineList.length>0">
<div> <div>
<span v-for="(file,fIndex) in scope.row.LineList"> <span v-for="(file,fIndex) in scope.row.LineList" :key="`d_`+scope.row.Id+`_l_`+fIndex">
{{file.Name}}{{(fIndex== (scope.row.LineList.length-1)&&scope.row.LineList.length>1)?"":","}} {{file.Name}}{{(fIndex== (scope.row.LineList.length-1)&&scope.row.LineList.length>1)?"":","}}
</span> </span>
</div> </div>
</template> </template>
<template v-if="scope.row.SeriesList&&scope.row.SeriesList.length>0"> <template v-if="scope.row.SeriesList&&scope.row.SeriesList.length>0">
<div> <div>
<span v-for="(file,fIndex) in scope.row.SeriesList"> <span v-for="(file,fIndex) in scope.row.SeriesList" :key="`d_`+scope.row.Id+`_s_`+fIndex">
{{file.Name}}{{(fIndex== (scope.row.SeriesList.length-1)&&scope.row.SeriesList.length>1)?"":","}} {{file.Name}}{{(fIndex== (scope.row.SeriesList.length-1)&&scope.row.SeriesList.length>1)?"":","}}
</span> </span>
</div> </div>
...@@ -116,7 +112,6 @@ ...@@ -116,7 +112,6 @@
</el-table-column> </el-table-column>
<el-table-column fixed :label="$t('objFill.v101.activity.col6.t8')"> <el-table-column fixed :label="$t('objFill.v101.activity.col6.t8')">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- style="width: 100px; height: 100px" -->
<el-image class="icon" :src="scope.row.Icon" :preview-src-list="[scope.row.Icon]"> </el-image> <el-image class="icon" :src="scope.row.Icon" :preview-src-list="[scope.row.Icon]"> </el-image>
</template> </template>
</el-table-column> </el-table-column>
...@@ -124,7 +119,6 @@ ...@@ -124,7 +119,6 @@
<template slot-scope="scope"> <template slot-scope="scope">
<el-image class="icon" :src="scope.row.BackgroundImage" :preview-src-list="[scope.row.BackgroundImage]"> <el-image class="icon" :src="scope.row.BackgroundImage" :preview-src-list="[scope.row.BackgroundImage]">
</el-image> </el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed :label="$t('admin.admin_status')"> <el-table-column fixed :label="$t('admin.admin_status')">
...@@ -149,11 +143,11 @@ ...@@ -149,11 +143,11 @@
</el-table> </el-table>
<el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage" <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
layout="total,prev, pager, next, jumper" :page-size=msg.pageSize :total='total'> layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination> </el-pagination>
<el-dialog :title="dialogTitle" :visible.sync="outerVisible" center width="1000px" <el-dialog :title="dialogTitle" :visible.sync="outerVisible" center width="1000px"
:before-close="closeChangeMachie"> :before-close="closeChangeMachie" append-to-body>
<el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px"> <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
...@@ -216,7 +210,7 @@ ...@@ -216,7 +210,7 @@
<template v-if="addMsg.Level==1"> <template v-if="addMsg.Level==1">
<el-form-item :label="$t('system.table_ssLine')"> <el-form-item :label="$t('system.table_ssLine')">
<el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.LineIdList" multiple collapse-tags <el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.LineIdList" multiple collapse-tags
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
:key="item.LineID"></el-option> :key="item.LineID"></el-option>
...@@ -226,8 +220,8 @@ ...@@ -226,8 +220,8 @@
<template v-else> <template v-else>
<el-form-item :label="$t('active.ad_xlmc')"> <el-form-item :label="$t('active.ad_xlmc')">
<el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.SeriesIdList" multiple collapse-tags <el-select :disabled="addMsg.IsLock === 1" v-model="addMsg.SeriesIdList" multiple collapse-tags
:placeholder="$t('pub.pleaseSel')"> :placeholder="$t('pub.pleaseSel')" filterable>
<el-option :label="$t('pub.unlimitedSel')" :value=queryCommonData.SelectDefaultValue></el-option> <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
<el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID" <el-option v-for="item in queryCommonData.LineTeamList" :label="item.LtName" :value="item.LtID"
:key="item.LtID"></el-option> :key="item.LtID"></el-option>
</el-select> </el-select>
...@@ -248,7 +242,6 @@ ...@@ -248,7 +242,6 @@
</template> </template>
</el-col> </el-col>
</el-row> </el-row>
<el-row> <el-row>
<el-col :span="12"> <el-col :span="12">
<el-form-item :label="$t('objFill.v101.activity.col6.t8')"> <el-form-item :label="$t('objFill.v101.activity.col6.t8')">
...@@ -261,15 +254,12 @@ ...@@ -261,15 +254,12 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</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;
<button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button> <button class="hollowFixedBtn" @click="outerVisible = false">{{$t('pub.cancelBtn')}}</button>
</div> </div>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
...@@ -329,6 +319,7 @@ ...@@ -329,6 +319,7 @@
LineIdList: [], LineIdList: [],
SeriesIdList: [], SeriesIdList: [],
IsSelfGuidedTour: 0, IsSelfGuidedTour: 0,
LinkUrl:"",//页面地址
}, },
rules: { rules: {
CategoryName: [{ CategoryName: [{
...@@ -345,6 +336,7 @@ ...@@ -345,6 +336,7 @@
} }
}, },
mounted() { mounted() {
this.getLineList();
this.getList(); this.getList();
}, },
methods: { methods: {
...@@ -373,12 +365,8 @@ ...@@ -373,12 +365,8 @@
this.chooseCategroyArray = arr; this.chooseCategroyArray = arr;
this.showCategoryName = arrLabel; this.showCategoryName = arrLabel;
}, },
getLineList() { //获取线路列表 getLineList() { //获取线路列表
this.apipost( this.apipost("line_post_GetAllList", {},
"line_post_GetList", {
LineDirection: 2
},
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.queryCommonData.LineList = res.data.data; this.queryCommonData.LineList = res.data.data;
...@@ -457,7 +445,6 @@ ...@@ -457,7 +445,6 @@
this.addMsg.AreaIdList = []; this.addMsg.AreaIdList = [];
} else { } else {
this.getCateGoryList(); this.getCateGoryList();
} }
}, },
changeSelfGuidedTour() { changeSelfGuidedTour() {
...@@ -476,7 +463,6 @@ ...@@ -476,7 +463,6 @@
lineIds = this.cateGoryList[index].LineIds; lineIds = this.cateGoryList[index].LineIds;
} }
this.getLineTeamList(lineIds); this.getLineTeamList(lineIds);
} }
}, },
getCateGoryList() { getCateGoryList() {
...@@ -500,7 +486,6 @@ ...@@ -500,7 +486,6 @@
this.$message.error(this.$t('objFill.v101.qingxzfujifl')); this.$message.error(this.$t('objFill.v101.qingxzfujifl'));
return return
} }
let params = { let params = {
...this.addMsg ...this.addMsg
} }
...@@ -519,9 +504,7 @@ ...@@ -519,9 +504,7 @@
}) })
} }
params.AreaIds = tempCategory.substring(0, tempCategory.lastIndexOf(',')); params.AreaIds = tempCategory.substring(0, tempCategory.lastIndexOf(','));
// if(params.AreaList&&params.AreaList.length>0){
// params.AreaIds=params.AreaList.toString();
// }
this.apipost('ws_post_SetCategory', params, res => { this.apipost('ws_post_SetCategory', params, res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.outerVisible = false; this.outerVisible = false;
...@@ -536,7 +519,6 @@ ...@@ -536,7 +519,6 @@
updateData({ updateData({
Id Id
}) { //修改 }) { //修改
this.getLineList();
this.apipost('ws_post_GetCategory', { this.apipost('ws_post_GetCategory', {
Id Id
...@@ -607,7 +589,6 @@ ...@@ -607,7 +589,6 @@
.ImageList.length > 0) { .ImageList.length > 0) {
this.$refs.BackgroundImage.ImageList = [] this.$refs.BackgroundImage.ImageList = []
} }
//this.$refs.tree.setCheckedKeys([]);
}, },
resetPageIndex() { resetPageIndex() {
this.msg.pageIndex = 1 this.msg.pageIndex = 1
...@@ -630,7 +611,6 @@ ...@@ -630,7 +611,6 @@
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
} }
} }
} }
</script> </script>
src/components/WebSet/home/indexRoll2.vue
View file @ f654874c
...@@ -300,6 +300,9 @@ ...@@ -300,6 +300,9 @@
if (chooseMenuObj) { if (chooseMenuObj) {
this.clickItem.SubName = chooseMenuObj.MenuName; this.clickItem.SubName = chooseMenuObj.MenuName;
this.clickItem.LinkUrl = chooseMenuObj.MenuUrl; this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
this.clickItem.FileUrl = chooseMenuObj.ImgUrl;
}
} }
this.$refs.chooseMenu.initMenuCheck(); this.$refs.chooseMenu.initMenuCheck();
}, },
......
src/components/WebSet/home/indexSlider1.vue
View file @ f654874c
...@@ -309,6 +309,9 @@ ...@@ -309,6 +309,9 @@
if (chooseMenuObj) { if (chooseMenuObj) {
this.clickItem.SubName = chooseMenuObj.MenuName; this.clickItem.SubName = chooseMenuObj.MenuName;
this.clickItem.LinkUrl = chooseMenuObj.MenuUrl; this.clickItem.LinkUrl = chooseMenuObj.MenuUrl;
if (chooseMenuObj.ImgUrl && chooseMenuObj.ImgUrl != '') {
this.clickItem.FileUrl = chooseMenuObj.ImgUrl;
}
} }
this.$refs.chooseMenu.initMenuCheck(); this.$refs.chooseMenu.initMenuCheck();
}, },
......
src/components/myOrdersAllType/components/allList.vue
View file @ f654874c
<style scoped> <style scoped>
.groupTourOrder_count{ .groupTourOrder_count {
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
} }
.groupTourOrder_count>div{
.groupTourOrder_count>div {
margin-right: 20px; margin-right: 20px;
} }
.groupTourOrder_count>div:last-child{
.groupTourOrder_count>div:last-child {
margin-right: 0; margin-right: 0;
} }
.groupTourOrder_count_item{
.groupTourOrder_count_item {
max-width: 500px; max-width: 500px;
} }
.groupTourOrder_count_item>p>span{
.groupTourOrder_count_item>p>span {
margin: 0; margin: 0;
} }
.color_red_order{
.color_red_order {
color: red; color: red;
} }
.HT_total{
.HT_total {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
margin: 5px 0; margin: 5px 0;
} }
.HT_total p{
.HT_total p {
width: 100%; width: 100%;
display: block; display: block;
} }
.HT_total p>span{
.HT_total p>span {
float: left; float: left;
display: inline-block; display: inline-block;
/* width: 25%; */ /* width: 25%; */
margin-right: 20px; margin-right: 20px;
} }
.HT_total p>span:last-child{
.HT_total p>span:last-child {
margin-right: 0; margin-right: 0;
} }
.TC_leftSearch>div{
.TC_leftSearch>div {
padding: 5px 0; padding: 5px 0;
} }
.groupTourOrderByTuan_ico{
.groupTourOrderByTuan_ico {
margin-left: 5px; margin-left: 5px;
} }
.groupTourOrderByTuan_ico>i{
.groupTourOrderByTuan_ico>i {
display: inline-block; display: inline-block;
margin: 0 5px 0 0; margin: 0 5px 0 0;
width: 8px; width: 8px;
...@@ -51,6 +63,7 @@ ...@@ -51,6 +63,7 @@
border-radius: 2px; border-radius: 2px;
vertical-align: middle; vertical-align: middle;
} }
.HotelWorkList .has-gutter tr th, .HotelWorkList .has-gutter tr th,
.el-table th.is-leaf { .el-table th.is-leaf {
background-color: #EAEAEA !important; background-color: #EAEAEA !important;
...@@ -77,13 +90,14 @@ ...@@ -77,13 +90,14 @@
.HotelWorkList .HworkInput .el-input { .HotelWorkList .HworkInput .el-input {
width: 210px; width: 210px;
} }
/deep/.query-box li span>em{
/deep/.query-box li span>em {
min-width: 60px; min-width: 60px;
} }
</style> </style>
<template> <template>
<div class="HotelWorkList"> <div class="HotelWorkList">
<div class="query-box HotelWorkInput" style="border-bottom: none;"> <div class="query-box HotelWorkInput" style="border-bottom: none;">
<ul> <ul>
...@@ -92,10 +106,7 @@ ...@@ -92,10 +106,7 @@
<em>{{$t('fnc.shzhuangtai')}}</em> <em>{{$t('fnc.shzhuangtai')}}</em>
<el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()"> <el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> --> <!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in TicketStatusList2' <el-option v-for='item in TicketStatusList2' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -105,10 +116,7 @@ ...@@ -105,10 +116,7 @@
<em>{{$t('fnc.shzhuangtai')}}</em> <em>{{$t('fnc.shzhuangtai')}}</em>
<el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()"> <el-select v-model='msg2.TicketStatus' class="w200" @change="msg2.papageIndex==1,GetList()">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> --> <!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in TicketStatusList3' <el-option v-for='item in TicketStatusList3' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -118,32 +126,31 @@ ...@@ -118,32 +126,31 @@
<em>{{$t('salesModule.ApplyStatus')}}</em> <em>{{$t('salesModule.ApplyStatus')}}</em>
<el-select v-model='msg.TicketStatus' class="w200"> <el-select v-model='msg.TicketStatus' class="w200">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> --> <!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in TicketStatusList' <el-option v-for='item in TicketStatusList' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'"> <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
<span><em>{{$t('MarketingActi.commName')}}</em> <span><em>{{$t('MarketingActi.commName')}}</em>
<el-input clearable type="" v-model="msg.ProductName" :placeholder="$t('ground.qingsrspmc')" class="w200"/> <el-input clearable type="" v-model="msg.ProductName" :placeholder="$t('ground.qingsrspmc')" class="w200" />
</span> </span>
</li> </li>
<li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'"> <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
<span><em>{{$t('objFill.orderid')}}</em> <span><em>{{$t('objFill.orderid')}}</em>
<el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg.OrderId" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrddid')" class="w200"/> <el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg.OrderId"
:placeholder="$t('objFill.v101.myOrdersAllType.qingsrddid')" class="w200" />
</span> </span>
</li> </li>
<li v-if="Title=='审核'"> <li v-if="Title=='审核'">
<span><em>{{$t('objFill.orderid')}}</em> <span><em>{{$t('objFill.orderid')}}</em>
<el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg2.OrderId" :placeholder="$t('objFill.v101.myOrdersAllType.qingsrddid')" class="w200"/> <el-input clearable type="Number" @keyup.native="checkInteger(msg2,'OrderId')" v-model="msg2.OrderId"
:placeholder="$t('objFill.v101.myOrdersAllType.qingsrddid')" class="w200" />
</span> </span>
</li> </li>
<li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'"> <li v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
<span><em>{{$t('visa.v_tuanhao')}}</em> <span><em>{{$t('visa.v_tuanhao')}}</em>
<el-input clearable type="" v-model="msg.TCNUM" :placeholder="$t('visa.v_shurutuanhao')" class="w200"/> <el-input clearable type="" v-model="msg.TCNUM" :placeholder="$t('visa.v_shurutuanhao')" class="w200" />
</span> </span>
</li> </li>
<template v-if="Title=='审核'||Title=='查看'"> <template v-if="Title=='审核'||Title=='查看'">
...@@ -152,12 +159,7 @@ ...@@ -152,12 +159,7 @@
<em>{{$t('sm.company')}}</em> <em>{{$t('sm.company')}}</em>
<el-select filterable v-model='msg2.RB_Branch_Id' class="w200"> <el-select filterable v-model='msg2.RB_Branch_Id' class="w200">
<el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option> <el-option value="-1" :label="$t('pub.unlimitedSel')"></el-option>
<el-option <el-option v-for="item in companyList" :label='item.BName' :value='item.Id' :key='item.Id'></el-option>
v-for="item in companyList"
:label='item.BName'
:value='item.Id'
:key='item.Id'
></el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
...@@ -166,9 +168,7 @@ ...@@ -166,9 +168,7 @@
<em>{{$t('visa.v_yewuyuan')}}</em> <em>{{$t('visa.v_yewuyuan')}}</em>
<el-select filterable v-model='msg2.EnterId' class="w200"> <el-select filterable v-model='msg2.EnterId' class="w200">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -186,7 +186,9 @@ ...@@ -186,7 +186,9 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> --> </el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}" style="width: 210px;"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="DatelistUse"
@change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}" style="width: 210px;">
</StartDateLimit>
</span> </span>
</li> </li>
</template> </template>
...@@ -196,9 +198,7 @@ ...@@ -196,9 +198,7 @@
<em>{{$t('visa.v_yewuyuan')}}</em> <em>{{$t('visa.v_yewuyuan')}}</em>
<el-select filterable v-model='msg.EnterId' class="w200" clearable> <el-select filterable v-model='msg.EnterId' class="w200" clearable>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -209,9 +209,7 @@ ...@@ -209,9 +209,7 @@
<em>{{$t('objFill.yinliuren')}}</em> <em>{{$t('objFill.yinliuren')}}</em>
<el-select filterable v-model='msg.LureEmpId' class="w200" clearable> <el-select filterable v-model='msg.LureEmpId' class="w200" clearable>
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in EmployeeList' <el-option v-for='item in EmployeeList' :label='item.EmName' :value='item.EmployeeId'
:label='item.EmName'
:value='item.EmployeeId'
:key='item.EmployeeId'> :key='item.EmployeeId'>
</el-option> </el-option>
</el-select> </el-select>
...@@ -232,10 +230,7 @@ ...@@ -232,10 +230,7 @@
<em>{{$t('hotel.hotel_OrderStates')}}</em> <em>{{$t('hotel.hotel_OrderStates')}}</em>
<el-select v-model='msg.OrderState' class="w200"> <el-select v-model='msg.OrderState' class="w200">
<!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> --> <!-- <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> -->
<el-option v-for='item in OrderStatusList' <el-option v-for='item in OrderStatusList' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -244,10 +239,7 @@ ...@@ -244,10 +239,7 @@
<span> <span>
<em>{{$t('salesModule.PaymentStatus')}}</em> <em>{{$t('salesModule.PaymentStatus')}}</em>
<el-select v-model='msg.Q_IsCollect' class="w200"> <el-select v-model='msg.Q_IsCollect' class="w200">
<el-option v-for='item in QIsCollectList' <el-option v-for='item in QIsCollectList' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
...@@ -265,7 +257,8 @@ ...@@ -265,7 +257,8 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesBM"> :end-placeholder="$t('OrderList.end')" @change="getDatesBM">
</el-date-picker> --> </el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="DatelistBM" @change="(startDate,endDate)=>{msg.StartTime=startDate,msg.EndTime=endDate}"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="DatelistBM"
@change="(startDate,endDate)=>{msg.StartTime=startDate,msg.EndTime=endDate}"></StartDateLimit>
</span> </span>
</li> </li>
<li v-if="Title=='申请'"> <li v-if="Title=='申请'">
...@@ -280,7 +273,8 @@ ...@@ -280,7 +273,8 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> --> </el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="DatelistUse"
@change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
</span> </span>
</li> </li>
<li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'&&Title!='查看'"> <li style="line-height: 30px; padding-left: 30px;" v-if="Title!='申请'&&Title!='审核'&&Title!='查看'">
...@@ -294,10 +288,7 @@ ...@@ -294,10 +288,7 @@
<span style="width: 100px;display: inline-block;">{{$t('advmanager.v_line')}}</span> <span style="width: 100px;display: inline-block;">{{$t('advmanager.v_line')}}</span>
<el-select v-model='msg.LineId' style="width: 210px;"> <el-select v-model='msg.LineId' style="width: 210px;">
<el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option> <el-option :value="0" :label="$t('pub.unlimitedSel')"></el-option>
<el-option v-for='item in LineList' <el-option v-for='item in LineList' :label='item.LineName' :value='item.LineID' :key='item.LineID'>
:label='item.LineName'
:value='item.LineID'
:key='item.LineID'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
...@@ -316,7 +307,9 @@ ...@@ -316,7 +307,9 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDatesUse"> :end-placeholder="$t('OrderList.end')" @change="getDatesUse">
</el-date-picker> --> </el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}" style="width: 210px;"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="DatelistUse"
@change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"
style="width: 210px;"></StartDateLimit>
</td> </td>
</tr> </tr>
...@@ -332,17 +325,16 @@ ...@@ -332,17 +325,16 @@
:start-placeholder="$t('OrderList.star')" :start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')" @change="getDates"> :end-placeholder="$t('OrderList.end')" @change="getDates">
</el-date-picker> --> </el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="Datelist" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;"></StartDateLimit> <StartDateLimit :clearable="false" :dateTime="Datelist"
@change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDates()}" style="width: 210px;">
</StartDateLimit>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding: 5px 0"> <td style="padding: 5px 0">
<span style="width: 100px;display: inline-block;">{{$t('objFill.tichenglx')}}</span> <span style="width: 100px;display: inline-block;">{{$t('objFill.tichenglx')}}</span>
<el-select v-model='msg.CommissionType' style="width: 210px;"> <el-select v-model='msg.CommissionType' style="width: 210px;">
<el-option v-for='item in CommissionTypeList' <el-option v-for='item in CommissionTypeList' :label='item.Name' :value='item.Id' :key='item.Id'>
:label='item.Name'
:value='item.Id'
:key='item.Id'>
</el-option> </el-option>
</el-select> </el-select>
</td> </td>
...@@ -350,7 +342,8 @@ ...@@ -350,7 +342,8 @@
<tr> <tr>
<td colspan="4"> <td colspan="4">
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" <input type="button" class="normalBtn" :value="$t('pub.searchBtn')"
@click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false" style="width: 310px!important;" /> @click="msg.pageIndex=1,currentPage=1,GetList();showWarningSearch=false"
style="width: 310px!important;" />
</td> </td>
</tr> </tr>
</table> </table>
...@@ -359,12 +352,13 @@ ...@@ -359,12 +352,13 @@
</el-popover> </el-popover>
</li> </li>
<li> <li>
<input type="button" class="normalBtn" :value="$t('pub.searchBtn')" <input type="button" class="normalBtn" :value="$t('pub.searchBtn')" @click.stop="search" />
@click.stop="search" /> <input v-if="pagesTitle=='销售'||pagesTitle=='OP'" type="button" class="hollowFixedBtn"
<input v-if="pagesTitle=='销售'||pagesTitle=='OP'" type="button" class="hollowFixedBtn" :value="$t('visa.v_daochu')" @click="exportExcel"> :value="$t('visa.v_daochu')" @click="exportExcel">
</li> </li>
</ul> </ul>
<span v-if="Title=='申请'" style="font-size:12px; color:red;padding:15px 0px 0px 0px;display:inline-block;">{{$t('objFill.v101.myOrdersAllType.zaicilbjzwp')}}</span> <span v-if="Title=='申请'"
style="font-size:12px; color:red;padding:15px 0px 0px 0px;display:inline-block;">{{$t('objFill.v101.myOrdersAllType.zaicilbjzwp')}}</span>
</div> </div>
<!-- 统计版块 --> <!-- 统计版块 -->
<div class="groupTourOrder_count" v-if="pagesTitle=='销售'||pagesTitle=='OP'"> <div class="groupTourOrder_count" v-if="pagesTitle=='销售'||pagesTitle=='OP'">
...@@ -410,55 +404,65 @@ ...@@ -410,55 +404,65 @@
</p> </p>
</div> </div>
</div> </div>
<OrderList :pagesTitle="Title" :OrderList="OrderList" <OrderList :pagesTitle="Title" :OrderList="OrderList" :msgObj="msg"
:msgObj="msg" :changePriceOuterVisible="changePriceOuterVisible" v-loading="loading"
:changePriceOuterVisible="changePriceOuterVisible"
v-loading="loading"
@success="msg.pageIndex=1,msg2.pageIndex=1,GetList()"> </OrderList> @success="msg.pageIndex=1,msg2.pageIndex=1,GetList()"> </OrderList>
<div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">{{$t('system.content_noData')}}</div> <div v-if="OrderList&&OrderList.length==0" style="text-align: center;padding: 100px;">
{{$t('system.content_noData')}}</div>
<el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle!='审核'&&pagesTitle!='查看'" background <el-pagination v-if="OrderList&&OrderList.length>0&&pagesTitle!='审核'&&pagesTitle!='查看'" background
@current-change="handleCurrentChange" :current-page.sync="currentPage" @current-change="handleCurrentChange" :current-page.sync="currentPage" layout="total,prev, pager, next, jumper"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"> :page-size="msg.pageSize" :total="total">
</el-pagination> </el-pagination>
<el-pagination v-if="OrderList&&OrderList.length>0&&(pagesTitle=='审核'||pagesTitle=='查看')" background <el-pagination v-if="OrderList&&OrderList.length>0&&(pagesTitle=='审核'||pagesTitle=='查看')" background
@current-change="handleCurrentChange2" :current-page.sync="currentPage2" @current-change="handleCurrentChange2" :current-page.sync="currentPage2" layout="total,prev, pager, next, jumper"
layout="total,prev, pager, next, jumper" :page-size="msg2.pageSize" :total=total2> :page-size="msg2.pageSize" :total=total2>
</el-pagination> </el-pagination>
</div> </div>
</template> </template>
<script> <script>
import OrderList from './OrderList.vue'; import OrderList from './OrderList.vue';
import StartDateLimit from '../../public/StartDateLimit.vue'; import StartDateLimit from '../../public/StartDateLimit.vue';
export default { export default {
props:['pagesTitle','dataObj'], props: ['pagesTitle', 'dataObj'],
components: { OrderList,StartDateLimit }, components: {
OrderList,
StartDateLimit
},
data() { data() {
return { return {
companyList:[], companyList: [],
getCompanyMsg:{ getCompanyMsg: {
RB_Group_Id:'0', RB_Group_Id: '0',
Status:'0', Status: '0',
}, },
total2:0, total2: 0,
currentPage2: 1, currentPage2: 1,
msg2:{ msg2: {
Q_IsCollect: '2',//收款状态 Q_IsCollect: '2', //收款状态
DepartSTime: '', //出发时间 DepartSTime: '', //出发时间
DepartETime: '', DepartETime: '',
EnterId: 0,//销售 EnterId: 0, //销售
RB_Branch_Id: '-1',//公司 RB_Branch_Id: '-1', //公司
OrderId: '', OrderId: '',
TicketStatus: '1',//审核状态 TicketStatus: '1', //审核状态
OrderType: '0', OrderType: '0',
pageIndex: 1, pageIndex: 1,
pageSize: 15, pageSize: 15,
IsSelectAll: 0, IsSelectAll: 0,
}, },
CommissionTypeList:[ CommissionTypeList: [{
{Name: this.$t('pub.unlimitedSel'),Id:'-1'}, Name: this.$t('pub.unlimitedSel'),
{Name: this.$t('objFill.chujingtc'),Id:'1'}, Id: '-1'
{Name: this.$t('objFill.guoneitc'),Id:'2'}, },
{
Name: this.$t('objFill.chujingtc'),
Id: '1'
},
{
Name: this.$t('objFill.guoneitc'),
Id: '2'
},
], ],
showWarningSearch: false, showWarningSearch: false,
TotalMsg: null, TotalMsg: null,
...@@ -497,82 +501,149 @@ ...@@ -497,82 +501,149 @@
EnterId: 0, //业务员id EnterId: 0, //业务员id
OrderState: '1', //订单状态 OrderState: '1', //订单状态
Q_IsCollect: "0", //收款状态 Q_IsCollect: "0", //收款状态
StartTime: "",//报名开始日期 StartTime: "", //报名开始日期
EndTime: "",//报名结束日期 EndTime: "", //报名结束日期
FinishSTime: "",//完结开始时间 FinishSTime: "", //完结开始时间
FinishETime: "",//完结结束时间 FinishETime: "", //完结结束时间
DepartSTime: "",//出发开始 DepartSTime: "", //出发开始
DepartETime: "",//出发结束 DepartETime: "", //出发结束
TCNUM: "",//团号 TCNUM: "", //团号
ProductName: "",//商品名称 ProductName: "", //商品名称
CustomerName: "",//客户名称 CustomerName: "", //客户名称
LureEmpId: 0,//引流人员 LureEmpId: 0, //引流人员
LineId: 0,//线路 LineId: 0, //线路
TravelType: 0,//跟团类型 1跟团 2当地游 TravelType: 0, //跟团类型 1跟团 2当地游
OrderType: "0",//订单类型 OrderType: "0", //订单类型
IsSelectCRM: 0,//1来源crm IsSelectCRM: 0, //1来源crm
IsMyOrder: 1,//1我的订单 IsMyOrder: 1, //1我的订单
CommissionType: '-1',//提成类型 1出境 2国内 CommissionType: '-1', //提成类型 1出境 2国内
TicketStatus: '0',//申请状态 TicketStatus: '0', //申请状态
}, },
total: 0, total: 0,
currentPage: 1, currentPage: 1,
OrderTypeList:[], OrderTypeList: [],
OrderStateType:[ OrderStateType: [{
{Name: this.$t('objFill.pickup'),ID:'1'}, Name: this.$t('objFill.pickup'),
{Name: this.$t('objFill.send'),ID:'2'}, ID: '1'
{Name: this.$t('objFill.baoche'),ID:'3'}, },
{
Name: this.$t('objFill.send'),
ID: '2'
},
{
Name: this.$t('objFill.baoche'),
ID: '3'
},
], ],
orderType:[ orderType: [{
{Name: this.$t('OrderList.orderType.tour'),ID:'1'}, Name: this.$t('OrderList.orderType.tour'),
{Name: this.$t('OrderList.orderType.guest'),ID:'2'}, ID: '1'
},
{
Name: this.$t('OrderList.orderType.guest'),
ID: '2'
},
], ],
Datelist:'', Datelist: '',
DatelistUse:'', DatelistUse: '',
DatelistBM: [], DatelistBM: [],
Title:'', Title: '',
EmployeeList:[], EmployeeList: [],
employeeMsg:{ // 员工 employeeMsg: { // 员工
GroupId:'', GroupId: '',
BranchId:-1, BranchId: -1,
DepartmentId:0, DepartmentId: 0,
PostId:0, PostId: 0,
IsLeave:0, IsLeave: 0,
}, },
OrderStatusList: [ OrderStatusList: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "0" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('pub.normalSel'), Id: "1" }, Id: "0"
{ Name: this.$t('pub.cancelBtn'), Id: "2" }, },
{
Name: this.$t('pub.normalSel'),
Id: "1"
},
{
Name: this.$t('pub.cancelBtn'),
Id: "2"
},
], ],
QIsCollectList: [ QIsCollectList: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "0" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('objFill.yishouqian'), Id: "1" }, Id: "0"
{ Name: this.$t('salesModule.NoCollect'), Id: "2" }, },
{
Name: this.$t('objFill.yishouqian'),
Id: "1"
},
{
Name: this.$t('salesModule.NoCollect'),
Id: "2"
},
], ],
ticketingStatusList: [], ticketingStatusList: [],
VisaList: [ VisaList: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "0" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('objFill.weichuqian'), Id: "1" }, Id: "0"
{ Name: this.$t('objFill.yichuqian'), Id: "2" }, },
{
Name: this.$t('objFill.weichuqian'),
Id: "1"
},
{
Name: this.$t('objFill.yichuqian'),
Id: "2"
},
], ],
LineList: [], LineList: [],
SummaryList: [], SummaryList: [],
TicketStatusList2: [ TicketStatusList2: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "0" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('objFill.dsh'), Id: "1" }, Id: "0"
{ Name: this.$t('fnc.ytongguo'), Id: "2" }, },
{ Name: this.$t('objFill.yibohui'), Id: "3" }, {
Name: this.$t('objFill.dsh'),
Id: "1"
},
{
Name: this.$t('fnc.ytongguo'),
Id: "2"
},
{
Name: this.$t('objFill.yibohui'),
Id: "3"
},
], ],
TicketStatusList3: [ TicketStatusList3: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "5" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('objFill.dsh'), Id: "1" }, Id: "5"
{ Name: this.$t('fnc.ytongguo'), Id: "2" }, },
{ Name: this.$t('objFill.yibohui'), Id: "3" }, {
Name: this.$t('objFill.dsh'),
Id: "1"
},
{
Name: this.$t('fnc.ytongguo'),
Id: "2"
},
{
Name: this.$t('objFill.yibohui'),
Id: "3"
},
], ],
TicketStatusList: [ TicketStatusList: [{
{ Name: this.$t('pub.unlimitedSel'), Id: "0" }, Name: this.$t('pub.unlimitedSel'),
{ Name: this.$t('objFill.daishenhe'), Id: "1" }, Id: "0"
{ Name: this.$t('objFill.yishenqing'), Id: "2" }, },
{
Name: this.$t('objFill.daishenhe'),
Id: "1"
},
{
Name: this.$t('objFill.yishenqing'),
Id: "2"
},
// { Name: this.$t('objFill.yibohui'), Id: "3" }, // { Name: this.$t('objFill.yibohui'), Id: "3" },
], ],
changePriceOuterVisible: true, changePriceOuterVisible: true,
...@@ -580,21 +651,21 @@ ...@@ -580,21 +651,21 @@
}; };
}, },
watch: { watch: {
pagesTitle(val,oldval){ pagesTitle(val, oldval) {
this.Title = val this.Title = val
}, },
dataObj:{ dataObj: {
handler(val, oldVal) { handler(val, oldVal) {
this.msg.OrderType = String(val.tab) this.msg.OrderType = String(val.tab)
this.msg.OrderId = val.OrderId this.msg.OrderId = val.OrderId
this.msg2.OrderType = String(val.tab) this.msg2.OrderType = String(val.tab)
this.msg2.OrderId = val.OrderId this.msg2.OrderId = val.OrderId
if(val.DepartSTime&&val.DepartSTime){ if (val.DepartSTime && val.DepartSTime) {
this.msg.DepartSTime = val.DepartSTime; this.msg.DepartSTime = val.DepartSTime;
this.msg.DepartETime = val.DepartSTime; this.msg.DepartETime = val.DepartSTime;
this.msg2.DepartSTime = val.DepartSTime; this.msg2.DepartSTime = val.DepartSTime;
this.msg2.DepartETime = val.DepartSTime; this.msg2.DepartETime = val.DepartSTime;
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime] this.DatelistUse = [this.msg.DepartSTime, this.msg.DepartETime]
} }
this.GetList() this.GetList()
}, },
...@@ -602,26 +673,26 @@ ...@@ -602,26 +673,26 @@
} }
}, },
methods: { methods: {
search(){ search() {
this.changePriceOuterVisible = false this.changePriceOuterVisible = false
if(this.dataObj&&this.dataObj.OrderId&&this.dataObj.DepartSTime&&this.dataObj.DepartETime){ if (this.dataObj && this.dataObj.OrderId && this.dataObj.DepartSTime && this.dataObj.DepartETime) {
this.msg.OrderId = 0 this.msg.OrderId = 0
this.msg2.OrderId = 0 this.msg2.OrderId = 0
this.msg2.OrderType = '0' this.msg2.OrderType = '0'
} }
this.msg.pageIndex=1, this.msg.pageIndex = 1,
this.currentPage=1, this.currentPage = 1,
this.msg2.pageIndex=1, this.msg2.pageIndex = 1,
this.currentPage2=1, this.currentPage2 = 1,
this.GetList() this.GetList()
}, },
// 公司 // 公司
getCompany(){ getCompany() {
this.apipost('admin_get_BranchGetList',{},res=>{ this.apipost('admin_get_BranchGetList', {}, res => {
if(res.data.resultCode==1){ if (res.data.resultCode == 1) {
this.companyList=res.data.data; this.companyList = res.data.data;
}else{} } else {}
},err=>{}) }, err => {})
}, },
exportExcel() { //导出 exportExcel() { //导出
if (!this.msg.StartTime || !this.msg.EndTime) { if (!this.msg.StartTime || !this.msg.EndTime) {
...@@ -631,7 +702,7 @@ ...@@ -631,7 +702,7 @@
let msg = JSON.parse(JSON.stringify(this.msg)) let msg = JSON.parse(JSON.stringify(this.msg))
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
msg.uid = userInfo.EmployeeId msg.uid = userInfo.EmployeeId
var fileName = this.$t('objFill.dingdantjb')+".xls"; var fileName = this.$t('objFill.dingdantjb') + ".xls";
this.GetLocalFile("GuestOrder_post_GetDownLodGuestOrderStatisticsList", msg, fileName); this.GetLocalFile("GuestOrder_post_GetDownLodGuestOrderStatisticsList", msg, fileName);
}, },
GetOrderTypeEnumList() { GetOrderTypeEnumList() {
...@@ -685,39 +756,42 @@ ...@@ -685,39 +756,42 @@
}, },
getEmployee() { //员工 getEmployee() { //员工
this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => { this.apipost('admin_get_EmployeeGetList', this.employeeMsg, res => {
if(res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.EmployeeList = res.data.data; this.EmployeeList = res.data.data;
} }
}, err => {}) }, err => {})
}, },
getDatesBM(){ getDatesBM() {
if(this.DatelistBM){ if (this.DatelistBM) {
this.msg.StartTime = this.DatelistBM[0]?this.DatelistBM[0]:'' this.msg.StartTime = this.DatelistBM[0] ? this.DatelistBM[0] : ''
this.msg.EndTime = this.DatelistBM[1]?this.DatelistBM[1]:'' this.msg.EndTime = this.DatelistBM[1] ? this.DatelistBM[1] : ''
}if(!this.DatelistBM){ }
if (!this.DatelistBM) {
this.msg.StartTime = '' this.msg.StartTime = ''
this.msg.EndTime = '' this.msg.EndTime = ''
} }
}, },
getDatesUse(){ getDatesUse() {
if(this.DatelistUse){ if (this.DatelistUse) {
this.msg.DepartSTime = this.DatelistUse[0]?this.DatelistUse[0]:'' this.msg.DepartSTime = this.DatelistUse[0] ? this.DatelistUse[0] : ''
this.msg.DepartETime = this.DatelistUse[1]?this.DatelistUse[1] :'' this.msg.DepartETime = this.DatelistUse[1] ? this.DatelistUse[1] : ''
this.msg2.DepartSTime = this.DatelistUse[0]?this.DatelistUse[0] :'' this.msg2.DepartSTime = this.DatelistUse[0] ? this.DatelistUse[0] : ''
this.msg2.DepartETime = this.DatelistUse[1]?this.DatelistUse[1] :'' this.msg2.DepartETime = this.DatelistUse[1] ? this.DatelistUse[1] : ''
}if(!this.DatelistUse){ }
if (!this.DatelistUse) {
this.msg.DepartSTime = '' this.msg.DepartSTime = ''
this.msg.DepartETime = '' this.msg.DepartETime = ''
this.msg2.DepartSTime = '' this.msg2.DepartSTime = ''
this.msg2.DepartETime = '' this.msg2.DepartETime = ''
} }
}, },
getDates(){ getDates() {
if(this.Datelist){ if (this.Datelist) {
this.msg.FinishSTime = this.Datelist[0]?this.Datelist[0]:'' this.msg.FinishSTime = this.Datelist[0] ? this.Datelist[0] : ''
this.msg.FinishETime = this.Datelist[1]?this.Datelist[1]:'' this.msg.FinishETime = this.Datelist[1] ? this.Datelist[1] : ''
}if(!this.Datelist){ }
if (!this.Datelist) {
this.msg.FinishSTime = '' this.msg.FinishSTime = ''
this.msg.FinishETime = '' this.msg.FinishETime = ''
} }
...@@ -733,24 +807,24 @@ ...@@ -733,24 +807,24 @@
d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d); d = new Date(ds[0], ds[1] - 1 + m, _d > max ? max : _d);
return d.toLocaleDateString().match(/\d+/g).join('-') return d.toLocaleDateString().match(/\d+/g).join('-')
}, },
getyMDOne(){ getyMDOne() {
let myDate = new Date() let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????) let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月) let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31) let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth myMonth = myMonth > 9 ? myMonth : '0' + myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday myToday = myToday > 9 ? myToday : '0' + myToday
let nowDate = myYear +'-'+ myMonth +'-01' let nowDate = myYear + '-' + myMonth + '-01'
return nowDate return nowDate
}, },
getyMDTwo(){ getyMDTwo() {
let myDate = new Date() let myDate = new Date()
let myYear = myDate.getFullYear();//获取完整的年份(4位,1970-????) let myYear = myDate.getFullYear(); //获取完整的年份(4位,1970-????)
let myMonth = myDate.getMonth()+ 1;//获取当前月份(0-11,8代表1月) let myMonth = myDate.getMonth() + 1; //获取当前月份(0-11,8代表1月)
let myToday = myDate.getDate(); //获取当前日(1-31) let myToday = myDate.getDate(); //获取当前日(1-31)
myMonth = myMonth > 9 ? myMonth : '0'+ myMonth myMonth = myMonth > 9 ? myMonth : '0' + myMonth
myToday = myToday > 9 ? myToday : '0'+ myToday myToday = myToday > 9 ? myToday : '0' + myToday
let nowDate = myYear +'-'+ myMonth +'-'+ myToday let nowDate = myYear + '-' + myMonth + '-' + myToday
return nowDate return nowDate
}, },
//获取酒店订单列表 //获取酒店订单列表
...@@ -759,20 +833,20 @@ ...@@ -759,20 +833,20 @@
let msgObj let msgObj
let url = "CarSingle_post_GetGuestOrderStatisticsPageList" let url = "CarSingle_post_GetGuestOrderStatisticsPageList"
// 销售 OP // 销售 OP
if(this.pagesTitle=='销售'){ if (this.pagesTitle == '销售') {
this.msg.IsMyOrder = '1' this.msg.IsMyOrder = '1'
this.msg.TicketStatus = '' this.msg.TicketStatus = ''
}else if(this.pagesTitle=='申请'){ } else if (this.pagesTitle == '申请') {
url = "CarSingle_post_GetChangePriceOrderPageList" url = "CarSingle_post_GetChangePriceOrderPageList"
this.msg.IsMyOrder = '1' this.msg.IsMyOrder = '1'
this.msg.Q_IsCollect = '2' this.msg.Q_IsCollect = '2'
}else if(this.pagesTitle=='审核'||this.pagesTitle=='查看'){ } else if (this.pagesTitle == '审核' || this.pagesTitle == '查看') {
url = "CarSingle_post_GetExaminePriceOrderPageList" url = "CarSingle_post_GetExaminePriceOrderPageList"
} else{ } else {
this.msg.TicketStatus = '' this.msg.TicketStatus = ''
this.msg.IsMyOrder = '0' this.msg.IsMyOrder = '0'
} }
msgObj = (this.pagesTitle=='审核'||this.pagesTitle=='查看')?this.msg2:this.msg msgObj = (this.pagesTitle == '审核' || this.pagesTitle == '查看') ? this.msg2 : this.msg
// if(this.pagesTitle=='查看'){ // if(this.pagesTitle=='查看'){
// msgObj.TicketStatus=5; // msgObj.TicketStatus=5;
// } // }
...@@ -781,26 +855,28 @@ ...@@ -781,26 +855,28 @@
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.changePriceOuterVisible = true this.changePriceOuterVisible = true
// 数据统计 // 数据统计
if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){ if (this.pagesTitle == '销售' || this.pagesTitle == 'OP') {
this.getSummaryData() this.getSummaryData()
} }
let data = res.data.data.pageData let data = res.data.data.pageData
this.OrderList = data; this.OrderList = data;
if(this.pagesTitle=='审核'||this.Title=='查看'){ if (this.pagesTitle == '审核' || this.Title == '查看') {
this.total2 = res.data.data.count; this.total2 = res.data.data.count;
}else{ } else {
this.total = res.data.data.count; this.total = res.data.data.count;
} }
// this.TotalMsg = res.data.data.StatModel // this.TotalMsg = res.data.data.StatModel
}else { } else {
this.Error(res.data.message); this.Error(res.data.message);
} }
this.loading = false this.loading = false
}, },
err => {this.loading = false} err => {
this.loading = false
}
); );
}, },
getSummaryData(){ getSummaryData() {
this.apipost( this.apipost(
"CarSingle_post_GetGuestOrderStatistics", "CarSingle_post_GetGuestOrderStatistics",
this.msg, this.msg,
...@@ -835,60 +911,60 @@ ...@@ -835,60 +911,60 @@
}, },
created() { created() {
let userInfo=this.getLocalStorage(); let userInfo = this.getLocalStorage();
this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID this.employeeMsg.GroupId = userInfo.RB_Group_id; //集团ID
this.msg.EnterId = this.$route.query.EnterId?Number(this.$route.query.EnterId):0//userInfo.EmployeeId; this.msg.EnterId = this.$route.query.EnterId ? Number(this.$route.query.EnterId) : 0 //userInfo.EmployeeId;
this.msg.LureEmpId = this.$route.query.LureEmpId?Number(this.$route.query.LureEmpId):0 this.msg.LureEmpId = this.$route.query.LureEmpId ? Number(this.$route.query.LureEmpId) : 0
if(this.pagesTitle=='销售'||this.pagesTitle=='OP'){ if (this.pagesTitle == '销售' || this.pagesTitle == 'OP') {
this.msg.StartTime = this.getBeforeDate(0, new Date()) this.msg.StartTime = this.getBeforeDate(0, new Date())
this.msg.EndTime = this.getBeforeDate(0, new Date()) this.msg.EndTime = this.getBeforeDate(0, new Date())
this.DatelistBM = [new Date(this.msg.StartTime),new Date()] this.DatelistBM = [new Date(this.msg.StartTime), new Date()]
}else{ } else {
var now = new Date(); var now = new Date();
var month = now.getMonth()+1;//js获取到的是月份是 0-11 所以要加1 var month = now.getMonth() + 1; //js获取到的是月份是 0-11 所以要加1
var year = now.getFullYear(); var year = now.getFullYear();
var nextMonthFirstDay = new Date([year,month ,1].join('-')).getTime(); var nextMonthFirstDay = new Date([year, month, 1].join('-')).getTime();
var oneDay = 1000 * 24 * 60 * 60; var oneDay = 1000 * 24 * 60 * 60;
var monthLast = new Date(nextMonthFirstDay - oneDay).getDate() var monthLast = new Date(nextMonthFirstDay - oneDay).getDate()
if(!this.$route.query.DepartSTime&&!this.$route.query.DepartSTime){ if (!this.$route.query.DepartSTime && !this.$route.query.DepartSTime) {
this.msg.DepartSTime = '2023-04-01'; this.msg.DepartSTime = '2023-04-01';
this.msg.DepartETime = [year,month,monthLast].join('-'); this.msg.DepartETime = [year, month, monthLast].join('-');
this.msg2.DepartSTime = '2023-04-01'; this.msg2.DepartSTime = '2023-04-01';
this.msg2.DepartETime = [year,month,monthLast].join('-'); this.msg2.DepartETime = [year, month, monthLast].join('-');
} }
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime] this.DatelistUse = [this.msg.DepartSTime, this.msg.DepartETime]
this.msg.Q_IsCollect = '2' this.msg.Q_IsCollect = '2'
} }
if(this.$route.query.OrderId){ if (this.$route.query.OrderId) {
this.msg.OrderId=this.$route.query.OrderId this.msg.OrderId = this.$route.query.OrderId
this.msg.StartTime = '' this.msg.StartTime = ''
this.msg.EndTime = '' this.msg.EndTime = ''
this.DatelistBM = [] this.DatelistBM = []
this.msg.OrderState = '0' this.msg.OrderState = '0'
} }
if(this.$route.query.DepartSTime){ if (this.$route.query.DepartSTime) {
this.msg.DepartSTime=this.$route.query.DepartSTime this.msg.DepartSTime = this.$route.query.DepartSTime
this.msg.DepartETime=this.$route.query.DepartETime this.msg.DepartETime = this.$route.query.DepartETime
this.msg2.DepartSTime=this.$route.query.DepartSTime this.msg2.DepartSTime = this.$route.query.DepartSTime
this.msg2.DepartETime=this.$route.query.DepartETime this.msg2.DepartETime = this.$route.query.DepartETime
this.msg.CommissionType = this.$route.query.CommissionType this.msg.CommissionType = this.$route.query.CommissionType
this.msg.StartTime = '' this.msg.StartTime = ''
this.msg.EndTime = '' this.msg.EndTime = ''
this.DatelistBM = [] this.DatelistBM = []
this.DatelistUse = [this.msg.DepartSTime,this.msg.DepartETime] this.DatelistUse = [this.msg.DepartSTime, this.msg.DepartETime]
this.msg.OrderState = '0' this.msg.OrderState = '0'
} }
}, },
mounted() { mounted() {
this.Title = this.pagesTitle this.Title = this.pagesTitle
if(this.Title=='OP'||this.Title=='审核'||this.Title=='查看'){ if (this.Title == 'OP' || this.Title == '审核' || this.Title == '查看') {
this.getEmployee() this.getEmployee()
if(this.Title=='审核'||this.Title=='查看'){ if (this.Title == '审核' || this.Title == '查看') {
this.getCompany() this.getCompany()
} }
} }
if(this.Title=='查看'){ if (this.Title == '查看') {
this.msg2.TicketStatus = '5' this.msg2.TicketStatus = '5'
this.msg2.IsSelectAll = 1 this.msg2.IsSelectAll = 1
} }
...@@ -908,4 +984,4 @@ ...@@ -908,4 +984,4 @@
}, },
}; };
</script> </script>
src/router/config.js
View file @ f654874c
...@@ -5915,7 +5915,7 @@ export default { ...@@ -5915,7 +5915,7 @@ export default {
{ {
path: '/Classification', path: '/Classification',
name: 'Classification', name: 'Classification',
component: resolve => require(['@/components/WebSet/Classification'], resolve), component: resolve => require(['@/components/WebSet/classification'], resolve),
meta: { meta: {
title: '分类管理' 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