-
-
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/post/objection/components/FlowOverviewSection.vue b/klp-ui/src/views/wms/post/objection/components/FlowOverviewSection.vue
index ae2223740..7c100866e 100644
--- a/klp-ui/src/views/wms/post/objection/components/FlowOverviewSection.vue
+++ b/klp-ui/src/views/wms/post/objection/components/FlowOverviewSection.vue
@@ -8,8 +8,6 @@
@@ -58,9 +60,7 @@ export default {
1: '待审核',
2: '意见填写中',
3: '待汇总方案',
- 4: '执行反馈中',
- 5: '执行完成',
- 6: '全部办结'
+ 4: '全部办结'
};
return map[this.flowStatus] || '未知';
},
@@ -69,9 +69,7 @@ export default {
1: 'info',
2: 'warning',
3: '',
- 4: 'warning',
- 5: 'success',
- 6: 'success'
+ 4: 'success'
};
return map[this.flowStatus] || '';
}
diff --git a/klp-ui/src/views/wms/post/objection/index.vue b/klp-ui/src/views/wms/post/objection/index.vue
index 4ed32b027..e0ce6bf17 100644
--- a/klp-ui/src/views/wms/post/objection/index.vue
+++ b/klp-ui/src/views/wms/post/objection/index.vue
@@ -15,11 +15,9 @@
— No opinion yet · 暂无意见 —
+
+ — No opinion yet · 暂无意见 —
+
+
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/post/objection/components/ExportPdfDialog.vue b/klp-ui/src/views/wms/post/objection/components/ExportPdfDialog.vue
new file mode 100644
index 000000000..232a4f8d2
--- /dev/null
+++ b/klp-ui/src/views/wms/post/objection/components/ExportPdfDialog.vue
@@ -0,0 +1,621 @@
+
+
+ 内部调查情况
+ {{ parsedData.internalInvestigation }}
+
+
+ 内部确认
+ {{ parsedData.internalConfirmer || '-' }} / {{ parsedData.internalConfirmDate || '-' }}
+
+
+ 外部调查情况
+ {{ parsedData.externalInvestigation }}
+
+
+ 外部确认
+ {{ parsedData.externalConfirmer || '-' }} / {{ parsedData.externalConfirmDate || '-' }}
+
+
+ 责任单位
+ {{ parsedData.responsibleUnit }}
+
+
+ 接收
+ {{ parsedData.receiver || '-' }} / {{ parsedData.acceptDate || '-' }}
+
+
+
+
+
+
+ 产生原因
+ {{ parsedData.cause }}
+
+
+ 流出原因
+ {{ parsedData.escapeReason }}
+
+
+ 纠正措施
+ {{ parsedData.correctiveAction }}
+
+
+ 预计整改日期
+ {{ parsedData.rectifyDate }}
+
+
+ 主管意见
+ {{ parsedData.supervisorOpinion }}
+
+
+
+
+
+
+ 处理意见
+ {{ parsedData.handlingOpinion }}
+
+
+ 领导意见
+ {{ parsedData.leaderOpinion }}
+
+
+
+ — No data · 暂无数据 —
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 附缺陷照片：
+
+
+
+ ![]()
+
+ 暂无缺陷照片
+
@@ -34,15 +32,13 @@ export default {
},
computed: {
/**
- * el-steps 的 active 属性是从 0 开始索引的。
- * 当 status=1 时 active=0（待审核高亮），
- * status=2 时 active=1（已完成待审核+意见填写中高亮），依此类推。
- * status=5（执行完成）和 status=6（全部办结）共享第5步作为已完成状态。
+ * el-steps active 从 0 开始。
+ * 1=待审核→0, 2=意见填写→1, 3=汇总方案→2, 4=全部办结→3
*/
activeStep() {
if (this.flowStatus == null) return -1;
const v = Number(this.flowStatus);
- if (v >= 6) return 5; // 全部办结 -> 第5步已完成
+ if (v >= 4) return 3;
return v - 1;
},
flowStatusText() {
@@ -50,9 +46,7 @@ export default {
1: '待审核',
2: '意见填写中',
3: '待汇总方案',
- 4: '执行反馈中',
- 5: '执行完成',
- 6: '全部办结'
+ 4: '全部办结'
};
return map[this.flowStatus] || '未知';
},
@@ -61,9 +55,7 @@ export default {
1: 'info',
2: 'warning',
3: '',
- 4: 'warning',
- 5: 'success',
- 6: 'success'
+ 4: 'success'
};
return map[this.flowStatus] || '';
}
diff --git a/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue b/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue
index 411771d92..60d7dd74c 100644
--- a/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue
+++ b/klp-ui/src/views/wms/post/objection/components/HeaderControlSection.vue
@@ -26,6 +26,8 @@
投诉日期：{{ parseTime(meta.complaintDate, '{y}-{m}-{d}') }}
+
+
@@ -76,7 +74,7 @@
:disabled="pdfLoading" title="导出PDF">导出PDF -->
+
+
+ 已提交意见 · Submitted Opinion
+
+
+
+
- 填写处理意见 · Fill in Opinion
+ {{ currentTask.taskStatus === 1 ? '修改处理意见' : '填写处理意见' }} · {{ currentTask.taskStatus === 1 ? 'Edit Opinion' : 'Fill in Opinion' }}
+
+
+
+
+
+
+
+
+
+
diff --git a/klp-ui/src/views/wms/post/objection/todo.vue b/klp-ui/src/views/wms/post/objection/todo.vue
index 92a8bfbd3..f22fca9d8 100644
--- a/klp-ui/src/views/wms/post/objection/todo.vue
+++ b/klp-ui/src/views/wms/post/objection/todo.vue
@@ -72,12 +72,14 @@
+
+
+
+
+
+
+
+
+
+
+
+ 意见汇总
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.complaintNo }}
+ {{ parseTime(item.complaintDate, '{y}-{m}-{d}') }}
+
+
+
+
+ 暂无待汇总的售后单
+
+
+
+
+
+
+ 请在左侧列表中选择一条售后单查看详情
+
+
+
+
+ 办 结
+ 导出
+ 刷新
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row._boundCount || 0 }} 卷
+
+
+
+
+
+
+ 今日排产明细（{{ scheduleItems.length }} 条）
+
+
+
+
+ 解绑
+
+
+
+
+
+
+ 已绑定钢卷 — {{ currentDetail.spec }} / {{ currentDetail.material }}
+ 绑定钢卷
+
+
+ 搜索
+
+ 已选 {{ selectedCoils.length }} 卷
+
+
+
源卷列表
+ 添加源卷
@@ -374,6 +375,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import TimeInput from "@/components/TimeInput";
import AbnormalForm from './components/AbnormalForm';
import PlanSheetViewer from './components/PlanSheetViewer.vue';
+import ScheduleDetailCoilBind from './components/ScheduleDetailCoilBind'
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
import ContractSelect from "@/components/KLPService/ContractSelect";
@@ -389,6 +391,7 @@ export default {
AbnormalForm,
ContractSelect,
PlanSheetViewer,
+ ScheduleDetailCoilBind,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
data() {
diff --git a/klp-ui/src/views/wms/coil/panels/do.vue b/klp-ui/src/views/wms/coil/panels/do.vue
index 0ddc5e4a0..dc0652cde 100644
--- a/klp-ui/src/views/wms/coil/panels/do.vue
+++ b/klp-ui/src/views/wms/coil/panels/do.vue
@@ -11,6 +11,7 @@
:name="tab.value">
待领物料列表
+
母卷信息
+
@@ -377,6 +378,7 @@ import WarehouseSelect from "@/components/KLPService/WarehouseSelect";
import TimeInput from "@/components/TimeInput";
import AbnormalForm from './components/AbnormalForm';
import PlanSheetViewer from './components/PlanSheetViewer.vue';
+import ScheduleDetailCoilBind from './components/ScheduleDetailCoilBind'
import { generateCoilNoPrefix } from "@/utils/coil/coilNo";
import ContractSelect from "@/components/KLPService/ContractSelect";
@@ -391,6 +393,7 @@ export default {
AbnormalForm,
ContractSelect,
PlanSheetViewer,
+ ScheduleDetailCoilBind,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
data() {
diff --git a/klp-ui/src/views/wms/coil/typing.vue b/klp-ui/src/views/wms/coil/typing.vue
index fc3c10087..99e8da2eb 100644
--- a/klp-ui/src/views/wms/coil/typing.vue
+++ b/klp-ui/src/views/wms/coil/typing.vue
@@ -30,9 +30,10 @@
-
+
{{ '更新信息' }}
+ 暂存内容
保存更新
@@ -405,6 +406,7 @@ import ContractSelect from "@/components/KLPService/ContractSelect";
import L2MatchPanel from './panels/L2MatchPanel.vue'
import DrMatchPanel from './panels/DrMatchPanel.vue';
import PlanSheetViewer from './components/PlanSheetViewer.vue';
+import ScheduleDetailCoilBind from './components/ScheduleDetailCoilBind'
// actionType -> 产线名称映射
@@ -431,6 +433,7 @@ export default {
L2MatchPanel,
DrMatchPanel,
PlanSheetViewer,
+ ScheduleDetailCoilBind,
},
dicts: ['coil_quality_status', 'coil_abnormal_position', 'coil_abnormal_code', 'coil_abnormal_degree', 'coil_business_purpose'],
data() {
diff --git a/klp-ui/src/views/wms/post/aps/requirement.vue b/klp-ui/src/views/wms/post/aps/requirement.vue
index 09fc0eac1..6226376cf 100644
--- a/klp-ui/src/views/wms/post/aps/requirement.vue
+++ b/klp-ui/src/views/wms/post/aps/requirement.vue
@@ -158,7 +158,7 @@
{{ order.orderCode || ('订单 #' + order.orderId) }}
-
+
@@ -399,6 +399,7 @@ import {
delRequirement,
addRel,
delRel,
+ listRel,
addRequirementDetail,
updateRequirementDetail,
delRequirementDetail
@@ -628,7 +629,8 @@ export default {
searchBindOrders() {
this.bindSearchLoading = true
listCrmOrder(this.bindQuery).then(res => {
- this.candidateOrderList = res.rows || []
+ const boundOrderIds = (this.currentReq?.orderList || []).map(o => o.orderId)
+ this.candidateOrderList = (res.rows || []).filter(o => !boundOrderIds.includes(o.orderId))
}).catch(() => {
this.candidateOrderList = []
}).finally(() => {
@@ -672,65 +674,87 @@ export default {
}
this.bindBtnLoading = true
const scheduleId = this.currentReq.scheduleId
- const allPromises = []
- this.selectedBindOrders.forEach(order => {
- // 1. 创建订单关联
- allPromises.push(
- addRel({
- orderId: order.orderId,
- scheduleId: scheduleId,
- relWeight: null,
- remark: ''
- })
- )
-
- // 2. 解析 productContent，每行产品创建一条排产明细
- if (order.productContent) {
- const parsed = parseProductContent(order.productContent)
- const products = parsed.products || []
- const productType = parsed.productName || ''
- products.forEach(prod => {
- allPromises.push(
- addRequirementDetail({
- scheduleId: scheduleId,
- orderDetailId: order.orderId,
- spec: prod.spec || '',
- material: prod.material || '',
- scheduleWeight: prod.quantity || 0,
- productType: productType,
- remark: prod.remark || ''
- })
- )
- })
- }
+ const orderTasks = this.selectedBindOrders.map(order => {
+ return addRel({
+ orderId: order.orderId,
+ scheduleId: scheduleId,
+ relWeight: null,
+ remark: ''
+ }).then(() => {
+ if (!order.productContent) return
+ let products = []
+ let productType = ''
+ try {
+ const parsed = parseProductContent(order.productContent)
+ products = (parsed.products || []).filter(p => p.spec && p.material)
+ productType = parsed.productName || ''
+ } catch (e) {
+ return
+ }
+ if (products.length === 0) return
+ const detailPromises = products.map(prod =>
+ addRequirementDetail({
+ scheduleId: scheduleId,
+ orderDetailId: order.orderId,
+ spec: prod.spec,
+ material: prod.material,
+ scheduleWeight: prod.quantity || 0,
+ productType: productType,
+ remark: prod.remark || ''
+ })
+ )
+ return Promise.all(detailPromises)
+ })
})
- Promise.all(allPromises).then(() => {
- this.$modal.msgSuccess('绑定成功，排产明细已生成')
+ Promise.allSettled(orderTasks).then(results => {
+ const successCount = results.filter(r => r.status === 'fulfilled').length
+ const failCount = results.filter(r => r.status === 'rejected').length
this.bindDialogVisible = false
this.handleReqClick(this.currentReq)
- }).catch(() => {
- this.$modal.msgError('绑定或创建明细失败')
+ if (failCount === 0) {
+ this.$modal.msgSuccess(`成功绑定 ${successCount} 个订单，排产明细已生成`)
+ } else if (successCount === 0) {
+ this.$modal.msgError('绑定失败，请重试')
+ } else {
+ this.$modal.msgWarning(`成功绑定 ${successCount} 个，${failCount} 个失败`)
+ }
}).finally(() => {
this.bindBtnLoading = false
})
},
- handleUnbindByOrderId(orderId) {
- const order = (this.currentReq.orderList || []).find(o => o.orderId === orderId)
- if (!order) {
- this.$message.warning('未找到关联记录')
- return
- }
- this.$confirm('确认解绑该订单吗？', '提示', {
+ handleUnbindByOrderId(order) {
+ this.$confirm('确认解绑该订单吗？解绑将同时删除对应的排产明细。', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- delRel(order.relId || orderId).then(() => {
+ const tasks = []
+ // 1. 删除该订单关联的排产明细
+ const detailIds = this.requirementDetailList
+ .filter(d => d.orderDetailId === order.orderId)
+ .map(d => d.scheduleDetailId)
+ detailIds.forEach(id => {
+ tasks.push(delRequirementDetail(id))
+ })
+ // 2. 查询并删除关联表记录
+ tasks.push(
+ listRel({ orderId: order.orderId, scheduleId: this.currentReq.scheduleId }).then(res => {
+ const rows = res.rows || []
+ if (rows.length === 0) {
+ throw new Error('未找到关联记录')
+ }
+ const relId = rows[0].id || rows[0].relId
+ return delRel(relId)
+ })
+ )
+ Promise.all(tasks).then(() => {
this.$modal.msgSuccess('解绑成功')
this.handleReqClick(this.currentReq)
+ }).catch(() => {
+ this.$modal.msgError('解绑失败')
})
}).catch(() => { })
},
diff --git a/klp-ui/src/views/wms/post/aps/schedule.vue b/klp-ui/src/views/wms/post/aps/schedule.vue
index 06d984e7e..726abd298 100644
--- a/klp-ui/src/views/wms/post/aps/schedule.vue
+++ b/klp-ui/src/views/wms/post/aps/schedule.vue
@@ -17,22 +17,22 @@
+
-
{{ summaryText }}
+
待审核产需单明细
共 {{ pendingScheduleList.length }} 个产需单
-
+
-
+
@@ -131,7 +131,7 @@
-
+
规格
材质
@@ -140,9 +140,9 @@
备注
{{ d.spec }}
@@ -162,34 +162,84 @@
-
+
已排产明细
-
- 共 {{ scheduledItemList.length }} 条
-
+
-
+
+ 共 {{ scheduledItemList.length }} 条
+
+
+
+ 合并选中项 ({{ selectedItems.length }})
+
+
+
+
+ 合并选中项
+
+
+
+
-
+
-
- 编辑
- 删除
-
+ {{ statusMap[scope.row.scheduleStatus] || '未知' }}
+
+
+
+
+
@@ -237,33 +287,329 @@
-
-
-
- {{ editForm.scheduleNo }}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ editForm.scheduleNo }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -275,9 +621,10 @@ import {
import {
getCrmOrderInfo,
listScheduleItem,
- addScheduleItem,
updateScheduleItem,
- delScheduleItem
+ delScheduleItem,
+ receiveScheduleItem,
+ mergeScheduleItem
} from '@/api/aps/schedule'
export default {
@@ -301,6 +648,24 @@ export default {
// 已排产
scheduledItemList: [],
+ selectedItems: [],
+ sourceColorMap: {},
+
+ // 合并对话框
+ mergeDialogVisible: false,
+ mergeBtnLoading: false,
+ mergeTemplateIndex: 0,
+ mergeSourceRows: [],
+ mergeForm: {
+ itemCount: 0, scheduleNo: '', customerName: '', spec: '', material: '',
+ scheduleWeight: 0, productType: '', productItem: '', businessUser: '',
+ businessPhone: '', deliveryCycle: undefined, usePurpose: '',
+ thicknessTolerance: '', widthTolerance: '', surfaceQuality: '',
+ surfaceTreatment: '', innerDiameter: '', outerDiameter: '',
+ packReq: '', cutEdgeReq: '', singleCoilWeight: '',
+ weightDeviation: '', otherTechReq: '', paymentDesc: '',
+ remark: '', scheduleDetailIds: ''
+ },
// 驳回
rejectDialogVisible: false,
@@ -322,20 +687,47 @@ export default {
drillOrder: null
}
},
+ watch: {
+ activeTab() {
+ this.selectedItems = []
+ }
+ },
created() {
this.handleQuery()
},
methods: {
getEmptyEditForm() {
return {
- itemId: undefined,
scheduleId: undefined,
scheduleNo: '',
+ prodDate: '',
+ scheduleStatus: undefined,
+ totalPlanWeight: undefined,
+ relContractNo: '',
+ businessUser: '',
+ businessPhone: '',
+ orderDate: '',
+ customerName: '',
+ deliveryCycle: undefined,
+ usePurpose: '',
+ productType: '',
+ thicknessTolerance: '',
+ widthTolerance: '',
+ surfaceQuality: '',
+ surfaceTreatment: '',
+ innerDiameter: '',
+ outerDiameter: '',
+ packReq: '',
+ cutEdgeReq: '',
+ singleCoilWeight: '',
+ weightDeviation: '',
+ otherTechReq: '',
+ paymentDesc: '',
spec: '',
material: '',
scheduleWeight: 0,
- productType: '',
- customerName: '',
+ productItem: '',
+ rowRemark: '',
remark: ''
}
},
@@ -386,40 +778,18 @@ export default {
},
handleAccept(sch) {
+ const details = sch.detailList || []
+ if (details.length === 0) {
+ this.$message.warning('该产需单无可排产的明细')
+ return
+ }
this.$confirm(
- `确认接收产需单「${sch.scheduleNo}」的全部排产明细吗？`,
+ `确认接收产需单「${sch.scheduleNo}」的全部排产明细吗？共 ${details.length} 条明细`,
'提示',
{ confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning' }
).then(() => {
- const details = sch.detailList || []
- if (details.length === 0) {
- this.$message.warning('该产需单无可排产的明细')
- return
- }
-
- const promises = details.map(detail =>
- addScheduleItem({
- scheduleId: sch.scheduleId,
- scheduleNo: sch.scheduleNo,
- spec: detail.spec || '',
- material: detail.material || '',
- scheduleWeight: detail.scheduleWeight || 0,
- productType: sch.productType || detail.productType || '',
- customerName: sch.customerName || '',
- remark: detail.remark || ''
- })
- )
-
- // 更新产需单状态为 2（已接收）
- promises.push(
- updateRequirement({
- scheduleId: sch.scheduleId,
- scheduleStatus: 2
- })
- )
-
this.$message.info('正在处理接收...')
- Promise.all(promises).then(() => {
+ receiveScheduleItem(sch.scheduleId).then(() => {
this.$modal.msgSuccess('接收成功，排产明细已写入')
this.queryPending()
}).catch(() => {
@@ -463,12 +833,24 @@ export default {
queryScheduled() {
this.schLoading = true
this.scheduledItemList = []
+ this.sourceColorMap = {}
+ this.selectedItems = []
listScheduleItem({ prodDate: this.queryDate, pageNum: 1, pageSize: 999 }).then(res => {
- this.scheduledItemList = res.rows || []
- const totalWeight = this.scheduledItemList.reduce((sum, d) => sum + (parseFloat(d.scheduleWeight) || 0), 0)
+ this.scheduledItemList = (res.rows || []).sort((a, b) => (a.scheduleNo || '').localeCompare(b.scheduleNo || ''))
+ try {
+ this.sourceColorMap = this.buildGroupColorMap(this.scheduledItemList)
+ } catch (e) {
+ console.error('buildGroupColorMap error:', e)
+ this.sourceColorMap = {}
+ }
+ const totalWeight = this.scheduledItemList.reduce((sum, d) => {
+ const w = parseFloat(d.scheduleWeight)
+ return sum + (isNaN(w) ? 0 : w)
+ }, 0)
this.summaryText = `共 ${this.scheduledItemList.length} 条明细，排产总吨数 ${totalWeight.toFixed(3)} 吨`
- }).catch(() => {
+ }).catch((e) => {
+ console.error('queryScheduled error:', e)
this.scheduledItemList = []
this.summaryText = ''
}).finally(() => {
@@ -504,7 +886,7 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
- delScheduleItem(row.itemId || row.scheduleItemId).then(() => {
+ delScheduleItem(row.scheduleId).then(() => {
this.$modal.msgSuccess('删除成功')
this.queryScheduled()
}).catch(() => {
@@ -513,6 +895,97 @@ export default {
}).catch(() => {})
},
+ // ====== 合并 ======
+ handleSelectionChange(rows) {
+ this.selectedItems = rows
+ },
+
+ getItemRowClassName({ row }) {
+ const key = row.scheduleNo
+ if (!key) return ''
+ const colorIndex = this.sourceColorMap[key]
+ return colorIndex !== undefined ? `merge-source-${colorIndex}` : ''
+ },
+
+ buildGroupColorMap(list) {
+ const map = {}
+ let colorIdx = 0
+ list.forEach(item => {
+ const key = item.scheduleNo
+ if (!key) return
+ if (!(key in map)) {
+ map[key] = colorIdx % 5
+ colorIdx++
+ }
+ })
+ return map
+ },
+
+ handleMergePrepare() {
+ if (this.selectedItems.length < 2) {
+ this.$message.warning('请至少选择2条排产明细进行合并')
+ return
+ }
+ this.mergeSourceRows = [...this.selectedItems]
+ this.mergeTemplateIndex = 0
+ this.pickMergeTemplate(this.mergeSourceRows[0])
+ this.mergeDialogVisible = true
+ },
+
+ pickMergeTemplate(row) {
+ const idx = this.mergeSourceRows.indexOf(row)
+ if (idx >= 0) this.mergeTemplateIndex = idx
+ this.mergeForm = {
+ itemCount: this.mergeSourceRows.length,
+ scheduleNo: row.scheduleNo || '',
+ customerName: row.customerName || '',
+ spec: row.spec || '',
+ material: row.material || '',
+ scheduleWeight: this.mergeSourceRows.reduce((sum, r) => sum + (parseFloat(r.scheduleWeight) || 0), 0),
+ productType: row.productType || '',
+ productItem: row.productItem || '',
+ businessUser: row.businessUser || '',
+ businessPhone: row.businessPhone || '',
+ deliveryCycle: row.deliveryCycle,
+ usePurpose: row.usePurpose || '',
+ thicknessTolerance: row.thicknessTolerance || '',
+ widthTolerance: row.widthTolerance || '',
+ surfaceQuality: row.surfaceQuality || '',
+ surfaceTreatment: row.surfaceTreatment || '',
+ innerDiameter: row.innerDiameter || '',
+ outerDiameter: row.outerDiameter || '',
+ packReq: row.packReq || '',
+ cutEdgeReq: row.cutEdgeReq || '',
+ singleCoilWeight: row.singleCoilWeight || '',
+ weightDeviation: row.weightDeviation || '',
+ otherTechReq: row.otherTechReq || '',
+ paymentDesc: row.paymentDesc || '',
+ remark: row.remark || '',
+ scheduleDetailIds: this.mergeSourceRows.map(r => r.scheduleDetailIds || '').filter(Boolean).join(',')
+ }
+ },
+
+ confirmMerge() {
+ this.mergeBtnLoading = true
+ const ids = this.mergeSourceRows.map(r => r.scheduleId)
+ const mergedBo = {
+ ...this.mergeForm,
+ prodDate: this.queryDate,
+ scheduleStatus: 2
+ }
+ delete mergedBo.itemCount
+ mergeScheduleItem({ ids, mergedBo }).then(() => {
+ this.$modal.msgSuccess(`合并成功：${ids.length} 条明细合并为 1 条`)
+ this.mergeDialogVisible = false
+ this.selectedItems = []
+ this.queryScheduled()
+ }).catch(() => {
+ this.$modal.msgError('合并失败')
+ }).finally(() => {
+ this.mergeBtnLoading = false
+ })
+ },
+
// ====== 下钻 & 辅助方法 ======
scheduleTotalWeight(sch) {
const details = sch.detailList || []
@@ -594,6 +1067,7 @@ export default {
flex: 1;
overflow: auto;
min-height: 0;
+ overflow-x: auto;
}
}
@@ -830,4 +1304,21 @@ export default {
color: $aps-text-muted;
font-size: 12px;
}
+
+// ====== 合并候选行颜色高亮（同一源排产单 → 同色） ======
+::v-deep .el-table__body tr.merge-source-0 > td {
+ background-color: #f0f5ff !important;
+}
+::v-deep .el-table__body tr.merge-source-1 > td {
+ background-color: #f6ffed !important;
+}
+::v-deep .el-table__body tr.merge-source-2 > td {
+ background-color: #fff7e6 !important;
+}
+::v-deep .el-table__body tr.merge-source-3 > td {
+ background-color: #f9f0ff !important;
+}
+::v-deep .el-table__body tr.merge-source-4 > td {
+ background-color: #fff0f6 !important;
+}
+ 编辑
+ 删除
+
+ 选中 {{ mergeForm.itemCount }} 条明细，请选择一个作为合并模板，下方字段将自动填充，您可修改后确认合并。
+
+
+
+
+ 合并后 schedule_detail_ids：{{ mergeForm.scheduleDetailIds }}
+
+
+