Commit a2016478 authored by youjie's avatar youjie

销售日期 功能权限

parent f9dc4704
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</span> </span>
</li> </li>
<li><span><em>{{$t('pub.date')}}</em> <li><span><em>{{$t('pub.date')}}</em>
<el-date-picker v-model='msg.StartDate' value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck"> <el-date-picker v-model='msg.StartDate' :clearable="false" value-format="yyyy-MM-dd" type="date" :picker-options="beforeCheck">
</el-date-picker> </el-date-picker>
<el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck"> <el-date-picker v-model='msg.EndDate' value-format="yyyy-MM-dd" type="date" :picker-options="afterCheck">
</el-date-picker> </el-date-picker>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
pageSize: 10, pageSize: 10,
//酒店选择数组 //酒店选择数组
HotelChooseArray: [], HotelChooseArray: [],
StartDate: this.getBeforeDate(0, new Date().Format("yyyy-MM-dd")), StartDate: this.getBeforeDate(-4, new Date().Format("yyyy-MM-dd")),
EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))), EndDate: this.getBeforeDate(-30, this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))),
//只查询日本 //只查询日本
Country: "0", Country: "0",
......
...@@ -25,15 +25,16 @@ ...@@ -25,15 +25,16 @@
</el-option> </el-option>
</el-select> </el-select>
</span> </span>
</li> </li>
<li> <li>
<span><em>{{$t('sm.Date')}}</em> <span><em>{{$t('sm.Date')}}</em>
<el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w150' value-format="yyyy-MM-dd" <!-- <el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w150' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
- <DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> msg.StartTime = date"></DateLimit>
-
<el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w150' <el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w150'
value-format="yyyy-MM-dd" type="date"></el-date-picker> value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -65,7 +66,7 @@ ...@@ -65,7 +66,7 @@
<tr> <tr>
<td>{{item.Id}}<br/>{{item.EnterName}}<br/>{{item.CreateDate}} </td> <td>{{item.Id}}<br/>{{item.EnterName}}<br/>{{item.CreateDate}} </td>
<td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.CustomerName}}<br/>{{item.CustomerMobile}}</p></td> <td><p class="fz12 over_ellipsis" style="width: 120px;">{{item.CustomerName}}<br/>{{item.CustomerMobile}}</p></td>
<td><span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span></td> <td><span @click="goUrl('散客机票','individualTicket',item.AirTicketId)" class="guest_num">{{item.AirTicketId}}</span></td>
<td>{{item.GuestNum}}/{{item.SeatNum}}{{item.FreightSpace}}</td> <td>{{item.GuestNum}}/{{item.SeatNum}}{{item.FreightSpace}}</td>
<td class="fz12">{{item.TC_Price}}</td> <td class="fz12">{{item.TC_Price}}</td>
<td class="fz12">{{item.Unit_Price}}</td> <td class="fz12">{{item.Unit_Price}}</td>
...@@ -83,8 +84,8 @@ ...@@ -83,8 +84,8 @@
<span v-if="item.Status==2">{{$t('pub.cancelBtn')}}</span> <span v-if="item.Status==2">{{$t('pub.cancelBtn')}}</span>
<span v-if="item.Status==3">{{$t('sm.daifukuan')}}</span> <span v-if="item.Status==3">{{$t('sm.daifukuan')}}</span>
</p> </p>
</td> </td>
<td> <td>
<p v-if="item.RefundStatus==2 && item.Status==1 && item.RefundFinanceList.length==0"> <p v-if="item.RefundStatus==2 && item.Status==1 && item.RefundFinanceList.length==0">
...@@ -99,7 +100,7 @@ ...@@ -99,7 +100,7 @@
<td colspan="15" class="RL_Order" style="height:20px"> <td colspan="15" class="RL_Order" style="height:20px">
<span class="RL-remarkTitle">{{$t('salesModule.MD')}}:</span> <span class="RL-remarkTitle">{{$t('salesModule.MD')}}:</span>
<span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0"> <span class="RL-redType RL-remarkCon" v-if="item.GuestList.length>0">
<el-popover <el-popover
placement="right" placement="right"
width="1000" width="1000"
...@@ -117,7 +118,7 @@ ...@@ -117,7 +118,7 @@
<el-table-column property="PassportNo" :label="$t('sm.huzhaohaoma')"></el-table-column> <el-table-column property="PassportNo" :label="$t('sm.huzhaohaoma')"></el-table-column>
<el-table-column property="NationalityName" :label="$t('visaT.nationality')"></el-table-column> <el-table-column property="NationalityName" :label="$t('visaT.nationality')"></el-table-column>
<el-table-column width="120" property="MobilePhone" :label="$t('pub.mbPhoneNum')"></el-table-column> <el-table-column width="120" property="MobilePhone" :label="$t('pub.mbPhoneNum')"></el-table-column>
<el-table-column property="AgeType" :label="$t('sm.nianlingType')"> <el-table-column property="AgeType" :label="$t('sm.nianlingType')">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.AgeType=='1'">{{$t('salesModule.Adult')}}</span> <span v-if="scope.row.AgeType=='1'">{{$t('salesModule.Adult')}}</span>
...@@ -136,8 +137,8 @@ ...@@ -136,8 +137,8 @@
<span class="RL-redType RL-remarkCon" v-else> <span class="RL-redType RL-remarkCon" v-else>
<span>{{$t('salesModule.ZWMD')}}</span> <span>{{$t('salesModule.ZWMD')}}</span>
</span> </span>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -164,7 +165,7 @@ ...@@ -164,7 +165,7 @@
{{$t('system.content_noData')}} {{$t('system.content_noData')}}
</span> </span>
</span> </span>
</div> </div>
</div> </div>
<div> <div>
...@@ -197,9 +198,16 @@ ...@@ -197,9 +198,16 @@
<script> <script>
import payURL from "../commonPage/payURL.vue"; import payURL from "../commonPage/payURL.vue";
import moment from "moment"; import moment from "moment";
import DateLimit from '../public/DateLimit.vue';
export default { export default {
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime);
return startTime.getTime() >= time.getTime();
}
},
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
...@@ -222,7 +230,7 @@ export default { ...@@ -222,7 +230,7 @@ export default {
showID: -1 showID: -1
}; };
}, },
components: {}, components: {DateLimit},
created() {}, created() {},
methods: { methods: {
// 退款操作 // 退款操作
......
...@@ -115,20 +115,22 @@ ...@@ -115,20 +115,22 @@
</li> </li>
<li> <li>
<span><em>{{ $t("scen.sc_ftTime") }}</em> <span><em>{{ $t("scen.sc_ftTime") }}</em>
<el-date-picker v-model="msg.QStartDate" @change="dataDuiQ()" class="w135" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.QStartDate" @change="dataDuiQ()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<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" <el-date-picker v-model="msg.QEndDate" @change="dataDuiQ()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
<span><em>{{ $t("fnc.bmriqi") }}</em> <span><em>{{ $t("fnc.bmriqi") }}</em>
<el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.CStartDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<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" <el-date-picker v-model="msg.CEndDate" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date" :picker-options="pickerCEndDate" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -760,14 +762,28 @@ ...@@ -760,14 +762,28 @@
import updateSalesMan from "../commonPage/updateSalesMan.vue"; import updateSalesMan from "../commonPage/updateSalesMan.vue";
import "@riophae/vue-treeselect/dist/vue-treeselect.css"; import "@riophae/vue-treeselect/dist/vue-treeselect.css";
import PriceDetail from '../orderCommon/PriceDetail.vue'; import PriceDetail from '../orderCommon/PriceDetail.vue';
import DateLimit from '../public/DateLimit.vue';
export default { export default {
components: { components: {
Treeselect, Treeselect,
updateSalesMan, updateSalesMan,
PriceDetail, PriceDetail,
DateLimit
}, },
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate);
return startTime.getTime() >= time.getTime();
}
},
pickerCEndDate: {
disabledDate: time => {
let startTime = new Date(this.msg.CStartDate);
return startTime.getTime() >= time.getTime();
}
},
normalizer(node) { normalizer(node) {
var obj = { var obj = {
id: node.DepartmentId, id: node.DepartmentId,
...@@ -878,7 +894,7 @@ ...@@ -878,7 +894,7 @@
res => { res => {
if (res.data.resultCode == 1) { if (res.data.resultCode == 1) {
this.customerList = res.data.data; this.customerList = res.data.data;
} }
}, },
err => {} err => {}
...@@ -966,7 +982,7 @@ ...@@ -966,7 +982,7 @@
}, },
// 结束日期不能小于开始日期 // 结束日期不能小于开始日期
dataDui() { dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") { if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "" && this.msg.CEndDate != null) {
this.$message.error("结束日期不能小于开始日期"); this.$message.error("结束日期不能小于开始日期");
this.msg.CEndDate = ""; this.msg.CEndDate = "";
} }
...@@ -975,7 +991,7 @@ ...@@ -975,7 +991,7 @@
if ( if (
new Date(this.msg.QStartDate).getTime() > new Date(this.msg.QStartDate).getTime() >
new Date(this.msg.QEndDate).getTime() && new Date(this.msg.QEndDate).getTime() &&
this.msg.QEndDate !== "" this.msg.QEndDate !== ""&&this.msg.QEndDate !=null
) { ) {
this.$message.error("结束日期不能小于开始日期"); this.$message.error("结束日期不能小于开始日期");
this.msg.QEndDate = ""; this.msg.QEndDate = "";
...@@ -1192,7 +1208,7 @@ ...@@ -1192,7 +1208,7 @@
if (this.$route.query.OrderId) { if (this.$route.query.OrderId) {
this.msg.tempOrderId = this.$route.query.OrderId this.msg.tempOrderId = this.$route.query.OrderId
} }
this.getCompany(); this.getCompany();
this.getCtlxList(); this.getCtlxList();
...@@ -1234,7 +1250,7 @@ ...@@ -1234,7 +1250,7 @@
this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1); this.GetCustomerListByKeyWord(this.$route.query.CustomerName,1);
if(this.$route.query.CustomerId){ if(this.$route.query.CustomerId){
this.msg.CustomerId = parseInt(this.$route.query.CustomerId); this.msg.CustomerId = parseInt(this.$route.query.CustomerId);
} }
} }
this.getList(); this.getList();
......
...@@ -1393,11 +1393,12 @@ ...@@ -1393,11 +1393,12 @@
</li> </li>
<li> <li>
<span><em>{{ $t("scen.sc_ftTime") }}</em> <span><em>{{ $t("scen.sc_ftTime") }}</em>
<el-date-picker v-model="msg.QStartDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.QStartDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QStartDate = date,dataDui2()}"></DateLimit>
- -
<el-date-picker v-model="msg.QEndDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd" <el-date-picker v-model="msg.QEndDate" @change="dataDui2()" class="w150" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date":picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li style="line-height: 30px; padding-left: 30px"> <li style="line-height: 30px; padding-left: 30px">
...@@ -2492,9 +2493,16 @@ ...@@ -2492,9 +2493,16 @@
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注 import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import PriceDetail from '../orderCommon/PriceDetail.vue'; import PriceDetail from '../orderCommon/PriceDetail.vue';
import DateLimit from '../public/DateLimit.vue';
export default { export default {
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate);
return startTime.getTime() >= time.getTime();
}
},
isShow: '', isShow: '',
pagesTitle: '跟团游订单', pagesTitle: '跟团游订单',
SpecialAppShow: false, SpecialAppShow: false,
...@@ -2817,6 +2825,7 @@ ...@@ -2817,6 +2825,7 @@
commissionDialog, commissionDialog,
orderRemark: orderRemark, orderRemark: orderRemark,
PriceDetail, PriceDetail,
DateLimit
}, },
filters: { filters: {
priceFormat(value) { priceFormat(value) {
...@@ -4951,6 +4960,7 @@ ...@@ -4951,6 +4960,7 @@
this.msg.tempOrderId = this.$route.query.OrderId this.msg.tempOrderId = this.$route.query.OrderId
} else { } else {
this.msg.QStartDate = new Date().Format("yyyy-MM-dd"); this.msg.QStartDate = new Date().Format("yyyy-MM-dd");
} }
this.getEmployee(); this.getEmployee();
this.getList(); this.getList();
......
...@@ -1248,11 +1248,12 @@ ...@@ -1248,11 +1248,12 @@
</span> </span>
</li> </li>
<li><span><em>{{$t('scen.sc_ftTime')}}</em> <li><span><em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker v-model='msg.QStartDate' @change="dataDui2()" class='w150' value-format="yyyy-MM-dd" <!-- <el-date-picker v-model='msg.QStartDate' @change="dataDui2()" class='w150' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.QStartDate" :EndGroupDate="msg.QEndDate" @change="(date)=> msg.QStartDate = date"></DateLimit>
- -
<el-date-picker v-model='msg.QEndDate' @change="dataDui2()" class='w150' value-format="yyyy-MM-dd" <el-date-picker v-model='msg.QEndDate' @change="dataDui2()" class='w150' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li style="line-height: 30px; padding-left: 30px;"> <li style="line-height: 30px; padding-left: 30px;">
...@@ -1282,11 +1283,12 @@ ...@@ -1282,11 +1283,12 @@
<tr> <tr>
<td>{{$t('fnc.bmriqi')}}</td> <td>{{$t('fnc.bmriqi')}}</td>
<td colspan="3"> <td colspan="3">
<el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" <!-- <el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<DateLimit :clearable="true" :StartGroupDate="msg.CStartDate" :EndGroupDate="msg.CEndDate" @change="(date)=> msg.CStartDate = date"></DateLimit>
- -
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" <el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date" :picker-options="pickerCEndDate" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -1867,9 +1869,22 @@ ...@@ -1867,9 +1869,22 @@
import updateSalesMan from '../commonPage/updateSalesMan.vue' import updateSalesMan from '../commonPage/updateSalesMan.vue'
import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog" import commissionDialog from "../FinancialModule/TradeCommission/commissionDialog"
import orderRemark from "../orderCommon/order-remark.vue"; //订单备注 import orderRemark from "../orderCommon/order-remark.vue"; //订单备注
import DateLimit from '../public/DateLimit.vue';
export default { export default {
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.QStartDate);
return startTime.getTime() >= time.getTime();
}
},
pickerCEndDate: {
disabledDate: time => {
let startTime = new Date(this.msg.CStartDate);
return startTime.getTime() >= time.getTime();
}
},
timer: false, timer: false,
fullHeight: document.documentElement.clientHeight, fullHeight: document.documentElement.clientHeight,
ScreenHeight: 0, ScreenHeight: 0,
...@@ -2255,6 +2270,7 @@ ...@@ -2255,6 +2270,7 @@
updateSalesMan: updateSalesMan, updateSalesMan: updateSalesMan,
commissionDialog, commissionDialog,
orderRemark: orderRemark, orderRemark: orderRemark,
DateLimit
}, },
watch: { watch: {
fullHeight(val) { fullHeight(val) {
......
...@@ -1511,9 +1511,10 @@ ...@@ -1511,9 +1511,10 @@
<li> <li>
<span> <span>
<em>{{$t('Airticket.Air_flightDate')}}</em> <em>{{$t('Airticket.Air_flightDate')}}</em>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateStart" type="date" <!-- <el-date-picker clearable class="w135" v-model="msg.QFlightDateStart" type="date"
:picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"> :picker-options="beforeCheck" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')">
</el-date-picker> </el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.QFlightDateStart" :EndGroupDate="msg.QFlightDateEnd" @change="(date)=> msg.QFlightDateStart = date"></DateLimit>
<span class="_ln">-</span> <span class="_ln">-</span>
<el-date-picker clearable class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck" <el-date-picker clearable class="w135" v-model="msg.QFlightDateEnd" type="date" :picker-options="afterCheck"
value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker> value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
...@@ -1715,9 +1716,12 @@ ...@@ -1715,9 +1716,12 @@
</div> </div>
</template> </template>
<script> <script>
import DateLimit from '../public/DateLimit.vue';
export default { export default {
components: {DateLimit},
data() { data() {
return { return {
isQueryHistoryData: false,
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { //disabledDate true 为禁止选择 disabledDate: (time) => { //disabledDate true 为禁止选择
let starTime = new Date(this.starTime) let starTime = new Date(this.starTime)
...@@ -1861,7 +1865,7 @@ ...@@ -1861,7 +1865,7 @@
}, },
afterCheck: { afterCheck: {
disabledDate: time => { disabledDate: time => {
let startTime = new Date(this.msg.sDate); let startTime = new Date(this.msg.QFlightDateStart);
return startTime.getTime() >= time.getTime(); return startTime.getTime() >= time.getTime();
} }
}, },
...@@ -1983,6 +1987,19 @@ ...@@ -1983,6 +1987,19 @@
}; };
}, },
methods: { methods: {
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData;
var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
this.CheckUserAuth(actiionContract, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.isQueryHistoryData = true;
}else{
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
this.msg.QFlightDateStart = StartDate
}
});
},
getTotalPrice: function () { getTotalPrice: function () {
this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price) this.addMsg.PreferPrice = Number(this.addMsg.YSeatNum) * Number(this.addMsg.Unit_Price)
this.getTicheng() this.getTicheng()
...@@ -3015,6 +3032,7 @@ ...@@ -3015,6 +3032,7 @@
} }
}, },
mounted() { mounted() {
this.GetSupperOrderEditAuth()
var id = this.$route.query.id; var id = this.$route.query.id;
if (id) { if (id) {
this.msg.ID = id; this.msg.ID = id;
......
...@@ -2342,7 +2342,7 @@ ...@@ -2342,7 +2342,7 @@
<i class="iconfont icon-hangban1"></i <i class="iconfont icon-hangban1"></i
>{{ $t("Operation.Op_Warmprompt") }} >{{ $t("Operation.Op_Warmprompt") }}
</p> </p>
<span>{{ $t("visa.v_sqtime") }}</span <span>{{ $t("visa.v_sqtime") }}</span
><i>{{ ><i>{{
item.SendVisaTime === "" ? "未设置" : item.SendVisaTime item.SendVisaTime === "" ? "未设置" : item.SendVisaTime
...@@ -4178,7 +4178,7 @@ export default { ...@@ -4178,7 +4178,7 @@ export default {
this.getPlatformAccount(obj.PlatformAccountTypeId); this.getPlatformAccount(obj.PlatformAccountTypeId);
this.getPlatformAccountNew(); this.getPlatformAccountNew();
this.clearMsg(); this.clearMsg();
this.SingleDMCPrice = obj.SingleDMCPrice; this.SingleDMCPrice = obj.SingleDMCPrice;
this.SingleDMCPricex = obj.SingleDMCPrice; this.SingleDMCPricex = obj.SingleDMCPrice;
}, },
......
...@@ -288,11 +288,13 @@ ...@@ -288,11 +288,13 @@
</li> </li>
<li> <li>
<span><em>{{ $t("hotel.hotel_StarDate") }}</em> <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
- -
<el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"
:picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -457,10 +459,16 @@ ...@@ -457,10 +459,16 @@
<script> <script>
import productOrderList from "../orderCommon/productOrderList.vue"; import productOrderList from "../orderCommon/productOrderList.vue";
import DateLimit from '../public/DateLimit.vue';
export default { export default {
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime);
return startTime.getTime() >= time.getTime();
}
},
pagesTitle: '跟团游产品', pagesTitle: '跟团游产品',
//当前登录用户信息 //当前登录用户信息
CurrentUserInfo: {}, CurrentUserInfo: {},
...@@ -507,7 +515,8 @@ ...@@ -507,7 +515,8 @@
}; };
}, },
components: { components: {
productOrderList productOrderList,
DateLimit
}, },
methods: { methods: {
//刷新页面 //刷新页面
......
...@@ -274,11 +274,12 @@ ...@@ -274,11 +274,12 @@
</span> </span>
</li> </li>
<li><span><em>{{$t('hotel.hotel_StarDate')}}</em> <li><span><em>{{$t('hotel.hotel_StarDate')}}</em>
<el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" <!-- <el-date-picker v-model='msg.StartTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartTime" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
- -
<el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" <el-date-picker v-model='msg.EndTime' @change="dataDui()" class='w135' value-format="yyyy-MM-dd"
type="date"></el-date-picker> type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li style="height:34px;line-height:34px;padding: 0 0 0 20px;vertical-align: middle;"> <li style="height:34px;line-height:34px;padding: 0 0 0 20px;vertical-align: middle;">
...@@ -395,10 +396,17 @@ ...@@ -395,10 +396,17 @@
import commonTeamInfo from "../commonPage/commonTeamInfo.vue"; import commonTeamInfo from "../commonPage/commonTeamInfo.vue";
import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue"; import tripDownLoadCommon from "../commonPage/TripDownLoadCommon.vue";
import carousel from "../commonPage/carousel.vue"; import carousel from "../commonPage/carousel.vue";
import DateLimit from '../public/DateLimit.vue';
export default { export default {
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime);
return startTime.getTime() >= time.getTime();
}
},
pagesTitle: '当地游产品', pagesTitle: '当地游产品',
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { disabledDate: (time) => {
...@@ -708,7 +716,8 @@ ...@@ -708,7 +716,8 @@
productOrderList, productOrderList,
commonTeamInfo: commonTeamInfo, commonTeamInfo: commonTeamInfo,
tripDownLoadCommon: tripDownLoadCommon, tripDownLoadCommon: tripDownLoadCommon,
carousel: carousel carousel: carousel,
DateLimit
}, },
watch: { watch: {
......
...@@ -36,9 +36,10 @@ ...@@ -36,9 +36,10 @@
</span> </span>
</li> </li>
<li><span><em>出团{{$t('sm.Date')}}</em> <li><span><em>出团{{$t('sm.Date')}}</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
- -
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateStart" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -46,9 +47,11 @@ ...@@ -46,9 +47,11 @@
<span> <el-tooltip class="item" effect="dark" content="导入购物佣金数据的日期(需要选择导入日期的起始时间才有效)" placement="top"> <span> <el-tooltip class="item" effect="dark" content="导入购物佣金数据的日期(需要选择导入日期的起始时间才有效)" placement="top">
<em>导入日期</em> <em>导入日期</em>
</el-tooltip> </el-tooltip>
<el-date-picker v-model='msg.CStartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <!-- <el-date-picker v-model='msg.CStartDate' 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"></DateLimit>
- -
<el-date-picker v-model='msg.CEndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <!-- <el-date-picker v-model='msg.CEndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter" :placeholder="$t('admin.admin_choDate')"></el-date-picker> -->
<DateLimit :clearable="true" :StartGroupDate="msg.CEndDate" @change="(date)=> {msg.CEndDate = date,dataDui()}"></DateLimit>
</span> </span>
</li> </li>
<li> <li>
...@@ -478,12 +481,26 @@ ...@@ -478,12 +481,26 @@
</template> </template>
<script> <script>
import attachments from "./components/attachments.vue"; import attachments from "./components/attachments.vue";
import DateLimit from '../public/DateLimit.vue';
export default { export default {
components: { components: {
attachments attachments,
DateLimit
}, },
data() { data() {
return { return {
pickerBeginDateStart: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate);
return startTime.getTime() >= time.getTime();
}
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.CStartDate);
return startTime.getTime() >= time.getTime();
}
},
saveUploadMsg: [], saveUploadMsg: [],
isUploadAttachment: false, isUploadAttachment: false,
FinanceTypeList: [{ FinanceTypeList: [{
...@@ -569,6 +586,12 @@ ...@@ -569,6 +586,12 @@
} }
}, },
methods: { methods: {
dataDui() {
if (this.msg.CStartDate > this.msg.CEndDate && this.msg.CEndDate !== "") {
this.$message.error("结束日期不能大于开始日期");
this.msg.CEndDate = "";
}
},
UploadAttachment(){ UploadAttachment(){
this.isUploadAttachment = true this.isUploadAttachment = true
}, },
......
...@@ -30,9 +30,10 @@ ...@@ -30,9 +30,10 @@
</span> </span>
</li> </li>
<li><span><em>{{$t('sm.Date')}}</em> <li><span><em>{{$t('sm.Date')}}</em>
<el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <!-- <el-date-picker v-model='msg.StartDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="msg.StartDate" :EndGroupDate="msg.EndDate" @change="(date)=> msg.StartDate = date"></DateLimit>
- -
<el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> <el-date-picker v-model='msg.EndDate' class='w135' value-format="yyyy-MM-dd" type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
<li> <li>
...@@ -258,9 +259,17 @@ ...@@ -258,9 +259,17 @@
</div> </div>
</template> </template>
<script> <script>
import DateLimit from '../public/DateLimit.vue';
export default { export default {
components: {DateLimit},
data() { data() {
return { return {
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartDate);
return startTime.getTime() >= time.getTime();
}
},
FinanceTypeList:[ FinanceTypeList:[
// {Name:this.$t('advmanager.v_all'),Id:0}, // {Name:this.$t('advmanager.v_all'),Id:0},
{Name:'领队佣金',Id:1}, {Name:'领队佣金',Id:1},
...@@ -439,7 +448,7 @@ ...@@ -439,7 +448,7 @@
that.Error("请选择导游账号!"); that.Error("请选择导游账号!");
return return
} }
this.$confirm('是否生成财务单据?', this.$t('tips.tips'), { this.$confirm('是否生成财务单据?', this.$t('tips.tips'), {
confirmButtonText: `确定`, confirmButtonText: `确定`,
cancelButtonText: `取消`, cancelButtonText: `取消`,
......
...@@ -238,9 +238,10 @@ ...@@ -238,9 +238,10 @@
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="8" :gutter="35">
<el-form-item label="支付日期"> <el-form-item label="支付日期">
<el-date-picker class="h34" @change="timeAdd" v-model="productionDate" type="daterange" <!-- <el-date-picker class="h34" @change="timeAdd" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')"></el-date-picker> value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')"></el-date-picker> -->
</el-form-item> <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{productionDate=[startDate,endDate],timeAdd()}"></StartDateLimit>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -402,7 +403,9 @@ ...@@ -402,7 +403,9 @@
</div> </div>
</template> </template>
<script> <script>
import StartDateLimit from '../public/StartDateLimit.vue';
export default { export default {
components: {StartDateLimit},
data() { data() {
return { return {
imageOptions: { imageOptions: {
...@@ -469,6 +472,22 @@ ...@@ -469,6 +472,22 @@
}, },
}, },
methods: { methods: {
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData;
var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
this.CheckUserAuth(actiionContract, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.isQueryHistoryData = true;
}else{
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDate = [StartDate, EndDate]
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
});
},
//设置抖音订单跟单人员 //设置抖音订单跟单人员
SetDYOrderEmp() { SetDYOrderEmp() {
if (this.postMsg.EmpId <= 0) { if (this.postMsg.EmpId <= 0) {
...@@ -543,6 +562,7 @@ ...@@ -543,6 +562,7 @@
} }
}, },
mounted() { mounted() {
this.GetSupperOrderEditAuth()
this.getPiaoWuEmp(); this.getPiaoWuEmp();
this.getPageList(); this.getPageList();
} }
......
...@@ -271,9 +271,10 @@ ...@@ -271,9 +271,10 @@
</el-col> </el-col>
<el-col :span="8" :gutter="35"> <el-col :span="8" :gutter="35">
<el-form-item label="支付日期"> <el-form-item label="支付日期">
<el-date-picker class="h34" @change="timeAdd" v-model="productionDate" type="daterange" <!-- <el-date-picker class="h34" @change="timeAdd" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')"></el-date-picker> value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')"></el-date-picker> -->
</el-form-item> <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{productionDate=[startDate,endDate],timeAdd()}"></StartDateLimit>
</el-form-item>
</el-col> </el-col>
</el-row> </el-row>
</el-form> </el-form>
...@@ -487,9 +488,12 @@ ...@@ -487,9 +488,12 @@
</div> </div>
</template> </template>
<script> <script>
import StartDateLimit from '../public/StartDateLimit.vue';
export default { export default {
components: {StartDateLimit},
data() { data() {
return { return {
isQueryHistoryData: false,
imageOptions: { imageOptions: {
navbar: false, navbar: false,
title: false title: false
...@@ -558,6 +562,22 @@ ...@@ -558,6 +562,22 @@
}, },
}, },
methods: { methods: {
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData;
var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
this.CheckUserAuth(actiionContract, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.isQueryHistoryData = true;
}else {
let StartDate = this.getBeforeDate(31, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDate = [StartDate, EndDate]
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
}
});
},
delImg(item, index) { delImg(item, index) {
item.FileList.splice(index, 1); item.FileList.splice(index, 1);
}, },
...@@ -687,6 +707,7 @@ ...@@ -687,6 +707,7 @@
} }
}, },
mounted() { mounted() {
this.GetSupperOrderEditAuth()
this.currentUserInfo = this.getLocalStorage(); this.currentUserInfo = this.getLocalStorage();
this.msg.QUpdateBy = this.currentUserInfo.EmployeeId; this.msg.QUpdateBy = this.currentUserInfo.EmployeeId;
this.getPiaoWuEmp(); this.getPiaoWuEmp();
......
...@@ -149,11 +149,12 @@ ...@@ -149,11 +149,12 @@
<li> <li>
<span> <span>
<em>{{$t('fnc.tuanqi')}}</em> <em>{{$t('fnc.tuanqi')}}</em>
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" <!-- <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder=""
v-model="queryMsg.QStartDate"> v-model="queryMsg.QStartDate">
</el-date-picker> </el-date-picker> -->
<el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" placeholder="" <DateLimit :clearable="false" :StartGroupDate="queryMsg.QStartDate" :EndGroupDate="queryMsg.QEndDate" @change="(date)=> queryMsg.QStartDate = date"></DateLimit>
v-model="queryMsg.QEndDate"> <el-date-picker class="w150" type="date" value-format="yyyy-MM-dd" :placeholder="$t('admin.admin_choDate')"
v-model="queryMsg.QEndDate" :picker-options="pickerBeginDateAfter">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
...@@ -266,9 +267,18 @@ ...@@ -266,9 +267,18 @@
</div> </div>
</template> </template>
<script> <script>
import DateLimit from '../../public/DateLimit.vue';
export default { export default {
components: {DateLimit},
data() { data() {
return { return {
isQueryHistoryData: false,
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.queryMsg.QStartDate);
return startTime.getTime() >= time.getTime();
}
},
queryCommonData: { queryCommonData: {
//线路列表 //线路列表
LineList: [], LineList: [],
...@@ -318,6 +328,19 @@ ...@@ -318,6 +328,19 @@
}; };
}, },
methods: { methods: {
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData;
var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
this.CheckUserAuth(actiionContract, res => {
if (res.data.resultCode == 1 && res.data.data == 1) {
this.isQueryHistoryData = true;
}else{
let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
this.queryMsg.QStartDate = StartDate
}
});
},
//初始化公司 //初始化公司
getCompanyList() { getCompanyList() {
let userInfo = this.getLocalStorage(); let userInfo = this.getLocalStorage();
...@@ -463,6 +486,7 @@ ...@@ -463,6 +486,7 @@
}, },
}, },
mounted() { mounted() {
this.GetSupperOrderEditAuth()
this.getCompanyList(); this.getCompanyList();
this.getLineList(); this.getLineList();
this.getList(); this.getList();
......
...@@ -562,11 +562,11 @@ ...@@ -562,11 +562,11 @@
</li> </li>
<li> <li>
<span><em>{{ $t("hotel.hotel_StarDate") }}</em> <span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" :clearable="false"
type="date"></el-date-picker> type="date" :picker-options="pickerBeginDateStart"></el-date-picker>
- -
<el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable <el-date-picker v-model="msg.EndTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd" clearable
type="date"></el-date-picker> type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
</span> </span>
</li> </li>
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
{{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}} {{subItem.DepartureAirPortName}} {{subItem.Departure_time}} {{subItem.ArrivalAirPortName}}
{{subItem.Arrival_time}}</div> {{subItem.Arrival_time}}</div>
</div> --> </div> -->
<el-popover width="900" trigger="click" popper-class="TC_tripDetails"> <el-popover width="900" trigger="click" popper-class="TC_tripDetails">
<table width="100%" border="0" cellspacing="0" cellpadding="0"> <table width="100%" border="0" cellspacing="0" cellpadding="0">
<tr class="_color_666" style="text-align:center;"> <tr class="_color_666" style="text-align:center;">
...@@ -704,7 +704,7 @@ ...@@ -704,7 +704,7 @@
<div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div> <div class="mb"><span>小孩占床: {{item.ChildNeedPrice}}&nbsp;不占床: {{item.ChildNoNeedPrice}}</span></div>
<div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div> <div class="mb"><span>婴儿: {{item.BabyPrice}}&nbsp; 婴儿附加费: {{item.BabyChargePrice}}</span></div>
<div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> --> <div class="mb"><span>老人附加费: {{item.OldManChargePrice}} &nbsp;签证: {{item.VisaPrice}}</span></div> -->
<div> <div>
<p> <p>
<i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }} <i class="iconfont icon-jiage"></i>{{ $t("Operation.Op_PriceInfo") }}
...@@ -895,7 +895,7 @@ ...@@ -895,7 +895,7 @@
<!-- <div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusYSeatNum}}</span></div> <!-- <div class="mb bold"><span class="item-title">经济舱:</span><span>{{item.YSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusYSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusCSeatNum}}</span></div> <div class="mb bold"><span class="item-title">商务舱:</span><span> {{item.CSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusCSeatNum}}</span></div>
<div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusFSeatNum}}</span></div> --> <div class="mb bold"><span class="item-title">头等舱:</span><span> {{item.FSeat}} <span class="item-title ml">剩余:</span>{{item.SurplusFSeatNum}}</span></div> -->
</div> </div>
</div> </div>
<div class="el-col w_10"> <div class="el-col w_10">
...@@ -933,11 +933,11 @@ ...@@ -933,11 +933,11 @@
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>
<div class="buy-box" v-show="isShowTeamOrder"> <div class="buy-box" v-show="isShowTeamOrder">
<orderForm @success="reSearchPage" @close="closeForm" <orderForm @success="reSearchPage" @close="closeForm"
:PTCID="teamInfo.TCID" :PTCID="teamInfo.TCID"
:POrderId="0" :POrderId="0"
:PBranchId="0" :PBranchId="0"
:PProductType="2" :PProductType="2"
:showCity="false" :showCity="false"
:productObj="teamInfo"> :productObj="teamInfo">
</orderForm> </orderForm>
...@@ -950,6 +950,22 @@ ...@@ -950,6 +950,22 @@
export default { export default {
data() { data() {
return { return {
pickerBeginDateStart: {
disabledDate: time => {
let endTime = new Date(this.getBeforeDate(1, new Date().Format("yyyy-MM-dd")));
return time && endTime.getTime() >= time.getTime()
}
// disabledDate: time => {
// let startTime = new Date(this.msg.EndTime);
// return startTime.getTime() <= time.getTime();
// }
},
pickerBeginDateAfter: {
disabledDate: time => {
let startTime = new Date(this.msg.StartTime);
return startTime.getTime() >= time.getTime();
}
},
pickerOptions0: { pickerOptions0: {
disabledDate: (time) => { disabledDate: (time) => {
let starTime = new Date(this.starTime); let starTime = new Date(this.starTime);
...@@ -1082,6 +1098,8 @@ ...@@ -1082,6 +1098,8 @@
}, },
}, },
mounted() { mounted() {
let StartDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
this.msg.StartTime = StartDate
this.getList(); this.getList();
}, },
}; };
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
: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="true" :dateTime="DatelistUse" @change="(startDate,endDate)=>{Datelist=[startDate,endDate],getDatesUse()}"></StartDateLimit> <StartDateLimit :clearable="true" :dateTime="DatelistUse" @change="(startDate,endDate)=>{DatelistUse=[startDate,endDate],getDatesUse()}"></StartDateLimit>
</span> </span>
</li> </li>
......
...@@ -183,7 +183,7 @@ ...@@ -183,7 +183,7 @@
</li> </li>
<li><span><em>{{$t('pub.date')}}</em> <li><span><em>{{$t('pub.date')}}</em>
<el-date-picker v-model='msg.Q_Date' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.Q_Date' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" :laceholder="$t('objFill.yuyueriqi')"> :picker-options="beforeCheck" :clearable="false" :laceholder="$t('objFill.yuyueriqi')">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
......
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
<li> <li>
<span> <span>
<em>出发时间</em> <em>出发时间</em>
<el-date-picker <!-- <el-date-picker
style="height: 34px;" style="height: 34px;"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
v-model="DatelistUse" v-model="DatelistUse"
...@@ -185,7 +185,8 @@ ...@@ -185,7 +185,8 @@
:range-separator="$t('OrderList.zhi')" :range-separator="$t('OrderList.zhi')"
: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>
</span> </span>
</li> </li>
</template> </template>
......
<template> <template>
<el-date-picker class="w150" type="date" v-model="SGroupDate" <el-date-picker class="w150" type="date" v-model="SGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
placeholder
:clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true" :clearable="((clearable==false||clearable)&&!isQueryHistoryData)?clearable:true"
@change="getTime"></el-date-picker> @change="getTime" :placeholder="$t('admin.admin_choDate')"></el-date-picker>
</template> </template>
<script> <script>
export default { export default {
...@@ -14,12 +13,15 @@ ...@@ -14,12 +13,15 @@
pickerBeginDateBefore: { pickerBeginDateBefore: {
disabledDate: time => { disabledDate: time => {
if(this.EndGroupDate){ if(this.EndGroupDate){
if(!this.isQueryHistoryData){ // if(!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions() // let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime(); // return time && endTime.getTime() >= time.getTime();
}else{ // }else{
let endTime = new Date(this.EndGroupDate); // let endTime = new Date(this.SGroupDate);
} // return time && endTime.getTime() >= time.getTime();
// }
let endTime = new Date(this.EndGroupDate);
return time && endTime.getTime() <= time.getTime();
}else { }else {
if(!this.isQueryHistoryData){ if(!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions() let endTime = this.TourDateRestrictions()
...@@ -62,7 +64,6 @@ ...@@ -62,7 +64,6 @@
GetSupperOrderEditAuth() { GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData; var actiionContract = this.$AuthCode.isQueryHistoryData;
var isQueryHistoryData = this.$AuthCode.isQueryHistoryData; var isQueryHistoryData = this.$AuthCode.isQueryHistoryData;
// 合同
this.CheckUserAuth(actiionContract, res => { this.CheckUserAuth(actiionContract, res => {
if (res.data.resultCode == 1 && res.data.data == 1) { if (res.data.resultCode == 1 && res.data.data == 1) {
this.isQueryHistoryData = true; this.isQueryHistoryData = true;
......
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
</li> --> </li> -->
<li><span><em>{{$t('pub.date')}}</em> <li><span><em>{{$t('pub.date')}}</em>
<el-date-picker v-model='msg.OpenTime' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" <el-date-picker v-model='msg.OpenTime' format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date"
:picker-options="beforeCheck" :laceholder="$t('objFill.menpiaoriqi')"> :picker-options="beforeCheck" :clearable="false" :laceholder="$t('objFill.menpiaoriqi')">
</el-date-picker> </el-date-picker>
</span> </span>
</li> </li>
......
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