From 375d08dd1c23523c94aefb98016a7093515303b4 Mon Sep 17 00:00:00 2001 From: zhangdi <15053473693@163.com> Date: Tue, 27 Jan 2026 14:05:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../productionMonitoring.js | 10 ++ .../blbWorkOrder/components/glass.vue | 71 ++++++------ .../blbWorkOrder/components/others.vue | 104 +++++++----------- .../components/batchesDialog.vue | 26 +++-- .../components/outsourceDialog.vue | 48 ++++++-- .../components/productionMonitoringDialog.vue | 10 +- .../productionMonitoring.vue | 66 ++++------- .../sinTerWorkOrder/index.vue | 47 ++++---- 8 files changed, 191 insertions(+), 191 deletions(-) diff --git a/src/api/productionManagement/productionMonitoring.js b/src/api/productionManagement/productionMonitoring.js index 39ece0a..88307e7 100644 --- a/src/api/productionManagement/productionMonitoring.js +++ b/src/api/productionManagement/productionMonitoring.js @@ -63,3 +63,13 @@ export const updateStatus = data => { data: data, }); }; + + +// 转烧结 +export const turnType = data => { + return request({ + url: '/blade-desk/workOrder/turnType', + method: 'post', + data: data, + }); +}; \ No newline at end of file diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue index e74e800..3e1d6bc 100644 --- a/src/views/productionManagement/blbWorkOrder/components/glass.vue +++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue @@ -19,19 +19,19 @@ > @@ -72,16 +74,29 @@ @closeDialog="closeDialog" > - + - + - + @@ -105,9 +120,9 @@ export default { }, data() { return { + itemData: [], //存数据 isPriorityOpen: false, showAbnormal: false, - showRadio: true, monitorDialog: false, showBatches: false, showClose: false, @@ -172,7 +187,6 @@ export default { align: 'center', column: [ { - label: '当前工序', prop: 'wpId', fixed: 'left', @@ -460,7 +474,6 @@ export default { }, mounted() {}, methods: { - //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单 queryOrdersHandle(status) { this.query = { @@ -470,25 +483,20 @@ export default { }, // 优先级调整 priorityFn(row) { - this.rowItem = row; - console.log(row.runStatus, 123); + this.itemData = [row]; this.isPriorityOpen = true; - // console.log(runStatus,123) - }, - handlePrioritySubmit(data) { - this.$message.success( - `优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}` - ); }, selectionChange(val) { this.selectionList = val; }, // 分批 - handleBatches() { + handleBatches(row) { + this.itemData = [row]; this.showBatches = true; }, // 关闭 - handleClose() { + handleClose(row) { + this.itemData = [row]; this.showClose = true; }, // 生产监控 @@ -515,17 +523,9 @@ export default { } }); }, - // 配套单打印 - handlePrint() {}, - processingHandle() { - const targetStatuses = [3, 5, 4, 6]; - const filteredData = this.data.filter(item => targetStatuses.includes(item.runStatus)); - const originalData = [...this.data]; - this.data = filteredData; - this.$message.success(`已筛选出${filteredData.length}条符合条件的订单`); - }, // 异常申报 - handleAbnormal() { + handleAbnormal(row) { + this.itemData = [row]; this.showAbnormal = true; }, // 关闭弹窗 @@ -535,12 +535,15 @@ export default { this.showClose = false; this.showAbnormal = false; this.isPriorityOpen = false; + this.onLoad(this.page, this.query); }, currentChange(currentPage) { this.page.currentPage = currentPage; + this.onLoad(this.page, this.query); }, sizeChange(pageSize) { this.page.pageSize = pageSize; + this.onLoad(this.page, this.query); }, refreshChange() { this.onLoad(this.page, this.query); @@ -548,7 +551,7 @@ export default { searchReset() { this.query = {}; this.treeDeptId = ''; - this.onLoad(this.page); + this.onLoad(this.page, this.query); }, searchChange(params, done) { this.query = params; diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue index c678e42..717810c 100644 --- a/src/views/productionManagement/blbWorkOrder/components/others.vue +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -19,19 +19,19 @@ > - - - - - - - - - - - - - - - - @@ -104,16 +74,29 @@ @closeDialog="closeDialog" > - + - - - + + + @@ -122,10 +105,11 @@ import productionDialog from '../../components/productionDialog.vue'; import batchesDialog from '../../components/batchesDialog.vue'; import closedDialog from '../../components/closedDialog.vue'; -import abnormalDialog from '../../components/abnormalDialog.vue'; +import abnormalDialog from './abnormalDialog.vue'; import productionMonitoringDialog from '../../components/productionMonitoringDialog.vue'; import { getList } from '@/api/productionManagement/sinTerWorkOrder'; + export default { components: { productionDialog, @@ -136,9 +120,9 @@ export default { }, data() { return { + itemData: [], //存数据 isPriorityOpen: false, showAbnormal: false, - showRadio: true, monitorDialog: false, showBatches: false, showClose: false, @@ -499,25 +483,20 @@ export default { }, // 优先级调整 priorityFn(row) { - this.rowItem = row; - console.log(row.runStatus, 123); + this.itemData = [row]; this.isPriorityOpen = true; - // console.log(runStatus,123) - }, - handlePrioritySubmit(data) { - this.$message.success( - `优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}` - ); }, selectionChange(val) { this.selectionList = val; }, // 分批 - handleBatches() { + handleBatches(row) { + this.itemData = [row]; this.showBatches = true; }, // 关闭 - handleClose() { + handleClose(row) { + this.itemData = [row]; this.showClose = true; }, // 生产监控 @@ -544,17 +523,9 @@ export default { } }); }, - // 配套单打印 - handlePrint() {}, - processingHandle() { - const targetStatuses = [3, 5, 4, 6]; - const filteredData = this.data.filter(item => targetStatuses.includes(item.runStatus)); - const originalData = [...this.data]; - this.data = filteredData; - this.$message.success(`已筛选出${filteredData.length}条符合条件的订单`); - }, // 异常申报 - handleAbnormal() { + handleAbnormal(row) { + this.itemData = [row]; this.showAbnormal = true; }, // 关闭弹窗 @@ -564,12 +535,15 @@ export default { this.showClose = false; this.showAbnormal = false; this.isPriorityOpen = false; + this.onLoad(this.page, this.query); }, currentChange(currentPage) { this.page.currentPage = currentPage; + this.onLoad(this.page, this.query); }, sizeChange(pageSize) { this.page.pageSize = pageSize; + this.onLoad(this.page, this.query); }, refreshChange() { this.onLoad(this.page, this.query); @@ -577,7 +551,7 @@ export default { searchReset() { this.query = {}; this.treeDeptId = ''; - this.onLoad(this.page); + this.onLoad(this.page, this.query); }, searchChange(params, done) { this.query = params; diff --git a/src/views/productionManagement/components/batchesDialog.vue b/src/views/productionManagement/components/batchesDialog.vue index 034e4fa..ec76805 100644 --- a/src/views/productionManagement/components/batchesDialog.vue +++ b/src/views/productionManagement/components/batchesDialog.vue @@ -37,8 +37,8 @@ :min="1" > - - + + @@ -73,7 +73,7 @@ export default { batchesForm: {}, batchesRules: { makeQty: [{ required: true, message: '请输入分批数量', trigger: 'blur' }], - reason: [{ required: true, message: '请选择分批原因', trigger: 'blur' }], + batchReason: [{ required: true, message: '请选择分批原因', trigger: 'blur' }], }, }; }, @@ -87,12 +87,20 @@ export default { submit() { this.$refs.batchesForm.validate(valid => { if (valid) { - // inBatches(this.batchesForm).then((res) => { - // if (res.code == 200) { - // this.$message.success('操作成功'); - // this.closeDialog(); - // } - // }); + let query = { + id: this.itemData[0].woId, + batchNo: this.itemData[0].batchNo, + cardNo: this.itemData[0].cardNo, + woCode: this.itemData[0].woCode, + makeQty: this.batchesForm.makeQty, + batchReason: this.batchesForm.batchReason, + }; + inBatches(query).then((res) => { + if (res.code == 200) { + this.$message.success('操作成功'); + this.closeDialog(); + } + }); } else { console.log('error submit!!'); return false; diff --git a/src/views/productionManagement/components/outsourceDialog.vue b/src/views/productionManagement/components/outsourceDialog.vue index 7ff5432..47b8c6e 100644 --- a/src/views/productionManagement/components/outsourceDialog.vue +++ b/src/views/productionManagement/components/outsourceDialog.vue @@ -4,13 +4,18 @@ title="转外协" append-to-body :modelValue="showDialog" - width="90%" + width="60%" @close="closeDialog" @open="handleOpen" > - - - + + + @@ -27,7 +32,7 @@ label="工序名称" prop="prWorkPlan.procedureSet.ppsName" > - + - + @@ -54,22 +59,23 @@