Browse Source

feat(order): 优化订单模块字段权限控制和买家选择功能

- 在字段权限组件中实现强制必填字段逻辑,系统级必录字段默认必填且不允许取消
- 修复字段可见性与必填状态的联动逻辑,隐藏字段时自动取消必填勾选
- 为订单搜索栏的Buyer字段添加插槽支持,允许页面自定义买家选择功能
- 实现订单页面买家选择弹窗功能,支持从当前客户下选择可用买家
- 调整买家选择弹窗的UI布局,优化列宽和对话框尺寸
- 为enquiry字段添加默认日期设置功能,新增时自动带出当天日期
- 为advance_payment字段添加下拉选项配置,统一Yes/No选项显示格式
- 修改文档发送和电放等字段的初始默认值设置逻辑
master
qiankanghui 2 weeks ago
parent
commit
a4fd1ebd53
  1. 36
      src/views/modules/inspection/inspectionRequestList.vue
  2. 17
      src/views/modules/order/poOrder.vue
  3. 8
      src/views/modules/order/poOrderAdvancedQueryHelper.js

36
src/views/modules/inspection/inspectionRequestList.vue

@ -383,21 +383,16 @@
style="width: 100%; margin-top: -10px;"
@selection-change="handleSelectionChange">
<el-table-column v-if="!isEditDialogMode" type="selection" width="30" align="center" fixed="left" />
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120"/>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="60"/>
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120"/>
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/>
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="qty" label="订单数量" header-align="center" align="right" width="80"/>
<el-table-column prop="waitInspectQty" label="未验货数量" header-align="center" align="right" width="80"/>
<el-table-column label="此次验货数量" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-input-number
v-model="scope.row.inspectQty"
:min="0"
:max="scope.row.waitInspectQty || 999999"
:max="scope.row.qty || 999999"
size="mini"
:controls="false"
style="width: 100%; box-sizing: border-box;">
@ -418,7 +413,7 @@
</el-table-column>
<el-table-column
prop="crd"
label="CRD日期"
label="CRD"
header-align="center"
align="center"
width="160"
@ -436,6 +431,8 @@
/>
</template>
</el-table-column>
<el-table-column prop="eta" label="ETA" header-align="center" align="center" width="110"/>
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
</el-table>
<el-table
@ -453,14 +450,11 @@
<el-link style="cursor: pointer" @click="deleteEditPoRow(scope.$index)">删除</el-link>
</template>
</el-table-column>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="60"/>
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120"/>
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="80"/>
<el-table-column prop="partNo" label="产品编码" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/>
<el-table-column prop="sku" label="SKU" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
<el-table-column prop="partDesc" label="物料名称" header-align="center" align="left" min-width="150" show-overflow-tooltip/>
<el-table-column prop="totalQty" label="未验货数量" header-align="center" align="right" width="90"/>
<el-table-column label="验货数量" header-align="center" align="center" width="150">
<el-table-column prop="aQty" label="订单数量" header-align="center" align="right" width="80"/>
<el-table-column label="此次验货数量" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-input-number
v-if="editPoEditMode"
@ -473,7 +467,7 @@
<span v-else>{{ scope.row.qty }}</span>
</template>
</el-table-column>
<el-table-column label="运输方式" header-align="center" align="center" width="120">
<el-table-column label="运输方式" header-align="center" align="center" width="100">
<template slot-scope="scope">
<el-select v-if="editPoEditMode" v-model="scope.row.shipMothod" placeholder="请选择" size="mini" style="width: 100%;">
<el-option
@ -486,7 +480,7 @@
<span v-else>{{ scope.row.shipMothod }}</span>
</template>
</el-table-column>
<el-table-column label="CRD日期" header-align="center" align="center" width="160">
<el-table-column label="CRD" header-align="center" align="center" width="160">
<template slot-scope="scope">
<el-date-picker
v-if="editPoEditMode"
@ -501,6 +495,8 @@
<span v-else>{{ scope.row.crd }}</span>
</template>
</el-table-column>
<el-table-column prop="eta" label="ETA" header-align="center" align="center" width="110"/>
<el-table-column prop="planner" label="Planner" header-align="center" align="left" min-width="120" show-overflow-tooltip/>
</el-table>
</div>
</el-form>
@ -2481,7 +2477,11 @@ export default {
shipMothod: row.shipMethod || row.shipMothod || '', // 保持字段一致性
crd: row.crd || '',
waitInspectQty: row.waitInspectQty || 0,
totalQty: row.waitInspectQty || 0 // 新增明细的未验货数量取PO的可用待验数量
totalQty: row.waitInspectQty || 0, // 新增明细的未验货数量取PO的可用待验数量
aQty: row.qty || 0, // 订单数量(A_Qty):选择弹窗行的 qty 即 A_Qty,下面 qty 会被本次验货数量覆盖
item: row.item || '',
eta: row.eta || '',
planner: row.planner || ''
}))
// 将新PO明细添加到编辑列表中
@ -3276,7 +3276,7 @@ export default {
supplierNo: item.supplierNo || item.supplier_no || this.addFormData.supplierNo || '',
supplierName: item.supplierName || item.supplier_name || this.addFormData.supplierName || '',
planner: item.planner || '',
inspectQty: item.waitInspectQty || 0, // 默认值为未验货数量
inspectQty: item.qty || 0, // 此次验货数量默认=订单数量(A_Qty),上限同订单数量
shipMethod: item.shipMethod || '',// 运输方式
crd: item.crd ? item.crd.split(' ')[0] : ''
}))

