diff --git a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue index 18a7d5ed..c3877766 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseBackModal.vue @@ -190,11 +190,10 @@ import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { BillModalMixin } from '../mixins/BillModalMixin' import { getMpListShort} from "@/utils/util" - import { getAction } from '@/api/manage' import JUpload from '@/components/jeecg/JUpload' import JDate from '@/components/jeecg/JDate' import Vue from 'vue' - import { getCurrentSystemConfig } from '@/api/api' + import { getCurrentSystemConfig, findBySelectSup } from '@/api/api' export default { name: "PurchaseBackModal", mixins: [JEditableTableMixin, BillModalMixin], @@ -452,6 +451,9 @@ 'accountId': accountId, 'remark': remark }) + findBySelectSup({organId: organId}).then((res)=> { + this.supList = res && Array.isArray(res) ? res : []; + }) getCurrentSystemConfig().then((res) => { if (res.code === 200 && res.data) { let flag = res.data.zeroChangeAmountFlag==='1'?true:false diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue index 5523fc8e..ed30befe 100644 --- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue +++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue @@ -221,7 +221,7 @@ import JUpload from '@/components/jeecg/JUpload' import JDate from '@/components/jeecg/JDate' import Vue from 'vue' - import { getCurrentSystemConfig } from '@/api/api' + import { getCurrentSystemConfig, findBySelectSup } from '@/api/api' export default { name: "PurchaseInModal", @@ -510,6 +510,9 @@ 'accountId': accountId, 'remark': remark }) + findBySelectSup({organId: organId}).then((res)=> { + this.supList = res && Array.isArray(res) ? res : []; + }) getCurrentSystemConfig().then((res) => { if (res.code === 200 && res.data) { let flag = res.data.zeroChangeAmountFlag==='1'?true:false diff --git a/jshERP-web/src/views/bill/modules/SaleBackModal.vue b/jshERP-web/src/views/bill/modules/SaleBackModal.vue index ea5c1fb5..454b7b70 100644 --- a/jshERP-web/src/views/bill/modules/SaleBackModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleBackModal.vue @@ -193,12 +193,11 @@ import { JEditableTableMixin } from '@/mixins/JEditableTableMixin' import { BillModalMixin } from '../mixins/BillModalMixin' import { getMpListShort, changeListFmtMinus, handleIntroJs } from '@/utils/util' - import { getAction } from '@/api/manage' import JSelectMultiple from '@/components/jeecg/JSelectMultiple' import JUpload from '@/components/jeecg/JUpload' import JDate from '@/components/jeecg/JDate' import Vue from 'vue' - import { getCurrentSystemConfig } from '@/api/api' + import { getCurrentSystemConfig, findBySelectCus } from '@/api/api' export default { name: "SaleBackModal", mixins: [JEditableTableMixin, BillModalMixin], @@ -462,6 +461,9 @@ 'accountId': accountId, 'remark': remark }) + findBySelectCus({organId: organId}).then((res)=> { + this.cusList = res && Array.isArray(res) ? res : []; + }) getCurrentSystemConfig().then((res) => { if (res.code === 200 && res.data) { let flag = res.data.zeroChangeAmountFlag==='1'?true:false diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue index 08c9e33a..dfa6e103 100644 --- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue +++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue @@ -236,7 +236,7 @@ import JUpload from '@/components/jeecg/JUpload' import JDate from '@/components/jeecg/JDate' import Vue from 'vue' - import { getCurrentSystemConfig } from '@/api/api' + import { getCurrentSystemConfig, findBySelectCus } from '@/api/api' export default { name: "SaleOutModal", mixins: [JEditableTableMixin, BillModalMixin], @@ -527,6 +527,9 @@ 'accountId': accountId, 'remark': remark }) + findBySelectCus({organId: organId}).then((res)=> { + this.cusList = res && Array.isArray(res) ? res : []; + }) getCurrentSystemConfig().then((res) => { if (res.code === 200 && res.data) { let flag = res.data.zeroChangeAmountFlag==='1'?true:false diff --git a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js index 5c9ebe2a..307d59fe 100644 --- a/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js +++ b/jshERP-web/src/views/financial/mixins/FinancialModalMixin.js @@ -290,6 +290,15 @@ export const FinancialModalMixin = { waitNeedListOk(organType, organId, selectBillRows) { if(organId) { this.form.setFieldsValue({'organId': organId}) + if(organType === '供应商') { + findBySelectSup({organId: organId}).then((res)=> { + this.supList = res && Array.isArray(res) ? res : []; + }) + } else if(organType === '客户') { + findBySelectCus({organId: organId}).then((res)=> { + this.cusList = res && Array.isArray(res) ? res : []; + }) + } } if (selectBillRows && selectBillRows.length > 0) { this.requestSubTableDataEx(selectBillRows, this.accountTable);