diff --git a/src/views/modules/supplier/priceSheetReport.vue b/src/views/modules/supplier/priceSheetReport.vue index 287b64f..e0642c2 100644 --- a/src/views/modules/supplier/priceSheetReport.vue +++ b/src/views/modules/supplier/priceSheetReport.vue @@ -9,9 +9,9 @@ @keyup.enter.native="handleSearch" /> - + - + @@ -112,7 +112,7 @@ border stripe style="width: 100%"> - + @@ -129,7 +129,7 @@ stripe style="width: 100%"> - + @@ -188,7 +188,7 @@ export default { return { searchData: { item: '', - shortNpc: '', + supplierName: '', sku: '', category: '' }, @@ -274,7 +274,7 @@ export default { return { site: this.$store.state.user.site, item: (this.searchData.item || '').trim(), - shortNpc: (this.searchData.shortNpc || '').trim(), + supplierName: (this.searchData.supplierName || '').trim(), sku: (this.searchData.sku || '').trim(), category: (this.searchData.category || '').trim(), page: state ? state.page : 1, @@ -320,7 +320,7 @@ export default { handleReset () { this.searchData = { item: '', - shortNpc: '', + supplierName: '', sku: '', category: '' } diff --git a/src/views/modules/sys/initialImport.vue b/src/views/modules/sys/initialImport.vue index d404218..efeb5db 100644 --- a/src/views/modules/sys/initialImport.vue +++ b/src/views/modules/sys/initialImport.vue @@ -193,7 +193,7 @@ export default { missingSuppliers: [], supplierPriceColumns: [ { prop: 'rawCode', label: 'RAW CODE', width: 120, align: 'center' }, - { prop: 'supplier', label: 'Short_NPC', width: 100, align: 'center' }, + { prop: 'supplier', label: '供应商名称', width: 180, align: 'center' }, { prop: 'moqColor', label: 'MOQ/COLOR', width: 80, align: 'center' }, { prop: 'qtyPo', label: 'QTY/PO', width: 80, align: 'center' }, { prop: 'qtyCarton', label: 'QTY/CARTON', width: 90, align: 'center' }, @@ -575,8 +575,8 @@ export default { */ showMissingDataAlert () { const showMissingItems = this.missingItems.length && !this.isPoOrderImport - const showMissingSuppliers = (this.activeImportType === 'supplierPrice' || this.isPoOrderImport) - && this.missingSuppliers.length + const showMissingSuppliers = (this.activeImportType === 'supplierPrice' || this.isPoOrderImport) && + this.missingSuppliers.length if (!showMissingItems && !showMissingSuppliers) { return } @@ -585,7 +585,7 @@ export default { messages.push(`以下Item不存在:${this.missingItems.join('、')}`) } if (showMissingSuppliers) { - const supplierLabel = this.isPoOrderImport ? 'Vendor Name' : 'ShortNPC' + const supplierLabel = this.isPoOrderImport ? 'Vendor Name' : '供应商名称' messages.push(`以下${supplierLabel}不存在:${this.missingSuppliers.join('、')}`) } const content = this.$createElement(