|
|
|
@ -312,7 +312,6 @@ |
|
|
|
<div class="po-section"> |
|
|
|
<div class="section-title"> |
|
|
|
<span>{{ isEditDialogMode ? 'PO明细' : '批量选择PO' }}</span> |
|
|
|
<el-button v-if="isEditDialogMode" type="success" style="margin-left: 5px" @click="openAddPoDialog">新增</el-button> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- PO号筛选和排序工具栏 --> |
|
|
|
@ -357,6 +356,54 @@ |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" size="medium" style="margin-top:13px;" @click="filterAddPoList">查询</el-button> |
|
|
|
<el-button type="primary" size="medium" style="margin-top:13px;" @click="filterAddPoList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
|
|
|
|
<!-- 编辑态PO明细筛选工具栏 --> |
|
|
|
<div v-if="isEditDialogMode" class="po-toolbar"> |
|
|
|
<el-form :inline="true" label-width="70px" size="mini" class="add-po-search-form"> |
|
|
|
<el-form-item label="PO"> |
|
|
|
<el-input |
|
|
|
v-model="editPoFilter.orderNo" |
|
|
|
clearable |
|
|
|
style="width: 120px" |
|
|
|
@keyup.enter.native="filterEditPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Item"> |
|
|
|
<el-input |
|
|
|
v-model="editPoFilter.item" |
|
|
|
clearable |
|
|
|
style="width: 120px" |
|
|
|
@keyup.enter.native="filterEditPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="D_CRD"> |
|
|
|
<div class="date-range"> |
|
|
|
<el-date-picker |
|
|
|
v-model="editPoFilter.crdStart" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="from" |
|
|
|
clearable |
|
|
|
style="width: 110px" |
|
|
|
@change="filterEditPoList"/> |
|
|
|
<span class="split">to</span> |
|
|
|
<el-date-picker |
|
|
|
v-model="editPoFilter.crdEnd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="to" |
|
|
|
clearable |
|
|
|
style="width: 110px" |
|
|
|
@change="filterEditPoList"/> |
|
|
|
</div> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" size="medium" style="margin-top:13px;" @click="filterEditPoList">查询</el-button> |
|
|
|
<el-button type="primary" size="medium" style="margin-top:13px;" @click="openAddPoDialog">新增</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
@ -428,7 +475,7 @@ |
|
|
|
<el-table |
|
|
|
v-else |
|
|
|
key="edit-po-table" |
|
|
|
:data="editPoDetailList" |
|
|
|
:data="filteredEditPoDetailList" |
|
|
|
border |
|
|
|
size="small" |
|
|
|
table-layout="fixed" |
|
|
|
@ -437,7 +484,7 @@ |
|
|
|
style="width: 100%; margin-top: -10px;"> |
|
|
|
<el-table-column fixed="right" header-align="center" align="center" width="80" label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-link style="cursor: pointer" @click="deleteEditPoRow(scope.$index)">删除</el-link> |
|
|
|
<el-link style="cursor: pointer" @click="deleteEditPoRow(scope.row)">删除</el-link> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="orderRef2" label="PO行号" header-align="center" align="center" width="60"/> |
|
|
|
@ -874,17 +921,62 @@ |
|
|
|
width="80%" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false"> |
|
|
|
<!-- 选择PO明细筛选工具栏(与新增一致:PO、Item、D_CRD) --> |
|
|
|
<div class="po-toolbar"> |
|
|
|
<el-form :inline="true" label-position="top" size="mini" class="add-po-search-form po-select-filter-form" style="display:flex; align-items:flex-end;"> |
|
|
|
<el-form-item label="PO"> |
|
|
|
<el-input |
|
|
|
v-model="addPoSelectFilter.orderNo" |
|
|
|
clearable |
|
|
|
style="width: 160px" |
|
|
|
@keyup.enter.native="filterAddPoSelectList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Item"> |
|
|
|
<el-input |
|
|
|
v-model="addPoSelectFilter.item" |
|
|
|
clearable |
|
|
|
style="width: 160px" |
|
|
|
@keyup.enter.native="filterAddPoSelectList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="D_CRD"> |
|
|
|
<div class="date-range"> |
|
|
|
<el-date-picker |
|
|
|
v-model="addPoSelectFilter.crdStart" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="from" |
|
|
|
clearable |
|
|
|
style="width: 130px" |
|
|
|
@change="filterAddPoSelectList"/> |
|
|
|
<span class="split">to</span> |
|
|
|
<el-date-picker |
|
|
|
v-model="addPoSelectFilter.crdEnd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="to" |
|
|
|
clearable |
|
|
|
style="width: 130px" |
|
|
|
@change="filterAddPoSelectList"/> |
|
|
|
</div> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label=" "> |
|
|
|
<el-button type="primary" size="medium" @click="filterAddPoSelectList">查询</el-button> |
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</div> |
|
|
|
<div class="rq"> |
|
|
|
<el-table |
|
|
|
class="po-edit-table" |
|
|
|
ref="addPoSelectTable" |
|
|
|
:data="addPoSelectList" |
|
|
|
:data="filteredAddPoSelectList" |
|
|
|
border |
|
|
|
size="small" |
|
|
|
table-layout="fixed" |
|
|
|
height="450px" |
|
|
|
v-loading="addPoSelectLoading" |
|
|
|
style="width: 100%; margin-top: -10px;" |
|
|
|
style="width: 100%; margin-top: 12px;" |
|
|
|
@selection-change="handleAddPoSelectionChange"> |
|
|
|
<el-table-column type="selection" width="40" align="center" fixed="left" /> |
|
|
|
<el-table-column prop="orderRef1" label="PO号" header-align="center" align="center" width="120"/> |
|
|
|
@ -1194,10 +1286,18 @@ export default { |
|
|
|
poList: [], |
|
|
|
filteredPoList: [], |
|
|
|
editPoDetailList: [], |
|
|
|
filteredEditPoDetailList: [], |
|
|
|
editPoFilter: { |
|
|
|
orderNo: '', |
|
|
|
item: '', |
|
|
|
crdStart: '', |
|
|
|
crdEnd: '' |
|
|
|
}, |
|
|
|
editPoDetailLoading: false, |
|
|
|
editPoEditMode: false, // 编辑PO明细的编辑模式 |
|
|
|
addPoDialogVisible: false, // 新增PO弹窗 |
|
|
|
addPoSelectList: [], // 新增PO选择列表 |
|
|
|
filteredAddPoSelectList: [], // 新增PO选择列表(筛选后展示) |
|
|
|
addPoSelectLoading: false, // 新增PO加载状态 |
|
|
|
addPoSelectPageIndex: 1, // 新增PO当前页 |
|
|
|
addPoSelectPageSize: 20, // 新增PO每页条数 |
|
|
|
@ -1209,6 +1309,12 @@ export default { |
|
|
|
sku: '', |
|
|
|
partDesc: '' |
|
|
|
}, |
|
|
|
addPoSelectFilter: { |
|
|
|
orderNo: '', |
|
|
|
item: '', |
|
|
|
crdStart: '', |
|
|
|
crdEnd: '' |
|
|
|
}, |
|
|
|
addPoFilter: { |
|
|
|
orderNo: '', |
|
|
|
partNo: '', |
|
|
|
@ -2128,12 +2234,26 @@ export default { |
|
|
|
this.poList = [] |
|
|
|
this.filteredPoList = [] |
|
|
|
this.editPoDetailList = [] |
|
|
|
this.filteredEditPoDetailList = [] |
|
|
|
this.editPoFilter = { |
|
|
|
orderNo: '', |
|
|
|
item: '', |
|
|
|
crdStart: '', |
|
|
|
crdEnd: '' |
|
|
|
} |
|
|
|
this.originalEditPoDetailList = [] // 保存原始PO列表,用于区分新增和修改 |
|
|
|
this.deletedPoKeys = new Set() // 记录用户手动删除的PO key |
|
|
|
this.editPoDetailLoading = false |
|
|
|
this.editPoEditMode = false |
|
|
|
this.addPoDialogVisible = false |
|
|
|
this.addPoSelectList = [] |
|
|
|
this.filteredAddPoSelectList = [] |
|
|
|
this.addPoSelectFilter = { |
|
|
|
orderNo: '', |
|
|
|
item: '', |
|
|
|
crdStart: '', |
|
|
|
crdEnd: '' |
|
|
|
} |
|
|
|
this.addPoSelectLoading = false |
|
|
|
this.addPoSelectPageIndex = 1 |
|
|
|
this.addPoSelectPageSize = 20 |
|
|
|
@ -2309,6 +2429,7 @@ export default { |
|
|
|
console.error('加载编辑PO明细失败:', error) |
|
|
|
this.$message.error('加载PO明细失败,请稍后重试') |
|
|
|
} finally { |
|
|
|
this.filterEditPoList() |
|
|
|
this.editPoDetailLoading = false |
|
|
|
} |
|
|
|
}, |
|
|
|
@ -2319,13 +2440,18 @@ export default { |
|
|
|
}, |
|
|
|
|
|
|
|
// 删除编辑PO明细中的某一行(仅缓存,保存时一并提交) |
|
|
|
deleteEditPoRow (index) { |
|
|
|
deleteEditPoRow (row) { |
|
|
|
this.$confirm('确定要删除这条PO明细吗?', '提示', { |
|
|
|
confirmButtonText: '确定', |
|
|
|
cancelButtonText: '取消', |
|
|
|
type: 'warning' |
|
|
|
}).then(() => { |
|
|
|
const deletedRow = this.editPoDetailList[index] |
|
|
|
const deletedRow = row |
|
|
|
// 筛选后行序号与源列表不一致,按引用定位真实索引 |
|
|
|
const index = this.editPoDetailList.indexOf(deletedRow) |
|
|
|
if (index === -1) { |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
// 记录被删除的PO的key和itemNo,用于保存时判断 |
|
|
|
const key = `${deletedRow.orderRef1 || ''}_${deletedRow.orderRef2 || ''}` |
|
|
|
@ -2345,6 +2471,7 @@ export default { |
|
|
|
|
|
|
|
// 从列表中移除该行(仅前端移除,不立即调用后端接口) |
|
|
|
this.editPoDetailList.splice(index, 1) |
|
|
|
this.filterEditPoList() |
|
|
|
this.$message.success('已标记删除,点击保存后生效') |
|
|
|
}).catch(() => { |
|
|
|
// 取消删除 |
|
|
|
@ -2360,6 +2487,13 @@ export default { |
|
|
|
this.addPoDialogVisible = true |
|
|
|
this.addPoSelectPageIndex = 1 |
|
|
|
this.addPoSelectedRows = [] |
|
|
|
this.addPoSelectFilter = { |
|
|
|
orderNo: '', |
|
|
|
item: '', |
|
|
|
crdStart: '', |
|
|
|
crdEnd: '' |
|
|
|
} |
|
|
|
this.filteredAddPoSelectList = [] |
|
|
|
this.resetAddPoSearch() |
|
|
|
this.loadAddPoSelectList() |
|
|
|
}, |
|
|
|
@ -2427,10 +2561,42 @@ export default { |
|
|
|
this.addPoSelectTotal = 0 |
|
|
|
this.$message.error('加载PO列表失败') |
|
|
|
}).finally(() => { |
|
|
|
this.filterAddPoSelectList() |
|
|
|
this.addPoSelectLoading = false |
|
|
|
}) |
|
|
|
}, |
|
|
|
|
|
|
|
// 选择PO明细弹窗-前端筛选(与新增一致:PO、Item、D_CRD) |
|
|
|
filterAddPoSelectList () { |
|
|
|
let result = [...this.addPoSelectList] |
|
|
|
const filter = this.addPoSelectFilter || {} |
|
|
|
const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim() |
|
|
|
const itemKeyword = String(filter.item || '').toLowerCase().trim() |
|
|
|
const crdStart = String(filter.crdStart || '').trim() |
|
|
|
const crdEnd = String(filter.crdEnd || '').trim() |
|
|
|
|
|
|
|
if (orderNoKeyword) { |
|
|
|
result = result.filter(item => { |
|
|
|
const orderRef1 = String(item.orderRef1 || '').toLowerCase() |
|
|
|
const orderNo = String(item.orderNo || item.order_no || '').toLowerCase() |
|
|
|
return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword) |
|
|
|
}) |
|
|
|
} |
|
|
|
if (itemKeyword) { |
|
|
|
result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword)) |
|
|
|
} |
|
|
|
if (crdStart || crdEnd) { |
|
|
|
result = result.filter(item => { |
|
|
|
const crd = String(item.crd || '').slice(0, 10) |
|
|
|
if (!crd) return false |
|
|
|
if (crdStart && crd < crdStart) return false |
|
|
|
if (crdEnd && crd > crdEnd) return false |
|
|
|
return true |
|
|
|
}) |
|
|
|
} |
|
|
|
this.filteredAddPoSelectList = result |
|
|
|
}, |
|
|
|
|
|
|
|
// 搜索新增PO列表 |
|
|
|
searchAddPoList () { |
|
|
|
this.addPoSelectPageIndex = 1 |
|
|
|
@ -2501,6 +2667,7 @@ export default { |
|
|
|
|
|
|
|
// 将新PO明细添加到编辑列表中 |
|
|
|
this.editPoDetailList = [...this.editPoDetailList, ...newItems] |
|
|
|
this.filterEditPoList() |
|
|
|
|
|
|
|
this.$message.success(`成功添加${newItems.length}条PO明细`) |
|
|
|
|
|
|
|
@ -3297,7 +3464,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.qty || 0, // 此次验货数量默认=订单数量(A_Qty),上限同订单数量 |
|
|
|
inspectQty: item.customer === '其他验货' ? 1 : (item.qty || 0), // “其他验货”客户默认此次验货数量为1(可改);其余默认=订单数量(A_Qty) |
|
|
|
shipMethod: item.shipMethod || '',// 运输方式 |
|
|
|
crd: item.crd ? item.crd.split(' ')[0] : '' |
|
|
|
})) |
|
|
|
@ -3393,6 +3560,37 @@ export default { |
|
|
|
this.filteredPoList = result |
|
|
|
}, |
|
|
|
|
|
|
|
// 编辑验货申请-PO明细筛选(与新增一致:PO、Item、D_CRD) |
|
|
|
filterEditPoList () { |
|
|
|
let result = [...this.editPoDetailList] |
|
|
|
const filter = this.editPoFilter || {} |
|
|
|
const orderNoKeyword = String(filter.orderNo || '').toLowerCase().trim() |
|
|
|
const itemKeyword = String(filter.item || '').toLowerCase().trim() |
|
|
|
const crdStart = String(filter.crdStart || '').trim() |
|
|
|
const crdEnd = String(filter.crdEnd || '').trim() |
|
|
|
|
|
|
|
if (orderNoKeyword) { |
|
|
|
result = result.filter(item => { |
|
|
|
const orderRef1 = String(item.orderRef1 || '').toLowerCase() |
|
|
|
const orderNo = String(item.orderNo || item.order_no || '').toLowerCase() |
|
|
|
return orderRef1.includes(orderNoKeyword) || orderNo.includes(orderNoKeyword) |
|
|
|
}) |
|
|
|
} |
|
|
|
if (itemKeyword) { |
|
|
|
result = result.filter(item => String(item.item || '').toLowerCase().includes(itemKeyword)) |
|
|
|
} |
|
|
|
if (crdStart || crdEnd) { |
|
|
|
result = result.filter(item => { |
|
|
|
const crd = String(item.crd || '').slice(0, 10) |
|
|
|
if (!crd) return false |
|
|
|
if (crdStart && crd < crdStart) return false |
|
|
|
if (crdEnd && crd > crdEnd) return false |
|
|
|
return true |
|
|
|
}) |
|
|
|
} |
|
|
|
this.filteredEditPoDetailList = result |
|
|
|
}, |
|
|
|
|
|
|
|
// 新增验货申请-PO筛选重置 |
|
|
|
resetAddPoFilter () { |
|
|
|
this.addPoFilter = { |
|
|
|
@ -4300,6 +4498,15 @@ export default { |
|
|
|
margin-bottom: 8px; |
|
|
|
} |
|
|
|
|
|
|
|
/* 选择PO明细弹窗日期筛选:与 po-section 一致,隐藏日历小图标 */ |
|
|
|
.po-select-filter-form /deep/ .el-date-editor .el-input__prefix { |
|
|
|
display: none; |
|
|
|
} |
|
|
|
|
|
|
|
.po-select-filter-form /deep/ .el-date-editor .el-input__inner { |
|
|
|
padding-left: 10px; |
|
|
|
} |
|
|
|
|
|
|
|
/* 新增PO明细弹窗表格单元格高度调整 */ |
|
|
|
/deep/ .el-dialog__body .el-table--small .el-table__row td { |
|
|
|
padding: 8px 0; |
|
|
|
|