Skip to content
GitLab
Commit 0d60fd53 authored by 神话's avatar 神话
Browse files

将报表中的时间段改为当前年

parent 8940b6e8
Show whitespace changes
Inline Side-by-side
jshERP-web/src/views/report/AllocationDetail.vue
View file @ 0d60fd53
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,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 { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectSup, findBillDetailByNumber} from '@/api/api' import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
...@@ -155,7 +155,7 @@ ...@@ -155,7 +155,7 @@
materialParam:'', materialParam:'',
depotId: '', depotId: '',
depotIdF: '', depotIdF: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
subType: "调拨", subType: "调拨",
remark: '' remark: ''
...@@ -203,7 +203,7 @@ ...@@ -203,7 +203,7 @@
created () { created () {
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
......
jshERP-web/src/views/report/CustomerAccount.vue
View file @ 0d60fd53
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
import BillDetail from '../bill/dialog/BillDetail' import BillDetail from '../bill/dialog/BillDetail'
import FinancialDetail from '../financial/dialog/FinancialDetail' import FinancialDetail from '../financial/dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import {findBySelectCus, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api' import {findBySelectCus, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
queryParam: { queryParam: {
supType: "客户", supType: "客户",
organId: '', organId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
}, },
ipagination:{ ipagination:{
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
}, },
created () { created () {
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
getQueryParams() { getQueryParams() {
......
jshERP-web/src/views/report/InDetail.vue
View file @ 0d60fd53
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,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 { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectSup, findBillDetailByNumber} from '@/api/api' import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
number: '', number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "入库", type: "入库",
remark: '' remark: ''
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
created () { created () {
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
......
jshERP-web/src/views/report/InMaterialCount.vue
View file @ 0d60fd53
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} 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'
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
organId: '', organId: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "入库" type: "入库"
}, },
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
created () { created () {
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
......
jshERP-web/src/views/report/OutDetail.vue
View file @ 0d60fd53
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,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 { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage' import {getAction} from '@/api/manage'
import {findBySelectCus, findBillDetailByNumber} from '@/api/api' import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
...@@ -146,7 +146,7 @@ ...@@ -146,7 +146,7 @@
number: '', number: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "出库", type: "出库",
remark: '' remark: ''
...@@ -194,7 +194,7 @@ ...@@ -194,7 +194,7 @@
created () { created () {
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
......
jshERP-web/src/views/report/OutMaterialCount.vue
View file @ 0d60fd53
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} 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'
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
organId: '', organId: '',
materialParam:'', materialParam:'',
depotId: '', depotId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
type: "出库" type: "出库"
}, },
...@@ -166,7 +166,7 @@ ...@@ -166,7 +166,7 @@
created () { created () {
this.getDepotData() this.getDepotData()
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
moment, moment,
......
jshERP-web/src/views/report/VendorAccount.vue
View file @ 0d60fd53
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
import BillDetail from '../bill/dialog/BillDetail' import BillDetail from '../bill/dialog/BillDetail'
import FinancialDetail from '../financial/dialog/FinancialDetail' import FinancialDetail from '../financial/dialog/FinancialDetail'
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatMonth, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import {findBySelectSup, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api' import {findBySelectSup, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
queryParam: { queryParam: {
supType: "供应商", supType: "供应商",
organId: '', organId: '',
beginTime: getNowFormatMonth() + '-01', beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'), endTime: moment().format('YYYY-MM-DD'),
}, },
ipagination:{ ipagination:{
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
}, },
created () { created () {
this.initSupplier() this.initSupplier()
this.defaultTimeStr = [moment(getNowFormatMonth() + '-01', this.dateFormat), moment(this.currentDay, this.dateFormat)] this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
}, },
methods: { methods: {
getQueryParams() { getQueryParams() {
......
Supports Markdown
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