diff --git a/src/stores/CustomerStore.js b/src/stores/CustomerStore.js index 2e9be7f..1333b54 100644 --- a/src/stores/CustomerStore.js +++ b/src/stores/CustomerStore.js @@ -24,9 +24,9 @@ class CustomerStore { }else { url += '&ApplydateCheck=0&EntrancedateCheck=1&ConfirmDateCheck=0'; } - url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (get_detail) { url += '&IsDetail=1'; } else { @@ -103,9 +103,9 @@ class CustomerStore { }else { url += '&ApplydateCheck=0&EntrancedateCheck=1&ConfirmDateCheck=0'; } - url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (get_detail) { url += '&IsDetail=1'; } else { @@ -187,9 +187,9 @@ class CustomerStore { } else { url += '&IsDetail=0'; } - url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; - url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&ApplydateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ApplydateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&EntrancedateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&EntrancedateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += '&ConfirmdateStart=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&ConfirmdateEnd=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); fetch(config.HT_HOST + url) .then((response) => response.json()) .then((json) => { diff --git a/src/stores/DashboardStore.js b/src/stores/DashboardStore.js index cd56116..7407000 100644 --- a/src/stores/DashboardStore.js +++ b/src/stores/DashboardStore.js @@ -34,7 +34,7 @@ class DashboardStore { this.orders_data.loading = true; const date_picker_store = this.rootStore.date_picker_store; let url = "/service-web/QueryData/GetOrderCount"; - url += "?WebCode=all&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "?WebCode=all&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); fetch(config.HT_HOST + url) .then(response => response.json()) @@ -79,7 +79,7 @@ class DashboardStore { const date_picker_store = this.rootStore.date_picker_store; let url = "/service-baseinfo/QueryWebData?type=orders_temp&db=1"; const website_code = "'" + this.ordersTemp_data.webcode.join("','") + "'"; - url += "&WebSite=" + website_code + "&ApplyDateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplyDateEnd=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&WebSite=" + website_code + "&ApplyDateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplyDateEnd=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); fetch(config.HT_HOST + url) .then(response => response.json()) .then(json => { @@ -100,7 +100,7 @@ class DashboardStore { const date_picker_store = this.rootStore.date_picker_store; let url = "/service-baseinfo/QueryWebData?type=orders_temp_detail&db=1"; const website_code = "'" + this.ordersTemp_data.webcode.join("','") + "'"; - url += "&WebSite=" + website_code + "&ApplyDateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplyDateEnd=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&WebSite=" + website_code + "&ApplyDateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplyDateEnd=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); fetch(config.HT_HOST + url) .then(response => response.json()) .then(json => { @@ -139,8 +139,8 @@ class DashboardStore { } else { url += "&ApplydateCheck=0&OrderStartdateCheck=1"; } - url += "&ApplydateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplydateEnd=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; - url += "&OrderStartdateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&OrderStartdateEnd=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&ApplydateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&ApplydateEnd=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); + url += "&OrderStartdateStart=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&OrderStartdateEnd=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); fetch(config.HT_HOST + url) .then(response => response.json()) .then(json => { @@ -222,7 +222,7 @@ class DashboardStore { const date_picker_store = this.rootStore.date_picker_store; this.exchangeRate_data.loading = true; let url = "/service-web/QueryData/GetCurrency?Currency=ALL"; - url += "&Currdate1=" + Currdate1_start + "&Currdate2=" + Currdate1_end + "%2023:59:59"; + url += "&Currdate1=" + Currdate1_start + "&Currdate2=" + Currdate1_end + "%2023:59:00"; fetch(config.HT_HOST + url) .then(response => response.json()) .then(json => { diff --git a/src/stores/DatePickerStore.js b/src/stores/DatePickerStore.js index 4034ecf..0b85984 100644 --- a/src/stores/DatePickerStore.js +++ b/src/stores/DatePickerStore.js @@ -1,5 +1,6 @@ import {makeAutoObservable} from "mobx"; import moment from "moment"; +import { DATE_FORMAT, DATETIME_FORMAT, SMALL_DATETIME_FORMAT } from '../config'; /** * 管理搜索组件的状态 */ @@ -56,8 +57,8 @@ class DatePickerStore { WebCode: 'ALL', IncludeTickets: '1', DateType: 'confirmDate', - Date1: this.start_date.format('YYYY-MM-DD'), - Date2: this.end_date.format('YYYY-MM-DD 23:59:59'), + Date1: this.start_date.format(DATE_FORMAT), + Date2: this.end_date.format(SMALL_DATETIME_FORMAT), }; setFormValues(data){ diff --git a/src/stores/FinancialStore.js b/src/stores/FinancialStore.js index abed82d..0466fc2 100644 --- a/src/stores/FinancialStore.js +++ b/src/stores/FinancialStore.js @@ -96,9 +96,9 @@ class FinancialStore { const date_picker_store = this.rootStore.date_picker_store; let url = '/service-web/QueryData/GetCreditCardBills'; url += `?business_unit=${this.credit_card_data.business_units}&groups=${this.credit_card_data.groups.toString()}&billtype=${this.bill_type_data.bill_types}`; - url += '&billdate1=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&billdate2=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&billdate1=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&billdate2=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += '&billdateOld1=' + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + '&billdateOld2=' + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&billdateOld1=' + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + '&billdateOld2=' + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT); } fetch(config.HT_HOST + url) .then((response) => response.json()) @@ -117,9 +117,9 @@ class FinancialStore { const date_picker_store = this.rootStore.date_picker_store; let url = '/service-web/QueryData/GetCreditCardBillsByType'; url += `?business_unit=${this.credit_card_data.business_units}&groups=${this.credit_card_data.groups.toString()}`; - url += '&billdate1=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&billdate2=' + date_picker_store.end_date.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&billdate1=' + date_picker_store.start_date.format(config.DATE_FORMAT) + '&billdate2=' + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += '&billdateOld1=' + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + '&billdateOld2=' + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + '%2023:59:59'; + url += '&billdateOld1=' + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + '&billdateOld2=' + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT); } fetch(config.HT_HOST + url) .then((response) => response.json()) diff --git a/src/stores/OrdersStore.js b/src/stores/OrdersStore.js index a1fa0c5..1fd6975 100644 --- a/src/stores/OrdersStore.js +++ b/src/stores/OrdersStore.js @@ -227,9 +227,9 @@ class OrdersStore { let url = "/service-web/QueryData/GetOrderCount"; url += `?OrderType=${ordertype}&OrderType_val=${ordertype_sub}&IncludeTickets=${this.include_tickets}`; url += `&DepartmentList=${this.groups.toString()}&DateType=${this.date_type}`; - url += "&WebCode=" + this.webcode + "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&WebCode=" + this.webcode + "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT); } fetch(config.HT_HOST + url) .then(response => response.json()) @@ -256,10 +256,10 @@ class OrdersStore { const date_picker_store = this.rootStore.date_picker_store; let url = "/service-web/QueryData/GetOrderCount"; // ?WebCode=cht&COLI_ApplyDate1=2022-08-01&COLI_ApplyDate2=2022-08-31&COLI_ApplyDateold1=2021-08-01&COLI_ApplyDateold2=2021-08-31'; url += "?WebCode=" + this.webcode + "&IncludeTickets=" + this.include_tickets; - url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT) ; url += `&DepartmentList=${this.groups.toString()}&DateType=${this.date_type}`; if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT) ; } fetch(config.HT_HOST + url) .then(response => response.json()) @@ -284,9 +284,9 @@ class OrdersStore { let url = "/service-web/QueryData/GetOrderCountByType"; url += "?WebCode=" + this.webcode + "&OrderType=" + order_type + "&IncludeTickets=" + this.include_tickets; url += `&DepartmentList=${this.groups.toString()}&DateType=${this.date_type}`; - url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT); } fetch(config.HT_HOST + url) .then(response => response.json()) @@ -311,9 +311,9 @@ class OrdersStore { } url += `?WebCode=${this.webcode}&OrderType=${ordertype}&OrderType_val=${ordertype_sub}&SubOrderType=${sub_type}` + "&IncludeTickets=" + this.include_tickets; url += `&DepartmentList=${this.groups.toString()}&DateType=${this.date_type}`; - url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDate1=" + date_picker_store.start_date.format(config.DATE_FORMAT) + "&COLI_ApplyDate2=" + date_picker_store.end_date.format(config.SMALL_DATETIME_FORMAT); if (date_picker_store.start_date_cp && date_picker_store.end_date_cp) { - url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.DATE_FORMAT) + "%2023:59:59"; + url += "&COLI_ApplyDateold1=" + date_picker_store.start_date_cp.format(config.DATE_FORMAT) + "&COLI_ApplyDateold2=" + date_picker_store.end_date_cp.format(config.SMALL_DATETIME_FORMAT); } fetch(config.HT_HOST + url) .then(response => response.json()) diff --git a/src/stores/SaleStore.js b/src/stores/SaleStore.js index e677f51..c643725 100644 --- a/src/stores/SaleStore.js +++ b/src/stores/SaleStore.js @@ -110,9 +110,9 @@ class SaleStore { this.date_title = `${date1_start}~${date1_end}`; let url = '/service-web/QueryData/GetDepartmentOrderML'; url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`; - url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`; + url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:00`; if (date2_start && date2_end) { - url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`; + url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:00`; this.date_title += ` ${date2_start}~${date2_end}`; } fetch(config.HT_HOST + url) @@ -152,9 +152,9 @@ class SaleStore { this.date_title = `${date1_start}~${date1_end}`; let url = '/service-web/QueryData/GetDepartmentOrderMLByType'; url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&OrderType=${this.active_tab_key}&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`; - url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`; + url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:00`; if (date2_start && date2_end) { - url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`; + url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:00`; this.date_title += ` ${date2_start}~${date2_end}`; } fetch(config.HT_HOST + url) @@ -453,9 +453,9 @@ class SaleStore { const date2_end = comm.empty(date_moment.end_date_cp) ? '' : date_moment.end_date_cp.format(config.DATE_FORMAT); let url = '/service-web/QueryData/GetDepartmentOrderMLByType_sub'; url += `?DepartmentList=${this.groups.toString()}&DateType=${this.date_type}&subType=${type_sub}&subTypeVal=-1&WebCode=${this.webcode}&IncludeTickets=${this.include_tickets}`; - url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:59`; + url += `&Date1=${date1_start}&Date2=${date1_end}%2023:59:00`; if (date2_start && date2_end) { - url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:59`; + url += `&OldDate1=${date2_start}&OldDate2=${date2_end}%2023:59:00`; this.date_title += ` ${date2_start}~${date2_end}`; } fetch(config.HT_HOST + url)