|
|
|
@ -25,6 +25,7 @@ |
|
|
|
<el-button v-if="editMode" style="margin-left: 2px" @click="cancelEditMode">取消</el-button> |
|
|
|
<el-button type="primary" style="margin-left: 2px" @click="openAddDialog" v-if="!editMode">新增</el-button> |
|
|
|
<el-button type="primary" plain style="margin-left: 2px" @click="openCurrentRowPriceDialog" v-if="!editMode" :disabled="!currentRow">查看价格表</el-button> |
|
|
|
<el-button type="warning" plain style="margin-left: 2px" @click="handleSplitToNewPo" v-if="!editMode" :disabled="!currentRow || !canSplitToNewPo(currentRow.status)">拆单到新PO</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
<el-table |
|
|
|
@ -41,7 +42,7 @@ |
|
|
|
label="操作" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="100"> |
|
|
|
width="140"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<div class="po-row-action-wrap"> |
|
|
|
<el-link |
|
|
|
@ -60,6 +61,10 @@ |
|
|
|
v-if="canReceivePoOrder(scope.row)" |
|
|
|
type="primary" |
|
|
|
@click.stop="handleReceivePoOrder(scope.row)">收货</el-link> |
|
|
|
<el-link |
|
|
|
v-if="canSplitPoOrder(scope.row.status)" |
|
|
|
type="primary" |
|
|
|
@click.stop="handleSplitPoOrder(scope.row)">拆分任务</el-link> |
|
|
|
<el-link |
|
|
|
v-if="canClosePoOrder(scope.row.status)" |
|
|
|
type="primary" |
|
|
|
@ -304,7 +309,7 @@ |
|
|
|
<!-- |
|
|
|
模态框:发货确认(shipped) |
|
|
|
交互规则: |
|
|
|
1) 第一行:订单数量(可编辑,回写 qty); |
|
|
|
1) 第一行:订单数量(A_Qty 工作数量,可编辑回写 a_qty;未拆分同步 qty,已拆分 P_Qty 冻结); |
|
|
|
2) 第二行:可发货数量(inspect_approve_qty - c_ship_qty,仅读); |
|
|
|
3) 第三行:本次发货数量(默认=可发货数量,可修改)。 |
|
|
|
--> |
|
|
|
@ -312,21 +317,21 @@ |
|
|
|
title="发货确认" |
|
|
|
v-drag |
|
|
|
:visible.sync="shipDialogVisible" |
|
|
|
width="360px" |
|
|
|
width="560px" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false" |
|
|
|
@closed="resetShipDialog"> |
|
|
|
<el-form label-position="top" class="ship-dialog-form"> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="12" > |
|
|
|
<el-form-item label="订单数量"> |
|
|
|
<el-row :gutter="12"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="订单数量(A_Qty)"> |
|
|
|
<el-input |
|
|
|
v-model="shipDialogForm.orderQty" |
|
|
|
disabled |
|
|
|
class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12" > |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="未发货数量"> |
|
|
|
<el-input |
|
|
|
:value="formatShipDialogDisplay(shipDialogForm.canShipQty)" |
|
|
|
@ -334,19 +339,53 @@ |
|
|
|
class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12" > |
|
|
|
<el-form-item label="本次发货数量"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="本次发货数量" required> |
|
|
|
<el-input |
|
|
|
v-model="shipDialogForm.shipQty" |
|
|
|
type="number" |
|
|
|
class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12" > |
|
|
|
<el-form-item label="发货单号"> |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="12"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="验货日期(D_Inspection)" required> |
|
|
|
<el-date-picker |
|
|
|
v-model="shipDialogForm.inspection" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="请选择" |
|
|
|
style="width: 100%;" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="装船日期(A_OBD)" required> |
|
|
|
<el-date-picker |
|
|
|
v-model="shipDialogForm.obd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="请选择" |
|
|
|
style="width: 100%;" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="确认完货日期(D_CRD)" required> |
|
|
|
<el-date-picker |
|
|
|
v-model="shipDialogForm.crd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="请选择" |
|
|
|
style="width: 100%;" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="12"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item label="发货单号" required> |
|
|
|
<el-input |
|
|
|
v-model="shipDialogForm.flexid" |
|
|
|
placeholder="选填" |
|
|
|
placeholder="必填" |
|
|
|
class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
@ -358,6 +397,169 @@ |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- |
|
|
|
模态框:拆分任务 |
|
|
|
交互规则: |
|
|
|
1) 第一区:当前行信息(PO/行号/订单数量/检验申请数量/发货数量,只读); |
|
|
|
2) 拆分行完全复制当前行,PO 与行号不可修改,新行号提交时由后端自动生成; |
|
|
|
3) 三项拆分数量手填,检验通过数量按 r=拆分检验申请÷原检验申请 比例换算不可手填,第四区实时显示剩余量; |
|
|
|
4) 新行完全复制原行字段,不提供可改字段区。 |
|
|
|
--> |
|
|
|
<el-dialog |
|
|
|
title="拆分任务" |
|
|
|
v-drag |
|
|
|
:visible.sync="splitDialogVisible" |
|
|
|
width="640px" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false" |
|
|
|
@closed="resetSplitDialog"> |
|
|
|
<el-form label-position="top" class="ship-dialog-form"> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="PO"> |
|
|
|
<el-input :value="splitDialogForm.poNo" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="行号"> |
|
|
|
<el-input :value="String(splitDialogForm.itemNo == null ? '' : splitDialogForm.itemNo)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="订单数量(P_Qty)"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitDialogForm.origQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="订单数量(A_Qty)"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitDialogForm.origAQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="检验申请数量"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitDialogForm.origToInspectQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="发货数量(ShippedQty)"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitDialogForm.origShipQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="检验通过数量"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitDialogForm.origApproveQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<div class="split-dialog-tip">拆分行将完全复制当前PO行,拆出部分只记 A_Qty(新行 P_Qty=0,原行 P_Qty 不变)。</div> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="拆分订单数量"> |
|
|
|
<el-input v-model="splitDialogForm.splitQty" type="number" class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="拆分检验申请数量"> |
|
|
|
<el-input v-model="splitDialogForm.splitToInspectQty" type="number" class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="拆分发货数量"> |
|
|
|
<el-input v-model="splitDialogForm.splitShipQty" type="number" class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="检验通过数量(按比例)"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitNewApprove)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="8"> |
|
|
|
<el-form-item label="拆分比例"> |
|
|
|
<el-input :value="splitRatioDisplay" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item label="剩余订单数量(A_Qty)"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitRemainQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item label="剩余检验申请数量"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitRemainToInspect)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item label="剩余发货数量"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitRemainShip)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item label="剩余检验通过数量"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitRemainApprove)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer ship-dialog-footer"> |
|
|
|
<el-button type="primary" :loading="splitDialogSaving" @click="submitSplitPoDialog">保存</el-button> |
|
|
|
<el-button @click="splitDialogVisible = false">取消</el-button> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 拆单到新 PO 弹窗:将原行部分数量拆分到全新 PO,新行继承状态,验货记录不动 --> |
|
|
|
<el-dialog |
|
|
|
title="拆单到新PO" |
|
|
|
v-drag |
|
|
|
:visible.sync="splitToNewPoDialogVisible" |
|
|
|
width="480px" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false" |
|
|
|
@closed="resetSplitToNewPoDialog"> |
|
|
|
<el-form label-position="top" class="ship-dialog-form"> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="PO"> |
|
|
|
<el-input :value="splitToNewPoDialogForm.poNo" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="行号"> |
|
|
|
<el-input :value="String(splitToNewPoDialogForm.itemNo == null ? '' : splitToNewPoDialogForm.itemNo)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="A_Qty"> |
|
|
|
<el-input :value="formatShipDialogDisplay(splitToNewPoDialogForm.origAQty)" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="状态"> |
|
|
|
<el-input :value="splitToNewPoDialogForm.origStatus" disabled class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
<el-divider /> |
|
|
|
<el-row :gutter="10"> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="目标 PO No" required> |
|
|
|
<el-input v-model="splitToNewPoDialogForm.targetPoNo" placeholder="如 CP0001" class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="12"> |
|
|
|
<el-form-item label="拆出数量" required> |
|
|
|
<el-input v-model="splitToNewPoDialogForm.splitQty" type="number" :max="splitToNewPoDialogForm.origAQty" class="ship-dialog-input" /> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<div slot="footer" class="dialog-footer ship-dialog-footer"> |
|
|
|
<el-button type="primary" :loading="splitToNewPoDialogSaving" @click="submitSplitToNewPoDialog">确认</el-button> |
|
|
|
<el-button @click="splitToNewPoDialogVisible = false">取消</el-button> |
|
|
|
</div> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<!-- 打样单收货确认弹窗:填写收货日期,确定后回写 c_po_actual_ready_date 并自动生成已排程验货申请 --> |
|
|
|
<el-dialog |
|
|
|
title="收货确认" |
|
|
|
@ -744,6 +946,8 @@ import { |
|
|
|
rollbackPoDetail, |
|
|
|
shipPoDetailPreview, |
|
|
|
shipPoDetail, |
|
|
|
splitPoDetail, |
|
|
|
splitToNewPo, |
|
|
|
receivePoDetail, |
|
|
|
createPoOrder, |
|
|
|
getPoCustomerOptions, |
|
|
|
@ -769,6 +973,7 @@ import { |
|
|
|
canIssuePoOrder, |
|
|
|
canRollbackPoOrder, |
|
|
|
canShipPoOrder, |
|
|
|
canSplitPoOrder, |
|
|
|
canReceivePoOrder, |
|
|
|
canClosePoOrder, |
|
|
|
canOpenPoOrder, |
|
|
|
@ -882,8 +1087,8 @@ const ADD_SELECT_OPTIONS_FIELD_CODE_MAP = { |
|
|
|
* - getDataList, sizeChangeHandle, currentChangeHandle, buildQueryRequest |
|
|
|
* |
|
|
|
* F. 行操作(状态流转) |
|
|
|
* - handleIssuePoOrder, handleShipPoOrder, handleClosePoOrder, handleOpenPoOrder |
|
|
|
* - canIssuePoOrder, canShipPoOrder, canClosePoOrder, canOpenPoOrder, canEditPoColumnByStatus |
|
|
|
* - handleIssuePoOrder, handleShipPoOrder, handleSplitPoOrder, handleClosePoOrder, handleOpenPoOrder |
|
|
|
* - canIssuePoOrder, canShipPoOrder, canSplitPoOrder, canClosePoOrder, canOpenPoOrder, canEditPoColumnByStatus |
|
|
|
* |
|
|
|
* G. 行编辑与批量提交 |
|
|
|
* - onCellChange, toggleEditMode, cancelEditMode, batchUpdatePoOrder, isNewRow |
|
|
|
@ -1029,6 +1234,38 @@ export default { |
|
|
|
flexid: '' |
|
|
|
}, |
|
|
|
|
|
|
|
// ===== 拆分任务弹窗状态 ===== |
|
|
|
splitDialogVisible: false, |
|
|
|
splitDialogSaving: false, |
|
|
|
splitDialogForm: { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
itemNo: null, |
|
|
|
poNo: '', |
|
|
|
origQty: 0, |
|
|
|
origAQty: 0, |
|
|
|
origToInspectQty: 0, |
|
|
|
origShipQty: 0, |
|
|
|
origApproveQty: 0, |
|
|
|
splitQty: '', |
|
|
|
splitToInspectQty: '', |
|
|
|
splitShipQty: '' |
|
|
|
}, |
|
|
|
|
|
|
|
// ===== 拆单到新 PO 弹窗状态 ===== |
|
|
|
splitToNewPoDialogVisible: false, |
|
|
|
splitToNewPoDialogSaving: false, |
|
|
|
splitToNewPoDialogForm: { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
itemNo: null, |
|
|
|
poNo: '', |
|
|
|
origAQty: 0, |
|
|
|
origStatus: '', |
|
|
|
targetPoNo: '', |
|
|
|
splitQty: '' |
|
|
|
}, |
|
|
|
|
|
|
|
// ===== 打样单收货确认弹窗状态 ===== |
|
|
|
receiveDialogVisible: false, |
|
|
|
receiveDialogSaving: false, |
|
|
|
@ -1393,7 +1630,8 @@ export default { |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
showOverflowTooltip: true, |
|
|
|
editAble: true, |
|
|
|
// P_Qty 为订单原始数量,编辑模式下一律只读;同步规则改由 A_Qty 触发。 |
|
|
|
editAble: false, |
|
|
|
editType: 'num', |
|
|
|
selectOptionsKey: '', |
|
|
|
selectOptions: null |
|
|
|
@ -1463,8 +1701,9 @@ export default { |
|
|
|
fixed: '', |
|
|
|
columnWidth: 80, |
|
|
|
showOverflowTooltip: true, |
|
|
|
editAble: false, |
|
|
|
editType: 'text', |
|
|
|
// A_Qty 为工作数量,编辑模式下直接维护;canEditCell 中已硬开为可编辑,不受后端 schema 影响。 |
|
|
|
editAble: true, |
|
|
|
editType: 'num', |
|
|
|
selectOptionsKey: '', |
|
|
|
selectOptions: null |
|
|
|
}, |
|
|
|
@ -2125,6 +2364,58 @@ export default { |
|
|
|
const rest = cols.filter(c => !leadProps.includes(c.columnProp)) |
|
|
|
return [...leading, ...rest] |
|
|
|
}, |
|
|
|
// ===== 拆分弹窗:比例与剩余量实时计算 ===== |
|
|
|
splitRatioValue () { |
|
|
|
const orig = this.normalizeShipDialogNumber(this.splitDialogForm.origToInspectQty) |
|
|
|
const split = this.normalizeShipDialogNumber(this.splitDialogForm.splitToInspectQty) |
|
|
|
if (!Number.isFinite(orig) || orig <= 0 || !Number.isFinite(split) || split <= 0) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
return split / orig |
|
|
|
}, |
|
|
|
splitNewApprove () { |
|
|
|
const approve = this.normalizeShipDialogNumber(this.splitDialogForm.origApproveQty) |
|
|
|
if (!Number.isFinite(approve) || approve <= 0) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
const value = approve * this.splitRatioValue |
|
|
|
return value > approve ? approve : value |
|
|
|
}, |
|
|
|
splitRatioDisplay () { |
|
|
|
return `${Math.round(this.splitRatioValue * 10000) / 100}%` |
|
|
|
}, |
|
|
|
splitRemainQty () { |
|
|
|
// 拆分只消耗 A_Qty,P_Qty 不变,剩余量按 A_Qty 口径展示 |
|
|
|
const orig = this.normalizeShipDialogNumber(this.splitDialogForm.origAQty) |
|
|
|
const split = this.normalizeShipDialogNumber(this.splitDialogForm.splitQty) |
|
|
|
if (!Number.isFinite(orig)) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
return Number.isFinite(split) ? orig - split : orig |
|
|
|
}, |
|
|
|
splitRemainToInspect () { |
|
|
|
const orig = this.normalizeShipDialogNumber(this.splitDialogForm.origToInspectQty) |
|
|
|
const split = this.normalizeShipDialogNumber(this.splitDialogForm.splitToInspectQty) |
|
|
|
if (!Number.isFinite(orig)) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
return Number.isFinite(split) ? orig - split : orig |
|
|
|
}, |
|
|
|
splitRemainShip () { |
|
|
|
const orig = this.normalizeShipDialogNumber(this.splitDialogForm.origShipQty) |
|
|
|
const split = this.normalizeShipDialogNumber(this.splitDialogForm.splitShipQty) |
|
|
|
if (!Number.isFinite(orig)) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
return Number.isFinite(split) ? orig - split : orig |
|
|
|
}, |
|
|
|
splitRemainApprove () { |
|
|
|
const approve = this.normalizeShipDialogNumber(this.splitDialogForm.origApproveQty) |
|
|
|
if (!Number.isFinite(approve)) { |
|
|
|
return 0 |
|
|
|
} |
|
|
|
return approve - this.splitNewApprove |
|
|
|
}, |
|
|
|
addExtFields () { |
|
|
|
return getEditableExtFieldsFromSchema(this.addFormSchemaFields) |
|
|
|
}, |
|
|
|
@ -2237,6 +2528,7 @@ export default { |
|
|
|
canIssuePoOrder, |
|
|
|
canRollbackPoOrder, |
|
|
|
canShipPoOrder, |
|
|
|
canSplitPoOrder, |
|
|
|
canReceivePoOrder, |
|
|
|
canClosePoOrder, |
|
|
|
canOpenPoOrder, |
|
|
|
@ -2344,6 +2636,10 @@ export default { |
|
|
|
if (!this.editMode || !item) return false |
|
|
|
const prop = item.columnProp |
|
|
|
if (prop === 'customer') return false |
|
|
|
// 编辑模式数量列硬开关:P_Qty 只读;A_Qty 一律允许编辑,忽略后端 schema editableFlag, |
|
|
|
// 实际落库由后端 resolveAQtyEditTargets 处理未拆分/已拆分两种同步语义。 |
|
|
|
if (prop === 'qty') return false |
|
|
|
if (prop === 'aQty') return true |
|
|
|
if (this.displayOnlyColumnProps.includes(prop)) return false |
|
|
|
if (this.isChooserEditColumn(prop)) { |
|
|
|
return canEditPoColumnByStatus(row.status, prop) |
|
|
|
@ -2790,7 +3086,11 @@ export default { |
|
|
|
currentShipQty: 0, |
|
|
|
canShipQty: 0, |
|
|
|
shipQty: 0, |
|
|
|
flexid: '' |
|
|
|
flexid: '', |
|
|
|
// 发货前需确认已填写的三个日期:验货日期(D_Inspection) / 装船日期(A_OBD) / 确认完货日期(D_CRD) |
|
|
|
inspection: '', |
|
|
|
obd: '', |
|
|
|
crd: '' |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
@ -2837,6 +3137,11 @@ export default { |
|
|
|
this.$message.error('无法识别订单行,请刷新后重试') |
|
|
|
return |
|
|
|
} |
|
|
|
// 行上的 发货前必填日期快照(前端需确保 D_Inspection/A_OBD/D_CRD 均已填写才能提交发货) |
|
|
|
const rowInspection = row && row.inspection != null ? row.inspection : '' |
|
|
|
const rowObd = row && row.obd != null ? row.obd : '' |
|
|
|
const rowCrd = row && row.crd != null ? row.crd : '' |
|
|
|
const rowFlexid = (row && row.flexid != null ? String(row.flexid) : '').trim() |
|
|
|
shipPoDetailPreview({ |
|
|
|
site: params.site, |
|
|
|
orderNo: params.orderNo, |
|
|
|
@ -2857,7 +3162,11 @@ export default { |
|
|
|
inspectApproveQty: preview.inspectApproveQty != null ? Number(preview.inspectApproveQty) : 0, |
|
|
|
currentShipQty: preview.currentShipQty != null ? Number(preview.currentShipQty) : 0, |
|
|
|
canShipQty: preview.canShipQty != null ? Number(preview.canShipQty) : 0, |
|
|
|
shipQty: preview.shipQty != null ? Number(preview.shipQty) : 0 |
|
|
|
shipQty: preview.shipQty != null ? Number(preview.shipQty) : 0, |
|
|
|
flexid: rowFlexid, |
|
|
|
inspection: rowInspection, |
|
|
|
obd: rowObd, |
|
|
|
crd: rowCrd |
|
|
|
} |
|
|
|
this.shipDialogVisible = true |
|
|
|
}).catch(err => { |
|
|
|
@ -2867,7 +3176,7 @@ export default { |
|
|
|
|
|
|
|
/** |
|
|
|
* 提交发货确认: |
|
|
|
* 1) 仅校验本次发货数量 > 0 且 <= 未发货数量; |
|
|
|
* 1) 前端预校验:发货单号必填 + D_Inspection/A_OBD/D_CRD 三个日期均已填写 + 本次发货数量 > 0 且 ≤ 未发货数量; |
|
|
|
* 2) 提交后端回写 qty / c_ship_qty / status; |
|
|
|
* 3) 成功后关闭弹窗并刷新列表。 |
|
|
|
*/ |
|
|
|
@ -2876,6 +3185,22 @@ export default { |
|
|
|
const unshippedQty = this.normalizeShipDialogNumber(this.shipDialogForm.canShipQty) |
|
|
|
const shipQty = this.normalizeShipDialogNumber(this.shipDialogForm.shipQty) |
|
|
|
|
|
|
|
// 发货单号必填 |
|
|
|
const flexid = (this.shipDialogForm.flexid || '').trim() |
|
|
|
if (!flexid) { |
|
|
|
this.$message.error('请填写发货单号') |
|
|
|
return |
|
|
|
} |
|
|
|
// 三个发货前必须已维护的日期字段(现已在弹窗中直接选择,行上有值会自动带入) |
|
|
|
const missingLabels = [] |
|
|
|
if (!this.shipDialogForm.inspection) missingLabels.push('验货日期(D_Inspection)') |
|
|
|
if (!this.shipDialogForm.obd) missingLabels.push('装船日期(A_OBD)') |
|
|
|
if (!this.shipDialogForm.crd) missingLabels.push('确认完货日期(D_CRD)') |
|
|
|
if (missingLabels.length > 0) { |
|
|
|
this.$message.error(`请选择:${missingLabels.join('、')}`) |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
if (!Number.isFinite(shipQty) || shipQty <= 0) { |
|
|
|
this.$message.error('本次发货数量必须大于0') |
|
|
|
return |
|
|
|
@ -2891,7 +3216,10 @@ export default { |
|
|
|
itemNo: this.shipDialogForm.itemNo, |
|
|
|
orderQty, |
|
|
|
shipQty, |
|
|
|
flexid: (this.shipDialogForm.flexid || '').trim() |
|
|
|
flexid, |
|
|
|
inspection: this.shipDialogForm.inspection, |
|
|
|
obd: this.shipDialogForm.obd, |
|
|
|
crd: this.shipDialogForm.crd |
|
|
|
} |
|
|
|
this.shipDialogSaving = true |
|
|
|
shipPoDetail(payload).then(({ data }) => { |
|
|
|
@ -2909,6 +3237,225 @@ export default { |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 点击拆分任务: |
|
|
|
* 1) 校验行标识后打开拆分弹窗,第一区展示当前行快照(只读); |
|
|
|
* 2) 新行完全复制原行字段,仅填写三项拆分数量; |
|
|
|
* 3) 新行号由后端提交时生成,前端不预占号。 |
|
|
|
*/ |
|
|
|
handleSplitPoOrder (row) { |
|
|
|
const params = buildPoDetailActionParams(row, this.$store.state.user.site) |
|
|
|
if (!params.orderNo || !params.site || params.itemNo == null) { |
|
|
|
this.$message.error('无法识别订单行,请刷新后重试') |
|
|
|
return |
|
|
|
} |
|
|
|
this.splitDialogForm = { |
|
|
|
site: params.site, |
|
|
|
orderNo: params.orderNo, |
|
|
|
itemNo: params.itemNo, |
|
|
|
poNo: row.poNo || '', |
|
|
|
origQty: Number(row.qty != null ? row.qty : 0), |
|
|
|
origAQty: Number(row.aQty != null ? row.aQty : (row.qty != null ? row.qty : 0)), |
|
|
|
origToInspectQty: Number(row.toInspectQty != null ? row.toInspectQty : 0), |
|
|
|
origShipQty: Number(row.shipQty != null ? row.shipQty : 0), |
|
|
|
origApproveQty: Number(row.inspectApproveQty != null ? row.inspectApproveQty : 0), |
|
|
|
splitQty: '', |
|
|
|
splitToInspectQty: '', |
|
|
|
splitShipQty: '' |
|
|
|
} |
|
|
|
this.splitDialogVisible = true |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 提交拆分: |
|
|
|
* 1) 前端预校验 0≤拆分≤原值、发货拆分为整数且≤按比例检验通过数量、至少一项>0; |
|
|
|
* 2) 提交后端(最终校验以后端为准,新行字段完全复制原行); |
|
|
|
* 3) 成功后关闭弹窗并刷新列表。 |
|
|
|
*/ |
|
|
|
submitSplitPoDialog () { |
|
|
|
const form = this.splitDialogForm |
|
|
|
const toNum = (value) => { |
|
|
|
const num = this.normalizeShipDialogNumber(value) |
|
|
|
return Number.isFinite(num) ? num : 0 |
|
|
|
} |
|
|
|
const splitQty = toNum(form.splitQty) |
|
|
|
const splitToInspect = toNum(form.splitToInspectQty) |
|
|
|
const splitShip = toNum(form.splitShipQty) |
|
|
|
if (splitQty < 0 || splitToInspect < 0 || splitShip < 0) { |
|
|
|
this.$message.error('拆分数量不能小于0') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitQty > Number(form.origAQty)) { |
|
|
|
this.$message.error('拆分订单数量不能大于原订单数量A_Qty') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitToInspect > Number(form.origToInspectQty)) { |
|
|
|
this.$message.error('拆分检验申请数量不能大于原检验申请数量') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitShip > Number(form.origShipQty)) { |
|
|
|
this.$message.error('拆分发货数量不能大于原发货数量') |
|
|
|
return |
|
|
|
} |
|
|
|
if (!Number.isInteger(splitShip)) { |
|
|
|
this.$message.error('拆分发货数量必须为整数') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitQty === 0 && splitToInspect === 0 && splitShip === 0) { |
|
|
|
this.$message.error('请至少填写一项大于0的拆分数量') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitShip > this.splitNewApprove + 1e-6) { |
|
|
|
this.$message.error('拆分发货数量不能大于按比例拆分的检验通过数量') |
|
|
|
return |
|
|
|
} |
|
|
|
const payload = { |
|
|
|
site: form.site, |
|
|
|
orderNo: form.orderNo, |
|
|
|
itemNo: form.itemNo, |
|
|
|
splitQty, |
|
|
|
splitToInspectQty: splitToInspect, |
|
|
|
splitShipQty: splitShip |
|
|
|
} |
|
|
|
this.splitDialogSaving = true |
|
|
|
splitPoDetail(payload).then(({ data }) => { |
|
|
|
this.splitDialogSaving = false |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.$message.success('拆分成功') |
|
|
|
this.splitDialogVisible = false |
|
|
|
// 拆分成功后自动将原行 PO 号填入顶部筛选并重查,方便核对拆分后的两行 |
|
|
|
if (form.poNo) { |
|
|
|
this.searchData.poNo = form.poNo |
|
|
|
this.handleSearch() |
|
|
|
} else { |
|
|
|
this.getDataList() |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.$message.error((data && data.msg) || '拆分失败') |
|
|
|
} |
|
|
|
}).catch(err => { |
|
|
|
this.splitDialogSaving = false |
|
|
|
this.$message.error((err && err.message) || '拆分失败') |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 关闭拆分弹窗时重置状态,避免上次缓存污染下一次操作。 |
|
|
|
*/ |
|
|
|
resetSplitDialog () { |
|
|
|
this.splitDialogSaving = false |
|
|
|
this.splitDialogForm = { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
itemNo: null, |
|
|
|
poNo: '', |
|
|
|
origQty: 0, |
|
|
|
origAQty: 0, |
|
|
|
origToInspectQty: 0, |
|
|
|
origShipQty: 0, |
|
|
|
origApproveQty: 0, |
|
|
|
splitQty: '', |
|
|
|
splitToInspectQty: '', |
|
|
|
splitShipQty: '' |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
/** 是否可「拆单到新PO」:非草稿/已关闭/已取消时可用(与拆分任务同口径) */ |
|
|
|
canSplitToNewPo (status) { |
|
|
|
return !!status && status !== '草稿' && status !== '已关闭' && status !== '已取消' |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 点击工具栏「拆单到新PO」按钮:打开弹窗,展示当前行快照。 |
|
|
|
*/ |
|
|
|
handleSplitToNewPo () { |
|
|
|
const row = this.currentRow |
|
|
|
if (!row) { |
|
|
|
this.$message.warning('请先选择一行数据') |
|
|
|
return |
|
|
|
} |
|
|
|
const params = buildPoDetailActionParams(row, this.$store.state.user.site) |
|
|
|
if (!params.orderNo || !params.site || params.itemNo == null) { |
|
|
|
this.$message.error('无法识别订单行,请刷新后重试') |
|
|
|
return |
|
|
|
} |
|
|
|
this.splitToNewPoDialogForm = { |
|
|
|
site: params.site, |
|
|
|
orderNo: params.orderNo, |
|
|
|
itemNo: params.itemNo, |
|
|
|
poNo: row.poNo || '', |
|
|
|
origAQty: Number(row.aQty != null ? row.aQty : (row.qty != null ? row.qty : 0)), |
|
|
|
origStatus: row.statusDisplay || row.status || '', |
|
|
|
targetPoNo: '', |
|
|
|
splitQty: '' |
|
|
|
} |
|
|
|
this.splitToNewPoDialogVisible = true |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 提交拆单到新 PO:校验入参后调用后端接口,成功后刷新列表。 |
|
|
|
*/ |
|
|
|
submitSplitToNewPoDialog () { |
|
|
|
const form = this.splitToNewPoDialogForm |
|
|
|
if (!form.targetPoNo || !form.targetPoNo.trim()) { |
|
|
|
this.$message.error('目标 PO No 不能为空') |
|
|
|
return |
|
|
|
} |
|
|
|
const splitQty = Number(form.splitQty) |
|
|
|
if (!Number.isFinite(splitQty) || splitQty <= 0) { |
|
|
|
this.$message.error('拆出数量必须大于0') |
|
|
|
return |
|
|
|
} |
|
|
|
if (splitQty > Number(form.origAQty)) { |
|
|
|
this.$message.error('拆出数量不能大于原行A_Qty') |
|
|
|
return |
|
|
|
} |
|
|
|
const payload = { |
|
|
|
site: form.site, |
|
|
|
orderNo: form.orderNo, |
|
|
|
itemNo: form.itemNo, |
|
|
|
splitQty: splitQty, |
|
|
|
targetPoNo: form.targetPoNo.trim() |
|
|
|
} |
|
|
|
this.splitToNewPoDialogSaving = true |
|
|
|
splitToNewPo(payload).then(({ data }) => { |
|
|
|
this.splitToNewPoDialogSaving = false |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.$message.success('拆单成功') |
|
|
|
this.splitToNewPoDialogVisible = false |
|
|
|
// 拆单成功后将筛选切到新 PO 号,立即展示拆出的新行 |
|
|
|
if (form.targetPoNo) { |
|
|
|
this.searchData.poNo = form.targetPoNo.trim() |
|
|
|
this.handleSearch() |
|
|
|
} else { |
|
|
|
this.getDataList() |
|
|
|
} |
|
|
|
} else { |
|
|
|
this.$message.error((data && data.msg) || '拆单失败') |
|
|
|
} |
|
|
|
}).catch(err => { |
|
|
|
this.splitToNewPoDialogSaving = false |
|
|
|
this.$message.error((err && err.message) || '拆单失败') |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 关闭拆单到新PO弹窗时重置状态。 |
|
|
|
*/ |
|
|
|
resetSplitToNewPoDialog () { |
|
|
|
this.splitToNewPoDialogSaving = false |
|
|
|
this.splitToNewPoDialogForm = { |
|
|
|
site: '', |
|
|
|
orderNo: '', |
|
|
|
itemNo: null, |
|
|
|
poNo: '', |
|
|
|
origAQty: 0, |
|
|
|
origStatus: '', |
|
|
|
targetPoNo: '', |
|
|
|
splitQty: '' |
|
|
|
} |
|
|
|
}, |
|
|
|
|
|
|
|
/** |
|
|
|
* 当天日期字符串(yyyy-MM-dd),收货日期默认值用。 |
|
|
|
*/ |
|
|
|
@ -3683,6 +4230,7 @@ export default { |
|
|
|
item: row.item, |
|
|
|
status: row.status, |
|
|
|
qty: row.qty === '' ? null : Number(row.qty), |
|
|
|
aQty: row.aQty === '' ? null : Number(row.aQty), |
|
|
|
price: row.price === '' ? null : Number(row.price), |
|
|
|
value: value === '' ? null : Number(value), |
|
|
|
shipQty: row.shipQty, |
|
|
|
@ -4867,8 +5415,12 @@ export default { |
|
|
|
padding: 0 4px; |
|
|
|
} |
|
|
|
|
|
|
|
.ship-dialog-form /deep/ .el-form-item { |
|
|
|
margin-bottom: 12px; |
|
|
|
} |
|
|
|
|
|
|
|
.ship-dialog-input { |
|
|
|
width: 120px; |
|
|
|
width: 100%; |
|
|
|
text-align: right; |
|
|
|
} |
|
|
|
|
|
|
|
@ -4876,6 +5428,13 @@ export default { |
|
|
|
text-align: center; |
|
|
|
} |
|
|
|
|
|
|
|
.split-dialog-tip { |
|
|
|
margin: 4px 0 10px; |
|
|
|
color: #909399; |
|
|
|
font-size: 12px; |
|
|
|
line-height: 1.5; |
|
|
|
} |
|
|
|
|
|
|
|
.el-table /deep/ .cell { |
|
|
|
height: auto; |
|
|
|
line-height: 1.5; |
|
|
|
|