From c4f9bd78eddffb42b591990d80125a7655c16a98 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期四, 19 三月 2026 09:27:42 +0800
Subject: [PATCH] 1.工序报工 修改排序规则
---
src/views/produce/reportCorrect.vue | 53 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 7 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index a9126cf..7746a83 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -34,10 +34,16 @@
<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-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.saorderno" placeholder="璇疯緭鍏�" style="width: 200px" />
+ </el-form-item>
+ <el-form-item v-show="isExpandForm" 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 +114,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 +142,28 @@
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="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ min-width="160"
+ show-tooltip-when-overflow
+ sortable="custom"
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="partnumber"
label="浜у搧缂栫爜"
@@ -331,6 +359,12 @@
</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>
<el-form-item label="浜у搧缂栫爜" class="dialogFormItem">
<div style="width: 200px;">
{{ dialogForm.partnumber }}
@@ -509,7 +543,6 @@
size="medium"
:precision="2"
:step="0.1"
- :max="10"
:min="0"
style="margin: 0 10px 5px"
/>
@@ -561,6 +594,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ orderno: '',
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -568,6 +602,7 @@
reportuser: '', // 鎶ュ伐浜哄憳
reportdate: '', // 鎶ュ伐鏃堕棿
stepcode: '',
+ saorderno: '',
prop: 'report_date', // 鎺掑簭瀛楁
order: 'desc', // 鎺掑簭瀛楁
page: 1, // 绗嚑椤�
@@ -715,7 +750,8 @@
reportuser: this.form.reportuser,
stepcode: this.form.stepcode,
reportdate: tempDate,
-
+ orderno: this.form.orderno,
+ saorderno: this.form.saorderno,
prop: this.form.prop, // 鎺掑簭瀛楁
order: this.form.order, // 鎺掑簭瀛楁
page: this.form.page, // 绗嚑椤�
@@ -742,6 +778,8 @@
reset() {
this.form.wkshopcode = ''
this.form.wo_code = ''
+ this.form.saorderno = ''
+ this.form.orderno = ''
this.form.partnumber = ''
this.form.partname = ''
this.form.partspec = ''
@@ -766,6 +804,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 +913,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