Commit 9976e2c5 authored by youjie's avatar youjie

财务功能权限 优化

parent 7a17aed3
......@@ -105,13 +105,13 @@
<template v-if="!heightQueryBox">
<el-col :span="5">
<el-form-item label="发团日期:">
<!-- <el-date-picker class="h34"
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd()"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="missionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="missionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<el-col :span="5">
......@@ -694,11 +694,11 @@
}
},
created(){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.missionDate = [StartDate, EndDate]
this.msg.QStartDate = this.missionDate[0];
this.msg.QEndDate = this.missionDate[1];
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.missionDate = [StartDate, EndDate]
// this.msg.QStartDate = this.missionDate[0];
// this.msg.QEndDate = this.missionDate[1];
if(this.$route.query.pageIndex){
this.msg.pageIndex = this.$route.query.pageIndex;
}
......
......@@ -579,10 +579,10 @@
</el-col>
<el-col :span="5">
<el-form-item :label="$t('fnc.jiaoyiriqi')">
<!-- <el-date-picker class="h34" style="width: 100%;" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
<el-date-picker class="h34" style="width: 100%;" v-model="transactionDate" @change="timeAdd(3)" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> -->
<StartDateLimit :clearable="false" style="width: 100%;" :dateTime="transactionDate" @change="(startDate,endDate)=>{msg.sTradeDate=startDate,msg.eTradeDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" style="width: 100%;" :dateTime="transactionDate" @change="(startDate,endDate)=>{msg.sTradeDate=startDate,msg.eTradeDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<el-col :span="3">
......@@ -679,9 +679,10 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
<!-- <el-date-picker style="width: 100%;" class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-date-picker> -->
<StartDateLimit :clearable="false" style="width: 100%;" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sDate=startDate,msg.eDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -1071,7 +1072,11 @@
}
},
created() {
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];
},
mounted() {
let userInfo = this.getLocalStorage();
......
......@@ -1082,7 +1082,7 @@
}
},
created() {
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let StartDate = this.getBeforeDate(365, 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];
......
......@@ -258,12 +258,13 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('fnc.zdriqi')">
<el-date-picker class="h34"
<!-- <el-date-picker class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -278,13 +279,13 @@
</el-col>
<el-col :span="6">
<el-form-item :label="$t('scen.sc_ftTime')">
<!-- <el-date-picker class="h34"
<el-date-picker class="h34"
v-model="missionDate"
@change="timeAdd(4)"
type="daterange"
value-format="yyyy-MM-dd">
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="missionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="missionDate" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
</template>
......@@ -900,11 +901,16 @@ export default {
}
},
created(){
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.missionDate = [StartDate, EndDate]
// this.msg.QStartDate = this.missionDate[0];
// this.msg.QEndDate = this.missionDate[1];
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.missionDate = [StartDate, EndDate]
this.msg.QStartDate = this.missionDate[0];
this.msg.QEndDate = this.missionDate[1];
this.productionDate = [StartDate, EndDate]
this.msg.sDate = this.productionDate[0];
this.msg.eDate = this.productionDate[1];
if(this.$route.query.returnCode){
this.active = this.$route.query.returnCode;
this.msg.Conditon = this.$route.query.returnCode;
......
......@@ -119,14 +119,14 @@
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item :label="$t('fnc.a_hkfkriqi')">
<!-- <el-date-picker class="h34"
<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> -->
<StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sTradeDate=startDate,msg.eTradeDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sTradeDate=startDate,msg.eTradeDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
......@@ -281,11 +281,11 @@ export default {
}
},
created(){
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.sTradeDate = this.productionDate[0];
this.msg.eTradeDate = this.productionDate[1];
// 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.sTradeDate = this.productionDate[0];
// this.msg.eTradeDate = this.productionDate[1];
this.userInfo = this.getLocalStorage();
if(this.$route.query.DayReport && this.$route.query.DayReport=='1'){
this.msg.IsFromDayReport =1;
......
......@@ -113,14 +113,14 @@
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<!-- <el-date-picker class="h34"
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -1036,11 +1036,11 @@ export default {
},
},
mounted(){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDateByTC = [StartDate, EndDate]
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1];
this.getAccountTypeList();
this.AccountType_post_GetList();
......
......@@ -149,14 +149,14 @@
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<!-- <el-date-picker class="h34"
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -572,11 +572,12 @@ export default {
}
},
created(){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDateByTC = [StartDate, EndDate]
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1];
this.userInfo = this.getLocalStorage();
if(this.$route.query.DayReport && this.$route.query.DayReport=='1'){
this.msg.IsFromDayReport =1;
......
......@@ -123,7 +123,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="发团日期">
<!-- <el-date-picker
<el-date-picker
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
......@@ -131,8 +131,8 @@
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')"
value-format="yyyy-MM-dd"
></el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
></el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<!-- <el-col :span="4" :gutter="35">
......@@ -898,11 +898,11 @@ export default {
},
},
mounted(){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDateByTC = [StartDate, EndDate]
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1];
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1];
let userInfo=this.getLocalStorage();
let ClientID = this.$route.query.ClientID;
......
......@@ -97,14 +97,14 @@
</el-col>
<el-col :span="8" :gutter="35">
<el-form-item label="发团日期">
<!-- <el-date-picker class="h34"
<el-date-picker class="h34"
@change="timeAddByTC"
v-model="productionDateByTC"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('restaurant.res_To')">
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit>
</el-date-picker>
<!-- <StartDateLimit :clearable="false" :dateTime="productionDateByTC" @change="(startDate,endDate)=>{msg.QStartDate=startDate,msg.QEndDate=endDate}"></StartDateLimit> -->
</el-form-item>
</el-col>
<el-col :span="4" :gutter="35">
......@@ -1052,11 +1052,11 @@ export default {
},
},
mounted(){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.productionDateByTC = [StartDate, EndDate]
this.msg.QStartDate = this.productionDateByTC[0];
this.msg.QEndDate = this.productionDateByTC[1]
// let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
// let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
// this.productionDateByTC = [StartDate, EndDate]
// this.msg.QStartDate = this.productionDateByTC[0];
// this.msg.QEndDate = this.productionDateByTC[1]
let userInfo=this.getLocalStorage();
this.getAccountTypeList();
this.AccountType_post_GetList();
......
......@@ -56,17 +56,18 @@
</el-select>
</li>
<li><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" :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QStartDate = date,dataDuiQ()}"></DateLimit>
<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> -->
-
<el-date-picker v-model='msg.QEndDate' @change="dataDuiQ()" class='w135' :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" type="date"></el-date-picker>
<!-- <DateLimit :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QEndDate = date,dataDuiQ()}"></DateLimit> -->
<!-- <DateLimit :clearable="false" :StartGroupDate="msg.QEndDate" :EndGroupDate="msg.QEndDate" @change="(date)=> {msg.QEndDate = date,dataDuiQ()}"></DateLimit> -->
</span>
</li>
<li><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>
<!-- <el-date-picker v-model='msg.CStartDate' @change="dataDui()" class='w135' value-format="yyyy-MM-dd" type="date"></el-date-picker> -->
<DateLimit :clearable="false" :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"></el-date-picker>
<el-date-picker v-model='msg.CEndDate' @change="dataDui()" class='w135' :picker-options="pickerBeginDateAfterBM" value-format="yyyy-MM-dd" type="date"></el-date-picker>
</span>
</li>
<li>
......@@ -382,6 +383,12 @@
return startTime.getTime() >= time.getTime();
}
},
pickerBeginDateAfterBM: {
disabledDate: time => {
let startTime = new Date(this.msg.CStartDate);
return startTime.getTime() >= time.getTime();
}
},
normalizer(node) {
var obj = {
id: node.DepartmentId,
......@@ -643,7 +650,9 @@
}
if(!this.$route.query||!this.$route.query.starTime){
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
this.msg.QStartDate = StartDate
let EndDate = this.getBeforeDate(-1, new Date().Format("yyyy-MM-dd"))
this.msg.CStartDate = StartDate
this.msg.CEndDate = EndDate
}
this.getList();
},
......
......@@ -294,7 +294,7 @@
<span><em>{{ $t("hotel.hotel_StarDate") }}</em>
<!-- <el-date-picker v-model="msg.StartTime" @change="dataDui()" class="w135" value-format="yyyy-MM-dd"
type="date"></el-date-picker> -->
<DateLimit :clearable="false" :EndGroupDate="msg.EndTime" @change="(date)=> {msg.StartTime = date,dataDui()}"></DateLimit>
<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"
type="date" :picker-options="pickerBeginDateAfter"></el-date-picker>
......
......@@ -183,7 +183,7 @@
<em>{{$t('scen.sc_ftTime')}}</em>
<!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
<DateLimit :clearable="false" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
......
......@@ -440,8 +440,9 @@
<li>
<span>
<em>{{$t('scen.sc_ftTime')}}</em>
<el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker>
<!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
<DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
<el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
:picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
</span>
......@@ -636,7 +637,11 @@
</div>
</template>
<script>
import DateLimit from '../../public/DateLimit.vue';
export default {
components: {
DateLimit
},
data() {
return {
ArrList: [],
......
<template>
<el-date-picker class="w150" type="date" v-model="StartGroupDate"
<el-date-picker class="w150" type="date" v-model="SGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
placeholder
:clearable="clearable==false||clearable?clearable:true"
......@@ -7,20 +7,20 @@
</template>
<script>
export default {
props:['EndGroupDate','clearable'],
props:['StartGroupDate','EndGroupDate','clearable'],
data() {
return {
StartGroupDate: '',
SGroupDate: '',
pickerBeginDateBefore: {
disabledDate: time => {
if(this.EndGroupDate){
if (this.EndGroupDate == null) {
if(this.StartGroupDate&&!this.isQueryHistoryData){
if(this.SGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}else return false;
} else {
if(this.StartGroupDate&&!this.isQueryHistoryData){
if(this.SGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}else{
......@@ -29,7 +29,7 @@
}
}
}else {
if(this.StartGroupDate&&!this.isQueryHistoryData){
if(this.SGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}
......@@ -48,7 +48,7 @@
"-" +
myDate.getDate();
if (!this.$route.query.tcmun) {
this.StartGroupDate = nowDate;
this.SGroupDate = nowDate;
}
},
mounted() {
......@@ -57,22 +57,22 @@
watch: {
EndGroupDate:{
handler(n,o){
this.EGroupDate = n
},
deep:false,
immediate: true,
},
StartGroupDate:{
handler(n,o){
this.SGroupDate = n
},
deep:true,
immediate: false,
deep:false,
immediate: true,
}
},
methods: {
getTime() {
this.$emit('change',this.StartGroupDate)
this.$emit('change',this.SGroupDate)
},
GetSupperOrderEditAuth() {
var actiionContract = this.$AuthCode.isQueryHistoryData;
......
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