diff --git a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue index 7c4fc0c6..3a2af728 100644 --- a/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue +++ b/src/views/emis/emisSettleBill/CustSettleBillQueryList.vue @@ -293,6 +293,7 @@ import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAc import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; import PayQrCode from '@/views/emis/emisSettlePayRecord/panel/PayQrCode.vue'; +import {timeFormat} from '@/utils/dateUtils' export default { @@ -416,6 +417,20 @@ export default { }, created() { this.queryOrderType="1" + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue index 57d9f5b5..b2272595 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMoneyPanel.vue @@ -274,6 +274,8 @@ import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAc import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAccountPicker.vue'; +import {timeFormat} from '@/utils/dateUtils' + export default { name: "ChargeBillMoneyPanel", @@ -385,6 +387,21 @@ export default { this.queryOrderType="1" // 必须业务已确认后才可以做收款和开票 this.blSiteConfirm="1" + + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, diff --git a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue index 46f81a52..e0405a11 100644 --- a/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/ChargeBillMonthPanel.vue @@ -223,6 +223,8 @@ import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import {timeFormat} from '@/utils/dateUtils' + export default { name: "ChargeBillMonthPanel", @@ -332,6 +334,18 @@ export default { created() { this.queryOrderType="1" + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList(); }, diff --git a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue index 1b767f62..5b76c3b8 100644 --- a/src/views/emis/emisSettleBill/panel/MoneyPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MoneyPanel.vue @@ -243,6 +243,7 @@ import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue'; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import {timeFormat} from '@/utils/dateUtils' export default { name: "MoneyPanel", @@ -353,6 +354,21 @@ export default { }, created() { this.queryOrderType="1" + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + + this.getList(); }, diff --git a/src/views/emis/emisSettleBill/panel/MonthPanel.vue b/src/views/emis/emisSettleBill/panel/MonthPanel.vue index 5644aea1..30d6b8e9 100644 --- a/src/views/emis/emisSettleBill/panel/MonthPanel.vue +++ b/src/views/emis/emisSettleBill/panel/MonthPanel.vue @@ -243,6 +243,8 @@ import AllMonthpayAccountPicker from '@/views/emis/EmisBaseTools/AllMonthpayAcco import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; +import {timeFormat} from '@/utils/dateUtils' + export default { name: "MoneyPanel", @@ -354,6 +356,20 @@ export default { created() { this.queryOrderType="1" + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, diff --git a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue index 21fb989b..8fd77d4c 100644 --- a/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue +++ b/src/views/emis/emisSettleBill/panel/SiteConfimPanel.vue @@ -297,6 +297,7 @@ import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import PayQrCode from '@/views/emis/emisSettlePayRecord/panel/PayQrCode.vue'; +import {timeFormat} from '@/utils/dateUtils' export default { @@ -423,6 +424,20 @@ export default { }, created() { this.queryOrderType="1" + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue index 36c8238d..7c67d045 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceHasOpenPanel.vue @@ -279,6 +279,7 @@ import { auditCenterNoPass,auditCenterPass,listEmisSettleInvoiceRecord, getEmisS import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm'; import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord"; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import {timeFormat} from '@/utils/dateUtils' export default { name: "CenterInvoiceHasOpenPanel", @@ -390,6 +391,19 @@ export default { this.queryParams.invoiceStatus=this.invoiceStatus; this.queryOrderType="1"; + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, methods: { diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue index edf95e3e..d9369d18 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/CenterInvoiceRecordDealListPanel.vue @@ -273,6 +273,7 @@ import { auditCenterNoPass,auditCenterPass,listEmisSettleInvoiceRecord, getEmisS import OpenBillForm from '@/views/emis/emisSettleInvoiceRecord/OpenBillForm'; import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord"; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; +import {timeFormat} from '@/utils/dateUtils' export default { name: "CenterInvoiceRecordDealListPanel", @@ -382,6 +383,20 @@ export default { this.queryParams.invoiceStatus=this.invoiceStatus; this.queryOrderType="1"; + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + + this.getList(); }, methods: { diff --git a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue index 33e1962b..e8954ac9 100644 --- a/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue +++ b/src/views/emis/emisSettleInvoiceRecord/panel/InvoiceRecordApplyListPanel.vue @@ -261,6 +261,8 @@ import emisSettleInvoiceRecordForm from '@/views/emis/emisSettleInvoiceRecord/em import { listEmisSettleInvoiceChRecord } from "@/api/emis/emisSettleInvoiceChRecord"; import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker'; import clip from '@/utils/clipboard' +import {timeFormat} from '@/utils/dateUtils' + export default { name: "emisSettleInvoiceRecord", @@ -352,6 +354,20 @@ export default { }, created() { this.queryOrderType="1"; + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.getList(); }, methods: { diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue index 811b805a..7c64d220 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMoneyList.vue @@ -488,6 +488,8 @@ import MergeBillForm from '@/views/emis/emisSettleBill/MergeBillForm.vue'; import { parseTime,genJsSeqNo } from "@/utils/custom"; import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPanel.vue'; +import {timeFormat} from '@/utils/dateUtils' + export default { name: "SubBillConfirmByMoneyList", @@ -761,6 +763,20 @@ export default { this.queryParams.blConfirmCenter='0'; this.actionType=this.$route.query.actionType; + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + this.initData(); this.getList(); }, diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue index ccfdb311..7eca9aa3 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue @@ -845,12 +845,26 @@ export default { } }else{ this.queryParams.blConfirmCenter='0'; - const end = new Date() - const start = new Date() + // const end = new Date() + // const start = new Date() + // start.setDate(1) + // start.setHours(0,0,0,0) + // end.setHours(23,59,59,0) + // this.dateTimeRange=[timeFormat(start), timeFormat(end)] + + let start = new Date() start.setDate(1) start.setHours(0,0,0,0) + + let end = new Date() end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) this.dateTimeRange=[timeFormat(start), timeFormat(end)] + } this.initData(); diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue index 0dc3b5e9..4c819304 100644 --- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue +++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue @@ -473,6 +473,8 @@ import { listEmisSettleSubBill, import { listEmisSettleBill, addEmisSettleBill } from "@/api/emis/emisSettleBill"; +import {timeFormat} from '@/utils/dateUtils' + import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker'; // import emisSettleSubBillView from '@/views/emis/emisSettleSubBill/emisSettleSubBillView'; @@ -783,6 +785,20 @@ export default { }; }, created() { + + let start = new Date() + start.setDate(1) + start.setHours(0,0,0,0) + + let end = new Date() + end.setHours(23,59,59,0) + var currentMonth = end.getMonth() + var nextMonth = ++currentMonth + var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) + var oneDay = 1000 * 60 * 60 * 24 + end=Date(nextMonthFirstDay - oneDay) + this.dateTimeRange=[timeFormat(start), timeFormat(end)] + // this.queryParams.blConfirmCenter='0'; this.actionType=this.$route.query.actionType; diff --git a/src/views/emis/emisTmsSiteBatchMiss/index.vue b/src/views/emis/emisTmsSiteBatchMiss/index.vue index d3c4783c..3469b166 100644 --- a/src/views/emis/emisTmsSiteBatchMiss/index.vue +++ b/src/views/emis/emisTmsSiteBatchMiss/index.vue @@ -200,7 +200,7 @@ import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vu import EmpNamePicker1 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; import EmpNamePicker2 from '@/views/emis/EmisBaseTools/EmpNamePicker.vue'; -import {timeDiffTime,timeFormat} from '@/utils/dateUtils' +import {timeFormat} from '@/utils/dateUtils' export default { @@ -272,7 +272,6 @@ export default { start.setDate(1) start.setHours(0,0,0,0) - let end = new Date() end.setHours(23,59,59,0) var currentMonth = end.getMonth() @@ -280,8 +279,6 @@ export default { var nextMonthFirstDay = new Date(end.getFullYear(), nextMonth, 1) var oneDay = 1000 * 60 * 60 * 24 end=Date(nextMonthFirstDay - oneDay) - - this.dateTimeRange=[timeFormat(start), timeFormat(end)] this.getList();