Browse Source

格式

master
常熟吴彦祖 1 month ago
parent
commit
4daa4bf21a
  1. 16
      src/views/modules/supplier/priceSheetReport.vue
  2. 8
      src/views/modules/sys/initialImport.vue

16
src/views/modules/supplier/priceSheetReport.vue

@ -9,9 +9,9 @@
@keyup.enter.native="handleSearch"
/>
</el-form-item>
<el-form-item label="ShortNPC">
<el-form-item label="供应商名称">
<el-input
v-model="searchData.shortNpc"
v-model="searchData.supplierName"
clearable
style="width: 160px"
@keyup.enter.native="handleSearch"
@ -73,7 +73,7 @@
style="width: 100%">
<el-table-column prop="rawCode" label="RAW CODE" min-width="140" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="sku" label="SKU" min-width="120" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplier" label="SUPPLIER" min-width="130" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplier" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="moqColor" label="MOQ/COLOR" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" />
<el-table-column prop="qtyPo" label="QTY/PO" min-width="110" header-align="center" align="right" :formatter="formatNumberCell" />
<el-table-column prop="qtyCarton" label="QTY/CARTON" min-width="120" header-align="center" align="right" :formatter="formatNumberCell" />
@ -112,7 +112,7 @@
border
stripe
style="width: 100%">
<el-table-column prop="supplier" label="" min-width="180" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplier" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="comments" label="COMMENTS" min-width="300" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="handlingCharge" label="HANDLING CHARGE" min-width="180" header-align="center" align="right" />
</el-table>
@ -129,7 +129,7 @@
stripe
style="width: 100%">
<el-table-column prop="rowNo" label="No" width="90" header-align="center" align="center" />
<el-table-column prop="supplier" label="Supplier" min-width="180" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="supplier" label="供应商名称" min-width="200" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="paymentTerms" label="Payment Terms" min-width="320" header-align="center" align="left" show-overflow-tooltip />
<el-table-column prop="telexReleaseStatus" label="Telex Release status" min-width="200" header-align="center" align="left" />
</el-table>
@ -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: ''
}

8
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(

Loading…
Cancel
Save