diff --git a/src/components/dict/SysDictSelect.vue b/src/components/dict/SysDictSelect.vue new file mode 100644 index 0000000..783c0fb --- /dev/null +++ b/src/components/dict/SysDictSelect.vue @@ -0,0 +1,211 @@ + + + + diff --git a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue index 5ade3b6..4647b53 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue @@ -68,15 +68,23 @@ layout="total, sizes, prev, pager, next, jumper"> - + - + - - - + + + @@ -106,9 +114,11 @@ updateSupplierGroup, deleteSupplierGroup } from "@/api/baseInformation/srmGroup.js" - import excel from "@/utils/excel-util.js"; + import excel from "@/utils/excel-util.js" + import SysDictSelect from '@/components/dict/SysDictSelect.vue' export default { + components: { SysDictSelect }, watch: { searchData: { deep: true, @@ -266,6 +276,12 @@ }, methods: { + /** 字典选中后回填描述(可再手工改描述) */ + onSupplierGroupDictChange (row) { + if (row && row.dictLabel != null && String(row.dictLabel).trim() !== '') { + this.modalData.groupDesc = row.dictLabel + } + }, // 每页数 sizeChangeHandle (val) { this.pageSize = val diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 3d300c1..a72df12 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -177,13 +177,17 @@ - - - 供应商分类 - + + + - + @@ -193,7 +197,7 @@ - + @@ -350,6 +354,7 @@ import { } from '@/api/srm/srmSupplier.js' import excel from '@/utils/excel-util.js' import Chooselist from '@/views/modules/common/Chooselist_eam' +import SysDictSelect from '@/components/dict/SysDictSelect.vue' import contract from './com_srmSupplier_Contract' import share from './com_srmSupplier_share' import documents from './com_srmSupplier_DocumentDefinition' @@ -364,8 +369,6 @@ export default { supplierNo: '', supplierName: '', active: '', - supplierGroup1:'', - supplierGroup2:'', currency:'', taxCode:'', paymentTerm:'', @@ -1190,6 +1193,7 @@ export default { /* 组件 */ components: { Chooselist, + SysDictSelect, contract, documents, share, @@ -1233,12 +1237,6 @@ export default { if (val === 1100) { strVal = this.searchData.supplierNo?this.searchData.supplierNo:'' } - if (this.tagNo === 521) { - strVal = this.currentSupplier.supplierGroup1 - } - if (this.taoNo === 525){ - strVal = this.currentSupplier.supplierGroup2 - } if (val === 513){ strVal = this.currentSupplier.currency } @@ -1264,12 +1262,6 @@ export default { if(this.tagNo == 513){ this.currentSupplier.currency = val.Currency } - if (this.tagNo === 521 ) { - this.currentSupplier.supplierGroup1 = val.supplier_group - } - if (this.tagNo === 525) { - this.currentSupplier.supplierGroup2 = val.supplier_group - } if (this.tagNo === 522) { this.currentSupplier.taxCode = val.TaxCode } @@ -1436,8 +1428,7 @@ export default { supplierName: '', supplierDocType: '', active: 'Y', - supplierGroup1:'', - supplierGroup2: '', + supplierGroup: '', abc: '', buyer: '', sourcingStaff: '',