feat(cost+wms): 新增生产指标标签功能并优化钢卷成本展示
1. 为生产指标实体、BO、VO新增tags标签字段并完善MyBatis映射 2. 在生产指标查询中添加标签模糊筛选条件 3. 新增生产指标计算结果API接口 4. 优化成本综合页面:支持标签字段的增改查,新增指标结果批量保存逻辑 5. 移除废弃的costDataService文件,重构钢卷详情页成本展示模块,新增加工路径可视化和吨钢成本计算展示 6. 注释并禁用了原有的检验任务相关代码逻辑
This commit is contained in:
@@ -37,7 +37,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<InspectionInfo :taskList="inspectionTaskList" :loading="inspectionLoading" />
|
||||
<!-- <InspectionInfo :taskList="inspectionTaskList" :loading="inspectionLoading" /> -->
|
||||
|
||||
<ProductionCharts v-if="isColdHardCoil"
|
||||
:segData="segData" :gaugeRows="gaugeRows" :shapeRows="shapeRows"
|
||||
@@ -54,7 +54,7 @@ import { listCoilAbnormal } from '@/api/wms/coilAbnormal'
|
||||
import { listTransferOrderItem } from '@/api/wms/transferOrderItem'
|
||||
import { listCoilQualityRejudge } from '@/api/wms/coilQualityRejudge'
|
||||
import { getTimingSegByEncoilId, getTimingPlanDetailByHotcoilId, getTimingRealtimeData } from '@/api/l2/timing'
|
||||
import { listInspectionTask } from "@/api/mes/qc/inspectionTask"
|
||||
// import { listInspectionTask } from "@/api/mes/qc/inspectionTask"
|
||||
import AbnormalTable from '@/views/wms/coil/components/AbnormalTable.vue'
|
||||
import { formatTime } from './statusUtils'
|
||||
|
||||
@@ -64,7 +64,7 @@ import LifecycleTrace from './components/LifecycleTrace.vue'
|
||||
import ContractInfo from './components/ContractInfo.vue'
|
||||
import SalesObjectionTable from './components/SalesObjectionTable.vue'
|
||||
import TransferRecords from './components/TransferRecords.vue'
|
||||
import InspectionInfo from './components/InspectionInfo.vue'
|
||||
// import InspectionInfo from './components/InspectionInfo.vue'
|
||||
import ProductionCharts from './components/ProductionCharts.vue'
|
||||
|
||||
export default {
|
||||
@@ -77,7 +77,7 @@ export default {
|
||||
ContractInfo,
|
||||
SalesObjectionTable,
|
||||
TransferRecords,
|
||||
InspectionInfo,
|
||||
// InspectionInfo,
|
||||
ProductionCharts
|
||||
},
|
||||
data() {
|
||||
@@ -107,7 +107,7 @@ export default {
|
||||
shapeRows: null,
|
||||
deliveryOrderInfo: {},
|
||||
salesObjectionInfo: [],
|
||||
inspectionTaskList: [],
|
||||
// inspectionTaskList: [],
|
||||
inspectionLoading: false,
|
||||
standardSteps: [],
|
||||
}
|
||||
@@ -150,7 +150,7 @@ export default {
|
||||
await this.fetchDeliveryOrderInfo()
|
||||
this.mergeTransferList()
|
||||
await this.getSalesObjectionList()
|
||||
await this.getInspectionTasks()
|
||||
// await this.getInspectionTasks()
|
||||
if (this.isColdHardCoil) {
|
||||
await this.loadProductionData()
|
||||
}
|
||||
@@ -229,18 +229,18 @@ export default {
|
||||
})
|
||||
this.tranferList = list
|
||||
},
|
||||
async getInspectionTasks() {
|
||||
this.inspectionLoading = true
|
||||
try {
|
||||
const res = await listInspectionTask({ enterCoilNos: this.coilInfo.enterCoilNo, pageNum: 1, pageSize: 100 })
|
||||
this.inspectionTaskList = res.rows || []
|
||||
} catch (e) {
|
||||
console.error('获取检验任务异常:', e)
|
||||
this.inspectionTaskList = []
|
||||
} finally {
|
||||
this.inspectionLoading = false
|
||||
}
|
||||
},
|
||||
// async getInspectionTasks() {
|
||||
// this.inspectionLoading = true
|
||||
// try {
|
||||
// const res = await listInspectionTask({ enterCoilNos: this.coilInfo.enterCoilNo, pageNum: 1, pageSize: 100 })
|
||||
// this.inspectionTaskList = res.rows || []
|
||||
// } catch (e) {
|
||||
// console.error('获取检验任务异常:', e)
|
||||
// this.inspectionTaskList = []
|
||||
// } finally {
|
||||
// // this.inspectionLoading = false
|
||||
// }
|
||||
// },
|
||||
getInboundTime() {
|
||||
if (!this.traceResult || !this.traceResult.steps) {
|
||||
return this.coilInfo.createTime || null
|
||||
|
||||
Reference in New Issue
Block a user