diff --git a/src/views/productionManagement/beforeAndAfterPlating/index.vue b/src/views/productionManagement/beforeAndAfterPlating/index.vue index e55eadd..8eb0717 100644 --- a/src/views/productionManagement/beforeAndAfterPlating/index.vue +++ b/src/views/productionManagement/beforeAndAfterPlating/index.vue @@ -95,7 +95,7 @@ export default { editBtn: false, addBtn: false, labelWidth: 120, - menu: false, + menu: true, menuWidth: 140, dialogWidth: 600, dialogClickModal: false, @@ -143,13 +143,13 @@ export default { this.afterBoundDialog = true; } }, - rowDel() { + rowDel(row) { this.$confirm('此操作将永久删除该数据, 是否继续?', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', }).then(() => { - deleteById().then(res => { + deleteById(row.id).then(res => { this.$message({ type: 'success', message: '删除成功!', diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue index 6813fba..1dad2f5 100644 --- a/src/views/productionManagement/blbWorkOrder/components/glass.vue +++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue @@ -220,7 +220,7 @@ export default { column: [ { label: '当前工序', - prop: 'wpId', + prop: 'ppsName', fixed: 'left', search: false, sortable: true, @@ -283,22 +283,22 @@ export default { overHidden: true, width: 150, }, - { - label: '计划单号', - prop: 'poCode', - search: true, - sortable: true, - overHidden: true, - width: 150, - }, - { - label: '返工单号', - prop: 'qcReworkCode', - search: false, - sortable: true, - overHidden: true, - width: 150, - }, + // { + // label: '计划单号', + // prop: 'poCode', + // search: true, + // sortable: true, + // overHidden: true, + // width: 150, + // }, + // { + // label: '返工单号', + // prop: 'qcReworkCode', + // search: false, + // sortable: true, + // overHidden: true, + // width: 150, + // }, { label: '零件号', prop: 'partCode', @@ -317,7 +317,7 @@ export default { }, { label: '产品型号', - prop: 'productModel', + prop: 'productType', search: false, sortable: true, overHidden: true, @@ -325,7 +325,7 @@ export default { }, { label: '产品名称', - prop: 'false', + prop: 'partName', search: false, sortable: true, overHidden: true, @@ -418,7 +418,7 @@ export default { }, { label: '调度员', - prop: 'userName', + prop: 'dispatcherName', search: true, sortable: true, overHidden: true, @@ -427,7 +427,7 @@ export default { { label: '计划下达时间', - prop: 'planTime', + prop: 'sendDownTime', sortable: true, filter: true, searchLabelWidth: 90, @@ -445,7 +445,7 @@ export default { }, { label: '计划完工时间', - prop: 'planTime1', + prop: 'planEndDate', search: false, sortable: true, overHidden: true, @@ -633,4 +633,25 @@ export default { }; - + diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue index 6a63ede..7a32d88 100644 --- a/src/views/productionManagement/blbWorkOrder/components/others.vue +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -220,7 +220,7 @@ export default { column: [ { label: '当前工序', - prop: 'wpId', + prop: 'ppsName', fixed: 'left', search: false, sortable: true, @@ -283,22 +283,22 @@ export default { overHidden: true, width: 150, }, - { - label: '计划单号', - prop: 'poCode', - search: true, - sortable: true, - overHidden: true, - width: 150, - }, - { - label: '返工单号', - prop: 'qcReworkCode', - search: false, - sortable: true, - overHidden: true, - width: 150, - }, + // { + // label: '计划单号', + // prop: 'poCode', + // search: true, + // sortable: true, + // overHidden: true, + // width: 150, + // }, + // { + // label: '返工单号', + // prop: 'qcReworkCode', + // search: false, + // sortable: true, + // overHidden: true, + // width: 150, + // }, { label: '零件号', prop: 'partCode', @@ -317,7 +317,7 @@ export default { }, { label: '产品型号', - prop: 'productModel', + prop: 'productType', search: false, sortable: true, overHidden: true, @@ -325,7 +325,7 @@ export default { }, { label: '产品名称', - prop: 'false', + prop: 'partName', search: false, sortable: true, overHidden: true, @@ -418,7 +418,7 @@ export default { }, { label: '调度员', - prop: 'userName', + prop: 'dispatcherName', search: true, sortable: true, overHidden: true, @@ -427,7 +427,7 @@ export default { { label: '计划下达时间', - prop: 'planTime', + prop: 'sendDownTime', sortable: true, filter: true, selectWidth: 150, @@ -446,7 +446,7 @@ export default { }, { label: '计划完工时间', - prop: 'planTime1', + prop: 'planEndDate', search: false, sortable: true, overHidden: true, @@ -635,4 +635,25 @@ export default { }; - + diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index 0a0920c..f0306b9 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -233,7 +233,7 @@ export default { column: [ { label: '当前工序', - prop: 'wpId', + prop: 'ppsName', fixed: 'left', search: false, sortable: true, @@ -296,22 +296,22 @@ export default { overHidden: true, width: 150, }, - { - label: '计划单号', - prop: 'poCode', - search: true, - sortable: true, - overHidden: true, - width: 150, - }, - { - label: '返工单号', - prop: 'qcReworkCode', - search: false, - sortable: true, - overHidden: true, - width: 150, - }, + // { + // label: '计划单号', + // prop: 'poCode', + // search: true, + // sortable: true, + // overHidden: true, + // width: 150, + // }, + // { + // label: '返工单号', + // prop: 'qcReworkCode', + // search: false, + // sortable: true, + // overHidden: true, + // width: 150, + // }, { label: '零件号', prop: 'partCode', @@ -330,7 +330,7 @@ export default { }, { label: '产品型号', - prop: 'productModel', + prop: 'productType', search: false, sortable: true, overHidden: true, @@ -338,7 +338,7 @@ export default { }, { label: '产品名称', - prop: 'false', + prop: 'partName', search: false, sortable: true, overHidden: true, @@ -430,7 +430,7 @@ export default { }, { label: '调度员', - prop: 'userName', + prop: 'dispatcherName', search: true, sortable: true, overHidden: true, @@ -439,7 +439,7 @@ export default { { label: '计划下达时间', - prop: 'planTime', + prop: 'sendDownTime', sortable: true, filter: true, selectWidth: 150, @@ -458,7 +458,7 @@ export default { }, { label: '计划完工时间', - prop: 'planTime1', + prop: 'planEndDate', search: false, sortable: true, overHidden: true,