Skip to content

S
SuperMan
Commit c2f01655 authored by youjie's avatar youjie
Browse files
Options

财务报表 时间限制

parent 62320617
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2848 additions and 2370 deletions
src/assets/utils/AuthCode.js
View file @ c2f01655
......@@ -33,5 +33,6 @@ var AuthCode = {
F_EditDeleteGuest:"F_EditDeleteGuest",//修改删除旅客和名单权限
LookPlatformAccountPwd:"LookPlatformAccountPwd",//查看平台账户密码权限
OPRecoverySaleOrder:"op_RecoverySaleOrder",//op恢复销售取消订单权限
isQueryHistoryData: "isQueryHistoryData",//是否查看2022前的数据权限
};
export default AuthCode;
\ No newline at end of file
export default AuthCode;
src/components/FinancialModule/DataAnalysis/allEchart.vue
View file @ c2f01655
......@@ -136,7 +136,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="日期">
<el-date-picker
<!-- <el-date-picker
size="small"
v-model="dateTime"
type="monthrange"
......@@ -148,7 +148,8 @@
:picker-options="pickerOptions"
@change="getDateTime"
:clearable="false">
</el-date-picker>
</el-date-picker> -->
<StartYMDateLimit :clearable="false" :dateTime="dateTime" @change="(startDate,endDate)=>{dateTime=[startDate,endDate],getDateTime(dateTime)}"></StartYMDateLimit>
</el-form-item>
</el-col>
<el-col :span="4" v-if="msg.Type==2">
......@@ -301,6 +302,8 @@ import fourIncomeChange from "./components/fourEchart/IncomeChange.vue";
import fourIncomeShare from "./components/fourEchart/IncomeShare.vue";
import fourWoolRateChange from "./components/fourEchart/WoolRateChange.vue";
import fourActualRateChange from "./components/fourEchart/ActualRateChange.vue";
import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
export default {
components: {
IncomeChange,IncomeShare,
......@@ -322,7 +325,9 @@ export default {
threeIncomeChange2,threeIncomeShare2,threeChangeProportion2,
fourIncomeChange,fourIncomeShare,
fourWoolRateChange,fourActualRateChange
fourWoolRateChange,fourActualRateChange,
StartYMDateLimit,
},
data() {
return {
......@@ -402,9 +407,9 @@ export default {
},
mounted() {
this.getCompanyMsg.RB_Group_Id = this.getLocalStorage().RB_Group_id
let sDate = moment().subtract(7, 'months').format('YYYY-MM');
let eDate = moment().subtract(1, 'months').format('YYYY-MM');
let sDate = moment().subtract(7, 'months').format('YYYY-MM-DD');
let eDate = moment().subtract(1, 'months').format('YYYY-MM-DD');
this.dateTime = [sDate,eDate]
this.msg.startDate = this.dateTime[0]
......@@ -534,6 +539,7 @@ export default {
this.msg.StandardBranchIds = '0'
this.coinGetShow = true
this.msg.StandardCurrencyId = -1
}else {
this.msg.LineIdList = [14]
this.msg.LineIdStr = '14'
......@@ -552,9 +558,13 @@ export default {
this.msg.OutBranchIdList=[];
this.msg.OutBranchIdList.push(userInfo.RB_Branch_id);
}
let sDate = moment().subtract(7, 'months').format('YYYY-MM-DD');
let eDate = moment().subtract(1, 'months').format('YYYY-MM-DD');
this.dateTime = [sDate,eDate]
this.msg.startDate = this.dateTime[0]
this.msg.endDate = this.dateTime[1]
this.getStatement()
this.$forceUpdate()
},
getDateTime(){
if(this.dateTime&&this.dateTime.length>0){
......
src/components/FinancialModule/DataAnalysis/index.vue
View file @ c2f01655
......@@ -110,7 +110,7 @@
</el-col>
<el-col :span="6">
<el-form-item label="日期">
<el-date-picker
<!-- <el-date-picker
size="small"
v-model="dateTime"
type="monthrange"
......@@ -122,7 +122,8 @@
:picker-options="pickerOptions"
@change="getDateTime"
:clearable="false">
</el-date-picker>
</el-date-picker> -->
<StartYMDateLimit :clearable="false" :dateTime="dateTime" @change="(startDate,endDate)=>{dateTime=[startDate,endDate],getDateTime(dateTime)}"></StartYMDateLimit>
</el-form-item>
</el-col>
<el-col :span="4" v-if="msg.Type==2">
......@@ -181,8 +182,9 @@ import Lines from "./components/line.vue";
import Corporations from "./components/corporation.vue";
import Packets from "./components/packet.vue";
import ShoppingCommission from "./components/ShoppingCommission.vue";
import StartYMDateLimit from '../../public/StartYMDateLimit.vue';
export default {
components: {Lines,Corporations,Packets,ShoppingCommission},
components: {Lines,Corporations,Packets,ShoppingCommission,StartYMDateLimit},
data() {
return {
coinGetShow: false,
......
src/components/FinancialModule/FinancialDocuments.vue
View file @ c2f01655
......@@ -822,9 +822,10 @@
<li v-if="msg.Conditon==1||msg.Conditon==3||msg.Conditon==2">
<span>
<em>{{$t('fnc.zdriqi')}}</em>
<el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
<!-- <el-date-picker class="h34" @change="timeAdd(1)" v-model="productionDate" type="daterange"
value-format="yyyy-MM-dd" :range-separator="$t('restaurant.res_To')">
</el-date-picker>
</el-date-picker> -->
<StartDateLimit :clearable="false" :dateTime="productionDate" @change="(startDate,endDate)=>{msg.sDate=startDate,msg.eDate=endDate}"></StartDateLimit>
</span>
</li>
<template v-if="heightQueryBox">
......@@ -1831,6 +1832,7 @@
import myGZBill from "./FinancialSubmodule/GZBillModule.vue";
import shouxufei from "./components/shouxufei.vue";
import editExchangeRate from "./components/editExchangeRate.vue";
import StartDateLimit from '../public/StartDateLimit.vue';
export default {
data() {
return {
......@@ -2125,7 +2127,8 @@
"my-HB-Bill": myhrBill,
"my-GZ-Bill": myGZBill,
shouxufei,
editExchangeRate
editExchangeRate,
StartDateLimit
},
mounted() {
let StartDate = this.getBeforeDate(186, new Date().Format("yyyy-MM-dd"))
......@@ -3132,17 +3135,23 @@
// 切换table栏
getActive(active, Conditon, BOSSBtn) {
this.active = active
if (this.active == 2 || this.active == 3) {
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];
} else {
this.productionDate = []
this.msg.sDate = '';
this.msg.eDate = '';
}
// if (this.active == 2 || this.active == 3) {
// 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];
// } else {
// this.productionDate = []
// this.msg.sDate = '';
// this.msg.eDate = '';
// }
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];
this.msg.Conditon = Conditon
if (BOSSBtn) {
this.BOSSBtn = false
......
src/components/FinancialModule/ReportForm/AirTicketLoss.vue
View file @ c2f01655
......@@ -8,15 +8,15 @@
<div class="AirTicketApp" style="padding-bottom:20px">
<div class="Header" style="display: flex;flex-wrap: nowrap; justify-content: space-between;padding: 10px 0;">
<div style="flex-shrink: 0; display: flex;align-items: center; flex-wrap: nowrap;">
<el-date-picker
<!-- <el-date-picker
v-model="value1"
type="daterange"
value-format="yyyy-MM-dd"
:range-separator="$t('OrderList.zhi')"
:start-placeholder="$t('OrderList.star')"
:end-placeholder="$t('OrderList.end')">
</el-date-picker>
</el-date-picker> -->
<StartDateLimit :dateTime="value1" @change="(startDate,endDate)=>{value1=[startDate,endDate]}"></StartDateLimit>
<button class="normalBtn" @click="getList">{{$t('pub.searchBtn')}}</button>
<button class="hollowFixedBtn" @click="Export">导出</button>
......@@ -54,7 +54,9 @@
</div>
</template>
<script>
import StartDateLimit from '../../public/StartDateLimit.vue';
export default {
components: {StartDateLimit},
data(){
return{
LossIncomeList:[],
......@@ -72,7 +74,8 @@ export default {
}
},created(){
this.userInfo = this.getLocalStorage();
},methods:{
},
methods:{
goUrl(x){
this.$router.push({
name: 'TeamRevenueReport',
......@@ -162,7 +165,8 @@ export default {
}
}
},mounted(){
},
mounted(){
//默认查询当月第一个到最后一天日期
if(this.$route.query.startDate && this.$route.query.endDate){
let startDate=this.$route.query.startDate;
......
src/components/FinancialModule/ReportForm/AnnualRanking.vue
View file @ c2f01655
......@@ -45,10 +45,11 @@
<div class="Header">
<li style="margin:10px 0;display:inline-block">
<em>年份：</em>
<el-date-picker size="small"
<!-- <el-date-picker size="small"
v-model="msg.Year" value-format="yyyy"
type="year"
placeholder="选择年">
placeholder="选择年"> -->
<YearLimit :dateTime="msg.Year" @change="(Date)=>{msg.Year=Date}"></YearLimit>
</el-date-picker>
</li>
<li style="margin:10px 0;display:inline-block">
......@@ -457,8 +458,10 @@
<script>
import moment from "moment"
import YearLimit from '../../public/YearLimit.vue';
export default {
name: 'AnnualRanking',
components: {YearLimit},
data (){
return{
type:0,
......
src/components/FinancialModule/ReportForm/ChangeRevenueReport.vue
View file @ c2f01655
......@@ -479,7 +479,7 @@ tr._item_list td:last-child {
</el-col>
<el-col :span="8">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker
<!-- <el-date-picker
class="h34"
@change="timeAdd(1)"
v-model="productionDate"
......@@ -487,7 +487,8 @@ tr._item_list td:last-child {
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
></el-date-picker>
></el-date-picker> -->
<StartDateLimit :dateTime="productionDate" @change="(startDate,endDate)=>{msg.startDate=startDate,msg.endDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -522,12 +523,12 @@ tr._item_list td:last-child {
<el-option value="0" label="否"></el-option>
</el-select>
</el-form-item>
</el-col>
</el-col>
<el-col :span="4">
<p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
<p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
</el-col>
</el-col>
</el-row>
</el-form>
<ul class="clearfix">
......@@ -600,18 +601,19 @@ tr._item_list td:last-child {
import Vue from "vue";
import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import StartDateLimit from '../../public/StartDateLimit.vue';
import { setTimeout } from "timers";
Vue.component("TCIDJump", {
// 团队跳转
template: `
<div>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrl('individualTicket',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrl('SettlementOrder',rowData.TCID)">{{rowData.TCID}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===6">{{rowData.TCID}}</span>
</div>
`,
props: {
rowData: {
......@@ -643,7 +645,7 @@ Vue.component("TCIDJump", {
Vue.component("TCNUMJumpChange", {
// 团队跳转
template: `<div>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TravelControlList',rowData.TCNUM)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===2" @click="goUrlExtend('individualTicket',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===3" @click="goUrlVisa('VisaProduct',rowData.TCID)">{{rowData.TCNUM}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===4" @click="goUrlExtend('SettlementOrder',rowData.TCID)">{{rowData.TCNUM}}</span>
......@@ -663,7 +665,7 @@ Vue.component("TCNUMJumpChange", {
}
},
created(){
},
methods: {
goUrl(path, id) {
......@@ -718,7 +720,7 @@ Vue.component("Transport", {
});
Vue.component("TCIDJumpWang", {
template: `<div>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData[field]}}</span>
<span style="cursor: pointer" v-if="rowData.DataType===1" @click="goUrl('TeamBalancePayment',rowData.TCID)">{{rowData[field]}}</span>
<span v-else >{{rowData[field]}}</span>
</div>`,
props: {
......@@ -767,7 +769,7 @@ export default {
Type: 1,
QueryCondition: "-1",
DataType: "1",
Is_Transport:'-1'
Is_Transport:'-1'
},
getCompanyMsg: {
// 公司
......@@ -1291,7 +1293,7 @@ export default {
this.productionDate[0]=this.msg.startDate;
this.productionDate[1]=this.msg.endDate;
}
if(this.msg.LineId>0){
this.msg.DataType="1";
}
......@@ -1311,7 +1313,7 @@ export default {
this.msg.DataType="3";
}
},
components: {},
components: {StartDateLimit},
mounted() {
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
......@@ -1330,7 +1332,7 @@ export default {
let userInfo = this.getLocalStorage();
this.getCompanyMsg.RB_Group_Id = userInfo.RB_Group_id; //集团ID
this.userId = userInfo.EmployeeId;
this.getCompanyList();
this.getCompanyList();
this.getLineList();
this.getStartList1();
this.getPageList();
......@@ -1840,7 +1842,7 @@ export default {
return "column-cell-class-name-test-red"
}
}
// 给三行column为‘hobby’的列设置className
if (columnName === "LineName") {
return "column-cell-class-name-test";
......@@ -1902,7 +1904,7 @@ export default {
});
},
customCompFunc(param) {
},
compare(property, type) {
// 升序 t 1升 2降
......@@ -1921,7 +1923,7 @@ export default {
}
},
sortChange(param) {
if (param.YingShou === "asc") {
this.DataList.sort(this.compare("YingShou", 1));
} else if (param.YingShou === "desc") {
......
src/components/FinancialModule/ReportForm/CombinedRevenueReport.vue
View file @ c2f01655
......@@ -470,7 +470,7 @@ tr._item_list td:last-child {
</el-col>
<el-col :span="8">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker
<!-- <el-date-picker
class="h34"
@change="timeAdd(1)"
v-model="productionDate"
......@@ -478,7 +478,8 @@ tr._item_list td:last-child {
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
></el-date-picker>
></el-date-picker> -->
<StartDateLimit :dateTime="productionDate" @change="(startDate,endDate)=>{msg.startDate=startDate,msg.endDate=endDate}"></StartDateLimit>
</el-form-item>
</el-col>
</el-row>
......@@ -548,6 +549,7 @@ tr._item_list td:last-child {
import Vue from "vue";
import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import StartDateLimit from '../../public/StartDateLimit.vue';
import { setTimeout } from "timers";
Vue.component("TCIDJump", {
// 团队跳转
......@@ -1016,7 +1018,7 @@ export default {
this.msg.endDate=this.$route.query.endDate;
}
},
components: {},
components: {StartDateLimit},
mounted() {
let allH, allW, cH, cW;
allH = document.documentElement.clientHeight;
......
src/components/FinancialModule/ReportForm/EasyReport.vue
View file @ c2f01655
......@@ -38,13 +38,14 @@
<el-row style="padding:15px 0 0 0;">
<el-col :span="6">
<el-form-item label="年份：">
<el-date-picker
<!-- <el-date-picker
v-model="year"
type="year"
@change="getData(2)"
value-format="yyyy"
placeholder="选择年">
</el-date-picker>
</el-date-picker> -->
<YearLimit :dateTime="year" @change="(Date)=>{msg.Year=Date,year=Date,getData(2)}"></YearLimit>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -185,6 +186,7 @@
</template>
<script>
import YearLimit from '../../public/YearLimit.vue';
import Vue from "vue";
//一月
Vue.component("YiYueJump", {
......@@ -585,6 +587,7 @@ Vue.component("ShiErYueJump", {
}
});
export default {
components: {YearLimit},
data() {
return {
IsShowTaxesShare:false,
......
src/components/FinancialModule/ReportForm/EasyReportAcrossYears.vue
View file @ c2f01655
......@@ -38,12 +38,13 @@
<el-row style="padding:15px 0 0 0;">
<el-col :span="6">
<el-form-item label="月份：">
<el-date-picker
<!-- <el-date-picker
v-model="msg.StartMonth"
type="month"
value-format="yyyy-MM"
placeholder="选择月">
</el-date-picker>
</el-date-picker> -->
<MonthLimit :dateTime="msg.StartMonth" @change="(Date)=>{msg.StartMonth=Date}"></MonthLimit>
</el-form-item>
</el-col>
<el-col :span="6">
......@@ -97,7 +98,7 @@
:column-cell-class-name="columnCellClass"
@on-custom-comp="customCompFunc"
@sort-change="sortChange"
>
</v-table>
<!-- :row-click="rowClick" -->
......@@ -108,6 +109,7 @@
<script>
import Vue from "vue";
import moment from 'moment'
import MonthLimit from '../../public/MonthLimit.vue';
//一月
Vue.component("YiYueJump", {
// 团队跳转
......@@ -131,12 +133,12 @@ Vue.component("YiYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -165,12 +167,12 @@ Vue.component("ErYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -198,12 +200,12 @@ Vue.component("SanYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -231,12 +233,12 @@ Vue.component("SiYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -264,12 +266,12 @@ Vue.component("WuYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -297,12 +299,12 @@ Vue.component("LiuYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -330,12 +332,12 @@ Vue.component("QiYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -363,12 +365,12 @@ Vue.component("BaYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -396,12 +398,12 @@ Vue.component("JiuYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -429,12 +431,12 @@ Vue.component("ShiYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -462,12 +464,12 @@ Vue.component("ShiYiYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -495,12 +497,12 @@ Vue.component("ShiErYueJump", {
goUrl(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
}
......@@ -508,6 +510,7 @@ Vue.component("ShiErYueJump", {
});
export default {
components: {MonthLimit},
data() {
return {
year: '',
......@@ -879,17 +882,17 @@ export default {
},
goUrl (path,startDate,endDate,BranchId,tab) {
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
this.$router.push({ name: path,query:{"startDate":startDate,"endDate":endDate,BranchId:BranchId,blank:'y',tab:tab} })
},
GoUrlFan(path,month,year,BranchId, ids) {
this.$router.push({
path: "/" + path,
query: {
query: {
year:year,
month:month,
BranchId:BranchId,
CostIds:ids,
blank: "y"
blank: "y"
}
});
},
......@@ -897,19 +900,19 @@ export default {
},
rowClick(rowIndex,rowData,column){
var that = this;
let startDate=that.year+"-"+column.start;
let endDate="";
let BranchId=that.msg.BranchId;
let month=column.month;
if(column.field=="ErYue"){
endDate=that.getFirstAndLastMonthDay(that.year,"02");
}else{
endDate=that.year+"-"+column.end
}
if(rowIndex<9){
// 联运收入
if(rowData.ZhaiYao=="联运收入"){
......@@ -929,7 +932,7 @@ export default {
}else{
if(rowData.ZhaiYao=="员工提成"){
if(Number(this.year)==2019){
if(column.title=="十月" || column.title=="十一月" || column.title=="十二月"){
let CostIds="";
CostIds=rowData.CostIds.replace('112,', '');
......@@ -953,41 +956,41 @@ export default {
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
}
}
else if(rowData.ZhaiYao=="歐洲與南亞損失分攤"){
that.goUrl("AirTicketLoss",startDate,endDate,BranchId,"机票分摊")
}
else if(rowData.ZhaiYao=="营业外收入"){
if(that.msg.BranchId==1218){
this.$router.push({
path: "/JumpReport",
query: {
query: {
year:rowData.Year,
month:month,
BranchId:rowData.BranchId,
CostIds:rowData.CostIds,
"IsJapanNonbusinessIncome":1,
blank: "y"
blank: "y"
}
});
}else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
}
}
else{
that.GoUrlFan('JumpReport',month,rowData.Year,rowData.BranchId,rowData.CostIds)
}
}
}
},
getFirstAndLastMonthDay( year, month){
getFirstAndLastMonthDay( year, month){
var firstdate = year + '-' + month + '-01';
var day = new Date(year,month,0);
var lastdate = year + '-' + month + '-' + day.getDate();//获取当月最后一天日期
var day = new Date(year,month,0);
var lastdate = year + '-' + month + '-' + day.getDate();//获取当月最后一天日期
return lastdate;
},
togbu: function () {
......@@ -1077,7 +1080,7 @@ export default {
if(rowData.ZongJi < 0 && columnName=="ZongJi"){
return "column-cell-class-name-test-red"
}
if(rowData.ZhaiYao=='以下项均不计入计算'){
if(rowData.YiYue==0){
rowData.YiYue='';
......@@ -1162,10 +1165,10 @@ export default {
}
if (rowData.ZhaiYao === '所得税费用') {
return "column-cell-class-name-test-greed-s";
}
}
if(rowData.ZhaiYao=='以下项均不计入计算'){
return "column-cell-class-name-test-lan-s"
}
return "column-cell-class-name-test-lan-s"
}
},
exportExcel: function () {
let msg = {
......@@ -1183,7 +1186,7 @@ export default {
getData: function (type) {
this.msg.sharelist = []
this.loading = true;
this.apipost('financestatistics_get_GetEasyReportForKYearList', this.msg, res=>{
if (res.data.resultCode == 1) {
let BranchStatus=res.data.data.IsBranchButton;
......@@ -1227,7 +1230,7 @@ export default {
this.UpdateEndTime=data.UpdateEndTime;
this.loading = false
this.$forceUpdate()
} else {
this.loading = false
this.$message.error(res.data.message)
......
src/components/FinancialModule/ReportForm/RevenueFileMan.vue
View file @ c2f01655
......@@ -31,14 +31,15 @@
<span>
<em>营收月份</em>
</span>
<el-date-picker class="w220"
<!-- <el-date-picker class="w220"
v-model="msg.Date"
type="month"
value-format="yyyy-MM"
placeholder="选择月">
</el-date-picker>
</el-date-picker> -->
<MonthLimit :dateTime="msg.Date" @change="(Date)=>{msg.Date=Date}"></MonthLimit>
</li>
<li style="float:right;margin-bottom:10px">
<input
type="button"
......@@ -80,7 +81,7 @@
<td>{{item.EmName}}</td>
<td>{{item.Description}}</td>
<td>{{item.ConfirmStatusName}}</td>
<td>
<p v-for="(list,index1) in item.EAddressList" :key="index1">
<a :download="list.Name" style="text-decoration: underline;cursor: pointer;padding-top:4px" :href="list.Path">{{list.Name}}</a>
......@@ -99,18 +100,18 @@
</td>
<td>
<el-tooltip class="item" effect="dark" :content="$t('pub.edit')" placement="top-start">
<el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
<el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="SetRules(item)" style="padding:4px" type="primary" icon="el-icon-edit" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="签名" placement="top-start">
<el-button v-if="item.ConfirmStatus==1 && item.EmployeeId==EmployeeId" @click="SetPic(item)" style="padding:4px" type="warning" icon="el-icon-star-off" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" :content="$t('system.table_delete')" placement="top-start">
<el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
<el-button v-if="item.CreateBy==EmployeeId && item.ConfirmStatus==1" @click="Delete(item)" style="padding:4px" type="danger" icon="el-icon-delete" circle></el-button>
</el-tooltip>
<el-tooltip class="item" effect="dark" content="利润分配制单" placement="top-start">
<el-button v-if="item.ConfirmStatus==2 && item.EmployeeId==EmployeeId" @click="goUrl(item)" style="padding:4px" type="success" icon="el-icon-circle-plus" circle></el-button>
</el-tooltip>
</td>
</tr>
<tr v-if="dataList.length==0">
......@@ -119,7 +120,7 @@
</table>
<el-pagination background @current-change="handleCurrentChange"
layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total='total'>
</el-pagination>
</el-pagination>
<el-dialog
title="营收文件"
:visible.sync="ruleVisible"
......@@ -176,7 +177,7 @@
</el-upload>
</div>
</div>
</el-form>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button size="small" @click="ruleVisible = false">{{$t('pub.cancelBtn')}}</el-button>
<el-button size="small" type="danger" @click="RulesOk('addMsg')">确 定</el-button>
......@@ -194,22 +195,24 @@
<div class="button" style="text-align:center;margin-top:20px">
<el-button size="small" @click="overwrite">重写</el-button>
<el-button size="small" type="danger" @click="commit">{{$t('fnc.tijiao')}}</el-button>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import moment from "moment"
import MonthLimit from '../../public/MonthLimit.vue';
export default {
name: 'Feedback',
components: {MonthLimit},
data (){
return{
F_GeneralManager:false,
......@@ -234,7 +237,7 @@ export default {
EAddressList:[],
Description:'',
},
rules:{
rules:{
Title: [{ required: true, message: '请输入标题', trigger: 'blur' }],
EmployeeId: [{ required: true, message: '请选择接收人', trigger: 'change' }],
Date: [
......@@ -281,14 +284,14 @@ export default {
canvas.width = this.$refs.canvasHW.offsetWidth - 10
this.canvasTxt = canvas.getContext('2d')
this.stageInfo = canvas.getBoundingClientRect()
},
filters:{
YMD(date){
return moment(date).format("YYYY-MM-DD");
}
},
methods:{
GetSupperOrderEditAuth() {
// F_GeneralManager_Special 财务总经理副总经理权限
......@@ -327,7 +330,7 @@ export default {
}
},err=>{})
}).catch(() => {
});
},
SetPic(item){
......@@ -402,8 +405,8 @@ export default {
);
}, 500);
this.signState=false;
},
mouseDown(ev) {
ev = ev || event
......@@ -537,24 +540,24 @@ export default {
err => {}
);
},
addRule(){
this.ruleVisible=true;
this.InitaddMsg();
this.saveMsg=[];
},
SetRules(item){
this.ruleVisible=true;
this.ruleVisible=true;
this.addMsg=Object.assign({},item);
this.saveMsg=[];
// 1 文档 2 数据 3 图片
let typeArr=[
{stringArr:'GIF|JPG|JPEG|PNG|BMP',type:3},
{stringArr:'DOCX|DOC|XLSX|XLS|PPT|PPTX|PDF',type:1},
]
this.addMsg.EAddressList.forEach(item=>{
let ft=item.Name.substring(item.Name.lastIndexOf('.')+1,item.Name.length).toUpperCase();
let fileTypeNumber = 2;
......@@ -575,7 +578,7 @@ export default {
};
this.saveMsg.push(obj)
})
},
RulesOk(formName){
this.$refs[formName].validate((valid) => {
......@@ -606,13 +609,13 @@ export default {
},
err => {}
);
} else {
}
});
},
InitaddMsg(){
this.addMsg={
......@@ -688,7 +691,7 @@ export default {
this.form.DepartmentId= id;
this.$forceUpdate();
},
getList(){
this.loading=true;
this.apipost(
......@@ -705,9 +708,9 @@ export default {
err => {}
);
},
}
}
}
</script>
<style>
......
src/components/FinancialModule/ReportForm/TeamRevenueReport.vue
View file @ c2f01655
......@@ -477,7 +477,8 @@ tr._item_list td:last-child {
</el-col>
<el-col :span="6">
<el-form-item :label="$t('scen.sc_ftTime')">
<el-date-picker
<StartDateLimit :dateTime="productionDate" @change="(startDate,endDate)=>{msg.startDate=startDate,msg.endDate=endDate}"></StartDateLimit>
<!-- <el-date-picker
class="h34"
@change="timeAdd(1)"
v-model="productionDate"
......@@ -485,7 +486,7 @@ tr._item_list td:last-child {
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
></el-date-picker>
></el-date-picker> -->
</el-form-item>
</el-col>
<el-col :span="4">
......@@ -742,6 +743,7 @@ import moment from 'moment'
import Vue from "vue";
import XLSX from "xlsx";
import downloadExcelEasy from "../../../assets/utils/downloadExcelEasy";
import StartDateLimit from '../../public/StartDateLimit.vue';
import { setTimeout } from "timers";
Vue.component("TCIDJump", {
// 团队跳转
......@@ -2655,7 +2657,7 @@ export default {
}
},
components: {},
components: {StartDateLimit},
mounted() {
let STime = this.getBeforeDate(31,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
let ETime = this.getBeforeDate(0,this.getBeforeDate(0,new Date().Format("yyyy-MM-dd")))
......
src/components/FinancialModule/ReportForm/dianshangannualRatio.vue
View file @ c2f01655
......@@ -13,14 +13,16 @@
<div class="block">
<el-date-picker v-model="msg.StartYear" type="year" format='yyyy' value-format="yyyy" @change='getmonth'
<!-- <el-date-picker v-model="msg.StartYear" type="year" format='yyyy' value-format="yyyy" @change='getmonth'
:clearable='false' placeholder="选择开始年">
</el-date-picker>
</el-date-picker> -->
<YearLimit :clearable='false' :dateTime="msg.StartYear" @change="(Date)=>{msg.StartYear=Date,getmonth(msg.StartYear)}"></YearLimit>
<span style="margin: 0 10px;">-</span>
<el-date-picker v-model="msg.EndYear" type="year" format='yyyy' value-format="yyyy" @change='getmonth'
<!-- <el-date-picker v-model="msg.EndYear" type="year" format='yyyy' value-format="yyyy" @change='getmonth'
:clearable='false' placeholder="选择结束年">
</el-date-picker>
</el-date-picker> -->
<YearLimit :clearable='false' :dateTime="msg.EndYear" @change="(Date)=>{msg.EndYear=Date,getmonth(msg.EndYear)}"></YearLimit>
</div>
</div>
......@@ -186,9 +188,10 @@
</template>
<script>
import YearLimit from '../../public/YearLimit.vue';
export default {
name: "dianshangannualRatio",
components: {YearLimit},
data() {
return {
value: '',
......
src/components/FinancialModule/ReportForm/dianshangyeardata.vue
View file @ c2f01655
......@@ -9,14 +9,16 @@
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<div class="block">
<el-date-picker v-model="msg.StartTime" type="month" format='yyyy-MM' value-format="yyyy-MM"
<!-- <el-date-picker v-model="msg.StartTime" type="month" format='yyyy-MM' value-format="yyyy-MM"
@change='getmonth' :clearable='false' placeholder="选择开始月份">
</el-date-picker>
</el-date-picker> -->
<MonthLimit :clearable='false' :dateTime="msg.StartTime" @change="(Date)=>{msg.StartTime=Date,getmonth(msg.StartTime)}"></MonthLimit>
<span style="margin: 0 10px;">-</span>
<el-date-picker v-model="msg.EndTime" type="month" format='yyyy-MM' value-format="yyyy-MM" @change='getmonth'
<!-- <el-date-picker class="w220" v-model="msg.EndTime" type="month" format='yyyy-MM' value-format="yyyy-MM" @change='getmonth'
:clearable='false' placeholder="选择结束月份">
</el-date-picker>
</el-date-picker> -->
<MonthLimit :clearable='false' :dateTime="msg.EndTime" @change="(Date)=>{msg.EndTime=Date,getmonth(msg.EndTime)}"></MonthLimit>
</div>
</div>
</div>
......@@ -237,8 +239,10 @@
</template>
<script>
import MonthLimit from '../../public/MonthLimit.vue';
export default {
name: "dianshangyeardata",
components: {MonthLimit},
data() {
return {
value: '',
......
src/components/FinancialModule/ReportForm/fxOrderProfitLossList.vue
View file @ c2f01655
......@@ -32,7 +32,7 @@
</el-option>
</el-select>
<div class="block" style="margin-left: 10px">
<el-date-picker
<!-- <el-date-picker
style="padding: 3px 10px; width: 380px; height: 32px"
v-model="value"
type="daterange"
......@@ -43,7 +43,8 @@
@change="change"
align="right"
>
</el-date-picker>
</el-date-picker> -->
<StartDateLimit :dateTime="value" @change="(startDate,endDate)=>{value=[startDate,endDate],change(value)}"></StartDateLimit>
</div>
<span style="margin: 0 10px">订单号</span>
<el-input
......@@ -391,8 +392,10 @@
</template>
<script>
import StartDateLimit from '../../public/StartDateLimit.vue';
export default {
name: "fxOrderProfitLossList",
components: {StartDateLimit},
data() {
return {
value: [],
......
src/components/FinancialModule/ReportForm/onlineRetailersdata.vue
View file @ c2f01655
......@@ -7,10 +7,10 @@
<el-button type="primary" class="el-button--small" @click="Export">导出全部</el-button>
</div>
</div>
<div class="content">
<div style="display: flex;flex-direction: row;align-items: center">
<!-- <div class="block" style="margin-left: 10px;">
<el-date-picker style="padding: 3px 10px;width: 380px;height: 32px" v-model="value" type="daterange"
:range-separator="$t('OrderList.zhi')" :start-placeholder="$t('OrderList.star')" :end-placeholder="$t('OrderList.end')" value-format="yyyy-MM-dd"
......@@ -18,7 +18,7 @@
</el-date-picker>
</div> -->
<div class="block">
<el-date-picker
<!-- <el-date-picker
v-model="msg.Month"
type="month"
format='yyyy-MM'
......@@ -26,14 +26,15 @@
@change='getmonth'
:clearable='false'
placeholder="选择月">
</el-date-picker>
</el-date-picker> -->
<MonthLimit :clearable="false" :dateTime="msg.Month" @change="(Date)=>{msg.Month=Date,getmonth(msg.Month)}"></MonthLimit>
</div>
</div>
</div>
<div style="padding: 15px ;background: #FFF;margin-bottom: 50px;">
<el-table :data="RList" v-loading="loading" header-cell-class-name="headClass" style="width: 100%;" border :row-class-name="tableRowClassName" :cell-style="columnStyle">
<el-table-column label="" prop="DateStr" width='80' fixed>
<template slot-scope="scope">
......@@ -161,7 +162,7 @@
<span v-else>{{scope.row.ProfitRate}}</span>
</template>
</el-table-column>
</el-table>
<el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 1300px;margin-top: 20px;" border header-row-class-name='angclass' row-class-name="angclass">
<el-table-column label="" prop="OrderNo" width='80' fixed>
......@@ -195,7 +196,7 @@
</template>
</el-table-column>
<el-table-column label="" prop='MonthProfit' width=''></el-table-column>
</el-table>
<el-table :data="averageData" v-loading="loading" header-cell-class-name="headClass" style="width: 210px;" border :show-header='false' >
<el-table-column label="" prop="OrderNo" width='80' >
......@@ -208,22 +209,24 @@
<span>{{scope.row.MonthProfitRate}}%</span>
</template>
</el-table-column>
</el-table>
</div>
</div>
</template>
<script>
import MonthLimit from '../../public/MonthLimit.vue';
export default {
name: "onlineRetailersdata",
components: {MonthLimit},
data() {
return {
value: [],
......@@ -243,7 +246,7 @@
this.msg.Month = nowtime.getFullYear() + '-' +((nowtime.getMonth()+1)<10 ?'0'+(nowtime.getMonth()+1):nowtime.getMonth()+1)
if (this.$route.query.timedata) {
this.msg.Month=this.$route.query.timedata;
}
this.getDateList()
},
......@@ -252,12 +255,12 @@
this.getDateList()
},
getDateList() {
this.loading = true;
this.mallapipost("/api/LiveHouse/GetDSMonthStatistics", this.msg, res => {
this.loading = false;
if (res.data.resultCode == 1) {
this.tableData = res.data.data;
let data = this.tableData.RList;
this.RList = [];
......@@ -308,7 +311,7 @@
ProfitRate:'',
}
data.forEach((x,i)=>{
if(x.hasOwnProperty('Date') && x.Date == '环比成长'){
x.Date=x.Date;
x.PeopleNum=x.PeopleNum+'%';
......@@ -350,18 +353,18 @@
} else {
this.Info(res.data.message);
}
})
},
getisred(dataInfo){
if((dataInfo.toString()).indexOf('-')!=-1){
return true
}else{
return false
}
},
Export() {
let msg = this.msg
......@@ -372,12 +375,12 @@
"电商月度统计"+this.msg.Month+".xls"
);
},
handleCurrentChange(val) {
this.msg.pageIndex = val;
this.getDateList();
......@@ -405,12 +408,12 @@
return 'background:#FFF;'
}
}
}
}
</script>
<style>
.onlineRetailersdata .el-card__header {
display: flex;
......@@ -420,24 +423,24 @@
background: #fff;
padding: 18px 20px;
}
.onlineRetailersdata .el-button--small {
padding: 9px 15px;
}
.onlineRetailersdata .content .searchInput {
border: 1px solid #DCDFE6;
border-radius: 4px;
margin-left: 20px;
}
.onlineRetailersdata .content .searchInput .el-input__inner {
border: none;
outline: none;
height: 30px;
line-height: 30px;
}
.onlineRetailersdata .content .searchInput {
line-height: normal;
display: inline-table;
......@@ -445,45 +448,45 @@
border-spacing: 0;
width: 250px;
margin-right: 20px;
}
.onlineRetailersdata .content {
background: #fff;
margin-top: 10px;
padding: 15px;
box-sizing: border-box;
}
.onlineRetailersdata .el-icon-date {
line-height: 24px;
}
.onlineRetailersdata .el-range-separator {
line-height: 24px;
}
.onlineRetailersdata .just {
color: rgb(104, 207, 61)
}
.onlineRetailersdata .negative {
color: red
}
.onlineRetailersdata .el-input__icon {
line-height: 24px;
}
.onlineRetailersdata .el-table td,
.el-table th {
padding: 3px 0;
}
.onlineRetailersdata .el-table {
font-size: 13px;
}
.onlineRetailersdata .el-select__tags-text {
display: inline-block;
width: 40px;
......@@ -491,11 +494,11 @@
text-overflow: ellipsis;
white-space: nowrap;
}
.onlineRetailersdata .el-select__tags {
max-width: 400px;
}
.onlineRetailersdata .Subtotal {
width: 100%;
margin: 10px 0;
......@@ -505,7 +508,7 @@
background: #f2f2f2;
font-size: 12px;
}
.onlineRetailersdata .Subtotal_item {
display: flex;
flex-direction: column;
......@@ -514,21 +517,21 @@
background: #fff;
padding: 20px;
}
.onlineRetailersdata .Subtotal_item .Subtotal_t {
margin: 3px 0;
font-size: 12px;
width: 90px;
display: inline-block;
}
.onlineRetailersdata .ProfitLoss {
display: flex;
flex-direction: row;
align-items: center;
background: #fff;
}
.onlineRetailersdata .ProfitLoss_xbox {
display: flex;
flex-direction: column;
......@@ -564,7 +567,6 @@
height: 12px;
}
</style>
\ No newline at end of file
src/components/TravelManager/TravelList/TravelControlList.vue
View file @ c2f01655
......@@ -181,8 +181,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 :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>
......@@ -1450,13 +1451,15 @@
import commonBusInfo from "../../commonPage/commonBusInfo.vue";
import priceDialog from '../TravelNewQuotation/priceDialog.vue';
import EditLeaveGroup from './components/EditLeaveGroup.vue';
import DateLimit from '../../public/DateLimit.vue';
export default {
components: {
commonBusInfo,
commonHotelInfo,
commonDinnerInfo,
priceDialog,
EditLeaveGroup
EditLeaveGroup,
DateLimit
},
provide() {
return {
......
src/components/public/DateLimit.vue 0 → 100644
View file @ c2f01655
<template>
<el-date-picker class="w150" type="date" v-model="StartGroupDate"
:picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd"
placeholder></el-date-picker>
</template>
<script>
export default {
props:['EndGroupDate'],
data() {
return {
StartGroupDate: '',
pickerBeginDateBefore: {
disabledDate: time => {
if(this.EndGroupDate){
if (this.EndGroupDate == null) {
if(this.StartGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}else return false;
} else {
if(this.StartGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}else{
let endTime = new Date(this.EndGroupDate);
return endTime.getTime() < time.getTime();
}
}
}else {
if(this.StartGroupDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}
}
}
},
isQueryHistoryData: false,
}
},
created() {
var myDate = new Date();
var nowDate =
myDate.getFullYear() +
"-" +
parseInt(myDate.getMonth() + 1) +
"-" +
myDate.getDate();
if (!this.$route.query.tcmun) {
this.StartGroupDate = nowDate;
}
},
mounted() {
this.GetSupperOrderEditAuth()
},
watch: {
StartGroupDate:{
handler(n,o){
this.$emit('change',this.StartGroupDate)
},
deep:true,
}
},
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;
}
});
},
}
}
</script>
src/components/public/MonthLimit.vue 0 → 100644
View file @ c2f01655
<template>
<!-- :picker-options="pickerBeginDateBefore" -->
<el-date-picker class="w220"
v-model="years"
type="month"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM"
placeholder="选择月"
:clearable="clearable==false||clearable?clearable:true">
</el-date-picker>
</template>
<script>
export default {
props:['dateTime','clearable'],
data() {
return {
years: '',
pickerBeginDateBefore: {
disabledDate: time => {
if(this.years&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
console.log(endTime)
return time && endTime.getTime() >= time.getTime();
}
}
},
isQueryHistoryData: false,
}
},
created() {
},
mounted() {
this.GetSupperOrderEditAuth()
},
watch: {
years:{
handler(n,o){
this.$emit('change',this.years)
},
deep:true,
},
dateTime:{
handler(n,o){
this.years = this.dateTime
},
deep:false,
immediate: true,
}
},
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;
}
});
},
}
}
</script>
src/components/public/StartDateLimit.vue 0 → 100644
View file @ c2f01655
<template>
<el-date-picker
class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="daterange"
value-format="yyyy-MM-dd"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
:clearable="clearable==false||clearable?clearable:true"
></el-date-picker>
</template>
<script>
export default {
props:['dateTime','clearable'],
data() {
return {
productionDate: [],
pickerOptions: {
onPick: ({ maxDate, minDate }) => {
this.choiceDate = minDate.getTime();
if (maxDate) {
this.choiceDate = "";
}
},
disabledDate: time => {
let endTime = this.TourDateRestrictions()
if (time < endTime&&!this.isQueryHistoryData) {
return true;
} else {
if (this.choiceDate) {
const one = 365 * 24 * 3600 * 1000;
const minTime = this.choiceDate - one;
const maxTime = this.choiceDate + one;
return time.getTime() < minTime || time.getTime() > maxTime;
}
}
}
},
startDate: '',
endDate: '',
isQueryHistoryData: false
}
},
created() {
},
mounted() {
this.GetSupperOrderEditAuth()
},
watch: {
dateTime:{
handler(n,o){
this.productionDate = this.dateTime
},
deep:true,
}
},
methods: {
timeAdd(type) {
// 日期格式
if (type === 1) {
if (!this.productionDate) {
this.startDate = "";
this.endDate = "";
this.$emit('change',this.startDate,this.endDate)
return;
}
this.startDate = this.productionDate[0];
this.endDate = this.productionDate[1];
this.$emit('change',this.startDate,this.endDate)
}
},
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;
}
});
},
}
}
</script>
src/components/public/StartYMDateLimit.vue 0 → 100644
View file @ c2f01655
<template>
<el-date-picker
class="h34"
@change="timeAdd(1)"
v-model="productionDate"
type="monthrange"
value-format="yyyy-MM"
align="right"
:picker-options="pickerOptions"
:range-separator="$t('OrderList.zhi')"
:clearable="clearable==false||clearable?clearable:true"
></el-date-picker>
</template>
<script>
export default {
props:['dateTime','clearable'],
data() {
return {
productionDate: [],
pickerOptions: {
shortcuts: [{
text: '本月',
onClick(picker) {
picker.$emit('pick', [new Date(), new Date()]);
}
}, {
text: '今年至今',
onClick(picker) {
const end = new Date();
const start = new Date(new Date().getFullYear(), 0);
picker.$emit('pick', [start, end]);
}
}, {
text: '最近六个月',
onClick(picker) {
const end = new Date();
const start = new Date();
start.setMonth(start.getMonth() - 6);
picker.$emit('pick', [start, end]);
}
}],
onPick: ({ maxDate, minDate }) => {
this.choiceDate = minDate.getTime();
if (maxDate) {
this.choiceDate = "";
}
},
disabledDate: time => {
let endTime = this.TourDateRestrictions()
if (time < endTime&&!this.isQueryHistoryData) {
return true;
} else {
if (this.choiceDate) {
const one = 365 * 24 * 3600 * 1000;
const minTime = this.choiceDate - one;
const maxTime = this.choiceDate + one;
return time.getTime() < minTime || time.getTime() > maxTime;
}
}
}
},
startDate: '',
endDate: '',
isQueryHistoryData: false
}
},
created() {
},
mounted() {
this.GetSupperOrderEditAuth()
},
watch: {
dateTime:{
handler(n,o){
this.productionDate = this.dateTime
},
deep:true,
}
},
methods: {
timeAdd(type) {
// 日期格式
if (type === 1) {
if (!this.productionDate) {
this.startDate = "";
this.endDate = "";
this.$emit('change',this.startDate,this.endDate)
return;
}
this.startDate = this.productionDate[0];
this.endDate = this.productionDate[1];
this.$emit('change',this.startDate,this.endDate)
}
},
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;
}
});
},
}
}
</script>
src/components/public/YearLimit.vue 0 → 100644
View file @ c2f01655
<template>
<el-date-picker
v-model="QStartDate"
:picker-options="pickerBeginDateBefore"
type="year"
value-format="yyyy"
placeholder="选择年"
:clearable="clearable==false||clearable?clearable:true">
</el-date-picker>
</template>
<script>
export default {
props:['dateTime','clearable'],
data() {
return {
QStartDate: '',
pickerBeginDateBefore: {
disabledDate: time => {
if(this.QStartDate&&!this.isQueryHistoryData){
let endTime = this.TourDateRestrictions()
return time && endTime.getTime() >= time.getTime();
}
}
},
isQueryHistoryData: false,
}
},
created() {
},
mounted() {
this.GetSupperOrderEditAuth()
},
watch: {
QStartDate:{
handler(n,o){
this.$emit('change',this.QStartDate)
},
deep:true,
},
dateTime:{
handler(n,o){
this.QStartDate = this.dateTime
},
deep:false,
immediate: true,
}
},
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;
}
});
},
}
}
</script>
src/plug/index.js
View file @ c2f01655
......@@ -123,6 +123,7 @@ export default {
let isOnline = 0; //0-本地测试，1-线上
let ocrUrl = "http://192.168.5.46:8888";
domainUrl = "http://192.168.5.46";
domainUrl = "http://192.168.5.39:8083";
let crmLocalFileStreamDownLoadUrl = "";
crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";
let javaUrldo = "";
......@@ -1928,5 +1929,14 @@ export default {
}
return color;
}
Vue.prototype.TourDateRestrictions = function (date1, date2) {
var endDate = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
var data_1 = Date.parse(date1?date1:'2021-12-31');
var data_2 = Date.parse(date2?date2:endDate);
var dateNum = Math.abs(data_2 - data_1);
var days = Math.floor(dateNum / (24 * 3600 * 1000));
let endTime = new Date(this.getBeforeDate(days, new Date().Format("yyyy-MM-dd")));
return endTime;
}
}
}
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