Skip to content

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

页面修改

parent 85e506b0
Hide whitespace changes
Inline Side-by-side
Showing with 155 additions and 133 deletions
src/components/SalesModule/enrollTotal.vue
View file @ a5fe41a7
......@@ -117,7 +117,8 @@
<span><em>{{ $t("scen.sc_ftTime") }}</em>
<!-- <el-date-picker v-model="msg.QStartDate" @change="dataDuiQ()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QStartDate = date,dataDuiQ()}"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate"
@change="(date)=> {msg.QStartDate = date,dataDuiQ()}"></DateLimit>
-
<el-date-picker v-model="msg.QEndDate" @change="dataDuiQ()" class="w135" value-format="yyyy-MM-dd"
type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
......@@ -127,7 +128,8 @@
<span><em>{{ $t("fnc.bmriqi") }}</em>
<!-- <el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="true" :StartGroupDate="msg.CStartDate" :EndGroupDate="msg.CEndDate" @change="(date)=> {msg.CStartDate = date,dataDuiQ()}"></DateLimit>
<DateLimit :clearable="true" :StartGroupDate="msg.CStartDate" :EndGroupDate="msg.CEndDate"
@change="(date)=> {msg.CStartDate = date,dataDuiQ()}"></DateLimit>
-
<el-date-picker v-model="msg.CEndDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date" :picker-options="pickerCEndDate" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
......@@ -135,18 +137,19 @@
</li>
<li>
<span><em>{{ $t("fnc.khxinxi") }}</em>
<el-select v-model="msg.CustomerId" class="w150" filterable remote reserve-keyword :placeholder="$t('pub.PleaseKeyWords')"
:remote-method="GetCustomerListByKeyWord">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for="item in customerList" :label="item.customerName" :value="item.customerId" :key="item.customerId">
<div>
<span>{{`${item.customerName}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini" >({{item.contact}}{{item.contactNumber}})</el-tag>
</span>
</div>
</el-option>
</el-select>
<el-select v-model="msg.CustomerId" class="w150" filterable remote reserve-keyword
:placeholder="$t('pub.PleaseKeyWords')" :remote-method="GetCustomerListByKeyWord">
<el-option :label="$t('pub.unlimitedSel')" value="0"></el-option>
<el-option v-for="item in customerList" :label="item.customerName" :value="item.customerId"
:key="item.customerId">
<div>
<span>{{`${item.customerName}`}}</span>
<span style="margin-left: 15px;">
<el-tag size="mini">({{item.contact}}{{item.contactNumber}})</el-tag>
</span>
</div>
</el-option>
</el-select>
</span>
</li>
......@@ -368,7 +371,9 @@
</p>
<p v-if="item.lureEmpName">{{$t('objFill.yinliuren')}}：{{ item.lureEmpName }}</p>
<p>{{ $t("hotel.hotel_StartTeam") }}：{{ item.startDate }}</p>
<p v-if="item.teamType==1||item.teamType==2">{{item.status==1?$t('objFill.weijietuan'):(item.status==2?$t('objFill.yijietuan'):(item.status==5?$t('objFill.daijietuansh'):""))}}{{item.status==2?item.outGroupAuditDate:""}}</p>
<p v-if="item.teamType==1||item.teamType==2">
{{item.status==1?$t('objFill.weijietuan'):(item.status==2?$t('objFill.yijietuan'):(item.status==5?$t('objFill.daijietuansh'):""))}}{{item.status==2?item.outGroupAuditDate:""}}
</p>
<p v-if="item.tradeWay == 1">{{ item.platformOrder }}</p>
<!-- <p v-if="item.commissionMoney" style="color: red;">
{{ $t("salesModule.CommissionNum") }}：{{ item.commissionMoney }}
......@@ -459,7 +464,8 @@
<span v-if="item.dueInMoney == 0" style="cursor: pointer">{{
moneyFormatN(item.income)
}}</span>
<span v-if="item.dueInMoney != 0" style="cursor: pointer; color: #e95252">{{ moneyFormatN(item.income) }}</span>
<span v-if="item.dueInMoney != 0"
style="cursor: pointer; color: #e95252">{{ moneyFormatN(item.income) }}</span>
</td>
<!-- 优惠 -->
<td>
......@@ -562,7 +568,8 @@
<td>{{ moneyFormatN(item.zaiTuMoney) }}</td>
<td>{{ moneyFormatN(item.cashReceiptsMoney) }}</td>
<td>
<span :class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ moneyFormatN(item.dueInMoney) }}</span>
<span
:class="{ color_red_order: item.dueInMoney !== item.preferPrice }">{{ moneyFormatN(item.dueInMoney) }}</span>
</td>
<td v-if="item.isChargeLossOrders == 1" class="fz12" style="color: #e95252">
{{ $t("fnc.shousun") }}
......@@ -644,30 +651,32 @@
<span style="color: red;">{{$t('objFill.liangyunbeizhu')}}:</span>
<span style="color: red;">{{ item.unionRemark }}</span>
</div>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
:key="uIndex">
{{$t('objFill.liangyunxx')}}：<span style="color: red">{{$t('objFill.yipeilianyun')}}{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span v-else>【{{$t('visa.v_zanding')}}】</span>
</span>
<template v-if="uItem.flightName&&uItem.flightName.id">
<br />
<span style="color:blue;">{{$t('Airticket.Air_go')}}:
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">{{$t('Airticket.Air_returnTrip')}}:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
</template>
</div>
</template>
<template v-if="item.orderUnionFlightList&&item.orderUnionFlightList.length>0">
<template v-for="(uItem,uIndex) in item.orderUnionFlightList">
<div v-if="(uItem.flightName&&uItem.flightName.id)||(uItem.backFlightName&&uItem.backFlightName.id)"
:key="uIndex">
{{$t('objFill.liangyunxx')}}：<span
style="color: red">{{$t('objFill.yipeilianyun')}}{{uItem.configNum}}人,{{uItem.airticketUnionNotes}}
<span v-if="uItem.isSure==1" style="color:rgb(71, 191, 140)">【OK】</span> <span
v-else>【{{$t('visa.v_zanding')}}】</span>
</span>
<template v-if="uItem.flightName&&uItem.flightName.id">
<br />
<span style="color:blue;">{{$t('Airticket.Air_go')}}:
{{uItem.flightName.startDateStr}} {{uItem.flightName.flight_number}}
{{uItem.flightName.departureTime}}-{{uItem.flightName.arrivalTime}}
{{uItem.flightName.dName}}-{{uItem.flightName.aName}}</span>
</template>
<template v-if="uItem.backFlightName&&uItem.backFlightName.id">
<br />
<span style="color:blue;">{{$t('Airticket.Air_returnTrip')}}:
{{uItem.backFlightName.startDateStr}} {{uItem.backFlightName.flight_number}}
{{uItem.backFlightName.departureTime}}-{{uItem.backFlightName.arrivalTime}}
{{uItem.backFlightName.dName}}-{{uItem.backFlightName.aName}}</span>
</template>
</div>
</template>
</template>
</td>
<td colspan="5" class="groupTourOrder_remarks" style="height: 40px">
<div>
......@@ -685,7 +694,8 @@
</template>
<template v-else>
<span class="font-color-red" v-if="item.orderspecialofferState === -1">{{$t('visa.v_jujue')}}</span>
<span class="font-color-org" v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-org"
v-if="item.orderspecialofferState === 0">{{$t('objFill.shengpizhong')}}</span>
<span class="font-color-green" v-if="item.orderspecialofferState === 1">{{$t('visa.v_tongguo')}}</span>
</template>
</div>
......@@ -821,8 +831,8 @@
IsCollectMoney: 0,
IsUseCoupon: "0",
IsUseRedEnvelopeMoney: "0",
CustomerId:"0",
isNormal:0,
CustomerId: "0",
isNormal: 0,
},
employeeMsg: {
RB_Group_id: "0",
......@@ -881,88 +891,95 @@
userId: 0,
//修改订单业务员1-有权限
isEditOrderCreate: 0,
customerList:[]
customerList: []
};
},
'$route': {
handler (val, oldVal) {
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
}
if (this.$route.query.OrderId) {
this.msg.tempOrderId = this.$route.query.OrderId
}
handler(val, oldVal) {
// crm自动登陆传过来的参数
if (this.$route.query.crmOrderObj) {
let crmOrderObj = JSON.parse(this.$route.query.crmOrderObj)
this.msg.tempOrderId = crmOrderObj.OrderId
}
if (this.$route.query.OrderId) {
this.msg.tempOrderId = this.$route.query.OrderId
}
this.getCompany();
this.getCompany();
this.getCtlxList();
this.getEmployee();
this.getLineList();
this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
if (this.$route.query.isOwn) {
this.isOwn = true;
this.msg.SellFormEmp = 1;
}
this.msg.CreateBy =
this.$route.query.EmployeeId === undefined ?
"-1" :
this.$route.query.EmployeeId;
this.msg.QStartDate =
this.$route.query.starTime === undefined ?
"" :
this.$route.query.starTime;
this.msg.QEndDate =
this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (
this.msg.QStartDate === "" &&
this.msg.QEndDate === "" &&
!this.msg.tempOrderId
) {
this.msg.QStartDate = new Date();
this.msg.QEndDate = new Date();
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
if(this.$route.query.CStartDate||this.$route.query.CEndDate){
this.msg.QStartDate = "";
this.msg.QEndDate = "";
this.msg.CStartDate = this.$route.query.CStartDate
this.msg.CEndDate = this.$route.query.CEndDate
if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
}
if(this.$route.query.BranchId>=-1){
this.msg.BranchId = this.$route.query.BranchId
}
if(this.$route.query.isNormal) this.msg.isNormal =this.$route.query.isNormal
if(this.$route.query.CustomerName){
this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
if(this.$route.query.CustomerId){
this.msg.CustomerId = parseInt(this.$route.query.CustomerId);
this.getCtlxList();
this.getEmployee();
this.getLineList();
this.getDepartment();
this.getDdztList();
if (this.$route.query.id) {
this.msg.tempOrderId = this.$route.query.id;
}
if (this.$route.query.isOwn) {
this.isOwn = true;
this.msg.SellFormEmp = 1;
}
this.msg.CreateBy =
this.$route.query.EmployeeId === undefined ?
"-1" :
this.$route.query.EmployeeId;
this.msg.RB_Department_Id =
this.$route.query.RB_Department_Id === undefined ?
"-1" :
this.$route.query.RB_Department_Id;
this.msg.QStartDate =
this.$route.query.starTime === undefined ?
"" :
this.$route.query.starTime;
this.msg.QEndDate =
this.$route.query.endTime === undefined ? "" : this.$route.query.endTime;
if (
this.msg.QStartDate === "" &&
this.msg.QEndDate === "" &&
!this.msg.tempOrderId
) {
this.msg.QStartDate = new Date();
this.msg.QEndDate = new Date();
}
if (this.$route.query.orderId) {
this.msg.tempOrderId = this.$route.query.orderId;
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
if (this.$route.query.CStartDate || this.$route.query.CEndDate) {
this.msg.QStartDate = "";
this.msg.QEndDate = "";
this.msg.CStartDate = this.$route.query.CStartDate
this.msg.CEndDate = this.$route.query.CEndDate
if (this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
}
if (this.$route.query.BranchId >= -1) {
this.msg.BranchId = this.$route.query.BranchId
}
if (this.$route.query.isNormal) this.msg.isNormal = this.$route.query.isNormal
if (this.$route.query.CustomerName) {
this.GetCustomerListByKeyWord(this.$route.query.CustomerName, 1);
if (this.$route.query.CustomerId) {
this.msg.CustomerId = parseInt(this.$route.query.CustomerId);
}
}
this.getList();
},
deep: true,
immediate: true
}
this.getList();
},
deep: true,
immediate: true
},
methods: {
GetCustomerListByKeyWord(query) {
if (query !== '') {
// this.employeeMsg.KeyWord = query;
// this.employeeMsg.KeyWord = query;
this.apipost(
"app_get_GetCustomerListByKeyWord",
{KeyWord:query},
"app_get_GetCustomerListByKeyWord", {
KeyWord: query
},
res => {
if (res.data.resultCode == 1) {
this.customerList = res.data.data;
......@@ -1063,7 +1080,7 @@
if (
new Date(this.msg.QStartDate).getTime() >
new Date(this.msg.QEndDate).getTime() &&
this.msg.QEndDate !== ""&&this.msg.QEndDate !=null
this.msg.QEndDate !== "" && this.msg.QEndDate != null
) {
this.$message.error(this.$t('objFill.jieshurqibnxyksrq'));
this.msg.QEndDate = "";
......@@ -1161,6 +1178,7 @@
this.getCompanyMsg,
(res) => {
if (res.data.resultCode == 1) {
console.log("admin_get_BranchGetList",res.data);
this.companyList = res.data.data;
} else {}
},
......@@ -1282,7 +1300,6 @@
}
this.getCompany();
this.getCtlxList();
this.getEmployee();
this.getLineList();
......@@ -1299,6 +1316,12 @@
this.$route.query.EmployeeId === undefined ?
"-1" :
this.$route.query.EmployeeId;
this.msg.RB_Department_Id =
this.$route.query.RB_Department_Id === undefined ?
"-1" :
this.$route.query.RB_Department_Id;
this.msg.QStartDate =
this.$route.query.starTime === undefined ?
"" :
......@@ -1318,22 +1341,21 @@
this.msg.QStartDate = "";
this.msg.QEndDate = "";
}
if(this.$route.query.CStartDate||this.$route.query.CEndDate){
this.msg.QStartDate = "";
this.msg.QEndDate = "";
this.msg.CStartDate = this.$route.query.CStartDate
this.msg.CEndDate = this.$route.query.CEndDate
if(this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
}
if(this.$route.query.BranchId>=-1){
this.msg.BranchId = this.$route.query.BranchId
}
if(this.$route.query.isNormal) this.msg.isNormal =this.$route.query.isNormal
if(this.$route.query.CustomerName){
this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
if(this.$route.query.CustomerId){
if (this.$route.query.CStartDate || this.$route.query.CEndDate) {
this.msg.QStartDate = "";
this.msg.QEndDate = "";
this.msg.CStartDate = this.$route.query.CStartDate
this.msg.CEndDate = this.$route.query.CEndDate
if (this.$route.query.discount) this.msg.IsUseCoupon = this.$route.query.discount
}
if (this.$route.query.BranchId &&this.$route.query.BranchId >= -1) {
this.msg.BranchId = Number(this.$route.query.BranchId);
}
if (this.$route.query.isNormal) this.msg.isNormal = this.$route.query.isNormal
if (this.$route.query.CustomerName) {
this.GetCustomerListByKeyWord(this.$route.query.CustomerName, 1);
if (this.$route.query.CustomerId) {
this.msg.CustomerId = parseInt(this.$route.query.CustomerId);
}
}
this.getList();
......
src/components/rank/dataCount.vue
View file @ a5fe41a7
......@@ -930,7 +930,7 @@ export default {
CEndDate: this.parameters.dateRange[1],
BranchId: this.parameters.branchId,
RB_Department_Id:this.parameters.RB_Department_Id,
CreateBy:this.parameters.empId,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
......@@ -939,7 +939,7 @@ export default {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
CreateBy:this.parameters.empId,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
......@@ -948,7 +948,7 @@ export default {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
CreateBy:this.parameters.empId,
EmployeeId:this.parameters.empId,
isNormal: 1,
blank: "y",
}
......@@ -957,7 +957,7 @@ export default {
CStartDate: this.parameters.dateRange[0],
CEndDate: this.parameters.dateRange[1],
RB_Department_Id:this.parameters.RB_Department_Id,
CreateBy:this.parameters.empId,
EmployeeId:this.parameters.empId,
discount: 1,
isNormal: 1,
blank: "y",
......
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