diff --git a/jshERP-web/src/views/bill/OtherInList.vue b/jshERP-web/src/views/bill/OtherInList.vue index d1b3dc04..4dd9b85c 100644 --- a/jshERP-web/src/views/bill/OtherInList.vue +++ b/jshERP-web/src/views/bill/OtherInList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '供应商名称', dataIndex: 'organName',width:120}, + { title: '供应商', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/OtherOutList.vue b/jshERP-web/src/views/bill/OtherOutList.vue index 4064facf..a013b46d 100644 --- a/jshERP-web/src/views/bill/OtherOutList.vue +++ b/jshERP-web/src/views/bill/OtherOutList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '客户名称', dataIndex: 'organName',width:120}, + { title: '客户', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/PurchaseBackList.vue b/jshERP-web/src/views/bill/PurchaseBackList.vue index 2d9c91a2..e7f4d60c 100644 --- a/jshERP-web/src/views/bill/PurchaseBackList.vue +++ b/jshERP-web/src/views/bill/PurchaseBackList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '供应商名称', dataIndex: 'organName',width:120}, + { title: '供应商', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/PurchaseInList.vue b/jshERP-web/src/views/bill/PurchaseInList.vue index bebf9d05..f5bac61b 100644 --- a/jshERP-web/src/views/bill/PurchaseInList.vue +++ b/jshERP-web/src/views/bill/PurchaseInList.vue @@ -166,7 +166,7 @@ return parseInt(index)+1; } }, - { title: '供应商名称', dataIndex: 'organName',width:120}, + { title: '供应商', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/PurchaseOrderList.vue b/jshERP-web/src/views/bill/PurchaseOrderList.vue index b93b9740..918a9629 100644 --- a/jshERP-web/src/views/bill/PurchaseOrderList.vue +++ b/jshERP-web/src/views/bill/PurchaseOrderList.vue @@ -173,7 +173,7 @@ return parseInt(index)+1; } }, - { title: '供应商名称', dataIndex: 'organName',width:120}, + { title: '供应商', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/RetailBackList.vue b/jshERP-web/src/views/bill/RetailBackList.vue index 6bff4cd5..f5e4d4a8 100644 --- a/jshERP-web/src/views/bill/RetailBackList.vue +++ b/jshERP-web/src/views/bill/RetailBackList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '会员卡号', dataIndex: 'organName',width:120}, + { title: '会员', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/RetailOutList.vue b/jshERP-web/src/views/bill/RetailOutList.vue index 1d54cd9d..25407535 100644 --- a/jshERP-web/src/views/bill/RetailOutList.vue +++ b/jshERP-web/src/views/bill/RetailOutList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '会员卡号', dataIndex: 'organName',width:120}, + { title: '会员', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/SaleBackList.vue b/jshERP-web/src/views/bill/SaleBackList.vue index 774068c7..e95b28c7 100644 --- a/jshERP-web/src/views/bill/SaleBackList.vue +++ b/jshERP-web/src/views/bill/SaleBackList.vue @@ -165,7 +165,7 @@ return parseInt(index)+1; } }, - { title: '客户名称', dataIndex: 'organName',width:120}, + { title: '客户', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/SaleOrderList.vue b/jshERP-web/src/views/bill/SaleOrderList.vue index db9e0e16..3d653882 100644 --- a/jshERP-web/src/views/bill/SaleOrderList.vue +++ b/jshERP-web/src/views/bill/SaleOrderList.vue @@ -173,7 +173,7 @@ return parseInt(index)+1; } }, - { title: '客户名称', dataIndex: 'organName',width:120}, + { title: '客户', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/bill/SaleOutList.vue b/jshERP-web/src/views/bill/SaleOutList.vue index f32e8569..c2b3d2df 100644 --- a/jshERP-web/src/views/bill/SaleOutList.vue +++ b/jshERP-web/src/views/bill/SaleOutList.vue @@ -166,7 +166,7 @@ return parseInt(index)+1; } }, - { title: '客户名称', dataIndex: 'organName',width:120}, + { title: '客户', dataIndex: 'organName',width:120}, { title: '单据编号', dataIndex: 'number',width:160, customRender:function (text,record,index) { if(record.linkNumber) { diff --git a/jshERP-web/src/views/financial/AdvanceInList.vue b/jshERP-web/src/views/financial/AdvanceInList.vue index cde90cd8..aa87d0e2 100644 --- a/jshERP-web/src/views/financial/AdvanceInList.vue +++ b/jshERP-web/src/views/financial/AdvanceInList.vue @@ -24,10 +24,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -107,7 +140,10 @@ queryParam: { billNo: "", searchMaterial: "", - type: "收预付款" + type: "收预付款", + organId: "", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -122,9 +158,10 @@ } }, { title: '付款会员', dataIndex: 'organName',width:140}, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '合计金额', dataIndex: 'totalPrice',width:80}, { title: '收款金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, @@ -144,10 +181,13 @@ } }, computed: { - + }, + created () { + this.initRetail() + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/GiroList.vue b/jshERP-web/src/views/financial/GiroList.vue index 7a2c6c46..12def793 100644 --- a/jshERP-web/src/views/financial/GiroList.vue +++ b/jshERP-web/src/views/financial/GiroList.vue @@ -24,10 +24,34 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -107,7 +131,9 @@ queryParam: { billNo: "", searchMaterial: "", - type: "转账" + type: "转账", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -121,9 +147,10 @@ return parseInt(index)+1; } }, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '实付金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, { @@ -142,10 +169,12 @@ } }, computed: { - + }, + created () { + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index 6d323ae5..760e8ea5 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -24,10 +24,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -107,7 +140,10 @@ queryParam: { billNo: "", searchMaterial: "", - type: "收入" + type: "收入", + organId: "", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -121,10 +157,11 @@ return parseInt(index)+1; } }, - { title: '往来单位', dataIndex: 'organName',width:140}, + { title: '客户', dataIndex: 'organName',width:140}, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '收入金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, { @@ -143,10 +180,13 @@ } }, computed: { - + }, + created () { + this.initCustomer() + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index 95b2a2e9..4946003b 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -24,10 +24,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -107,7 +140,10 @@ queryParam: { billNo: "", searchMaterial: "", - type: "支出" + type: "支出", + organId: "", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -121,10 +157,11 @@ return parseInt(index)+1; } }, - { title: '往来单位', dataIndex: 'organName',width:140}, + { title: '供应商', dataIndex: 'organName',width:140}, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '支出金额', dataIndex: 'changeAmount',width:80}, { title: '备注', dataIndex: 'remark',width:200}, { @@ -143,10 +180,13 @@ } }, computed: { - + }, + created () { + this.initSupplier() + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/MoneyInList.vue b/jshERP-web/src/views/financial/MoneyInList.vue index eb1031aa..85047b5c 100644 --- a/jshERP-web/src/views/financial/MoneyInList.vue +++ b/jshERP-web/src/views/financial/MoneyInList.vue @@ -24,10 +24,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -108,7 +141,10 @@ queryParam: { billNo: "", searchMaterial: "", - type: "收款" + type: "收款", + organId: "", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -123,9 +159,10 @@ } }, { title: '客户', dataIndex: 'organName',width:140}, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '合计收款', dataIndex: 'totalPrice',width:80}, { title: '优惠金额', dataIndex: 'discountMoney',width:80}, { title: '实际收款', dataIndex: 'changeAmount',width:80}, @@ -146,10 +183,13 @@ } }, computed: { - + }, + created () { + this.initCustomer() + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/MoneyOutList.vue b/jshERP-web/src/views/financial/MoneyOutList.vue index 109279b8..596f5c39 100644 --- a/jshERP-web/src/views/financial/MoneyOutList.vue +++ b/jshERP-web/src/views/financial/MoneyOutList.vue @@ -24,10 +24,43 @@ /> + 查询 重置 + + {{ toggleSearchStatus ? '收起' : '展开' }} + + @@ -108,7 +141,10 @@ queryParam: { billNo: "", searchMaterial: "", - type: "付款" + type: "付款", + organId: "", + creator: "", + handsPersonId: "" }, // 表头 columns: [ @@ -123,9 +159,10 @@ } }, { title: '供应商', dataIndex: 'organName',width:140}, + { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, - { title: '操作员', dataIndex: 'userName',width:80}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, + { title: '操作员', dataIndex: 'userName',width:80}, { title: '合计付款', dataIndex: 'totalPrice',width:80}, { title: '优惠金额', dataIndex: 'discountMoney',width:80}, { title: '实际付款', dataIndex: 'changeAmount',width:80}, @@ -146,10 +183,13 @@ } }, computed: { - + }, + created () { + this.initSupplier() + this.initUser() + this.initPerson() }, methods: { - } } diff --git a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue index 40709784..1ab5f1d4 100644 --- a/jshERP-web/src/views/financial/dialog/FinancialDetail.vue +++ b/jshERP-web/src/views/financial/dialog/FinancialDetail.vue @@ -32,7 +32,7 @@ - + {{model.handsPersonName}} @@ -85,7 +85,7 @@
- + @@ -139,13 +139,13 @@
- + - + {{model.handsPersonName}} @@ -197,13 +197,13 @@
- + - + {{model.handsPersonName}} @@ -261,7 +261,7 @@ - + {{model.handsPersonName}} @@ -330,7 +330,7 @@ - + {{model.handsPersonName}} diff --git a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js index 064e0150..56b2a088 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialListMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialListMixin.js @@ -1,4 +1,15 @@ +import {findBySelectSup, findBySelectCus, findBySelectRetail, getUserList, getPersonByType } from '@/api/api' + export const FinancialListMixin = { + data () { + return { + supList: [], + cusList: [], + retailList: [], + userList: [], + personList: [] + } + }, computed: { importExcelUrl: function(){ return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`; @@ -37,6 +48,45 @@ export const FinancialListMixin = { } this.loadData(1); }, + initSupplier() { + let that = this; + findBySelectSup({}).then((res)=>{ + if(res) { + that.supList = res; + } + }); + }, + initCustomer() { + let that = this; + findBySelectCus({}).then((res)=>{ + if(res) { + that.cusList = res; + } + }); + }, + initRetail() { + let that = this; + findBySelectRetail({}).then((res)=>{ + if(res) { + that.retailList = res; + } + }); + }, + initUser() { + getUserList({}).then((res)=>{ + if(res) { + this.userList = res; + } + }); + }, + initPerson() { + let that = this; + getPersonByType({type:'财务员'}).then((res)=>{ + if(res && res.code === 200) { + that.personList = res.data.personList; + } + }) + }, onDateChange: function (value, dateString) { this.queryParam.beginTime=dateString[0]; this.queryParam.endTime=dateString[1]; diff --git a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue index 0bea2622..d629c8d5 100644 --- a/jshERP-web/src/views/financial/modules/AdvanceInModal.vue +++ b/jshERP-web/src/views/financial/modules/AdvanceInModal.vue @@ -26,8 +26,8 @@ - - + {{ item.name }} @@ -146,7 +146,7 @@ }, handsPersonId:{ rules: [ - { required: true, message: '请选择经手人!' } + { required: true, message: '请选择财务人员!' } ] }, billTime:{ diff --git a/jshERP-web/src/views/financial/modules/GiroModal.vue b/jshERP-web/src/views/financial/modules/GiroModal.vue index 7cf91810..79fd4e19 100644 --- a/jshERP-web/src/views/financial/modules/GiroModal.vue +++ b/jshERP-web/src/views/financial/modules/GiroModal.vue @@ -16,8 +16,8 @@ - - + {{ item.name }} @@ -138,7 +138,7 @@ validatorRules:{ handsPersonId:{ rules: [ - { required: true, message: '请选择经手人!' } + { required: true, message: '请选择财务人员!' } ] }, billTime:{ diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index c26672f6..b85391f7 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -16,8 +16,8 @@ - - + {{ item.supplier }} @@ -26,8 +26,8 @@ - - + {{ item.name }} @@ -146,12 +146,12 @@ validatorRules:{ organId:{ rules: [ - { required: true, message: '请选择往来单位!' } + { required: true, message: '请选择客户!' } ] }, handsPersonId:{ rules: [ - { required: true, message: '请选择经手人!' } + { required: true, message: '请选择财务人员!' } ] }, billTime:{ diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index 2dc8548d..c81116d4 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -16,8 +16,8 @@ - - + {{ item.supplier }} @@ -26,8 +26,8 @@ - - + {{ item.name }} @@ -146,12 +146,12 @@ validatorRules:{ organId:{ rules: [ - { required: true, message: '请选择往来单位!' } + { required: true, message: '请选择供应商!' } ] }, handsPersonId:{ rules: [ - { required: true, message: '请选择经手人!' } + { required: true, message: '请选择财务人员!' } ] }, billTime:{ diff --git a/jshERP-web/src/views/financial/modules/MoneyInModal.vue b/jshERP-web/src/views/financial/modules/MoneyInModal.vue index a5257328..e8b9def8 100644 --- a/jshERP-web/src/views/financial/modules/MoneyInModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyInModal.vue @@ -27,8 +27,8 @@ - - + {{ item.name }} @@ -173,7 +173,7 @@ rules: [{ required: true, message: '请选择客户!' }] }, handsPersonId:{ - rules: [{ required: true, message: '请选择经手人!' }] + rules: [{ required: true, message: '请选择财务人员!' }] }, billTime:{ 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 f5e64d75..9996cd78 100644 --- a/jshERP-web/src/views/financial/modules/MoneyOutModal.vue +++ b/jshERP-web/src/views/financial/modules/MoneyOutModal.vue @@ -27,8 +27,8 @@ - - + {{ item.name }} @@ -173,7 +173,7 @@ rules: [{ required: true, message: '请选择供应商!' }] }, handsPersonId:{ - rules: [{ required: true, message: '请选择经手人!' }] + rules: [{ required: true, message: '请选择财务人员!' }] }, billTime:{ rules: [{ required: true, message: '请选择单据日期!' }]