|
|
|
@ -13,6 +13,16 @@ |
|
|
|
:site="searchData.site" |
|
|
|
v-model="searchData.customer" |
|
|
|
@change="onSessionCustomerChange" /> |
|
|
|
<!-- Buyer 查询条件:可正常手动输入;点击搜索图标弹出当前 Customer 下的 Buyer 选择表格 --> |
|
|
|
<el-input |
|
|
|
slot="buyer" |
|
|
|
v-model="searchData.buyer" |
|
|
|
clearable |
|
|
|
placeholder="请输入或选择" |
|
|
|
style="width: 130px" |
|
|
|
@keyup.enter.native="handleSearch"> |
|
|
|
<i slot="suffix" class="el-icon-search" style="cursor: pointer" @click.stop="openSearchBuyerSelect"></i> |
|
|
|
</el-input> |
|
|
|
</com-po-order-search-bar> |
|
|
|
<el-form :inline="true" label-position="top" style="margin-top:1px "> |
|
|
|
<el-form-item> |
|
|
|
@ -167,8 +177,8 @@ |
|
|
|
<template v-if="(item.columnProp === 'confirmed' || item.columnProp === 'wantReceiveDate') && !isNewRow(scope.row)"> |
|
|
|
<span>{{ scope.row[item.columnProp] }}</span> |
|
|
|
</template> |
|
|
|
<!-- 对于 inspection 和 realCrd 字段,仅在修改时(非新增行)可编辑 --> |
|
|
|
<template v-else-if="(item.columnProp === 'inspection' || item.columnProp === 'realCrd') && isNewRow(scope.row)"> |
|
|
|
<!-- 对于 inspection 字段,仅在修改时(非新增行)可编辑;A_CRD(realCrd) 已放开,按 schema editableFlag 在所有行可编辑 --> |
|
|
|
<template v-else-if="item.columnProp === 'inspection' && isNewRow(scope.row)"> |
|
|
|
<span>{{ scope.row[item.columnProp] }}</span> |
|
|
|
</template> |
|
|
|
<template v-else> |
|
|
|
@ -786,8 +796,8 @@ |
|
|
|
title="选择 Buyer" |
|
|
|
v-drag |
|
|
|
:visible.sync="buyerDialogVisible" |
|
|
|
width="640px" |
|
|
|
top="10vh" |
|
|
|
width="480px" |
|
|
|
top="20vh" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false" |
|
|
|
@closed="resetBuyerDialog"> |
|
|
|
@ -797,7 +807,7 @@ |
|
|
|
<el-table |
|
|
|
ref="buyerSelectTable" |
|
|
|
:data="buyerDialogRows" |
|
|
|
:height="360" |
|
|
|
:height="240" |
|
|
|
border |
|
|
|
stripe |
|
|
|
highlight-current-row |
|
|
|
@ -805,8 +815,8 @@ |
|
|
|
empty-text="当前 Customer 未维护可用 Buyer" |
|
|
|
@current-change="onBuyerDialogCurrentChange" |
|
|
|
@row-dblclick="applyBuyerDialogSelection"> |
|
|
|
<el-table-column prop="code" label="Buyer 编码" min-width="180" header-align="center" align="center" /> |
|
|
|
<el-table-column prop="name" label="Buyer 名称" min-width="280" header-align="center" show-overflow-tooltip /> |
|
|
|
<el-table-column prop="code" label="Buyer 编码" min-width="120" header-align="center" align="center" /> |
|
|
|
<el-table-column prop="name" label="Buyer 名称" min-width="200" header-align="center" show-overflow-tooltip /> |
|
|
|
</el-table> |
|
|
|
<div slot="footer" class="dialog-footer"> |
|
|
|
<el-button |
|
|
|
@ -993,7 +1003,8 @@ const ADD_NUMBER_FIELD_CODES = new Set(['price', 'qty', 'ship_qty', 'sum_price'] |
|
|
|
const ADD_FILTERABLE_SELECT_FIELD_CODES = new Set(['customer', 'buyer', 'departure', 'destination']) |
|
|
|
const ADD_FORCE_DETAIL_FIELD_CODES = new Set(['part_no', 'price', 'qty']) |
|
|
|
const ADD_READONLY_DEFAULT_TODAY_FIELD_CODES = new Set(['create_date']) |
|
|
|
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date']) |
|
|
|
// po_place_date、enquiry(D_Enquiry)在新增表单默认带出录入当天日期,仍可手动修改 |
|
|
|
const ADD_EDITABLE_DEFAULT_TODAY_FIELD_CODES = new Set(['po_place_date', 'enquiry']) |
|
|
|
const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = { |
|
|
|
order_type: 'poOrderTypeOptions', |
|
|
|
customer: 'poCustomerOptions', |
|
|
|
@ -1003,6 +1014,7 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = { |
|
|
|
status: 'poOrderStatusValueOptions', // rqrq - 新增状态显示英文,值保留中文 |
|
|
|
doc_sent: 'yesNoOptions', |
|
|
|
telex_release: 'yesNoOptions', |
|
|
|
advance_payment: 'yesNoOptions', |
|
|
|
advance_paid: 'yesNoOptions' |
|
|
|
} |
|
|
|
|
|
|
|
@ -1282,8 +1294,8 @@ export default { |
|
|
|
{ label: '陆运 ROAD', value: 'ROAD' } |
|
|
|
], |
|
|
|
yesNoOptions: [ |
|
|
|
{ label: 'Y', value: 'Y' }, |
|
|
|
{ label: 'N', value: 'N' } |
|
|
|
{ label: 'Yes', value: 'Y' }, |
|
|
|
{ label: 'No', value: 'N' } |
|
|
|
] |
|
|
|
}, |
|
|
|
dictSelectOptionsMap: {}, |
|
|
|
@ -2176,8 +2188,8 @@ export default { |
|
|
|
columnWidth: 120, |
|
|
|
showOverflowTooltip: true, |
|
|
|
editAble: true, |
|
|
|
editType: 'text', |
|
|
|
selectOptionsKey: '', |
|
|
|
editType: 'select', |
|
|
|
selectOptionsKey: 'yesNoOptions', |
|
|
|
selectOptions: null |
|
|
|
}, |
|
|
|
{ |
|
|
|
@ -5077,10 +5089,10 @@ export default { |
|
|
|
inspectionResult: '', |
|
|
|
flexid: '', |
|
|
|
obd: '', |
|
|
|
docSent: '', |
|
|
|
telexRelease: '', |
|
|
|
docSent: 'N', |
|
|
|
telexRelease: 'N', |
|
|
|
advancePayment: 'N', |
|
|
|
advancePaid: '', |
|
|
|
advancePaid: 'N', |
|
|
|
planner: '', |
|
|
|
remarkDelay: '', |
|
|
|
remark: '', |
|
|
|
@ -5283,6 +5295,7 @@ export default { |
|
|
|
/** |
|
|
|
* 打开 Buyer 选择弹窗。接口按当前 Site + Customer 查询 po_buyer, |
|
|
|
* 因此弹窗不会混入其他 Customer 的 Buyer。 |
|
|
|
* target:master/detail 回填新增弹窗表单,search 回填顶部筛选 searchData.buyer。 |
|
|
|
*/ |
|
|
|
openAddBuyerSelect (target = 'master') { |
|
|
|
const customer = String(this.searchData.customer || '').trim() |
|
|
|
@ -5290,7 +5303,7 @@ export default { |
|
|
|
this.$message.warning('请先选择 Customer') |
|
|
|
return |
|
|
|
} |
|
|
|
this.buyerDialogTarget = target === 'detail' ? 'detail' : 'master' |
|
|
|
this.buyerDialogTarget = target === 'detail' ? 'detail' : (target === 'search' ? 'search' : 'master') |
|
|
|
this.buyerDialogRows = [] |
|
|
|
this.buyerDialogSelectedRow = null |
|
|
|
this.buyerDialogVisible = true |
|
|
|
@ -5300,7 +5313,7 @@ export default { |
|
|
|
return |
|
|
|
} |
|
|
|
this.buyerDialogRows = Array.isArray(options) ? options : [] |
|
|
|
const targetForm = this.getAddTargetForm(this.buyerDialogTarget) |
|
|
|
const targetForm = this.getBuyerDialogForm(this.buyerDialogTarget) |
|
|
|
const currentBuyer = String((targetForm && targetForm.buyer) || '').trim() |
|
|
|
const selected = this.buyerDialogRows.find(row => row && row.code === currentBuyer) || null |
|
|
|
this.buyerDialogSelectedRow = selected |
|
|
|
@ -5314,6 +5327,19 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
/** 顶部筛选 Buyer:点击搜索图标弹出当前 Customer 下的 Buyer 选择表格。 */ |
|
|
|
openSearchBuyerSelect () { |
|
|
|
this.openAddBuyerSelect('search') |
|
|
|
}, |
|
|
|
|
|
|
|
/** Buyer 弹窗回填目标表单;search 目标为顶部筛选对象本身。 */ |
|
|
|
getBuyerDialogForm (target) { |
|
|
|
if (target === 'search') { |
|
|
|
return this.searchData |
|
|
|
} |
|
|
|
return this.getAddTargetForm(target) |
|
|
|
}, |
|
|
|
|
|
|
|
onBuyerDialogCurrentChange (row) { |
|
|
|
this.buyerDialogSelectedRow = row || null |
|
|
|
}, |
|
|
|
@ -5323,7 +5349,7 @@ export default { |
|
|
|
if (!row || !row.code) { |
|
|
|
return |
|
|
|
} |
|
|
|
const targetForm = this.getAddTargetForm(this.buyerDialogTarget) |
|
|
|
const targetForm = this.getBuyerDialogForm(this.buyerDialogTarget) |
|
|
|
if (targetForm) { |
|
|
|
this.$set(targetForm, 'buyer', row.code) |
|
|
|
} |
|
|
|
|