From a192359bdb64aba47991744e8bda74c0b6232c8c Mon Sep 17 00:00:00 2001 From: zhangdi <1104545947@qq.com> Date: Mon, 30 Mar 2026 14:30:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=9B=91=E6=8E=A7=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/desk/myMessage.vue | 13 +- .../components/addTemplateDialog.vue | 4 +- .../processManagement/inPlantProcess.vue | 22 +- src/views/processManagement/taskDispatch.vue | 2 +- src/views/workRate/index.vue | 932 ++++++++++-------- 5 files changed, 530 insertions(+), 443 deletions(-) diff --git a/src/views/desk/myMessage.vue b/src/views/desk/myMessage.vue index 1845b63..438da43 100644 --- a/src/views/desk/myMessage.vue +++ b/src/views/desk/myMessage.vue @@ -251,12 +251,15 @@ export default { } }, onLoad(page, params = {}) { - getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { - const data = res.data.data; - this.page.total = data.total; - this.data = data.records; + // getList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => { + // const data = res.data.data; + // this.page.total = data.total; + // this.data = data.records; + // this.loading = false; + // }); + + this.data = [] this.loading = false; - }); }, }, }; diff --git a/src/views/processManagement/components/addTemplateDialog.vue b/src/views/processManagement/components/addTemplateDialog.vue index 8ee8043..b7367c3 100644 --- a/src/views/processManagement/components/addTemplateDialog.vue +++ b/src/views/processManagement/components/addTemplateDialog.vue @@ -792,7 +792,7 @@ export default { type: 'success', message: '操作成功!', }); - // this.$emit('closeDialog'); + this.$emit('closeDialog'); this.getDetail() }) .catch(err => { @@ -807,7 +807,7 @@ export default { type: 'success', message: '操作成功!', }); - // this.$emit('closeDialog'); + this.$emit('closeDialog'); this.getDetail() }) .catch(err => { diff --git a/src/views/processManagement/inPlantProcess.vue b/src/views/processManagement/inPlantProcess.vue index b6a2e96..ec2fe0f 100644 --- a/src/views/processManagement/inPlantProcess.vue +++ b/src/views/processManagement/inPlantProcess.vue @@ -136,17 +136,17 @@ export default { align: 'left', searchLabelWidth: 60, }, - { - label: '产线', - prop: 'equipmentName', - search: true, - sortable: true, - filter: true, - span: 12, - headerAlign: 'center', - align: 'left', - searchLabelWidth: 45, - }, + // { + // label: '产线', + // prop: 'equipmentName', + // search: true, + // sortable: true, + // filter: true, + // span: 12, + // headerAlign: 'center', + // align: 'left', + // searchLabelWidth: 45, + // }, { label: '确认编号', prop: 'confirmCondition', diff --git a/src/views/processManagement/taskDispatch.vue b/src/views/processManagement/taskDispatch.vue index 9c43e8a..9fafab8 100644 --- a/src/views/processManagement/taskDispatch.vue +++ b/src/views/processManagement/taskDispatch.vue @@ -74,7 +74,7 @@ export default { border: true, index: true, selection: true, - selectable: (row, index) => row.children.length === 0, + selectable:true, viewBtn: false, delBtn: false, editBtn: false, diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue index d18eb0a..87ec351 100644 --- a/src/views/workRate/index.vue +++ b/src/views/workRate/index.vue @@ -7,345 +7,287 @@ @close="closeDialog" fullscreen > - - - -
-
车间订单号：{{ detailsForm.orderWoCode||'' }}
-
流程卡号：{{ detailsForm.cardNo||'' }}
-
- 零件号： - {{ detailsForm.partCode||'' }} -
-
批次号：{{ detailsForm.batchNo||'' }}
-
订单数量：{{ detailsForm.poQty||'' }}
-
状态：{{ detailsForm.curStatus||'' }}
-
- 优先级： - {{ detailsForm.priority||'' }} -
-
- 调度员：{{ detailsForm.dispatcher === null ? '' : detailsForm.userName }} -
-
订单下达：{{ detailsForm.sendDownTime||'' }}
-
生产数量：{{ detailsForm.makeQty ||''}}
-
零件名称：{{ detailsForm.dsPart.partName||'' }}
-
产品型号：{{ detailsForm.dsPart.productType||'' }}
-
硬度：{{ detailsForm.dsPart.hardness||'' }}
-
计划完工：{{ detailsForm.planEndDate ||''}}
-
- 需求交期：{{ detailsForm.priority === 4 ? detailsForm.demandDate : '' }} -
-
镀种：{{ detailsForm.dsPart.plate||'' }}
-
面积(dm²)：{{ detailsForm.dsPart.area ||''}}
-
材料：{{ detailsForm.dsPart.material||'' }}
-
生产标识：{{ detailsForm.prodIdent||'' }}
-
镀后入库：{{ detailsForm.putStoreTime ||''}}
-
标记要求：{{ detailsForm.dsPart.signMemo||'' }}
-
关键信息：{{ detailsForm.dsPart.cruxMemo ||''}}
-
试验数量：{{ detailsForm.testQty ||''}}
-
消耗数量：{{ detailsForm.lossQty ||''}}
-
- 是否印字： - 否 - 单 - 双 -
-
工艺路线：{{ detailsForm.dsPart.craftWay ||''}}
-
- 返工单号： - {{ detailsForm.qcReworkCode||'' }} -
-
- 涂色标个数：{{ detailsForm.dsPart.tsbNum }} -
-
- 涂色带个数：{{ detailsForm.dsPart.tsdNum||'' }} -
-
- 涂箭头个数：{{ detailsForm.dsPart.tjtNum ||''}} -
-
产品系列：{{ detailsForm.dsPart.productSeries||'' }}
-
工作订单备注：{{ detailsForm.poMemo||'' }}
-
- 会议要求周期：{{ detailsForm.priority === 4 ? detailsForm.meetCycle : '' }} -
-
- 审理单号： - {{ detailsForm.reworkCode||'' }} +
+
+ {{ item.label }}： + {{ item.value }} + {{ item.value }} + {{ item.value }} +
+ + +
+ + {{ orderInfoExpanded ? '收起 ▲' : '展开更多 ▼' }} + +
+
+ +
+
+
+ +
+ +
-
-
- - -
-
- +
+
{{ item.orders + '-' + item.ppsName }}
+
+ + + + +
- -
-
-
{{ item.orders + '-' + item.ppsName }}
-
- - - - + +
+ 班组： + + {{ item.makeTeam }} + +
+ +
+ + 接收人： + + {{ item.status != 1 && item.receiveManName ? item.receiveManName : '-' }} + +
+ +
+ 计划加工人： + + {{ item.planWorkMan }} + +
+ +
+ 报工人/数量： + + {{ item.workManName }}/{{ item.workQty }} + + -
-
- -
- 班组： - - {{ item.makeTeam }} - -
- -
- - 接收人： - - {{ item.status != 1 && item.receiveManName ? item.receiveManName : '-' }} - -
- -
- 计划加工人： - - {{ item.planWorkMan }} - -
- -
- 报工人/数量： - - {{ item.workManName }}/{{ item.workQty }} - - - -
- -
- - 额定/实际工时(min)： - {{ item.hourQuota }}/{{ item.hourActual }} -
- -
- - 计划开始： - - {{ item.planStartTime }} - -
-
- - 计划结束： - - {{ item.planEndTime }} - -
- -
- - 实际开始： - {{ item.factStartTime || '-' }} -
-
- - 实际结束： - - {{ item.factEndTime || '-' }} -
+ +
+ + 额定/实际工时(min)： + {{ item.hourQuota }}/{{ item.hourActual }} +
+ +
+ + 计划开始： + + {{ item.planStartTime }} + +
+
+ + 计划结束： + + {{ item.planEndTime }} + +
+ +
+ + 实际开始： + {{ item.factStartTime || '-' }} +
+
+ + 实际结束： + {{ item.factEndTime || '-' }}
-
-
-
工序详情
- - {{ - processDetails.qualifiedQty - }} - {{ - selectedItemInfo.planStartTime - }} - {{ - selectedItemInfo.planEndTime - }} - {{ - processDetails.receiveMan - }} - {{ - selectedItemInfo.factStartTime - }} - {{ - selectedItemInfo.planEndTime - }} - {{ - processDetails.testQty - }} - {{ - processDetails.lossQty - }} - {{ - processDetails.scrapQty - }} - -
-
-
加工记录
- - - - - - - -
-
-
转试记录
- - - - - - -
-
+
+
+
工序详情
+ + {{ + processDetails.qualifiedQty + }} + {{ + selectedItemInfo.planStartTime + }} + {{ + selectedItemInfo.planEndTime + }} + {{ + processDetails.receiveMan + }} + {{ + selectedItemInfo.factStartTime + }} + {{ + selectedItemInfo.planEndTime + }} + {{ + processDetails.testQty + }} + {{ + processDetails.lossQty + }} + {{ + processDetails.scrapQty + }} + +
+
+
加工记录
+ -
同槽信息
- - - - - - - - - -
-
+ + + + + +
+
+
转试记录
+ + + + + + +
+
+
同槽信息
+ + + + + + + + + +
+
+
设备使用详情
+ -
设备使用详情
- - - - - - -
-
-
检验记录
- - - {{ processDetails.checkQty }} - - - {{ processDetails.qualifiedQty }} - - - {{ processDetails.unqualifiedQty }} - - - {{ processDetails.lossQty }} - - - {{ processDetails.scrapQty }} - - - {{ processDetails.reworkQty }} - - - {{ processDetails.checkMemo }} - - -
-
+ + + + +
+
+
检验记录
+ + + {{ processDetails.checkQty }} + + + {{ processDetails.qualifiedQty }} + + + {{ processDetails.unqualifiedQty }} + + + {{ processDetails.lossQty }} + + + {{ processDetails.scrapQty }} + + + {{ processDetails.reworkQty }} + + + {{ processDetails.checkMemo }} + + +
+
+
检验项
+ -
检验项
- - - - - - - - - - - - - - - -
-
-
- 过程质量记录 - -
-
-
- - - - -