diff --git a/jshERP-web/src/api/api.js b/jshERP-web/src/api/api.js index 6a7b703b..f644d2cb 100644 --- a/jshERP-web/src/api/api.js +++ b/jshERP-web/src/api/api.js @@ -95,6 +95,7 @@ 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 findBySelectOrgan = (params)=>postAction("/supplier/findBySelect_organ",params); //单据相关 const findBillDetailByNumber = (params)=>getAction("/depotHead/getDetailByNumber",params); const findStockByDepotAndBarCode = (params)=>getAction("/depotItem/findStockByDepotAndBarCode",params); @@ -177,6 +178,7 @@ export { findBySelectSup, findBySelectCus, findBySelectRetail, + findBySelectOrgan, findBillDetailByNumber, findStockByDepotAndBarCode, getBatchNumberList, diff --git a/jshERP-web/src/views/financial/ItemInList.vue b/jshERP-web/src/views/financial/ItemInList.vue index cf55e1ef..5262c6a9 100644 --- a/jshERP-web/src/views/financial/ItemInList.vue +++ b/jshERP-web/src/views/financial/ItemInList.vue @@ -155,7 +155,7 @@ }, // 表头 columns: [ - { title: '客户', dataIndex: 'organName',width:140, ellipsis:true}, + { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, diff --git a/jshERP-web/src/views/financial/ItemOutList.vue b/jshERP-web/src/views/financial/ItemOutList.vue index 46a9e530..acd97bd4 100644 --- a/jshERP-web/src/views/financial/ItemOutList.vue +++ b/jshERP-web/src/views/financial/ItemOutList.vue @@ -155,7 +155,7 @@ }, // 表头 columns: [ - { title: '供应商', dataIndex: 'organName',width:140, ellipsis:true}, + { title: '往来单位', dataIndex: 'organName',width:140, ellipsis:true}, { title: '财务人员', dataIndex: 'handsPersonName',width:140}, { title: '单据编号', dataIndex: 'billNo',width:160}, { title: '单据日期 ', dataIndex: 'billTimeStr',width:160}, diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 45d1baea..b5525903 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -1,5 +1,5 @@ import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil' -import {findBySelectSup,findBySelectCus,findBySelectRetail,findStockByDepotAndBarCode,getAccount,getPersonByType,findInOutItemByParam} from '@/api/api' +import {findBySelectSup,findBySelectCus,findBySelectRetail,findBySelectOrgan,findStockByDepotAndBarCode,getAccount,getPersonByType,findInOutItemByParam} from '@/api/api' import { getAction,putAction } from '@/api/manage' import { getMpListShort, getNowFormatDateTime } from "@/utils/util" import Vue from 'vue' @@ -11,6 +11,7 @@ export const FinancialModalMixin = { supList: [], cusList: [], retailList: [], + organList: [], personList: [], accountList: [], spans: { @@ -73,6 +74,14 @@ export const FinancialModalMixin = { } }); }, + initOrgan() { + let that = this; + findBySelectOrgan({}).then((res)=>{ + if(res) { + that.organList = res; + } + }); + }, initRetail() { let that = this; findBySelectRetail({}).then((res)=>{ diff --git a/jshERP-web/src/views/financial/modules/ItemInModal.vue b/jshERP-web/src/views/financial/modules/ItemInModal.vue index f781f60d..70c325bd 100644 --- a/jshERP-web/src/views/financial/modules/ItemInModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemInModal.vue @@ -16,10 +16,10 @@ - - + - + {{ item.supplier }} @@ -199,7 +199,7 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } - this.initCustomer() + this.initOrgan() this.initPerson() this.initInOutItem('in') this.initAccount() diff --git a/jshERP-web/src/views/financial/modules/ItemOutModal.vue b/jshERP-web/src/views/financial/modules/ItemOutModal.vue index fc26312e..803e9961 100644 --- a/jshERP-web/src/views/financial/modules/ItemOutModal.vue +++ b/jshERP-web/src/views/financial/modules/ItemOutModal.vue @@ -16,10 +16,10 @@ - - + - + {{ item.supplier }} @@ -199,7 +199,7 @@ let url = this.readOnly ? this.url.detailList : this.url.detailList; this.requestSubTableData(url, params, this.accountTable); } - this.initSupplier() + this.initOrgan() this.initPerson() this.initInOutItem('out') this.initAccount()