17
src/views/modules/order/poOrder.vue

@ -1012,8 +1012,8 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = {
departure: 'poDepartureOptions',
destination: 'poDestinationOptions',
status: 'poOrderStatusValueOptions', // rqrq - 新增状态显示英文,值保留中文
doc_sent: 'yesNoOptions',
telex_release: 'yesNoOptions',
doc_sent: 'yesNoTextOptions',
telex_release: 'yesNoTextOptions',
advance_payment: 'yesNoOptions',
advance_paid: 'yesNoOptions'
}
@ -1296,6 +1296,11 @@ export default {
yesNoOptions: [
{ label: 'Yes', value: 'Y' },
{ label: 'No', value: 'N' }
],
// Doc Sent / Telex Release 专用:库内直接存 Yes/No 全拼,与列表显示、顶部筛选口径一致 - rqrq
yesNoTextOptions: [
{ label: 'Yes', value: 'Yes' },
{ label: 'No', value: 'No' }
]
},
dictSelectOptionsMap: {},
@ -2143,7 +2148,7 @@ export default {
showOverflowTooltip: true,
editAble: true,
editType: 'select',
selectOptionsKey: 'yesNoOptions',
selectOptionsKey: 'yesNoTextOptions',
selectOptions: null
},
{
@ -2166,7 +2171,7 @@ export default {
showOverflowTooltip: true,
editAble: true,
editType: 'select',
selectOptionsKey: 'yesNoOptions',
selectOptionsKey: 'yesNoTextOptions',
selectOptions: null
},
{
@ -5089,8 +5094,8 @@ export default {
inspectionResult: '',
flexid: '',
obd: '',
docSent: 'N',
telexRelease: 'N',
docSent: 'No',
telexRelease: 'No',
advancePayment: 'N',
advancePaid: 'N',
planner: '',

8
src/views/modules/order/poOrderAdvancedQueryHelper.js

@ -145,15 +145,17 @@ function normalizeSearchList (list) {
/**
* Telex Release 页面值转库值。
* Yes 对应 true,No 对应 false;未选择时返回空,查询全部(含空值)。
* 库内实际存的就是 Yes / No(与页面选项文案一致),因此直接透传 'Yes' / 'No' 参与等值查询;
* SQL Server 默认排序规则大小写不敏感,库里的 yes/no 全拼变体同样能命中。
* 未选择时返回空,查询全部(含空值)。
*/
function mapTelexReleaseToDb (value) {
const text = trimSearchText(value)
if (text === 'Yes') {
return 'true'
return 'Yes'
}
if (text === 'No') {
return 'false'
return 'No'
}
return ''
}

Loading…
Cancel
Save