purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给报表查询时间段进行修改，默认3个月

Browse Source
This commit is contained in:
jishenghua
2024-04-25 22:25:18 +08:00
parent fb0ec830d5
commit fd718a05c6
10 changed files with 88 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
jshERP-web/src/views/report/AllocationDetail.vue
View File

@@ -21,7 +21,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -140,7 +139,7 @@
<script> <script>
import BillDetail from '../bill/dialog/BillDetail' import BillDetail from '../bill/dialog/BillDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectSup, findBillDetailByNumber, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectSup, findBillDetailByNumber, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -170,8 +169,9 @@
depotId: '', depotId: '',
depotIdF: '', depotIdF: '',
organizationId: '', organizationId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
subType: "调拨", subType: "调拨",
remark: '' remark: ''
}, },
@@ -179,9 +179,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001'] pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [], supList: [],
depotList: [], depotList: [],
orgaTree: [], orgaTree: [],
@@ -222,7 +219,6 @@
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -234,9 +230,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
if (arg === 1) { if (arg === 1) {

20
jshERP-web/src/views/report/BuyInReport.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -116,7 +115,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, getMpListShort } from "@/utils/util" import { getNowFormatYear, getMpListShort, getPrevMonthFormatDate, getFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectSup, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectSup, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -139,8 +138,9 @@
}, },
queryParam: { queryParam: {
materialParam:'', materialParam:'',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
organId: '', organId: '',
depotId: '', depotId: '',
organizationId: '', organizationId: '',
@@ -150,9 +150,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [], supList: [],
depotList: [], depotList: [],
orgaTree: [], orgaTree: [],
@@ -187,7 +184,6 @@
this.initSupplier() this.initSupplier()
this.getDepotData() this.getDepotData()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -200,9 +196,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容

20
jshERP-web/src/views/report/CustomerAccount.vue
View File

@@ -22,7 +22,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -96,7 +95,7 @@
<script> <script>
import DebtAccountList from './modules/DebtAccountList' import DebtAccountList from './modules/DebtAccountList'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import {findBySelectCus} from '@/api/api' import {findBySelectCus} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -121,16 +120,14 @@
queryParam: { queryParam: {
supplierType: "客户", supplierType: "客户",
organId: '', organId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [], supList: [],
firstTotal: '', firstTotal: '',
lastTotal: '', lastTotal: '',
@@ -165,7 +162,6 @@
}, },
created () { created () {
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
getQueryParams() { getQueryParams() {
@@ -184,9 +180,11 @@
}); });
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容

20
jshERP-web/src/views/report/InDetail.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -141,7 +140,7 @@
<script> <script>
import BillDetail from '../bill/dialog/BillDetail' import BillDetail from '../bill/dialog/BillDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -169,8 +168,9 @@
number: '', number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
type: "入库", type: "入库",
creator: "", creator: "",
organizationId: '', organizationId: '',
@@ -180,9 +180,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001'] pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
organList: [], organList: [],
depotList: [], depotList: [],
userList: [], userList: [],
@@ -227,7 +224,6 @@
this.initSupplier() this.initSupplier()
this.initUser() this.initUser()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -239,9 +235,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
if (arg === 1) { if (arg === 1) {

20
jshERP-web/src/views/report/InMaterialCount.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -115,7 +114,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -142,17 +141,15 @@
materialParam:'', materialParam:'',
depotId: '', depotId: '',
organizationId: '', organizationId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
type: "入库", type: "入库",
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
organList: [], organList: [],
depotList: [], depotList: [],
orgaTree: [], orgaTree: [],
@@ -185,7 +182,6 @@
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -197,9 +193,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
if (arg === 1) { if (arg === 1) {

20
jshERP-web/src/views/report/OutDetail.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -141,7 +140,7 @@
<script> <script>
import BillDetail from '../bill/dialog/BillDetail' import BillDetail from '../bill/dialog/BillDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectOrgan, findBillDetailByNumber, getUserList, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -169,8 +168,9 @@
number: '', number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
type: "出库", type: "出库",
creator: "", creator: "",
organizationId: '', organizationId: '',
@@ -180,9 +180,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001'] pageSizeOptions: ['11', '21', '31', '101', '201', '301', '1001', '2001', '3001']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
organList: [], organList: [],
depotList: [], depotList: [],
userList: [], userList: [],
@@ -227,7 +224,6 @@
this.initSupplier() this.initSupplier()
this.initUser() this.initUser()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -239,9 +235,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
if (arg === 1) { if (arg === 1) {

20
jshERP-web/src/views/report/OutMaterialCount.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -115,7 +114,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectOrgan, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -142,17 +141,15 @@
materialParam:'', materialParam:'',
depotId: '', depotId: '',
organizationId: '', organizationId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
type: "出库", type: "出库",
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
organList: [], organList: [],
depotList: [], depotList: [],
orgaTree: [], orgaTree: [],
@@ -185,7 +182,6 @@
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -197,9 +193,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
if (arg === 1) { if (arg === 1) {

15
jshERP-web/src/views/report/RetailOutReport.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -116,7 +115,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, getMpListShort } from "@/utils/util" import { getNowFormatYear, getMpListShort, getPrevMonthFormatDate, getFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectRetail, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectRetail, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -139,8 +138,9 @@
}, },
queryParam: { queryParam: {
materialParam:'', materialParam:'',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
organId: '', organId: '',
depotId: '', depotId: '',
organizationId: '', organizationId: '',
@@ -150,8 +150,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '', defaultTimeStr: '',
retailList: [], retailList: [],
depotList: [], depotList: [],
@@ -187,7 +185,6 @@
this.initRetail() this.initRetail()
this.getDepotData() this.getDepotData()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -202,9 +199,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]);
this.queryParam.beginTime=dateString[0]; this.queryParam.beginTime=dateString[0];
this.queryParam.endTime=dateString[1]; this.queryParam.endTime=dateString[1];
if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容

20
jshERP-web/src/views/report/SaleOutReport.vue
View File

@@ -17,7 +17,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -116,7 +115,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, getMpListShort } from "@/utils/util" import { getNowFormatYear, getMpListShort, getPrevMonthFormatDate, getFormatDate } from '@/utils/util'
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectCus, getAllOrganizationTreeByUser} from '@/api/api' import {findBySelectCus, getAllOrganizationTreeByUser} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -139,8 +138,9 @@
}, },
queryParam: { queryParam: {
materialParam:'', materialParam:'',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
organId: '', organId: '',
depotId: '', depotId: '',
organizationId: '', organizationId: '',
@@ -150,9 +150,6 @@
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
cusList: [], cusList: [],
depotList: [], depotList: [],
orgaTree: [], orgaTree: [],
@@ -187,7 +184,6 @@
this.initCustomer() this.initCustomer()
this.getDepotData() this.getDepotData()
this.loadAllOrgaData() this.loadAllOrgaData()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
@@ -202,9 +198,11 @@
return param; return param;
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容

20
jshERP-web/src/views/report/VendorAccount.vue
View File

@@ -22,7 +22,6 @@
<a-range-picker <a-range-picker
style="width: 100%" style="width: 100%"
v-model="queryParam.createTimeRange" v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD" format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']" :placeholder="['开始时间', '结束时间']"
@change="onDateChange" @change="onDateChange"
@@ -96,7 +95,7 @@
<script> <script>
import DebtAccountList from './modules/DebtAccountList' import DebtAccountList from './modules/DebtAccountList'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear } from "@/utils/util" import { getFormatDate, getNowFormatYear, getPrevMonthFormatDate } from '@/utils/util'
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import {findBySelectSup} from '@/api/api' import {findBySelectSup} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
@@ -121,16 +120,14 @@
queryParam: { queryParam: {
supplierType: "供应商", supplierType: "供应商",
organId: '', organId: '',
beginTime: getNowFormatYear() + '-01-01', beginTime: getPrevMonthFormatDate(3),
endTime: moment().format('YYYY-MM-DD'), endTime: getFormatDate(),
createTimeRange: [moment(getPrevMonthFormatDate(3)), moment(getFormatDate())],
}, },
ipagination:{ ipagination:{
pageSize: 11, pageSize: 11,
pageSizeOptions: ['11', '21', '31', '101', '201'] pageSizeOptions: ['11', '21', '31', '101', '201']
}, },
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [], supList: [],
firstTotal: '', firstTotal: '',
lastTotal: '', lastTotal: '',
@@ -165,7 +162,6 @@
}, },
created () { created () {
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
getQueryParams() { getQueryParams() {
@@ -184,9 +180,11 @@
}); });
}, },
onDateChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString[0],dateString[1]); this.queryParam.beginTime=dateString[0]
this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]
this.queryParam.endTime=dateString[1]; if(dateString[0] && dateString[1]) {
this.queryParam.createTimeRange = [moment(dateString[0]), moment(dateString[1])]
}
}, },
loadData(arg) { loadData(arg) {
//加载数据 若传入参数1则加载第一页的内容 //加载数据 若传入参数1则加载第一页的内容