diff --git a/src/views/modules/inspection/inspectionRequestList.vue b/src/views/modules/inspection/inspectionRequestList.vue index b13073d..8be1970 100644 --- a/src/views/modules/inspection/inspectionRequestList.vue +++ b/src/views/modules/inspection/inspectionRequestList.vue @@ -383,21 +383,16 @@ style="width: 100%; margin-top: -10px;" @selection-change="handleSelectionChange"> - - + - - - - + + 删除 + - - - - - - + + - + - + + + @@ -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] : '' })) diff --git a/src/views/modules/order/poOrder.vue b/src/views/modules/order/poOrder.vue index a5db08b..6b37776 100644 --- a/src/views/modules/order/poOrder.vue +++ b/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: '', diff --git a/src/views/modules/order/poOrderAdvancedQueryHelper.js b/src/views/modules/order/poOrderAdvancedQueryHelper.js index 843dc35..8b0d860 100644 --- a/src/views/modules/order/poOrderAdvancedQueryHelper.js +++ b/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 '' }