gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化出入库明细和出入库汇总报表界面

Browse Source
This commit is contained in:
季圣华 2022-10-13 23:11:23 +08:00
parent 0a9cb85654
commit d117bd3064
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,10 +42,10 @@
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="24">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择供应商" v-model="queryParam.organId"
<a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
<a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
{{ item.supplier }}
</a-select-option>
</a-select>
@ -121,7 +121,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage'
import {findBySelectSup, findBillDetailByNumber} from '@/api/api'
import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
import Vue from 'vue'
@ -160,7 +160,7 @@
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [],
organList: [],
depotList: [],
tabKey: "1",
// 表头
@ -185,13 +185,13 @@
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
{title: '税率(%)', dataIndex: 'taxRate', width: 60},
{title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60},
{title: '供应商', dataIndex: 'sname', width: 80, ellipsis:true},
{title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true},
{title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
{title: '入库日期', dataIndex: 'operTime', width: 70},
{title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
],
url: {
list: "/depotHead/findInDetail",
list: "/depotHead/findInOutDetail",
}
}
},
@ -216,9 +216,9 @@
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{
findBySelectOrgan({}).then((res)=>{
if(res) {
that.supList = res;
that.organList = res;
}
});
},

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

@ -8,10 +8,10 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="24">
<a-form-item label="供应商" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择供应商" v-model="queryParam.organId"
<a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
<a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
{{ item.supplier }}
</a-select-option>
</a-select>
@ -104,7 +104,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage'
import {findBySelectSup} from '@/api/api'
import {findBySelectOrgan} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
import Vue from 'vue'
@ -140,7 +140,7 @@
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [],
organList: [],
depotList: [],
tabKey: "1",
// 表头
@ -186,9 +186,9 @@
},
initSupplier() {
let that = this;
findBySelectSup({}).then((res)=>{
findBySelectOrgan({}).then((res)=>{
if(res) {
that.supList = res;
that.organList = res;
}
});
},

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

@ -42,10 +42,10 @@
</a-col>
<template v-if="toggleSearchStatus">
<a-col :md="6" :sm="24">
<a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择客户" v-model="queryParam.organId"
<a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
<a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
{{ item.supplier }}
</a-select-option>
</a-select>
@ -121,7 +121,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage'
import {findBySelectCus, findBillDetailByNumber} from '@/api/api'
import {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
import Vue from 'vue'
@ -160,7 +160,7 @@
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [],
organList: [],
depotList: [],
tabKey: "1",
// 表头
@ -185,13 +185,13 @@
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
{title: '税率(%)', dataIndex: 'taxRate', width: 60},
{title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, width: 60},
{title: '客户', dataIndex: 'sname', width: 80, ellipsis:true},
{title: '往来单位', dataIndex: 'sname', width: 80, ellipsis:true},
{title: '仓库', dataIndex: 'dname', width: 80, ellipsis:true},
{title: '出库日期', dataIndex: 'operTime', width: 70},
{title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
],
url: {
list: "/depotHead/findInDetail",
list: "/depotHead/findInOutDetail",
}
}
},
@ -216,9 +216,9 @@
},
initSupplier() {
let that = this;
findBySelectCus({}).then((res)=>{
findBySelectOrgan({}).then((res)=>{
if(res) {
that.supList = res;
that.organList = res;
}
});
},

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

@ -8,10 +8,10 @@
<a-form layout="inline" @keyup.enter.native="searchQuery">
<a-row :gutter="24">
<a-col :md="6" :sm="24">
<a-form-item label="客户" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择客户" v-model="queryParam.organId"
<a-form-item label="往来单位" :labelCol="labelCol" :wrapperCol="wrapperCol">
<a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children">
<a-select-option v-for="(item,index) in supList" :key="index" :value="item.id">
<a-select-option v-for="(item,index) in organList" :key="index" :value="item.id">
{{ item.supplier }}
</a-select-option>
</a-select>
@ -104,7 +104,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, openDownloadDialog, sheet2blob} from "@/utils/util"
import {getAction} from '@/api/manage'
import {findBySelectCus} from '@/api/api'
import {findBySelectOrgan} from '@/api/api'
import JEllipsis from '@/components/jeecg/JEllipsis'
import moment from 'moment'
import Vue from 'vue'
@ -140,7 +140,7 @@
dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '',
supList: [],
organList: [],
depotList: [],
tabKey: "1",
// 表头
@ -186,9 +186,9 @@
},
initSupplier() {
let that = this;
findBySelectCus({}).then((res)=>{
findBySelectOrgan({}).then((res)=>{
if(res) {
that.supList = res;
that.organList = res;
}
});
},