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

修改采购统计和销售统计报表

Browse Source
This commit is contained in:
神话
2022-05-04 21:50:02 +08:00
parent d436976228
commit dd07b4639b
2 changed files with 52 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8,14 +8,20 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="月份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-month-picker placeholder="请选择月份" :default-value="moment(currentMonth, monthFormat)" <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
style="width:100%" :format="monthFormat" @change="onChange"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input> <a-range-picker
style="width: 100%"
v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChange"
/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
@@ -67,7 +73,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment' import moment from 'moment'
import Vue from 'vue' import Vue from 'vue'
@@ -79,9 +85,6 @@
}, },
data () { data () {
return { return {
// 查询条件
currentMonth: moment().format('YYYY-MM'),
monthFormat: 'YYYY-MM',
labelCol: { labelCol: {
span: 5 span: 5
}, },
@@ -90,14 +93,18 @@
offset: 1 offset: 1
}, },
queryParam: { queryParam: {
monthTime: moment().format('YYYY-MM'),
materialParam:'', materialParam:'',
beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'),
mpList: getMpListShort(Vue.ls.get('materialPropertyList')) mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
}, },
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: '',
tabKey: "1", tabKey: "1",
// 表头 // 表头
columns: [ columns: [
@@ -124,6 +131,9 @@
} }
} }
}, },
created () {
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
},
methods: { methods: {
moment, moment,
getQueryParams() { getQueryParams() {
@@ -134,12 +144,14 @@
param.pageSize = this.ipagination.pageSize-1; param.pageSize = this.ipagination.pageSize-1;
return param; return param;
}, },
onChange: function (value, dateString) { onDateChange: function (value, dateString) {
this.queryParam.monthTime=dateString; console.log(dateString[0],dateString[1]);
this.queryParam.beginTime=dateString[0];
this.queryParam.endTime=dateString[1];
}, },
searchQuery() { searchQuery() {
if(this.queryParam.monthTime == ''){ if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
this.$message.warning('请选择月份！') this.$message.warning('请选择单据日期！')
} else { } else {
this.loadData(1); this.loadData(1);
} }

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

@@ -8,14 +8,20 @@
<a-form layout="inline" @keyup.enter.native="searchQuery"> <a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24"> <a-row :gutter="24">
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="月份" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-month-picker placeholder="请选择月份" :default-value="moment(currentMonth, monthFormat)" <a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input>
style="width:100%" :format="monthFormat" @change="onChange"/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="6" :sm="24"> <a-col :md="6" :sm="24">
<a-form-item label="商品信息" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-item label="单据日期" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-input placeholder="条码/名称/规格/型号" v-model="queryParam.materialParam"></a-input> <a-range-picker
style="width: 100%"
v-model="queryParam.createTimeRange"
:default-value="defaultTimeStr"
format="YYYY-MM-DD"
:placeholder="['开始时间', '结束时间']"
@change="onDateChange"
/>
</a-form-item> </a-form-item>
</a-col> </a-col>
<a-col :md="4" :sm="24"> <a-col :md="4" :sm="24">
@@ -72,7 +78,7 @@
</template> </template>
<script> <script>
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util" import { getNowFormatYear, getMpListShort, openDownloadDialog, sheet2blob} from "@/utils/util"
import JEllipsis from '@/components/jeecg/JEllipsis' import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment' import moment from 'moment'
import Vue from 'vue' import Vue from 'vue'
@@ -84,9 +90,6 @@
}, },
data () { data () {
return { return {
// 查询条件
currentMonth: moment().format('YYYY-MM'),
monthFormat: 'YYYY-MM',
labelCol: { labelCol: {
span: 5 span: 5
}, },
@@ -95,14 +98,18 @@
offset: 1 offset: 1
}, },
queryParam: { queryParam: {
monthTime: moment().format('YYYY-MM'),
materialParam:'', materialParam:'',
beginTime: getNowFormatYear() + '-01-01',
endTime: moment().format('YYYY-MM-DD'),
mpList: getMpListShort(Vue.ls.get('materialPropertyList')) mpList: getMpListShort(Vue.ls.get('materialPropertyList'))
}, },
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: '',
tabKey: "1", tabKey: "1",
// 表头 // 表头
columns: [ columns: [
@@ -129,6 +136,9 @@
} }
} }
}, },
created () {
this.defaultTimeStr = [moment(getNowFormatYear() + '-01-01', this.dateFormat), moment(this.currentDay, this.dateFormat)]
},
methods: { methods: {
moment, moment,
create(){ create(){
@@ -141,13 +151,14 @@
param.pageSize = this.ipagination.pageSize-1; param.pageSize = this.ipagination.pageSize-1;
return param; return param;
}, },
onChange: function (value, dateString) { onDateChange: function (value, dateString) {
console.log(dateString); console.log(dateString[0],dateString[1]);
this.queryParam.monthTime=dateString; this.queryParam.beginTime=dateString[0];
this.queryParam.endTime=dateString[1];
}, },
searchQuery() { searchQuery() {
if(this.queryParam.monthTime == ''){ if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){
this.$message.warning('请选择月份！') this.$message.warning('请选择单据日期！')
} else { } else {
this.loadData(1); this.loadData(1);
} }