|
|
|
|
@ -17,16 +17,16 @@ |
|
|
|
|
detailForm.plateGoodsCode |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="物料名称:">{{ |
|
|
|
|
detailForm.goodsName |
|
|
|
|
detailForm.plateGoodsName |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="相关订单数:">{{ |
|
|
|
|
detailForm.ordersNumber |
|
|
|
|
detailForm.detailOrderNum |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="物料需求量(克):">{{ |
|
|
|
|
detailForm.goodsDemand |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="物料使用量(克):">{{ |
|
|
|
|
detailForm.usageAmount |
|
|
|
|
detailForm.goodsDemand - detailForm.surplus |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="物料剩余量(克):">{{ |
|
|
|
|
detailForm.surplus |
|
|
|
|
@ -41,13 +41,13 @@ |
|
|
|
|
detailForm.silverPotassiumResidue |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="提报人:">{{ |
|
|
|
|
detailForm.createUser |
|
|
|
|
detailForm.createUserName |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="提报时间:">{{ |
|
|
|
|
detailForm.createTime |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="需求状态:">{{ |
|
|
|
|
detailForm.statusTitle |
|
|
|
|
detailForm.statusName |
|
|
|
|
}}</el-descriptions-item> |
|
|
|
|
<el-descriptions-item style="width: 25%" label="审批意见:">{{ |
|
|
|
|
detailForm.approvalMemo |
|
|
|
|
@ -68,40 +68,40 @@ |
|
|
|
|
> |
|
|
|
|
<el-table-column |
|
|
|
|
label="计划单号" |
|
|
|
|
prop="pjYieldOrder.poCode" |
|
|
|
|
prop="ypCode" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column label="车间订单号" prop="orderWoCode" align="center"></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="零件号" |
|
|
|
|
prop="pjYieldOrder.partCode" |
|
|
|
|
prop="partCode" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="零件名称" |
|
|
|
|
prop="pjYieldOrder.partName" |
|
|
|
|
prop="partName" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column label="物料编码" prop="plateGoodsCode" align="center"></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="计划下达时间" |
|
|
|
|
prop="createTime" |
|
|
|
|
prop="releaseDate" |
|
|
|
|
align="center" |
|
|
|
|
width="170" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="生产标识" |
|
|
|
|
prop="pjYieldOrder.prodIdent" |
|
|
|
|
prop="productIdent" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="生产数量" |
|
|
|
|
prop="pjYieldOrder.poQty" |
|
|
|
|
prop="ypQty" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
<el-table-column |
|
|
|
|
label="物料需求量(克)" |
|
|
|
|
prop="plateSingleQuotaTotal" |
|
|
|
|
prop="goodsDemand" |
|
|
|
|
align="center" |
|
|
|
|
></el-table-column> |
|
|
|
|
</el-table> |
|
|
|
|
@ -126,189 +126,35 @@ export default { |
|
|
|
|
return { |
|
|
|
|
detailForm: {}, |
|
|
|
|
tableData: [], |
|
|
|
|
isOpen:false |
|
|
|
|
}; |
|
|
|
|
}, |
|
|
|
|
mounted() {}, |
|
|
|
|
mounted() { |
|
|
|
|
console.log('materialDialog-----------',this.materialDialog) |
|
|
|
|
// if(this.materialDialog){ |
|
|
|
|
// this.getDetail() |
|
|
|
|
// } |
|
|
|
|
}, |
|
|
|
|
methods: { |
|
|
|
|
async open() { |
|
|
|
|
// this.detailForm = { |
|
|
|
|
// // 基础主键与编码 |
|
|
|
|
// id: 1, |
|
|
|
|
// demandCode: 'DMD-0001', |
|
|
|
|
// pgrCode: 'PGR-001', |
|
|
|
|
|
|
|
|
|
// // 作业中心 & 物料信息 |
|
|
|
|
// wcId: 100, |
|
|
|
|
// plateGoodsCode: 'PLATE-001', |
|
|
|
|
// goodsBoId: 456, |
|
|
|
|
// coefficientBoId: 789, |
|
|
|
|
|
|
|
|
|
// // 需求与剩余 |
|
|
|
|
// goodsDemand: 445.32, |
|
|
|
|
// declaredQuota: 200.32, |
|
|
|
|
// declaredSilver: 50.0, |
|
|
|
|
// declaredStatus: 2, |
|
|
|
|
// surplus: 245.0, |
|
|
|
|
// silverPotassiumResidue: 10.0, |
|
|
|
|
|
|
|
|
|
// // 银钾相关 |
|
|
|
|
// silverPotassium: 30.0, |
|
|
|
|
// coefficient: 0.54, |
|
|
|
|
// declaredSilver: 50.0, |
|
|
|
|
|
|
|
|
|
// // 审批相关 |
|
|
|
|
// approvalMan: 123, |
|
|
|
|
// approvalUser: '审批人姓名', |
|
|
|
|
// approvalTime: '2023-05-22 12:21:32', |
|
|
|
|
// approvalStatus: 1, |
|
|
|
|
// approvalMemo: '审批通过', |
|
|
|
|
// approvalOpinion: '审批通过', |
|
|
|
|
|
|
|
|
|
// // 兼容旧字段（保留以免模板其他地方使用） |
|
|
|
|
// requiredCode: '001', |
|
|
|
|
// workCenter: 1, |
|
|
|
|
// goodsCode: 'wl_001', |
|
|
|
|
// goodsName: '物料名称', |
|
|
|
|
// ordersNumber: 15, |
|
|
|
|
// createUser: 'XXX', |
|
|
|
|
// createTime: '2025-10-20 11:20:32', |
|
|
|
|
// plateSingleQuotaTotal: '445.32', |
|
|
|
|
// }; |
|
|
|
|
// this.tableData = [ |
|
|
|
|
// { |
|
|
|
|
// id: 1001, |
|
|
|
|
// demandCode: 'DMD-0001', |
|
|
|
|
// pgrCode: 'PGR-001', |
|
|
|
|
// wcId: 100, |
|
|
|
|
// plateGoodsCode: 'PLATE-001', |
|
|
|
|
// goodsBoId: 456, |
|
|
|
|
// coefficientBoId: 789, |
|
|
|
|
// goodsDemand: 120.0, |
|
|
|
|
// declaredQuota: 50.0, |
|
|
|
|
// declaredSilver: 10.0, |
|
|
|
|
// declaredStatus: 1, |
|
|
|
|
// surplus: 20.0, |
|
|
|
|
// silverPotassium: 5.0, |
|
|
|
|
// silverPotassiumResidue: 2.0, |
|
|
|
|
// coefficient: 0.12, |
|
|
|
|
// approvalMan: 123, |
|
|
|
|
// approvalTime: '2023-05-18 09:00:00', |
|
|
|
|
// approvalStatus: 1, |
|
|
|
|
// approvalMemo: '通过', |
|
|
|
|
// pjYieldOrder: { |
|
|
|
|
// poCode: 'WO-220245431', |
|
|
|
|
// partCode: '21E8-950-1378-H1', |
|
|
|
|
// partName: 'XXX', |
|
|
|
|
// prodIdent: 'JII', |
|
|
|
|
// poQty: 50, |
|
|
|
|
// }, |
|
|
|
|
// orderWoCode: 'WO-220245431', |
|
|
|
|
// createTime: '2023-05-17 10:50:08', |
|
|
|
|
// plateSingleQuotaTotal: '120.00', |
|
|
|
|
// async getDetail(){ |
|
|
|
|
// const ref = await getOrderMoldPlanCaDeatils({ id: this.id }); |
|
|
|
|
// if (ref.data.code == 200) { |
|
|
|
|
// this.detailForm = ref.data.data; |
|
|
|
|
// this.tableData = ref.data.data.yieldOrderList; |
|
|
|
|
// this.isOpen = true |
|
|
|
|
// } |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// id: 1002, |
|
|
|
|
// demandCode: 'DMD-0002', |
|
|
|
|
// pgrCode: 'PGR-002', |
|
|
|
|
// wcId: 101, |
|
|
|
|
// plateGoodsCode: 'PLATE-002', |
|
|
|
|
// goodsBoId: 457, |
|
|
|
|
// coefficientBoId: 790, |
|
|
|
|
// goodsDemand: 25.32, |
|
|
|
|
// declaredQuota: 10.0, |
|
|
|
|
// declaredSilver: 2.5, |
|
|
|
|
// declaredStatus: 2, |
|
|
|
|
// surplus: 5.0, |
|
|
|
|
// silverPotassium: 1.2, |
|
|
|
|
// silverPotassiumResidue: 0.8, |
|
|
|
|
// coefficient: 0.08, |
|
|
|
|
// approvalMan: 124, |
|
|
|
|
// approvalTime: '2023-05-19 10:00:00', |
|
|
|
|
// approvalStatus: 0, |
|
|
|
|
// approvalMemo: '待审', |
|
|
|
|
// pjYieldOrder: { |
|
|
|
|
// poCode: 'WO-220245432', |
|
|
|
|
// partCode: '21E8-950-1378-H1', |
|
|
|
|
// partName: 'XXX', |
|
|
|
|
// prodIdent: 'JII', |
|
|
|
|
// poQty: 50, |
|
|
|
|
// }, |
|
|
|
|
// orderWoCode: 'WO-220245432', |
|
|
|
|
// createTime: '2023-05-17 10:50:08', |
|
|
|
|
// plateSingleQuotaTotal: '25.32', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// id: 1003, |
|
|
|
|
// demandCode: 'DMD-0003', |
|
|
|
|
// pgrCode: 'PGR-003', |
|
|
|
|
// wcId: 102, |
|
|
|
|
// plateGoodsCode: 'PLATE-003', |
|
|
|
|
// goodsBoId: 458, |
|
|
|
|
// coefficientBoId: 791, |
|
|
|
|
// goodsDemand: 100.0, |
|
|
|
|
// declaredQuota: 40.0, |
|
|
|
|
// declaredSilver: 8.0, |
|
|
|
|
// declaredStatus: 1, |
|
|
|
|
// surplus: 30.0, |
|
|
|
|
// silverPotassium: 3.5, |
|
|
|
|
// silverPotassiumResidue: 1.5, |
|
|
|
|
// coefficient: 0.15, |
|
|
|
|
// approvalMan: 125, |
|
|
|
|
// approvalTime: '2023-05-20 11:00:00', |
|
|
|
|
// approvalStatus: 1, |
|
|
|
|
// approvalMemo: '通过', |
|
|
|
|
// pjYieldOrder: { |
|
|
|
|
// poCode: 'WO-220245433', |
|
|
|
|
// partCode: '21E8-950-1378-H1', |
|
|
|
|
// partName: 'XXX', |
|
|
|
|
// prodIdent: 'JII', |
|
|
|
|
// poQty: 50, |
|
|
|
|
// }, |
|
|
|
|
// orderWoCode: 'WO-220245433', |
|
|
|
|
// createTime: '2023-05-17 10:50:08', |
|
|
|
|
// plateSingleQuotaTotal: '100.00', |
|
|
|
|
// }, |
|
|
|
|
// { |
|
|
|
|
// id: 1004, |
|
|
|
|
// demandCode: 'DMD-0004', |
|
|
|
|
// pgrCode: 'PGR-004', |
|
|
|
|
// wcId: 103, |
|
|
|
|
// plateGoodsCode: 'PLATE-004', |
|
|
|
|
// goodsBoId: 459, |
|
|
|
|
// coefficientBoId: 792, |
|
|
|
|
// goodsDemand: 200.0, |
|
|
|
|
// declaredQuota: 150.0, |
|
|
|
|
// declaredSilver: 25.0, |
|
|
|
|
// declaredStatus: 3, |
|
|
|
|
// surplus: 50.0, |
|
|
|
|
// silverPotassium: 6.0, |
|
|
|
|
// silverPotassiumResidue: 4.0, |
|
|
|
|
// coefficient: 0.2, |
|
|
|
|
// approvalMan: 126, |
|
|
|
|
// approvalTime: '2023-05-21 12:00:00', |
|
|
|
|
// approvalStatus: 2, |
|
|
|
|
// approvalMemo: '拒绝', |
|
|
|
|
// pjYieldOrder: { |
|
|
|
|
// poCode: 'WO-220245434', |
|
|
|
|
// partCode: '21E8-950-1378-H1', |
|
|
|
|
// partName: 'XXX', |
|
|
|
|
// prodIdent: 'JII', |
|
|
|
|
// poQty: 50, |
|
|
|
|
// }, |
|
|
|
|
// orderWoCode: 'WO-220245434', |
|
|
|
|
// createTime: '2023-05-17 10:50:08', |
|
|
|
|
// plateSingleQuotaTotal: '200.00', |
|
|
|
|
// }, |
|
|
|
|
// ]; |
|
|
|
|
async open() { |
|
|
|
|
try { |
|
|
|
|
const ref = await getOrderMoldPlanCaDeatils({ id: this.id }); |
|
|
|
|
if (res.data.code == 200) { |
|
|
|
|
this.detailForm = res.data.data.detailForm; |
|
|
|
|
this.tableData = res.data.data.list; |
|
|
|
|
if (ref.data.code == 200) { |
|
|
|
|
this.detailForm = ref.data.data; |
|
|
|
|
this.tableData = ref.data.data.yieldOrderList; |
|
|
|
|
} |
|
|
|
|
} catch (err) {console.log(err)} |
|
|
|
|
}, |
|
|
|
|
closeDialog() { |
|
|
|
|
this.isOpen = false |
|
|
|
|
this.$emit('closeDialog'); |
|
|
|
|
}, |
|
|
|
|
}, |
|
|
|
|
|
jinna
3 months ago