|
|
|
@ -3,6 +3,15 @@ |
|
|
|
<!-- 查询条件 --> |
|
|
|
<el-form :inline="true" label-position="top" class="search-form-inline"> |
|
|
|
<div class="search-row"> |
|
|
|
<el-form-item label="订单类型" class="search-item"> |
|
|
|
<el-select v-model="searchData.orderType" placeholder="全部" style="width: 120px"> |
|
|
|
<el-option |
|
|
|
v-for="item in poOrderTypeOptions" |
|
|
|
:key="item.value" |
|
|
|
:label="item.label" |
|
|
|
:value="item.value" /> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item v-if="!isSupplierPageMode" class="search-item"> |
|
|
|
<span style="cursor: pointer" slot="label" @click="getBaseList(520)"><a href="#">供应商编码</a></span> |
|
|
|
<el-input v-model="searchData.supplierNo" style="width: 120px" @keyup.enter.native="getMainData"/> |
|
|
|
@ -311,58 +320,11 @@ |
|
|
|
<!-- 步骤2:批量选择PO / 编辑态PO明细 --> |
|
|
|
<div class="po-section"> |
|
|
|
<div class="section-title"> |
|
|
|
<span>{{ isEditDialogMode ? 'PO明细' : '批量选择PO' }}</span> |
|
|
|
<span>PO明细</span> |
|
|
|
</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="addPoFilter.orderNo" |
|
|
|
clearable |
|
|
|
style="width: 120px" |
|
|
|
@keyup.enter.native="filterAddPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="Item"> |
|
|
|
<el-input |
|
|
|
v-model="addPoFilter.item" |
|
|
|
clearable |
|
|
|
style="width: 120px" |
|
|
|
@keyup.enter.native="filterAddPoList"/> |
|
|
|
</el-form-item> |
|
|
|
<el-form-item label="D_CRD"> |
|
|
|
<div class="date-range"> |
|
|
|
<el-date-picker |
|
|
|
v-model="addPoFilter.crdStart" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="from" |
|
|
|
clearable |
|
|
|
style="width: 110px" |
|
|
|
@change="filterAddPoList"/> |
|
|
|
<span class="split">to</span> |
|
|
|
<el-date-picker |
|
|
|
v-model="addPoFilter.crdEnd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="to" |
|
|
|
clearable |
|
|
|
style="width: 110px" |
|
|
|
@change="filterAddPoList"/> |
|
|
|
</div> |
|
|
|
</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"> |
|
|
|
<!-- PO明细筛选工具栏(新增/编辑共用:查询 + 新增) --> |
|
|
|
<div class="po-toolbar"> |
|
|
|
<el-form :inline="true" label-width="70px" size="mini" class="add-po-search-form"> |
|
|
|
<el-form-item label="PO"> |
|
|
|
<el-input |
|
|
|
@ -409,71 +371,6 @@ |
|
|
|
</div> |
|
|
|
|
|
|
|
<el-table |
|
|
|
v-if="!isEditDialogMode" |
|
|
|
key="create-po-table" |
|
|
|
ref="addPoTable" |
|
|
|
:data="filteredPoList" |
|
|
|
border |
|
|
|
size="small" |
|
|
|
table-layout="fixed" |
|
|
|
height="350px" |
|
|
|
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="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="item" label="Item" header-align="center" align="left" min-width="100" show-overflow-tooltip/> |
|
|
|
<el-table-column prop="qty" 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.qty || 999999" |
|
|
|
size="mini" |
|
|
|
:controls="false" |
|
|
|
style="width: 100%; box-sizing: border-box;"> |
|
|
|
</el-input-number> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column prop="shipMethod" label="运输方式" header-align="center" align="center" width="100"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-select v-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%; box-sizing: border-box;"> |
|
|
|
<el-option |
|
|
|
v-for="opt in shipMethodOptions" |
|
|
|
:key="opt.value" |
|
|
|
:label="opt.label" |
|
|
|
:value="opt.value" |
|
|
|
/> |
|
|
|
</el-select> |
|
|
|
</template> |
|
|
|
</el-table-column> |
|
|
|
<el-table-column |
|
|
|
prop="crd" |
|
|
|
label="CRD" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
width="160" |
|
|
|
sortable |
|
|
|
:sort-method="(a, b) => sortCrdDate(a, b)"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
<el-date-picker |
|
|
|
v-model="scope.row.crd" |
|
|
|
type="date" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期" |
|
|
|
size="mini" |
|
|
|
style="width: 100%;" |
|
|
|
/> |
|
|
|
</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 |
|
|
|
v-else |
|
|
|
key="edit-po-table" |
|
|
|
:data="filteredEditPoDetailList" |
|
|
|
border |
|
|
|
@ -918,7 +815,7 @@ |
|
|
|
<el-dialog |
|
|
|
title="选择PO明细" |
|
|
|
:visible.sync="addPoDialogVisible" |
|
|
|
width="80%" |
|
|
|
width="60%" |
|
|
|
append-to-body |
|
|
|
:close-on-click-modal="false"> |
|
|
|
<!-- 选择PO明细筛选工具栏(与新增一致:PO、Item、D_CRD) --> |
|
|
|
@ -979,15 +876,10 @@ |
|
|
|
style="width: 100%; margin-top: 12px;" |
|
|
|
@selection-change="handleAddPoSelectionChange"> |
|
|
|
<el-table-column type="selection" width="40" align="center" fixed="left" /> |
|
|
|
<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="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="90"/> |
|
|
|
<el-table-column prop="waitInspectQty" label="未验货数量" header-align="center" align="right" width="90"/> |
|
|
|
<el-table-column prop="qty" 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 |
|
|
|
@ -1000,7 +892,7 @@ |
|
|
|
</el-input-number> |
|
|
|
</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-model="scope.row.shipMethod" placeholder="请选择" size="mini" style="width: 100%;"> |
|
|
|
<el-option |
|
|
|
@ -1012,7 +904,7 @@ |
|
|
|
</el-select> |
|
|
|
</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-model="scope.row.crd" |
|
|
|
@ -1021,10 +913,12 @@ |
|
|
|
format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期" |
|
|
|
size="mini" |
|
|
|
style="width: 80%;"> |
|
|
|
style="width: 100%;"> |
|
|
|
</el-date-picker> |
|
|
|
</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-pagination |
|
|
|
@ -1212,6 +1106,7 @@ import ComInspectionRequestFeeTab from './com_inspectionRequestFeeTab.vue' |
|
|
|
import { fetchSupplierDetail } from '@/utils/supplierChooselistHelper' |
|
|
|
import excel from '@/utils/excel-util.js' |
|
|
|
import { listActiveShipMethods } from '@/api/port/portTransit.js' |
|
|
|
import { PO_ORDER_TYPE_OPTIONS } from '@/views/modules/order/poOrderTypeOptions.js' |
|
|
|
|
|
|
|
export default { |
|
|
|
props: { |
|
|
|
@ -1451,12 +1346,15 @@ export default { |
|
|
|
uploadFileName: '', |
|
|
|
uploadFile: null, |
|
|
|
uploadPreviewList: [], |
|
|
|
// 订单类型筛选选项(与订单页一致:采购订单 PO / 打样单 Sample) - rqrq |
|
|
|
poOrderTypeOptions: PO_ORDER_TYPE_OPTIONS, |
|
|
|
searchData: { |
|
|
|
requestNo: '', |
|
|
|
supplierNo: '', |
|
|
|
supplierName: '', |
|
|
|
planner: '', |
|
|
|
status: '', |
|
|
|
orderType: 'PO', |
|
|
|
qcOperator: '', |
|
|
|
createBy: '', |
|
|
|
requestDateStart: '', |
|
|
|
@ -2029,7 +1927,6 @@ export default { |
|
|
|
this.$set(this.addFormData, 'inspectCityShort', '') |
|
|
|
this.$set(this.addFormData, 'contact', '') |
|
|
|
console.log('供应商编码赋值:', supplierNoVal, '供应商名称赋值:', supplierNameVal) |
|
|
|
this.loadPoList() |
|
|
|
// 查询供应商地址获取验货地址和联系人 |
|
|
|
if (supplierNoVal) { |
|
|
|
this.fetchSupplierAddress(supplierNoVal) |
|
|
|
@ -2193,12 +2090,12 @@ export default { |
|
|
|
addInspectionRequest () { |
|
|
|
this.addDialogMode = 'create' |
|
|
|
this.resetAddForm() |
|
|
|
this.editPoEditMode = true // 新增弹窗下半部分与编辑一致:明细可直接编辑 |
|
|
|
if (this.isSupplierPageMode) { |
|
|
|
if (!this.applyCurrentSupplierToAddForm()) { |
|
|
|
this.$message.warning('当前账号未维护供应商编码,请先在用户维护中配置') |
|
|
|
return |
|
|
|
} |
|
|
|
this.loadPoList() |
|
|
|
this.fetchSupplierAddress(this.addFormData.supplierNo) |
|
|
|
} |
|
|
|
this.addDialogVisible = true |
|
|
|
@ -2512,8 +2409,8 @@ export default { |
|
|
|
limit: this.addPoSelectPageSize |
|
|
|
} |
|
|
|
|
|
|
|
// 如果是编辑模式且已有PO明细,构建排除列表 |
|
|
|
if (this.isEditDialogMode && this.editPoDetailList && this.editPoDetailList.length > 0) { |
|
|
|
// 如果已有PO明细,构建排除列表(新增/编辑均适用,避免重复选择) |
|
|
|
if (this.editPoDetailList && this.editPoDetailList.length > 0) { |
|
|
|
const excludePoItems = [] |
|
|
|
this.editPoDetailList.forEach(item => { |
|
|
|
// 优先使用 poNo 和 poItemNo(对应后端 order_no 和 item_no) |
|
|
|
@ -2640,7 +2537,7 @@ export default { |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
if (!this.addFormData.requestNo) { |
|
|
|
if (this.isEditDialogMode && !this.addFormData.requestNo) { |
|
|
|
this.$message.warning('申请单号为空,无法添加PO明细') |
|
|
|
return |
|
|
|
} |
|
|
|
@ -3243,7 +3140,6 @@ export default { |
|
|
|
this.addPoPlannerDisplayFromChooser = '' |
|
|
|
this.poSupplierDialogVisible = false |
|
|
|
this.orderSupplierDialogVisible = false |
|
|
|
this.loadPoList() |
|
|
|
this.fetchSupplierAddress(supplierNoVal) |
|
|
|
}, |
|
|
|
|
|
|
|
@ -3635,19 +3531,19 @@ export default { |
|
|
|
this.handleSaveEdit() |
|
|
|
return |
|
|
|
} |
|
|
|
console.log('开始保存,当前选择的PO列表:', this.selectedPoList) |
|
|
|
console.log('开始保存,当前PO明细列表:', this.editPoDetailList) |
|
|
|
console.log('表单数据:', this.addFormData) |
|
|
|
|
|
|
|
this.$refs.addFormData.validate((valid) => { |
|
|
|
console.log('表单验证结果:', valid) |
|
|
|
if (valid) { |
|
|
|
if (this.selectedPoList.length === 0) { |
|
|
|
this.$message.warning('请至少选择一条PO明细') |
|
|
|
if (this.editPoDetailList.length === 0) { |
|
|
|
this.$message.warning('请至少添加一条PO明细') |
|
|
|
return |
|
|
|
} |
|
|
|
|
|
|
|
// 检查验货数量 |
|
|
|
const hasInvalidQty = this.selectedPoList.some(item => !item.inspectQty || item.inspectQty <= 0) |
|
|
|
const hasInvalidQty = this.editPoDetailList.some(item => !item.qty || item.qty <= 0) |
|
|
|
if (hasInvalidQty) { |
|
|
|
this.$message.warning('请填写有效的验货数量') |
|
|
|
return |
|
|
|
@ -3664,14 +3560,14 @@ export default { |
|
|
|
inspectContract: this.addFormData.contact, |
|
|
|
inspectPhone: this.addFormData.inspectPhone || '', |
|
|
|
remark: '', |
|
|
|
items: this.selectedPoList.map(item => ({ |
|
|
|
orderNo: item.orderNo || item.order_ref1 || item.orderRef1, |
|
|
|
itemNo: item.itemNo || item.item_no || item.order_ref2 || item.orderRef2, |
|
|
|
items: this.editPoDetailList.map(item => ({ |
|
|
|
orderNo: item.poNo || item.orderNo || item.order_ref1 || item.orderRef1, |
|
|
|
itemNo: item.poItemNo || item.itemNo || item.item_no || item.orderRef2 || item.order_ref2, |
|
|
|
partNo: item.partNo, |
|
|
|
orderRef1: item.orderRef1, |
|
|
|
orderRef2: item.orderRef2, |
|
|
|
qty: item.inspectQty, |
|
|
|
shipMethod: item.shipMethod, |
|
|
|
qty: item.qty, |
|
|
|
shipMethod: item.shipMothod || item.shipMethod, |
|
|
|
crd: item.crd |
|
|
|
})) |
|
|
|
} |
|
|
|
|