From 8ce9e095b0d0f37e4ac9ff7e11bb998ff1e9e5e5 Mon Sep 17 00:00:00 2001 From: taozi <1362265981@qq.com> Date: Mon, 22 Dec 2025 17:59:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/abnormalDialog.vue | 57 + .../blbWorkOrder/components/glass.vue | 2959 +++++++++++++++++ .../blbWorkOrder/components/others.vue | 2904 ++++++++++++++++ .../blbWorkOrder/index.vue | 764 +---- .../components/abnormalDialog.vue | 56 +- .../components/batchesDialog.vue | 66 +- .../productionMonitoring.vue | 159 +- .../productionManagement/reworkOrder.vue | 1 + .../sinTerWorkOrder/index.vue | 2821 ++++++++++++---- 9 files changed, 8382 insertions(+), 1405 deletions(-) create mode 100644 src/views/productionManagement/blbWorkOrder/components/abnormalDialog.vue create mode 100644 src/views/productionManagement/blbWorkOrder/components/glass.vue create mode 100644 src/views/productionManagement/blbWorkOrder/components/others.vue diff --git a/src/views/productionManagement/blbWorkOrder/components/abnormalDialog.vue b/src/views/productionManagement/blbWorkOrder/components/abnormalDialog.vue new file mode 100644 index 0000000..0c7b0cb --- /dev/null +++ b/src/views/productionManagement/blbWorkOrder/components/abnormalDialog.vue @@ -0,0 +1,57 @@ + + + + + + + + + 已完成 + 未完成 + + + + + + 取 消 + 保 存 + + + + + + + + \ No newline at end of file diff --git a/src/views/productionManagement/blbWorkOrder/components/glass.vue b/src/views/productionManagement/blbWorkOrder/components/glass.vue new file mode 100644 index 0000000..5e115bd --- /dev/null +++ b/src/views/productionManagement/blbWorkOrder/components/glass.vue @@ -0,0 +1,2959 @@ + + + + + + 过程记录打印 + + + 在制品 + 加工中 + 检验中 + 已完工 + + + 生产监控 + 关闭 + 分批 + + 异常申报 + + {{ row.makeTeam && row.makeTeam.tsName }} + {{ + row.procedureSet && row.procedureSet.ppsName + }} + + {{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : (row.planTime1 || '-') }} + + + {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : (row.planTime || '-') }} + + + {{ Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : (row.putStoreTime || '-') }} + + {{ + row.pjYieldOrder && row.pjYieldOrder.partCode + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.prodIdent + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.partName + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.plate + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.productType + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.useDept + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.poArea + }} + {{ + row.dispatcher && row.dispatcher.userName + }} + {{ + row.nextProcedureSet && row.nextProcedureSet.ppsName + }} + {{ + row.nextMakeTeam && row.nextMakeTeam.tsName + }} + {{ + row.pjYieldOrder && + row.pjYieldOrder.failureMan && + row.pjYieldOrder.failureMan.userName + }} + + + + + + + + + + 取 消 + 打 印 + + + + + + + + + + + + + + + + + + diff --git a/src/views/productionManagement/blbWorkOrder/components/others.vue b/src/views/productionManagement/blbWorkOrder/components/others.vue new file mode 100644 index 0000000..ee9f5ed --- /dev/null +++ b/src/views/productionManagement/blbWorkOrder/components/others.vue @@ -0,0 +1,2904 @@ + + + + + + 过程记录打印 + + + 在制品 + 加工中 + 检验中 + 已完工 + + + 生产监控 + 关闭 + 分批 + 优先级调整 + 异常申报 + + {{ row.makeTeam && row.makeTeam.tsName }} + {{ + row.procedureSet && row.procedureSet.ppsName + }} + + {{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : (row.planTime1 || '-') }} + + + {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : (row.planTime || '-') }} + + + {{ Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : (row.putStoreTime || '-') }} + + {{ + row.pjYieldOrder && row.pjYieldOrder.partCode + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.prodIdent + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.partName + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.plate + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.productType + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.useDept + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.poArea + }} + {{ + row.dispatcher && row.dispatcher.userName + }} + {{ + row.nextProcedureSet && row.nextProcedureSet.ppsName + }} + {{ + row.nextMakeTeam && row.nextMakeTeam.tsName + }} + {{ + row.pjYieldOrder && + row.pjYieldOrder.failureMan && + row.pjYieldOrder.failureMan.userName + }} + + + + + + + + + + 取 消 + 打 印 + + + + + + + + + + + + + + + + + + diff --git a/src/views/productionManagement/blbWorkOrder/index.vue b/src/views/productionManagement/blbWorkOrder/index.vue index ee2be0d..6380d14 100644 --- a/src/views/productionManagement/blbWorkOrder/index.vue +++ b/src/views/productionManagement/blbWorkOrder/index.vue @@ -1,95 +1,27 @@ - - - - - - - 删除 - - - 导入 - - - - - - - 是 - 否 - - - - - - + + + + + + - +} + \ No newline at end of file diff --git a/src/views/productionManagement/components/abnormalDialog.vue b/src/views/productionManagement/components/abnormalDialog.vue index 38c46c3..6de91a7 100644 --- a/src/views/productionManagement/components/abnormalDialog.vue +++ b/src/views/productionManagement/components/abnormalDialog.vue @@ -1,16 +1,19 @@ - + - - - - + + + + + + - + 需要 不需要 @@ -26,7 +29,7 @@ 取 消 - 保 存 + 确 认 @@ -58,29 +61,38 @@ export default { // 关闭弹窗 closeDialog() { this.$emit('closeDialog'); - this.$refs.batchesForm.resetFields(); + this.$refs.batchesForm.resetFields() + this.$refs.batchesForm.clearValidate() }, } } - \ No newline at end of file diff --git a/src/views/productionManagement/components/batchesDialog.vue b/src/views/productionManagement/components/batchesDialog.vue index 2db8f9d..b38d756 100644 --- a/src/views/productionManagement/components/batchesDialog.vue +++ b/src/views/productionManagement/components/batchesDialog.vue @@ -1,18 +1,17 @@ - - - - + + + + (1)返工:分批后剩余数量零件依据返工订单进行生产 + (2)关闭:分批后自动关闭剩余数量零件的生产 + (3)其他:分批后剩余数量零件排产后进行生产 + + + - + @@ -40,7 +39,7 @@ 取 消 - 保 存 + 确 认 @@ -56,7 +55,7 @@ export default { }, data() { return { - isOpen : false, + isOpen: false, batchesForm: {}, batchesRules: { makeQty: [{ required: true, message: '请输入分批数量', trigger: 'blur' }], @@ -73,28 +72,39 @@ export default { methods: { // 关闭弹窗 closeDialog() { - this.$emit('closeDialog'); + this.$emit('closeDialog') + this.$refs.batchesForm.resetFields() }, } } - \ No newline at end of file diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue index 52e19c3..0b4c129 100644 --- a/src/views/productionManagement/productionMonitoring.vue +++ b/src/views/productionManagement/productionMonitoring.vue @@ -5,8 +5,8 @@ @row-del="rowDel" @search-change="searchChange" @search-reset="searchReset" @selection-change="selectionChange" @current-change="currentChange" @size-change="sizeChange" @refresh-change="refreshChange" @on-load="onLoad"> - 过程记录打印 - 打印标签 + 过程记录打印 + 打印标签 @@ -26,7 +26,7 @@ 关闭 更多 @@ -35,12 +35,11 @@ - / - 分批 - 外协 + + 分批 + 外协 - 优先级调整 - 异常申报 + 优先级调整 + 异常申报 + @submitPriority="handlePrioritySubmit"> @@ -245,7 +252,7 @@ export default { }, ], }, - + { label: "当前工序", prop: "ppsName", @@ -279,7 +286,7 @@ export default { }, { label: "订单状态", - prop: "runStatus", + prop: "runStatusTitle", type: "select", search: true, sortable: true, @@ -529,7 +536,7 @@ export default { // }, // ], // }, - { + { label: "MES流程卡号", prop: "false", search: false, @@ -604,8 +611,7 @@ export default { }, ], }, - - { + { label: "单批次面积", prop: "batchArea", search: false, @@ -620,7 +626,7 @@ export default { }, ], }, - { + { label: "订单优先级", prop: "priorityTitle", type: "select", @@ -733,61 +739,77 @@ export default { }, ], }, - { + { label: "计划下达时间", prop: "planTime", - search: true, sortable: true, - overHidden: true, - type: "datetimerange", + filter: true, + selectWidth: 150, + span: 12, + search: true, + width: 200, + searchSpan: 8, + type: 'datetimerange', format: 'YYYY-MM-DD HH:mm:ss', valueFormat: 'YYYY-MM-DD HH:mm:ss', - startPlaceholder: '时间日期开始', - endPlaceholder: '时间日期结束', - width: 200, + startPlaceholder: '开始日期', + endPlaceholder: '结束日期', + rangeSeparator: '-', + searchRange: true, rules: [ { required: true, - message: "请输入计划下达时间", - trigger: "blur", + message: "请选择日期范围", + trigger: "change", }, ], - }, { + }, + { label: "计划完工时间", prop: "planEndDate", search: false, sortable: true, overHidden: true, + type: "datetimerange", + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + startPlaceholder: '时间日期开始', + endPlaceholder: '时间日期结束', width: 200, rules: [ { required: true, - message: "请输入计划完工时间", + message: "请输入计划下达时间", trigger: "blur", }, ], }, + { label: "镀后入库时间", prop: "putStoreTime", - search: true, sortable: true, - overHidden: true, + filter: true, + span: 12, + search: true, + searchSpan: 8, width: 200, - type: "datetimerange", - format: 'yyyy-MM-DD HH:mm:ss', - valueFormat: 'yyyy-MM-DD HH:mm:ss', - startPlaceholder: '时间日期开始', - endPlaceholder: '时间日期结束', + type: 'datetimerange', + format: 'YYYY-MM-DD HH:mm:ss', + valueFormat: 'YYYY-MM-DD HH:mm:ss', + startPlaceholder: '开始日期', + endPlaceholder: '结束日期', + rangeSeparator: '-', + searchRange: true, rules: [ { required: true, - message: "请输入镀后入库时间", - trigger: "blur", + message: "请选择日期范围", + trigger: "change", }, ], }, - + { label: "外协状态", prop: "oemType", @@ -890,9 +912,9 @@ export default { }, ], }, - - - + + + // { // label: "已入库数量", // prop: "inventoryQty", @@ -993,7 +1015,7 @@ export default { // }, // ], // }, - + { label: "备注", prop: "memo", @@ -1043,12 +1065,15 @@ export default { mounted() { }, methods: { // 优先级调整 - priorityFn() { - this.isPriorityOpen = true - }, - handlePrioritySubmit(data) { - this.$message.success(`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}`); - }, + priorityFn(row) { + this.rowItem = row; + console.log(row.runStatus, 123) + this.isPriorityOpen = true + // console.log(runStatus,123) + }, + handlePrioritySubmit(data) { + this.$message.success(`优先级已调整为${data.priority === 1 ? '一级' : data.priority === 2 ? '二级' : '三级'}`); + }, selectionChange(val) { this.selectionList = val; }, @@ -1127,9 +1152,13 @@ export default { } else { } }, - //查询【加工中3、工艺变更5、检验中4、审理中6】状态的订单 + //查询【生产中3、工艺变更5、检验中4、审理中6】状态的订单 queryOrdersHandle() { - + 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() { @@ -1350,7 +1379,7 @@ export default { nowWorkCenter: null, oem: false, oemOut: true, - oemType: 1, + oemType: -1, oldRunStatus: null, orderMarkTitle: "热表中心", orderWoCode: "WO-2303122891-R01", @@ -1476,7 +1505,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 3, - runStatusTitle: "加工中", + runStatusTitle: "生产中", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-03-28 10:01:18", @@ -1677,7 +1706,7 @@ export default { nowWorkCenter: null, oem: false, oemOut: true, - oemType: 1, + oemType: -1, oldRunStatus: null, orderMarkTitle: "热表中心", orderWoCode: "WO-2303123426-R01", @@ -1803,7 +1832,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 2, - runStatusTitle: "加工中", + runStatusTitle: "待生产", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-03-28 16:29:14", @@ -2133,7 +2162,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 4, - runStatusTitle: "加工中", + runStatusTitle: "检验中", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-04-10 21:17:11", @@ -2324,7 +2353,7 @@ export default { nowWorkCenter: null, oem: false, oemOut: true, - oemType: 1, + oemType: -1, oldRunStatus: null, orderMarkTitle: "热表中心", orderWoCode: "WO-2303122891-R01", @@ -2450,7 +2479,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 6, - runStatusTitle: "加工中", + runStatusTitle: "审理中", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-03-28 10:01:18", @@ -2641,7 +2670,7 @@ export default { nowWorkCenter: null, oem: false, oemOut: true, - oemType: 1, + oemType: -1, oldRunStatus: null, orderMarkTitle: "热表中心", orderWoCode: "WO-2303122891-R01", @@ -2767,7 +2796,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 5, - runStatusTitle: "加工中", + runStatusTitle: "工艺变更", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-03-28 10:01:18", @@ -2958,7 +2987,7 @@ export default { nowWorkCenter: null, oem: false, oemOut: true, - oemType: 1, + oemType: -1, oldRunStatus: null, orderMarkTitle: "热表中心", orderWoCode: "WO-2303122891-R01", @@ -3084,7 +3113,7 @@ export default { reworkNo: null, rsCode: null, runStatus: 19, - runStatusTitle: "加工中", + runStatusTitle: "已返工", schedStatus: 0, scrapQty: 0.0, sendDownTime: "2023-03-28 10:01:18", @@ -3100,7 +3129,7 @@ export default { ybCode: null, ybLocal: null, }, - + ]; this.page.total = this.data.length; }, diff --git a/src/views/productionManagement/reworkOrder.vue b/src/views/productionManagement/reworkOrder.vue index 77fa280..1567185 100644 --- a/src/views/productionManagement/reworkOrder.vue +++ b/src/views/productionManagement/reworkOrder.vue @@ -44,6 +44,7 @@ export default { editBtnIcon: " ", labelWidth: "200px", dialogWidth: 600, + menuWidth: 80, dialogClickModal: false, searchEnter: true, filterBtn: true, diff --git a/src/views/productionManagement/sinTerWorkOrder/index.vue b/src/views/productionManagement/sinTerWorkOrder/index.vue index e9fe838..0777159 100644 --- a/src/views/productionManagement/sinTerWorkOrder/index.vue +++ b/src/views/productionManagement/sinTerWorkOrder/index.vue @@ -1,98 +1,150 @@ - - + + - 删除 + 过程记录打印 + 打印标签 + 配套单打印 - 导入 + 在制品 + 加工中 + 检验中 + 已完工 - - - - 是 - 否 + + 生产监控 + 关闭 + 分批 + 优先级调整 + 异常申报 + + {{ row.makeTeam && row.makeTeam.tsName }} + {{ + row.procedureSet && row.procedureSet.ppsName + }} + + {{ Array.isArray(row.planTime1) ? row.planTime1.join(' ~ ') : (row.planTime1 || '-') }} + + + {{ Array.isArray(row.planTime) ? row.planTime.join(' ~ ') : (row.planTime || '-') }} + + + {{ Array.isArray(row.putStoreTime) ? row.putStoreTime.join(' ~ ') : (row.putStoreTime || '-') }} + {{ + row.pjYieldOrder && row.pjYieldOrder.partCode + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.prodIdent + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.partName + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.plate + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.productType + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.useDept + }} + {{ + row.pjYieldOrder && row.pjYieldOrder.poArea + }} + {{ + row.dispatcher && row.dispatcher.userName + }} + {{ + row.nextProcedureSet && row.nextProcedureSet.ppsName + }} + {{ + row.nextMakeTeam && row.nextMakeTeam.tsName + }} + {{ + row.pjYieldOrder && + row.pjYieldOrder.failureMan && + row.pjYieldOrder.failureMan.userName + }} - - + + + + + + + + + 取 消 + 打 印 + + + + + + + + + + + + + +
(1)返工:分批后剩余数量零件依据返工订单进行生产
(2)关闭:分批后自动关闭剩余数量零件的生产
(3)其他:分批后剩余数量零件排产后进行生产