Skip to content
GitLab
Commit d117bd30 authored by 季圣华's avatar 季圣华
Browse files

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

parent 0a9cb856
Hide whitespace changes
Inline Side-by-side
jshERP-web/src/views/report/InDetail.vue
View file @ d117bd30
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<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-select placeholder="选择供应商" v-model="queryParam.organId" <a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :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 }} {{ item.supplier }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, 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 {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
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'
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'), currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '', defaultTimeStr: '',
supList: [], organList: [],
depotList: [], depotList: [],
tabKey: "1", tabKey: "1",
// 表头 // 表头
...@@ -185,13 +185,13 @@ ...@@ -185,13 +185,13 @@
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
{title: '税率(%)', dataIndex: 'taxRate', width: 60}, {title: '税率(%)', dataIndex: 'taxRate', width: 60},
{title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, 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: 'dname', width: 80, ellipsis:true},
{title: '入库日期', dataIndex: 'operTime', width: 70}, {title: '入库日期', dataIndex: 'operTime', width: 70},
{title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
], ],
url: { url: {
list: "/depotHead/findInDetail", list: "/depotHead/findInOutDetail",
} }
} }
}, },
...@@ -216,9 +216,9 @@ ...@@ -216,9 +216,9 @@
}, },
initSupplier() { initSupplier() {
let that = this; let that = this;
findBySelectSup({}).then((res)=>{ findBySelectOrgan({}).then((res)=>{
if(res) { if(res) {
that.supList = res; that.organList = res;
} }
}); });
}, },
......
jshERP-web/src/views/report/InMaterialCount.vue
View file @ d117bd30
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<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-select placeholder="选择供应商" v-model="queryParam.organId" <a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :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 }} {{ item.supplier }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, 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 {findBySelectOrgan} from '@/api/api'
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'
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'), currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '', defaultTimeStr: '',
supList: [], organList: [],
depotList: [], depotList: [],
tabKey: "1", tabKey: "1",
// 表头 // 表头
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
}, },
initSupplier() { initSupplier() {
let that = this; let that = this;
findBySelectSup({}).then((res)=>{ findBySelectOrgan({}).then((res)=>{
if(res) { if(res) {
that.supList = res; that.organList = res;
} }
}); });
}, },
......
jshERP-web/src/views/report/OutDetail.vue
View file @ d117bd30
...@@ -42,10 +42,10 @@ ...@@ -42,10 +42,10 @@
</a-col> </a-col>
<template v-if="toggleSearchStatus"> <template v-if="toggleSearchStatus">
<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-select placeholder="选择客户" v-model="queryParam.organId" <a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :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 }} {{ item.supplier }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, 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 {findBySelectOrgan, findBillDetailByNumber} from '@/api/api'
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'
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'), currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '', defaultTimeStr: '',
supList: [], organList: [],
depotList: [], depotList: [],
tabKey: "1", tabKey: "1",
// 表头 // 表头
...@@ -185,13 +185,13 @@ ...@@ -185,13 +185,13 @@
{title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60}, {title: '金额', dataIndex: 'allPrice', sorter: (a, b) => a.allPrice - b.allPrice, width: 60},
{title: '税率(%)', dataIndex: 'taxRate', width: 60}, {title: '税率(%)', dataIndex: 'taxRate', width: 60},
{title: '税额', dataIndex: 'taxMoney', sorter: (a, b) => a.taxMoney - b.taxMoney, 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: 'dname', width: 80, ellipsis:true},
{title: '出库日期', dataIndex: 'operTime', width: 70}, {title: '出库日期', dataIndex: 'operTime', width: 70},
{title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true} {title: '备注', dataIndex: 'newRemark', width: 100, ellipsis:true}
], ],
url: { url: {
list: "/depotHead/findInDetail", list: "/depotHead/findInOutDetail",
} }
} }
}, },
...@@ -216,9 +216,9 @@ ...@@ -216,9 +216,9 @@
}, },
initSupplier() { initSupplier() {
let that = this; let that = this;
findBySelectCus({}).then((res)=>{ findBySelectOrgan({}).then((res)=>{
if(res) { if(res) {
that.supList = res; that.organList = res;
} }
}); });
}, },
......
jshERP-web/src/views/report/OutMaterialCount.vue
View file @ d117bd30
...@@ -8,10 +8,10 @@ ...@@ -8,10 +8,10 @@
<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-select placeholder="选择客户" v-model="queryParam.organId" <a-select placeholder="选择往来单位" v-model="queryParam.organId"
:dropdownMatchSelectWidth="false" showSearch allow-clear optionFilterProp="children"> :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 }} {{ item.supplier }}
</a-select-option> </a-select-option>
</a-select> </a-select>
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import { getNowFormatYear, 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 {findBySelectOrgan} from '@/api/api'
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'
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
dateFormat: 'YYYY-MM-DD', dateFormat: 'YYYY-MM-DD',
currentDay: moment().format('YYYY-MM-DD'), currentDay: moment().format('YYYY-MM-DD'),
defaultTimeStr: '', defaultTimeStr: '',
supList: [], organList: [],
depotList: [], depotList: [],
tabKey: "1", tabKey: "1",
// 表头 // 表头
...@@ -186,9 +186,9 @@ ...@@ -186,9 +186,9 @@
}, },
initSupplier() { initSupplier() {
let that = this; let that = this;
findBySelectCus({}).then((res)=>{ findBySelectOrgan({}).then((res)=>{
if(res) { if(res) {
that.supList = res; that.organList = res;
} }
}); });
}, },
......
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