diff --git a/oms_web/oms_vue/src/api/project/order.js b/oms_web/oms_vue/src/api/project/order.js index 5c7b0aa9..039113ae 100644 --- a/oms_web/oms_vue/src/api/project/order.js +++ b/oms_web/oms_vue/src/api/project/order.js @@ -114,11 +114,11 @@ export function savePurchaseOrderMap(data) { } // 查询采购单SN码列表 -export function purchaseSnList(purchaseNo, orderCode) { +export function purchaseSnList(purchaseNo, orderCode, productCode) { return request({ url: '/project/order/vue/purchaseSnList', method: 'get', - params: { purchaseNo, orderCode } + params: { purchaseNo, orderCode, productCode } }) } diff --git a/oms_web/oms_vue/src/views/inventory/execution/index.vue b/oms_web/oms_vue/src/views/inventory/execution/index.vue index 0f06b574..cffbd822 100644 --- a/oms_web/oms_vue/src/views/inventory/execution/index.vue +++ b/oms_web/oms_vue/src/views/inventory/execution/index.vue @@ -243,6 +243,15 @@
产品型号： {{ item.model || '-' }} + 生成虚拟采购单
@@ -250,32 +259,38 @@ {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum : '-' }}
- 已配货: - {{ item.phNum !== undefined && item.phNum !== null ? item.phNum : '-' }} - 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-(item.phNum||0): '-'}} + 已配额: + {{ calculateCurrentTotalPhNum(item) }} + 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-calculateCurrentTotalPhNum(item): '-'}}
已备货: {{ item.bhNum !== undefined && item.bhNum !== null ? item.bhNum : '-' }} 缺货: {{ item.orderNum !== undefined && item.orderNum !== null ? item.orderNum-(item.bhNum||0): '-'}} + 备货完成
- - - - + + - + + + + + + + - - - - + + @@ -321,7 +331,7 @@
关 闭 - + 保存修改
@@ -337,8 +347,8 @@
本次将保存 {{ stockingSaveChangedList.length }} 条配额量变更，是否继续？
- - + +
@@ -356,7 +366,7 @@ >
- 分配出库 SN 码 + 已出库 SN 码
@@ -406,22 +416,17 @@
- - 全选 - - 当前仓库SN码总数：{{ getWarehouseSnCount(outerSnActiveWarehouse) }} - - 清空已选 - + +
- {{ sn.productSn }}
- 取消 - - 确认分配 {{ outerSnSelectedCount }} - + 关闭
+ + + + + + +
@@ -464,13 +471,15 @@ import { getToken } from "@/utils/auth"; import OrderDetailDrawer from '../../project/order/OrderDetailDrawer.vue'; import ProjectDetailDrawer from '../../project/info/ProjectDetailDrawer.vue'; import Edit from './edit.vue'; +import PurchaseOrderDetail from '../../purchaseorder/components/PurchaseOrderDetail.vue'; export default { name: "Execution", components: { ProjectDetailDrawer, OrderDetailDrawer, - Edit // Register the Edit component + Edit, + PurchaseOrderDetail }, dicts: ['execution_outer_status', 'execution_delivery_status', 'execution_sign_status', 'purchase_status'], data() { @@ -518,6 +527,16 @@ export default { outerSnSelectedList: [], outerSnSelectAll: false, outerSnSelectIndeterminate: false, + outerSnPagination: { + pageNum: 1, + pageSize: 100, + total: 0 + }, + // --- 采购单弹窗 --- + purchaseOpen: false, + purchaseTitle: '', + currentPurchaseOrderData: null, + virtualPurchaseProductInfo: null, // 查询参数 queryParams: { pageNum: 1, @@ -550,6 +569,23 @@ export default { created() { this.getList(); }, + watch: { + purchaseOpen(val) { + if (!val) { + this.currentPurchaseOrderData = null; + this.virtualPurchaseProductInfo = null; + this.$refs.purchaseOrderDetail?.resetForm(); + } else { + this.$nextTick(() => { + if (this.virtualPurchaseProductInfo) { + this.$refs.purchaseOrderDetail?.initVirtualPurchase(this.virtualPurchaseProductInfo); + } else { + this.$refs.purchaseOrderDetail?.resetForm(); + } + }); + } + } + }, computed: { outerSnSelectedCount() { return this.outerSnSelectedList.length; @@ -559,7 +595,25 @@ export default { return Number.isNaN(quotaQuantity) ? 0 : quotaQuantity; }, stockingTotalCost() { - return (this.stockingDetailList || []).reduce((total, item) => total + (Number(item.sumCost) || 0), 0); + return (this.stockingDetailList || []).reduce((total, item) => { + const baseCost = Number(item.sumCost) || 0; + + let additionalCost = 0; + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); + const key = this.getBindDraftKey(item.productCode, bindItem.purchaseId); + const currentPhNum = this.stockingBindDraftMap[key] !== undefined + ? Number(this.stockingBindDraftMap[key]) + : (bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum)); + const price = Number(bindItem.price) || 0; + const diff = currentPhNum - originalPhNum; + additionalCost += diff * price; + }); + } + + return total + baseCost + additionalCost; + }, 0); }, filteredSnList() { let list = this.outerSnDetail.snList || []; @@ -570,7 +624,10 @@ export default { const keyword = this.outerSnSearchKeyword.toLowerCase(); list = list.filter(sn => (sn.productSn || '').toLowerCase().includes(keyword)); } - return list; + this.outerSnPagination.total = list.length; + const start = (this.outerSnPagination.pageNum - 1) * this.outerSnPagination.pageSize; + const end = start + this.outerSnPagination.pageSize; + return list.slice(start, end); } }, methods: { @@ -689,13 +746,22 @@ export default { this.stockingDetailLoading = true; productMatchList(row.orderCode).then(response => { const list = response.data || []; - return Promise.all(list.map(item => this.loadBindPageData(row.orderCode, { - ...item, - originalTotalPhNum: item.phNum, - bindList: [], - bindTotal: 0, - bindPageNum: 1, - bindPageSize: this.stockingBindPageSize + return Promise.all(list.map(item => this.loadAllBindData(row.orderCode, item).then(allBindList => { + const bindPageNum = 1; + const bindPageSize = this.stockingBindPageSize; + const startIndex = (bindPageNum - 1) * bindPageSize; + const endIndex = startIndex + bindPageSize; + const bindList = allBindList.slice(startIndex, endIndex); + + return { + ...item, + originalTotalPhNum: item.phNum, + allBindList: allBindList, + bindList: bindList, + bindTotal: allBindList.length, + bindPageNum: bindPageNum, + bindPageSize: bindPageSize + }; }))); }).then(list => { this.stockingDetailList = list; @@ -705,9 +771,13 @@ export default { this.stockingDetailLoading = false; }); }, - getDraftBindNum(purchaseId, defaultValue) { - if (this.stockingBindDraftMap[purchaseId] !== undefined) { - return this.stockingBindDraftMap[purchaseId]; + getBindDraftKey(productCode, purchaseId) { + return `${productCode}_${purchaseId}`; + }, + getDraftBindNum(productCode, purchaseId, defaultValue) { + const key = this.getBindDraftKey(productCode, purchaseId); + if (this.stockingBindDraftMap[key] !== undefined) { + return this.stockingBindDraftMap[key]; } return defaultValue; }, @@ -719,7 +789,9 @@ export default { const validValue = Math.max(minValue, Math.min(rawValue, maxValue)); row.phNum = validValue; - this.$set(this.stockingBindDraftMap, row.purchaseId, validValue); + const key = this.getBindDraftKey(item.productCode, row.purchaseId); + this.$set(this.stockingBindDraftMap, key, validValue); + this.updateItemTotalPhNum(item); }, calculateMaxPhNum(row, item) { const originalPhNum = row.originalPhNum === '' || row.originalPhNum === null || row.originalPhNum === undefined ? 0 : Number(row.originalPhNum); @@ -728,58 +800,46 @@ export default { const maxPhysical = originalPhNum + originalKyNum; - let otherRowsPhNumSum = 0; - if (item && item.bindList) { - item.bindList.forEach(b => { - if (b.purchaseId !== row.purchaseId) { - const p = Number(b.phNum) || 0; - otherRowsPhNumSum += p; - } - }); - } + const currentTotalPhNum = this.calculateCurrentTotalPhNum(item); + const key = this.getBindDraftKey(item.productCode, row.purchaseId); + const currentRowPhNum = this.stockingBindDraftMap[key] !== undefined + ? Number(this.stockingBindDraftMap[key]) + : (row.phNum === '' || row.phNum === null || row.phNum === undefined ? 0 : Number(row.phNum)); - const maxAllowedByOrder = orderNum - otherRowsPhNumSum; + const maxAllowedByOrder = orderNum - currentTotalPhNum + currentRowPhNum; return Math.min(maxPhysical, maxAllowedByOrder); }, - loadBindPageData(orderCode, item) { + loadAllBindData(orderCode, item) { return productMatchBindList(orderCode, item.productCode, { - pageNum: item.bindPageNum, - pageSize: item.bindPageSize, + pageNum: 1, + pageSize: 9999, orderByColumn: 't6.createTime', isAsc: 'desc' }).then(bindResponse => { - const bindList = (bindResponse.rows || []).map(bindItem => ({ + return (bindResponse.rows || []).map(bindItem => ({ ...bindItem, - phNum: this.getDraftBindNum(bindItem.purchaseId, bindItem.phNum), + phNum: this.getDraftBindNum(item.productCode, bindItem.purchaseId, bindItem.phNum), originalPhNum: bindItem.originalPhNum !== undefined ? bindItem.originalPhNum : bindItem.phNum, originalKyNum: bindItem.originalKyNum !== undefined ? bindItem.originalKyNum : bindItem.kyNum })); - return { - ...item, - originalTotalPhNum: item.originalTotalPhNum !== undefined ? item.originalTotalPhNum : item.phNum, - bindList, - bindTotal: bindResponse.total || 0 - }; }).catch(() => { - return { - ...item, - bindList: [], - bindTotal: 0 - }; + return []; }); }, handleBindPageChange(item) { - this.stockingDetailLoading = true; - this.loadBindPageData(this.stockingDetailRow.orderCode, item).then(updatedItem => { - this.stockingDetailList = this.stockingDetailList.map(currentItem => { - if (currentItem.productCode === updatedItem.productCode) { - return updatedItem; - } - return currentItem; - }); - }).finally(() => { - this.stockingDetailLoading = false; + const startIndex = (item.bindPageNum - 1) * item.bindPageSize; + const endIndex = startIndex + item.bindPageSize; + const bindList = (item.allBindList || []).slice(startIndex, endIndex); + + this.stockingDetailList = this.stockingDetailList.map(currentItem => { + if (currentItem.productCode === item.productCode) { + return { + ...currentItem, + bindList: bindList + }; + } + return currentItem; }); }, handleBindNumChange(row, item) { @@ -796,25 +856,60 @@ export default { const diff = nextValue - originalPhNum; row.kyNum = originalKyNum - diff; - this.$set(this.stockingBindDraftMap, row.purchaseId, nextValue); + const key = this.getBindDraftKey(item.productCode, row.purchaseId); + this.$set(this.stockingBindDraftMap, key, nextValue); + + this.updateItemTotalPhNum(item); + }, + calculateCurrentTotalPhNum(item) { + if (!item || !item.productCode || !item.allBindList) return 0; + + let total = 0; + item.allBindList.forEach(bindItem => { + const key = this.getBindDraftKey(item.productCode, bindItem.purchaseId); + if (this.stockingBindDraftMap && this.stockingBindDraftMap[key] !== undefined) { + total += Number(this.stockingBindDraftMap[key]); + } else { + const phNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); + total += phNum; + } + }); + + return total; + }, + findBindItemByPurchaseId(productCode, purchaseId) { + const product = this.stockingDetailList.find(item => item.productCode === productCode); + if (!product) return null; + + return product.allBindList?.find(b => String(b.purchaseId) === String(purchaseId)); + }, + updateItemTotalPhNum(item) { + if (item) { + this.$set(item, 'phNum', this.calculateCurrentTotalPhNum(item)); + } }, handleSaveStockingBind() { const changedList = []; this.stockingDetailList.forEach(item => { - (item.bindList || []).forEach(bindItem => { - this.handleBindNumChange(bindItem, item); - const currentPhNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); - const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); - if (currentPhNum !== originalPhNum) { - changedList.push({ - orderId: this.stockingDetailRow.id, - purchaseId: bindItem.purchaseId, - purchaseNo: bindItem.purchaseNo, - originalBindNum: originalPhNum, - bindNum: currentPhNum - }); - } - }); + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + const key = this.getBindDraftKey(item.productCode, bindItem.purchaseId); + const currentPhNum = this.stockingBindDraftMap[key] !== undefined + ? Number(this.stockingBindDraftMap[key]) + : (bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum)); + const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); + if (currentPhNum !== originalPhNum) { + changedList.push({ + orderId: this.stockingDetailRow.id, + purchaseId: bindItem.purchaseId, + purchaseNo: bindItem.purchaseNo, + productCode: item.productCode, + originalBindNum: originalPhNum, + bindNum: currentPhNum + }); + } + }); + } }); if (!changedList.length) { this.$message.warning('暂无变更数据'); @@ -828,17 +923,40 @@ export default { Promise.all(this.stockingSaveChangedList.map(item => savePurchaseOrderMap({ orderId: item.orderId, purchaseId: item.purchaseId, + productCode: item.productCode, bindNum: item.bindNum }))).then(() => { this.$message.success('保存成功'); this.stockingDetailList.forEach(item => { - item.originalTotalPhNum = item.phNum; - (item.bindList || []).forEach(bindItem => { - bindItem.originalPhNum = bindItem.phNum; - bindItem.originalKyNum = bindItem.kyNum; - this.$delete(this.stockingBindDraftMap, bindItem.purchaseId); - }); + item.originalTotalPhNum = this.calculateCurrentTotalPhNum(item); + if (item.allBindList) { + item.allBindList.forEach(bindItem => { + const key = this.getBindDraftKey(item.productCode, bindItem.purchaseId); + if (this.stockingBindDraftMap[key] !== undefined) { + bindItem.phNum = this.stockingBindDraftMap[key]; + bindItem.originalPhNum = bindItem.phNum; + const originalKyNum = bindItem.originalKyNum === '' || bindItem.originalKyNum === null || bindItem.originalKyNum === undefined ? 0 : Number(bindItem.originalKyNum); + const diff = bindItem.phNum - (bindItem.originalPhNum || 0); + bindItem.kyNum = originalKyNum - diff; + bindItem.originalKyNum = bindItem.kyNum; + } + }); + } + if (item.bindList) { + item.bindList.forEach(bindItem => { + const key = this.getBindDraftKey(item.productCode, bindItem.purchaseId); + if (this.stockingBindDraftMap[key] !== undefined) { + bindItem.phNum = this.stockingBindDraftMap[key]; + bindItem.originalPhNum = bindItem.phNum; + const originalKyNum = bindItem.originalKyNum === '' || bindItem.originalKyNum === null || bindItem.originalKyNum === undefined ? 0 : Number(bindItem.originalKyNum); + const diff = bindItem.phNum - (bindItem.originalPhNum || 0); + bindItem.kyNum = originalKyNum - diff; + bindItem.originalKyNum = bindItem.kyNum; + } + }); + } }); + this.stockingBindDraftMap = {}; this.stockingSaveConfirmVisible = false; this.stockingDetailVisible = false; this.stockingSaveChangedList = []; @@ -861,13 +979,14 @@ export default { this.outerSnSelectedList = []; this.outerSnSelectAll = false; this.outerSnSelectIndeterminate = false; + this.outerSnPagination = { pageNum: 1, pageSize: 100, total: 0 }; if (!row || !row.purchaseNo) { this.$message.warning('采购单号为空，无法查询SN码'); return; } this.outerSnDialogVisible = true; this.outerSnLoading = true; - purchaseSnList(row.purchaseNo, this.stockingDetailRow.orderCode).then(response => { + purchaseSnList(row.purchaseNo, this.stockingDetailRow.orderCode, item.productCode).then(response => { const data = response.data || {}; this.outerSnDetail = { totalQuantity: data.totalQuantity || 0, @@ -882,18 +1001,8 @@ export default { const alreadyBoundSns = this.outerSnDetail.snList .filter(sn => sn.orderCode && sn.orderCode === this.stockingDetailRow.orderCode) .map(sn => sn.productSn); - const availableSns = this.outerSnDetail.snList - .filter(sn => !this.isSnDisabled(sn)) - .map(sn => sn.productSn); - let initialSelected = [...alreadyBoundSns]; - if (initialSelected.length < this.outerSnQuotaQuantity) { - const needCount = this.outerSnQuotaQuantity - initialSelected.length; - const remainingToSelect = availableSns.filter(sn => !initialSelected.includes(sn)).slice(0, needCount); - initialSelected = initialSelected.concat(remainingToSelect); - } - - this.outerSnSelectedList = initialSelected.slice(0, this.outerSnQuotaQuantity); + this.outerSnSelectedList = alreadyBoundSns; this.updateSelectAllState(); }).finally(() => { this.outerSnLoading = false; @@ -907,6 +1016,9 @@ export default { return this.outerSnSelectedList.includes(productSn); }, isSnDisabled(sn) { + if (sn.orderCode && sn.orderCode === (this.stockingDetailRow && this.stockingDetailRow.orderCode)) { + return false; + } return !!(sn.outerCode || (sn.orderCode && sn.orderCode !== (this.stockingDetailRow && this.stockingDetailRow.orderCode))); }, handleSnCardClick(sn) { @@ -934,36 +1046,6 @@ export default { } this.updateSelectAllState(); }, - handleOuterSnSelectAll(checked) { - const quotaQuantity = this.outerSnQuotaQuantity; - const availableSns = this.filteredSnList.filter(sn => !this.isSnDisabled(sn)).map(sn => sn.productSn); - if (checked) { - if (quotaQuantity <= 0) { - this.$message.warning('当前配额数量为0，不能选择SN码'); - this.outerSnSelectAll = false; - this.outerSnSelectIndeterminate = false; - return; - } - const normalizedSelectedList = this.outerSnSelectedList.slice(0, quotaQuantity); - const unselectedSns = availableSns.filter(sn => !normalizedSelectedList.includes(sn)); - const remainCount = quotaQuantity - normalizedSelectedList.length; - this.outerSnSelectedList = normalizedSelectedList.concat(unselectedSns.slice(0, Math.max(remainCount, 0))); - if (availableSns.length > this.outerSnSelectedList.filter(sn => availableSns.includes(sn)).length) { - this.$message.warning(`最多只能选择 ${quotaQuantity} 个SN码`); - } - } else { - this.outerSnSelectedList = this.outerSnSelectedList.filter(sn => !availableSns.includes(sn)).slice(0, quotaQuantity); - } - this.updateSelectAllState(); - }, - handleOuterSnClearSelected() { - const quotaQuantity = this.outerSnQuotaQuantity; - if (this.outerSnSelectedList.length > quotaQuantity) { - this.$message.warning(`已选SN码数量超过配额 ${quotaQuantity}，已清空选择`); - } - this.outerSnSelectedList = []; - this.updateSelectAllState(); - }, canSelectMoreSn(showMessage = true) { if (this.outerSnSelectedList.length < this.outerSnQuotaQuantity) { return true; @@ -984,72 +1066,6 @@ export default { this.outerSnSelectAll = selectedInCurrent === availableSns.length; this.outerSnSelectIndeterminate = selectedInCurrent > 0 && selectedInCurrent < availableSns.length; }, - handleConfirmSnSelection() { - if (this.outerSnSelectedList.length > this.outerSnQuotaQuantity) { - this.$message.warning(`最多只能选择 ${this.outerSnQuotaQuantity} 个SN码`); - return; - } - this.$confirm(`确认将选中的 ${this.outerSnSelectedList.length} 个SN码分配给当前订单？`, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }).then(() => { - const loading = this.$loading({ - lock: true, - text: '正在处理中...', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }); - - // 收集所有变更的配额信息 - const changedList = []; - this.stockingDetailList.forEach(item => { - (item.bindList || []).forEach(bindItem => { - const currentPhNum = bindItem.phNum === '' || bindItem.phNum === null || bindItem.phNum === undefined ? 0 : Number(bindItem.phNum); - const originalPhNum = bindItem.originalPhNum === '' || bindItem.originalPhNum === null || bindItem.originalPhNum === undefined ? 0 : Number(bindItem.originalPhNum); - if (currentPhNum !== originalPhNum) { - changedList.push({ - orderId: this.stockingDetailRow.id, - purchaseId: bindItem.purchaseId, - purchaseNo: bindItem.purchaseNo, - originalBindNum: originalPhNum, - bindNum: currentPhNum, - bindItem: bindItem - }); - } - }); - }); - - let saveQuotaPromise = Promise.resolve(); - if (changedList.length > 0) { - saveQuotaPromise = Promise.all(changedList.map(item => savePurchaseOrderMap({ - orderId: item.orderId, - purchaseId: item.purchaseId, - bindNum: item.bindNum - }))); - } - - saveQuotaPromise.then(() => { - return bindOrderSnCodes(this.stockingDetailRow.orderCode, this.outerSnProductRow.productCode, this.outerSnBindRow.purchaseNo, this.stockingDetailRow.id, this.outerSnBindRow.purchaseId, this.outerSnSelectedList); - }).then(response => { - loading.close(); - this.$message.success(`成功分配 ${this.outerSnSelectedList.length} 个SN码` + (changedList.length > 0 ? '，并同步保存了配额修改' : '')); - this.outerSnDialogVisible = false; - - if (changedList.length > 0) { - changedList.forEach(item => { - item.bindItem.originalPhNum = item.bindNum; - this.$delete(this.stockingBindDraftMap, item.purchaseId); - }); - } - - this.handleShowStockingDetail(this.stockingDetailRow); - this.getList(); - }).catch(() => { - loading.close(); - }); - }).catch(() => {}); - }, /** 格式化备货状态 */ formatOrderStockingStatus(value) { const statusMap = { @@ -1069,6 +1085,64 @@ export default { BHWC: 'stocking-status--green' }; return classMap[value] || 'stocking-status--yellow'; + }, + handleGenerateVirtualPurchase(item) { + this.currentPurchaseOrderData = null; + this.virtualPurchaseProductInfo = { + productCode: item.productCode, + model: item.model, + productType: item.productType, + vendorName: item.vendorName, + vendorCode: item.vendorCode, + orderNum: item.orderNum, + orderCode: this.stockingDetailRow.orderCode, + projectName: this.stockingDetailRow.projectName, + projectCode: this.stockingDetailRow.projectCode + }; + this.purchaseOpen = true; + this.purchaseTitle = `生成虚拟采购单 - ${item.model || item.productCode}`; + }, + submitPurchaseForm() { + this.$refs.purchaseOrderDetail.submitForm(); + }, + cancelPurchase() { + this.purchaseOpen = false; + }, + handleOuterSnPageChange() { + }, + handlePurchaseSuccess() { + this.purchaseOpen = false; + this.$message.success('采购单创建成功'); + this.getList(); + if (this.virtualPurchaseProductInfo && this.stockingDetailVisible) { + this.refreshCurrentProductBindList(this.virtualPurchaseProductInfo.productCode); + } + }, + refreshCurrentProductBindList(productCode) { + const targetItem = this.stockingDetailList.find(item => item.productCode === productCode); + if (!targetItem) { + return; + } + this.loadAllBindData(this.stockingDetailRow.orderCode, targetItem).then(allBindList => { + const bindPageNum = targetItem.bindPageNum || 1; + const bindPageSize = targetItem.bindPageSize || this.stockingBindPageSize; + const startIndex = (bindPageNum - 1) * bindPageSize; + const endIndex = startIndex + bindPageSize; + const bindList = allBindList.slice(startIndex, endIndex); + this.stockingDetailList = this.stockingDetailList.map(item => { + if (item.productCode === productCode) { + return { + ...item, + allBindList: allBindList, + bindList: bindList, + bindTotal: allBindList.length + }; + } + return item; + }); + }).catch(() => { + this.$message.error('刷新采购列表失败'); + }); } } }; @@ -1374,6 +1448,12 @@ export default { border-bottom: 1px solid #e4e7ed; } +.outer-sn-grid-header .pagination-container { + margin: 0; + padding: 0; + background: transparent; +} + .outer-sn-current-count { flex: 1; margin-left: 16px; diff --git a/oms_web/oms_vue/src/views/inventory/info/innerLog.vue b/oms_web/oms_vue/src/views/inventory/info/innerLog.vue index 076ab3db..5ef7d0fa 100644 --- a/oms_web/oms_vue/src/views/inventory/info/innerLog.vue +++ b/oms_web/oms_vue/src/views/inventory/info/innerLog.vue @@ -1,13 +1,13 @@