From c4d59de5b8132c70ae4dc64e4309fc6d761b111d Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 16 十二月 2025 09:24:56 +0800
Subject: [PATCH] 1.工艺模式 生产工单带工序改为默认历史最新2.生产执行新增 订单号字段
---
src/views/produce/stepReport.vue | 70 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 21 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index d76d562..80c5d05 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -75,16 +75,24 @@
:name="'produceCode'+item.code"
placeholder="璇锋壂鎻忔垨杈撳叆"
style="width: 300px"
-
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
+
+ <el-form-item label="璁㈠崟鍙�" style=" display: flex;">
+ <el-input
+ v-model="form.orderno"
+ placeholder="璇疯緭鍏�"
+ style="width: 200px"
+ @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
+ />
+ </el-form-item>
+
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input
v-model="form.partcode"
placeholder="璇疯緭鍏�"
style="width: 200px"
-
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -92,18 +100,16 @@
<el-input
v-model="form.partname"
placeholder="璇疯緭鍏�"
-
style="width: 200px"
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
- <el-form-item label="杞﹂棿鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="杞﹂棿鍚嶇О" style=" display: flex;">
<el-select
v-model="form.wkshopcode"
filterable
:popper-append-to-body="false"
style="width: 200px"
-
placeholder="璇烽�夋嫨"
>
<el-option
@@ -130,21 +136,21 @@
</el-form>
<div
class="bodyTopFormExpand"
- style="height:5px"
+ style="height:10px"
>
- <!-- <svg-icon-->
- <!-- v-show="mouseHoverType==='mouseout'"-->
- <!-- style="cursor: pointer"-->
- <!-- :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"-->
- <!-- @mouseenter="mouseHoverType=$event.type"-->
- <!-- />-->
- <!-- <svg-icon-->
- <!-- v-show="mouseHoverType==='mouseenter'"-->
- <!-- style="cursor: pointer"-->
- <!-- :icon-class="!isExpandForm?'doubleDown':'doubleUp'"-->
- <!-- @click="isExpandForm=!isExpandForm"-->
- <!-- @mouseout="mouseHoverType=$event.type"-->
- <!-- />-->
+ <svg-icon
+ v-show="mouseHoverType==='mouseout'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown3':'doubleUp3'"
+ @mouseenter="mouseHoverType=$event.type"
+ />
+ <svg-icon
+ v-show="mouseHoverType==='mouseenter'"
+ style="cursor: pointer"
+ :icon-class="!isExpandForm?'doubleDown':'doubleUp'"
+ @click="isExpandForm=!isExpandForm"
+ @mouseout="mouseHoverType=$event.type"
+ />
</div>
</div>
@@ -154,10 +160,10 @@
:key="'tableDataRef'+item.code"
class="tableFixed"
:data="tableData"
- :height="tableHeight+50"
+ :height="isExpandForm?(tableHeight+10):(tableHeight+50)+'px'"
border
row-class-name="custom-row"
- :style="{width: 100+'%',height:tableHeight+'px'}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
highlight-current-row
:header-cell-style="headerCellStyle()"
:cell-style="cellStyle()"
@@ -206,6 +212,17 @@
show-tooltip-when-overflow
sortable="custom"
/>
+ <el-table-column
+ prop="m_po"
+ label="璁㈠崟鍙�"
+ min-width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.m_po?row.m_po:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
@@ -423,6 +440,9 @@
<el-divider v-if="activeName==='涓嶈壇寰呭鐞�'" content-position="left">寰呭鐞嗕俊鎭�</el-divider>
<el-form-item label="宸ュ崟缂栧彿" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.wo_code }}</div>
+ </el-form-item>
+ <el-form-item label="璁㈠崟鍙�" class="dialogFormItem">
+ <div class="dialogFormItemDiv">{{ dialogForm.orderno? dialogForm.orderno:'/' }}</div>
</el-form-item>
<el-form-item label="浜у搧缂栫爜" class="dialogFormItem">
<div class="dialogFormItemDiv">{{ dialogForm.partnumber }}</div>
@@ -982,11 +1002,14 @@
directives: { elDragDialog, waves },
data() {
return {
+ mouseHoverType: 'mouseout',
+ isExpandForm: false,
mainHeight: 0,
tableHeight: 0,
form: {
wkshopcode: '',
wocode: '', // 宸ュ崟鍙�
+ orderno: '', // 璁㈠崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
partspec: '', // 浜у搧瑙勬牸
@@ -1014,6 +1037,7 @@
dialogForm: {
'wo_code': '',
'partnumber': '',
+ 'orderno': '',
'partname': '',
'partspec': '',
'seq': '',
@@ -1285,6 +1309,7 @@
res = res.data
this.dialogForm.wo_code = res.data1.wo_code
this.dialogForm.partnumber = res.data1.partnumber
+ this.dialogForm.orderno = res.data1.orderno
this.dialogForm.partname = res.data1.partname
this.dialogForm.partspec = res.data1.partspec
this.dialogForm.seq = res.data1.seq
@@ -1327,6 +1352,7 @@
res = res.data
this.dialogForm.wo_code = res.wo_code
this.dialogForm.partnumber = res.partnumber
+ this.dialogForm.orderno = res.orderno
this.dialogForm.partname = res.partname
this.dialogForm.partspec = res.partspec
this.dialogForm.seq = res.seq
@@ -1368,6 +1394,7 @@
this.dialogForm = {
'wo_code': '',
'partnumber': '',
+ 'orderno': '',
'partname': '',
'partspec': '',
'seq': '',
@@ -1726,6 +1753,7 @@
reset() {
this.form.wkshopcode = ''
this.form.wocode = ''
+ this.form.orderno = ''
this.form.workOrderCurrentValue = ''
this.form.partcode = ''
this.form.partname = ''
--
Gitblit v1.9.3