@@ -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 @@
-
+