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/reportVerify.vue |   27 ++++++++++++++++++++++-----
 1 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index 675ec8b..d221a6a 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -51,7 +51,11 @@
             <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 v-show="isExpandForm" label="浜у搧缂栫爜" style=" display: flex;">
               <el-input v-model="form.partnumber" placeholder="璇疯緭鍏�" style="width: 200px" />
             </el-form-item>
             <el-form-item v-show="isExpandForm" label="浜у搧鍚嶇О" style=" display: flex;">
@@ -115,10 +119,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"
@@ -156,6 +160,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="浜у搧缂栫爜"
@@ -363,6 +378,7 @@
       tableHeight: 0,
       form: {
         wkshopcode: '',
+        orderno: '', //
         wo_code: '', // 宸ュ崟缂栫爜
         partnumber: '', // 浜у搧缂栫爜
         partname: '', // 浜у搧鍚嶇О
@@ -427,7 +443,7 @@
         reportuser: this.form.reportuser,
         stepname: this.form.stepname,
         reportdate: tempDate,
-
+        orderno: this.form.orderno,
         prop: this.form.prop, // 鎺掑簭瀛楁
         order: this.form.order, // 鎺掑簭瀛楁
         page: this.form.page, // 绗嚑椤�
@@ -454,6 +470,7 @@
     reset() {
       this.form.wkshopcode = ''
       this.form.wo_code = ''
+      this.form.orderno = ''
       this.form.partnumber = ''
       this.form.partname = ''
       this.form.partspec = ''
@@ -531,7 +548,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