|
|
@ -70,6 +70,9 @@ |
|
|
<span v-else-if="item.columnProp === 'handlingCharge'"> |
|
|
<span v-else-if="item.columnProp === 'handlingCharge'"> |
|
|
{{ formatSupplierNumberDisplay(scope.row[item.columnProp]) }} |
|
|
{{ formatSupplierNumberDisplay(scope.row[item.columnProp]) }} |
|
|
</span> |
|
|
</span> |
|
|
|
|
|
<span v-else-if="item.columnProp === 'defaultOriginPort'"> |
|
|
|
|
|
{{ portNameByCode(scope.row.defaultOriginPort) }} |
|
|
|
|
|
</span> |
|
|
<span v-else>{{ scope.row[item.columnProp] }}</span> |
|
|
<span v-else>{{ scope.row[item.columnProp] }}</span> |
|
|
</span> |
|
|
</span> |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
<span v-if="item.columnImage"><img :src="scope.row[item.columnProp]" |
|
|
@ -290,6 +293,18 @@ |
|
|
<el-input v-model="currentSupplier.handlingCharge" type="number"></el-input> |
|
|
<el-input v-model="currentSupplier.handlingCharge" type="number"></el-input> |
|
|
</el-form-item> |
|
|
</el-form-item> |
|
|
</el-col> |
|
|
</el-col> |
|
|
|
|
|
<el-col :span="6"> |
|
|
|
|
|
<el-form-item label="始发港"> |
|
|
|
|
|
<el-select v-model="currentSupplier.defaultOriginPort" clearable filterable placeholder="请选择始发港" style="width: 100%"> |
|
|
|
|
|
<el-option |
|
|
|
|
|
v-for="p in originPortOptions" |
|
|
|
|
|
:key="p.portCode" |
|
|
|
|
|
:label="p.portName" |
|
|
|
|
|
:value="p.portCode"> |
|
|
|
|
|
</el-option> |
|
|
|
|
|
</el-select> |
|
|
|
|
|
</el-form-item> |
|
|
|
|
|
</el-col> |
|
|
</el-row> |
|
|
</el-row> |
|
|
</div> |
|
|
</div> |
|
|
<div class="form-section"> |
|
|
<div class="form-section"> |
|
|
@ -420,6 +435,7 @@ import { |
|
|
testCurrentLoginSite |
|
|
testCurrentLoginSite |
|
|
} from '@/api/srm/srmSupplier.js' |
|
|
} from '@/api/srm/srmSupplier.js' |
|
|
import excel from '@/utils/excel-util.js' |
|
|
import excel from '@/utils/excel-util.js' |
|
|
|
|
|
import { searchPortList } from '@/api/port/portInfo.js' |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
import Chooselist from '@/views/modules/common/Chooselist_eam' |
|
|
import SysDictSelect from '@/components/dict/SysDictSelect.vue' |
|
|
import SysDictSelect from '@/components/dict/SysDictSelect.vue' |
|
|
import contract from './com_srmSupplier_Contract' |
|
|
import contract from './com_srmSupplier_Contract' |
|
|
@ -454,6 +470,8 @@ export default { |
|
|
mainDataList: [], |
|
|
mainDataList: [], |
|
|
supplierGroupRequestList: [], |
|
|
supplierGroupRequestList: [], |
|
|
supplierDocTypeOptions: [], |
|
|
supplierDocTypeOptions: [], |
|
|
|
|
|
// 始发港下拉选项(来源 port_Info,is_departure_port='Y') |
|
|
|
|
|
originPortOptions: [], |
|
|
dataListLoading: false, |
|
|
dataListLoading: false, |
|
|
activeName: 'AddressTab', |
|
|
activeName: 'AddressTab', |
|
|
columnArray1: [ |
|
|
columnArray1: [ |
|
|
@ -583,6 +601,24 @@ export default { |
|
|
status: true, |
|
|
status: true, |
|
|
fixed: false |
|
|
fixed: false |
|
|
}, |
|
|
}, |
|
|
|
|
|
{ |
|
|
|
|
|
userId: this.$store.state.user.name, |
|
|
|
|
|
functionId: this.functionId, |
|
|
|
|
|
serialNumber: '811001Table1DefaultOriginPort', |
|
|
|
|
|
tableId: '811001Table1', |
|
|
|
|
|
tableName: '供应商信息', |
|
|
|
|
|
columnProp: 'defaultOriginPort', |
|
|
|
|
|
headerAlign: 'center', |
|
|
|
|
|
align: 'center', |
|
|
|
|
|
columnLabel: '默认始发港', |
|
|
|
|
|
columnWidth: '120', |
|
|
|
|
|
columnHidden: false, |
|
|
|
|
|
columnImage: false, |
|
|
|
|
|
columnSortable: false, |
|
|
|
|
|
sortLv: 0, |
|
|
|
|
|
status: true, |
|
|
|
|
|
fixed: false |
|
|
|
|
|
}, |
|
|
{ |
|
|
{ |
|
|
userId: this.$store.state.user.name, |
|
|
userId: this.$store.state.user.name, |
|
|
functionId: this.functionId, |
|
|
functionId: this.functionId, |
|
|
@ -1324,6 +1360,7 @@ export default { |
|
|
updateBy: '', |
|
|
updateBy: '', |
|
|
memo:'', |
|
|
memo:'', |
|
|
planner: '', |
|
|
planner: '', |
|
|
|
|
|
defaultOriginPort: '', |
|
|
site: this.$store.state.user.site, |
|
|
site: this.$store.state.user.site, |
|
|
}, |
|
|
}, |
|
|
supplierRules: { |
|
|
supplierRules: { |
|
|
@ -1378,6 +1415,26 @@ export default { |
|
|
'status-inactive': status === 'Inactive' |
|
|
'status-inactive': status === 'Inactive' |
|
|
} |
|
|
} |
|
|
}, |
|
|
}, |
|
|
|
|
|
// 加载始发港下拉选项(port_Info 中 is_departure_port='Y') |
|
|
|
|
|
loadOriginPortOptions () { |
|
|
|
|
|
searchPortList({ isDeparturePort: 'Y' }).then(({ data }) => { |
|
|
|
|
|
if (data && data.code === 0) { |
|
|
|
|
|
this.originPortOptions = Array.isArray(data.rows) ? data.rows : [] |
|
|
|
|
|
} else { |
|
|
|
|
|
this.originPortOptions = [] |
|
|
|
|
|
} |
|
|
|
|
|
}).catch(() => { |
|
|
|
|
|
this.originPortOptions = [] |
|
|
|
|
|
}) |
|
|
|
|
|
}, |
|
|
|
|
|
// 始发港保存的是港口编码,列表/展示时映射为港口名称;无匹配则回退原值 |
|
|
|
|
|
portNameByCode (code) { |
|
|
|
|
|
if (code === null || code === undefined || code === '') { |
|
|
|
|
|
return '' |
|
|
|
|
|
} |
|
|
|
|
|
const hit = this.originPortOptions.find(p => p.portCode === code) |
|
|
|
|
|
return hit ? hit.portName : code |
|
|
|
|
|
}, |
|
|
/** |
|
|
/** |
|
|
* 查询列表小单费去尾零。 |
|
|
* 查询列表小单费去尾零。 |
|
|
* 业务意图:handling_charge 按“去尾零”展示,整数显示为 1 而不是 1.000。 |
|
|
* 业务意图:handling_charge 按“去尾零”展示,整数显示为 1 而不是 1.000。 |
|
|
@ -1754,6 +1811,7 @@ export default { |
|
|
updateBy: '', |
|
|
updateBy: '', |
|
|
memo:'', |
|
|
memo:'', |
|
|
planner: '', |
|
|
planner: '', |
|
|
|
|
|
defaultOriginPort: '', |
|
|
site: this.$store.state.user.site, |
|
|
site: this.$store.state.user.site, |
|
|
} |
|
|
} |
|
|
this.loadSupplierDocTypeOptions() |
|
|
this.loadSupplierDocTypeOptions() |
|
|
@ -1841,6 +1899,7 @@ export default { |
|
|
created() { |
|
|
created() { |
|
|
// 查询报表的类型 |
|
|
// 查询报表的类型 |
|
|
this.getMainData() |
|
|
this.getMainData() |
|
|
|
|
|
this.loadOriginPortOptions() |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |
|
|
|