diff --git a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue index 73edd85..aed11c8 100644 --- a/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue +++ b/src/views/modules/srmBaseInformation/srmDeliveryTerm.vue @@ -9,8 +9,8 @@ - - + + @@ -76,8 +76,8 @@ - - + + diff --git a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue index cb154f3..a7774b5 100644 --- a/src/views/modules/srmBaseInformation/srmPaymentTerm.vue +++ b/src/views/modules/srmBaseInformation/srmPaymentTerm.vue @@ -9,8 +9,8 @@ - - + + @@ -78,8 +78,8 @@ - - + + diff --git a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue index 8cafccf..9df38e7 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierCurrency.vue @@ -10,8 +10,8 @@ - - + + @@ -79,8 +79,8 @@ - - + + diff --git a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue index 79eb1c9..5ade3b6 100644 --- a/src/views/modules/srmBaseInformation/srmSupplierGroup.vue +++ b/src/views/modules/srmBaseInformation/srmSupplierGroup.vue @@ -9,8 +9,8 @@ - - + + @@ -75,14 +75,14 @@ - - + + - - + + @@ -340,7 +340,7 @@ groupDesc: '', site: this.$store.state.user.site, // 使用当前用户默认站点 active: 'Y', - groupType: 'Group1', + groupType: '供应商分组1', createBy: this.$store.state.user.name, updateBy: this.$store.state.user.name, flag: '1' diff --git a/src/views/modules/srmBaseInformation/srmTax.vue b/src/views/modules/srmBaseInformation/srmTax.vue index 9d0f7f9..f72835c 100644 --- a/src/views/modules/srmBaseInformation/srmTax.vue +++ b/src/views/modules/srmBaseInformation/srmTax.vue @@ -73,8 +73,8 @@ - - + + @@ -469,7 +469,6 @@ export default { taxCode: row.taxCode, site: row.site }; - deleteTax(deleteData).then(({data}) => { if (data && data.code === 0) { this.getDataList() diff --git a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue index 5b5639e..5ed1376 100644 --- a/src/views/modules/srmSupplier/com_srmSupplier_Address.vue +++ b/src/views/modules/srmSupplier/com_srmSupplier_Address.vue @@ -6,8 +6,8 @@ - - + + @@ -49,93 +49,126 @@ - - + + + + + - + - + - - - + + + + - - - - - + + + + + + + - + + + + + - + + + - + - + - + + - + - - - + + - - - - - - - - - + + + - + - + + + + + - + - - + - + - + + + + + - + + + + + + + + + + - - - - - - - 保存 - 关闭 - + + + 保存 + 关闭 + + diff --git a/src/views/modules/srmSupplier/srmSupplierAddress.vue b/src/views/modules/srmSupplier/srmSupplierAddress.vue index ff2f936..6abece8 100644 --- a/src/views/modules/srmSupplier/srmSupplierAddress.vue +++ b/src/views/modules/srmSupplier/srmSupplierAddress.vue @@ -9,8 +9,8 @@ - - + + @@ -108,8 +108,8 @@ - - + + diff --git a/src/views/modules/srmSupplier/supplierList.vue b/src/views/modules/srmSupplier/supplierList.vue index 21d786d..3f0bfc3 100644 --- a/src/views/modules/srmSupplier/supplierList.vue +++ b/src/views/modules/srmSupplier/supplierList.vue @@ -13,8 +13,8 @@ - - + + @@ -144,36 +144,31 @@ - + - - - - - - - - - + - - + + - - -
- 供应商分类 - + 供应商分组1 + + + + + + 供应商分组2 + @@ -186,15 +181,16 @@ + +
+ +
+ - -
-
- 税率编号 @@ -213,12 +209,26 @@ + +
+
+ 货币 + + + + + + + + + +
@@ -248,16 +258,21 @@
- + - + + +
+ +
+ @@ -268,11 +283,6 @@ - -
- -
- @@ -283,22 +293,13 @@ - - - - - - - - - - +
- + @@ -307,7 +308,7 @@
- + @@ -351,7 +352,8 @@ export default { supplierNo: '', supplierName: '', active: '', - supplierGroup:'', + supplierGroup1:'', + supplierGroup2:'', currency:'', taxCode:'', paymentTerm:'', @@ -900,7 +902,7 @@ export default { columnProp: 'active', headerAlign: 'center', align: 'center', - columnLabel: '在用', + columnLabel: '启用', columnWidth: '100', columnHidden: false, columnImage: false, @@ -1047,7 +1049,8 @@ export default { supplierName: '', supplierDocType: '', active: '', - supplierGroup:'', + supplierGroup1:'', + supplierGroup2:'', abc: '', sourcingstaff: '', currency:'', @@ -1106,8 +1109,11 @@ export default { if (val === 1100) { strVal = this.searchData.supplierNo } - if (val === 521) { - strVal = this.currentSupplier.supplierGroup + if (this.tagNo === 521) { + strVal = this.currentSupplier.supplierGroup1 + } + if (this.taoNo === 525){ + strVal = this.currentSupplier.supplierGroup2 } if (val === 513){ strVal = this.currentSupplier.currency @@ -1134,8 +1140,11 @@ export default { if(this.tagNo == 513){ this.currentSupplier.currency = val.Currency } - if (this.tagNo === 521) { - this.currentSupplier.supplierGroup = val.supplier_group + 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 @@ -1285,7 +1294,8 @@ export default { supplierName: '', supplierDocType: '', active: 'Y', - supplierGroup:'', + supplierGroup1:'', + supplierGroup2: '', abc: '', buyer: '', sourcingstaff: '', diff --git a/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue b/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue index 3c161b2..5757252 100644 --- a/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue +++ b/src/views/modules/supplierPerformance/performanceEvaluateRequest.vue @@ -62,7 +62,7 @@ - +