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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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