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/reportCorrect.vue | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index a9126cf..747064d 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -34,10 +34,13 @@
<el-form-item label="宸ュ崟缂栫爜" style=" display: flex;">
<el-input v-model="form.wo_code" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
+ <el-form-item label="璁㈠崟鍙�" style=" display: flex;">
+ <el-input v-model="form.orderno" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
<el-form-item label="浜у搧缂栫爜" style=" display: flex;">
<el-input v-model="form.partnumber" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
- <el-form-item label="浜у搧鍚嶇О" style=" display: flex;">
+ <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
<el-input v-model="form.partname" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item v-show="isExpandForm" label="浜у搧瑙勬牸" style=" display: flex;">
@@ -108,10 +111,10 @@
ref="tableDataRef"
class="tableFixed"
:data="tableData"
- :height="isExpandForm?tableHeight:(tableHeight+40)+'px'"
+ :height="isExpandForm?tableHeight:(tableHeight+80)+'px'"
border
row-class-name="custom-row"
- :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+40)+'px',}"
+ :style="{width: 100+'%',height:isExpandForm?tableHeight:(tableHeight+80)+'px',}"
highlight-current-row
:header-cell-style="this.$headerCellStyle"
:cell-style="this.$cellStyle"
@@ -136,6 +139,17 @@
min-width="160"
show-overflow-tooltip
/>
+ <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="partnumber"
label="浜у搧缂栫爜"
@@ -328,6 +342,12 @@
<el-form-item label="宸ュ崟缂栧彿" class="dialogFormItem">
<div style="width: 200px;">
{{ dialogForm.wo_code }}
+ </div>
+ <!-- <el-input v-model="dialogForm.postcode" style="width: 200px" />-->
+ </el-form-item>
+ <el-form-item label="璁㈠崟鍙�" class="dialogFormItem">
+ <div style="width: 200px;">
+ {{ dialogForm.m_po }}
</div>
<!-- <el-input v-model="dialogForm.postcode" style="width: 200px" />-->
</el-form-item>
@@ -561,6 +581,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ orderno: '',
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -715,7 +736,7 @@
reportuser: this.form.reportuser,
stepcode: this.form.stepcode,
reportdate: tempDate,
-
+ orderno: this.form.orderno,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -742,6 +763,7 @@
reset() {
this.form.wkshopcode = ''
this.form.wo_code = ''
+ this.form.orderno = ''
this.form.partnumber = ''
this.form.partname = ''
this.form.partspec = ''
@@ -766,6 +788,7 @@
if (res.code === '200') {
this.dialogForm.id = row.id
this.dialogForm.sbid = row.sbid
+ this.dialogForm.m_po = row.m_po
this.dialogForm.wo_code = row.wo_code
this.dialogForm.partnumber = row.partnumber
this.dialogForm.partname = row.partname
@@ -874,7 +897,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 255
+ this.tableHeight = this.mainHeight - 295
this.$refs.tableDataRef.doLayout()
})
}
--
Gitblit v1.9.3