diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js index 18416461..4c649ff4 100644 --- a/jshERP-web/src/api/api.js +++ b/jshERP-web/src/api/api.js @@ -161,12 +161,9 @@ const checkSupplier = (params)=>getAction("/supplier/checkIsNameExist",params); const findBySelectSup = (params)=>postAction("/supplier/findBySelect_sup",params); const findBySelectCus = (params)=>postAction("/supplier/findBySelect_cus",params); const findBySelectRetail = (params)=>postAction("/supplier/findBySelect_retail",params); -const findSupplierById = (params)=>getAction("/supplier/findById",params); //单据相关 -const findDepotHeadTotalPay = (params)=>getAction("/depotHead/findTotalPay",params); const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params); const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params); -const findAccountHeadTotalPay = (params)=>getAction("/accountHead/findTotalPay",params); const findFinancialDetailByNumber = (params)=>getAction("/accountHead/getDetailByNumber",params); export { @@ -277,11 +274,8 @@ export { findBySelectSup, findBySelectCus, findBySelectRetail, - findSupplierById, - findDepotHeadTotalPay, findBillDetailByNumber, findStockByDepotAndBarCode, - findAccountHeadTotalPay, findFinancialDetailByNumber } diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index 7c97ff4b..ea3b87b4 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -51,7 +51,7 @@ 批量操作 - diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index b680ae1d..1389d4d4 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -51,7 +51,7 @@ 批量操作 - diff --git a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue index 564b437f..1713c346 100644 --- a/jshERP-web/src/views/bill/modules/AllocationOutModal.vue +++ b/jshERP-web/src/views/bill/modules/AllocationOutModal.vue @@ -17,7 +17,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/AssembleModal.vue b/jshERP-web/src/views/bill/modules/AssembleModal.vue index 90800201..dd282570 100644 --- a/jshERP-web/src/views/bill/modules/AssembleModal.vue +++ b/jshERP-web/src/views/bill/modules/AssembleModal.vue @@ -17,7 +17,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/DisassembleModal.vue b/jshERP-web/src/views/bill/modules/DisassembleModal.vue index 5a132049..2b308d1e 100644 --- a/jshERP-web/src/views/bill/modules/DisassembleModal.vue +++ b/jshERP-web/src/views/bill/modules/DisassembleModal.vue @@ -17,7 +17,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/OtherInModal.vue b/jshERP-web/src/views/bill/modules/OtherInModal.vue index cfaac708..a32eb17a 100644 --- a/jshERP-web/src/views/bill/modules/OtherInModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherInModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/OtherOutModal.vue b/jshERP-web/src/views/bill/modules/OtherOutModal.vue index 4d8bd3e0..fdbceebb 100644 --- a/jshERP-web/src/views/bill/modules/OtherOutModal.vue +++ b/jshERP-web/src/views/bill/modules/OtherOutModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 4f8c8137..0b5c0e55 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 1e7fdf59..7ee93ec0 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue index f77f2abd..c9245376 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseOrderModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/RetailBackModal.vue b/jshERP-web/src/views/bill/modules/RetailBackModal.vue index 253d0888..9225c011 100644 --- a/jshERP-web/src/views/bill/modules/RetailBackModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailBackModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/RetailOutModal.vue b/jshERP-web/src/views/bill/modules/RetailOutModal.vue index cc6a651e..9ec710f2 100644 --- a/jshERP-web/src/views/bill/modules/RetailOutModal.vue +++ b/jshERP-web/src/views/bill/modules/RetailOutModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index 3dbe622c..fd1a3c4d 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue index 85e18dc8..58e22714 100644 --- a/jshERP-web/src/views/bill/modules/SaleOrderModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOrderModal.vue @@ -26,7 +26,7 @@ - + diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 017e84c5..a98e5495 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -27,7 +27,7 @@ - + diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index ac71cac6..3ed9631a 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -35,7 +35,7 @@ - + @@ -149,6 +149,11 @@ rules: [ { required: true, message: '请选择经手人!' } ] + }, + billTime:{ + rules: [ + { required: true, message: '请选择单据日期!' } + ] } }, url: { diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index d4b8d8cd..c9f198a2 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -26,7 +26,7 @@ - + @@ -139,6 +139,11 @@ { required: true, message: '请选择经手人!' } ] }, + billTime:{ + rules: [ + { required: true, message: '请选择单据日期!' } + ] + }, accountId:{ rules: [ { required: true, message: '请选择付款账户!' } diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index 9b140cf6..1d6c3d2e 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -35,7 +35,7 @@ - + @@ -151,6 +151,11 @@ { required: true, message: '请选择经手人!' } ] }, + billTime:{ + rules: [ + { required: true, message: '请选择单据日期!' } + ] + }, accountId:{ rules: [ { required: true, message: '请选择收入账户!' } diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index 8b302a3e..4d7e004a 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -35,7 +35,7 @@ - + @@ -151,6 +151,11 @@ { required: true, message: '请选择经手人!' } ] }, + billTime:{ + rules: [ + { required: true, message: '请选择单据日期!' } + ] + }, accountId:{ rules: [ { required: true, message: '请选择付款账户!' } diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index 6bcf3d0a..f524eaf4 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -36,7 +36,7 @@ - + @@ -172,6 +172,9 @@ handsPersonId:{ rules: [{ required: true, message: '请选择经手人!' }] }, + billTime:{ + rules: [{ required: true, message: '请选择单据日期!' }] + }, accountId:{ rules: [{ required: true, message: '请选择收款账户!' }] }, diff --git a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue index 62527594..6c6dc804 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -36,7 +36,7 @@ - + @@ -172,6 +172,9 @@ handsPersonId:{ rules: [{ required: true, message: '请选择经手人!' }] }, + billTime:{ + rules: [{ required: true, message: '请选择单据日期!' }] + }, accountId:{ rules: [{ required: true, message: '请选择付款账户!' }] }, diff --git a/jshERP-web/src/views/report/CustomerAccount.vue b/jshERP-web/src/views/report/CustomerAccount.vue index c511eb0d..f49db802 100644 --- a/jshERP-web/src/views/report/CustomerAccount.vue +++ b/jshERP-web/src/views/report/CustomerAccount.vue @@ -27,7 +27,7 @@ /> - + 查询 打印 @@ -35,7 +35,7 @@ - {{firstTotal}} {{lastTotal}} {{pleaseSelect}} + {{firstTotal}} {{lastTotal}} @@ -71,7 +71,8 @@ import FinancialDetail from '../financial/dialog/FinancialDetail' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getNowFormatMonth } from '@/utils/util'; - import {findBySelectCus, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api' + import { getAction } from '@/api/manage' + import {findBySelectCus, findBillDetailByNumber, findFinancialDetailByNumber} from '@/api/api' import JEllipsis from '@/components/jeecg/JEllipsis' import moment from 'moment' export default { @@ -97,7 +98,6 @@ supList: [], firstTotal: '', lastTotal: '', - pleaseSelect: '（请选择客户）', tabKey: "1", // 表头 columns: [ @@ -160,40 +160,6 @@ this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]; }, - initTotal(prefix, time, type) { - findSupplierById({supplierId: this.queryParam.organId}).then((res)=>{ - if (res && res.data && res.data[0]) { - let beginNeedGet = res.data[0].BeginNeedGet; - let beginNeedPay = res.data[0].BeginNeedPay; - findDepotHeadTotalPay({supplierId: this.queryParam.organId, endTime: time, supType: "customer" }).then((res)=>{ - if (res && res.code === 200 && res.data && res.data.rows) { - let moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; - findAccountHeadTotalPay({supplierId: this.queryParam.organId, endTime: time, supType: "customer" }).then((res)=>{ - if (res && res.code === 200 && res.data && res.data.rows) { - let moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; - let money = moneyA + moneyB; - let moneyBeginNeedGet = beginNeedGet - 0; //期初应收 - let moneyBeginNeedPay = beginNeedPay - 0; //期初应付 - money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); - if(type === 'first') { - this.firstTotal = prefix + money + "，" - } else if(type === 'last') { - this.lastTotal = prefix + money - } - } - }) - } - }) - } - }) - }, - initStatistics() { - if(this.queryParam.organId) { - this.initTotal('期初应收：', this.queryParam.beginTime, 'first') - this.initTotal('期末应收：', this.queryParam.endTime, 'last') - this.pleaseSelect = '' - } - }, myHandleDetail(record) { if(record.type === '收入' || record.type === '收款') { findFinancialDetailByNumber({ billNo: record.number }).then((res) => { @@ -211,12 +177,33 @@ }) } }, + loadData(arg) { + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1; + } + let params = this.getQueryParams();//查询条件 + this.loading = true; + getAction(this.url.list, params).then((res) => { + if (res.code===200) { + this.dataSource = res.data.rows; + this.ipagination.total = res.data.total; + if(this.queryParam.organId) { + this.firstTotal = '期初应收：' + res.data.firstMoney + "，" + this.lastTotal = '期末应收：' + res.data.lastMoney + } + } + if(res.code===510){ + this.$message.warning(res.data) + } + this.loading = false; + }) + }, searchQuery() { - if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){ + if(this.queryParam.beginTime === '' || this.queryParam.endTime === ''){ this.$message.warning('请选择单据日期！') } else { this.loadData(1); - this.initStatistics(); } } } diff --git a/jshERP-web/src/views/report/VendorAccount.vue b/jshERP-web/src/views/report/VendorAccount.vue index e7b4be63..2b2783f4 100644 --- a/jshERP-web/src/views/report/VendorAccount.vue +++ b/jshERP-web/src/views/report/VendorAccount.vue @@ -27,7 +27,7 @@ /> - + 查询 打印 @@ -35,7 +35,7 @@ - {{firstTotal}} {{lastTotal}} {{pleaseSelect}} + {{firstTotal}} {{lastTotal}} @@ -71,7 +71,8 @@ import FinancialDetail from '../financial/dialog/FinancialDetail' import { JeecgListMixin } from '@/mixins/JeecgListMixin' import { getNowFormatMonth } from '@/utils/util'; - import {findBySelectSup, findSupplierById, findDepotHeadTotalPay, findAccountHeadTotalPay, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api' + import { getAction } from '@/api/manage' + import {findBySelectSup, findBillDetailByNumber,findFinancialDetailByNumber} from '@/api/api' import JEllipsis from '@/components/jeecg/JEllipsis' import moment from 'moment' export default { @@ -97,7 +98,6 @@ supList: [], firstTotal: '', lastTotal: '', - pleaseSelect: '（请选择供应商）', tabKey: "1", // 表头 columns: [ @@ -160,41 +160,6 @@ this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]; }, - initTotal(prefix, time, type) { - findSupplierById({supplierId: this.queryParam.organId}).then((res)=>{ - if (res && res.data && res.data[0]) { - let beginNeedGet = res.data[0].BeginNeedGet; - let beginNeedPay = res.data[0].BeginNeedPay; - findDepotHeadTotalPay({supplierId: this.queryParam.organId, endTime: time, supType: "customer" }).then((res)=>{ - if (res && res.code === 200 && res.data && res.data.rows) { - let moneyA = res.data.rows.getAllMoney.toFixed(2) - 0; - findAccountHeadTotalPay({supplierId: this.queryParam.organId, endTime: time, supType: "customer" }).then((res)=>{ - if (res && res.code === 200 && res.data && res.data.rows) { - let moneyB = res.data.rows.getAllMoney.toFixed(2) - 0; - let money = moneyA + moneyB; - let moneyBeginNeedGet = beginNeedGet - 0; //期初应收 - let moneyBeginNeedPay = beginNeedPay - 0; //期初应付 - money = (money + moneyBeginNeedGet - moneyBeginNeedPay).toFixed(2); - money = 0-money; - if(type === 'first') { - this.firstTotal = prefix + money + "，" - } else if(type === 'last') { - this.lastTotal = prefix + money - } - } - }) - } - }) - } - }) - }, - initStatistics() { - if(this.queryParam.organId) { - this.initTotal('期初应付：', this.queryParam.beginTime, 'first') - this.initTotal('期末应付：', this.queryParam.endTime, 'last') - this.pleaseSelect = '' - } - }, myHandleDetail(record) { if(record.type === '支出' || record.type === '付款') { findFinancialDetailByNumber({ billNo: record.number }).then((res) => { @@ -212,12 +177,33 @@ }) } }, + loadData(arg) { + //加载数据 若传入参数1则加载第一页的内容 + if (arg === 1) { + this.ipagination.current = 1; + } + let params = this.getQueryParams();//查询条件 + this.loading = true; + getAction(this.url.list, params).then((res) => { + if (res.code===200) { + this.dataSource = res.data.rows; + this.ipagination.total = res.data.total; + if(this.queryParam.organId) { + this.firstTotal = '期初应付：' + res.data.firstMoney + "，" + this.lastTotal = '期末应付：' + res.data.lastMoney + } + } + if(res.code===510){ + this.$message.warning(res.data) + } + this.loading = false; + }) + }, searchQuery() { - if(this.queryParam.beginTime == '' || this.queryParam.endTime == ''){ + if(this.queryParam.beginTime === '' || this.queryParam.endTime === ''){ this.$message.warning('请选择单据日期！') } else { this.loadData(1); - this.initStatistics(); } } }