From b6adac94a183008795725233d2dde157d4e65f28 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期三, 16 十月 2024 13:24:10 +0800
Subject: [PATCH] 1.工序报工、报工调整、报工审核 新增销售单号 字段
---
src/views/produce/reportCorrect.vue | 19 +++++++++
src/views/produce/stepReport.vue | 32 ++++++++++++---
src/views/produce/reportVerify.vue | 25 ++++++++++--
3 files changed, 64 insertions(+), 12 deletions(-)
diff --git a/src/views/produce/reportCorrect.vue b/src/views/produce/reportCorrect.vue
index 3b8383e..8d69408 100644
--- a/src/views/produce/reportCorrect.vue
+++ b/src/views/produce/reportCorrect.vue
@@ -30,10 +30,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.socode" 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;">
@@ -117,6 +120,17 @@
min-width="160"
show-overflow-tooltip
/>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ sortable="custom"
+ min-width="160"
+ show-overflow-tooltip
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="partnumber"
label="浜у搧缂栫爜"
@@ -482,6 +496,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ socode: '', // 閿�鍞崟鍙�
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -566,6 +581,7 @@
const data = {
wkshopcode: this.form.wkshopcode,
wo_code: this.form.wo_code,
+ socode: this.form.socode,
partnumber: this.form.partnumber,
partname: this.form.partname,
partspec: this.form.partspec,
@@ -597,6 +613,7 @@
// 閲嶇疆
reset() {
this.form.wkshopcode = ''
+ this.form.socode = ''
this.form.wo_code = ''
this.form.partnumber = ''
this.form.partname = ''
diff --git a/src/views/produce/reportVerify.vue b/src/views/produce/reportVerify.vue
index b4de596..7b604d6 100644
--- a/src/views/produce/reportVerify.vue
+++ b/src/views/produce/reportVerify.vue
@@ -51,7 +51,10 @@
<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.socode" 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 +118,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 +159,17 @@
min-width="160"
show-overflow-tooltip
/>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ sortable="custom"
+ min-width="160"
+ show-overflow-tooltip
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="partnumber"
label="浜у搧缂栫爜"
@@ -356,6 +370,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ socode: '', // 閿�鍞崟鍙�
wo_code: '', // 宸ュ崟缂栫爜
partnumber: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -407,6 +422,7 @@
const data = {
wkshopcode: this.form.wkshopcode,
wo_code: this.form.wo_code,
+ socode: this.form.socode,
reviewstatus: this.form.reviewstatus,
partnumber: this.form.partnumber,
partname: this.form.partname,
@@ -441,6 +457,7 @@
reset() {
this.form.wkshopcode = ''
this.form.wo_code = ''
+ this.form.socode = ''
this.form.partnumber = ''
this.form.partname = ''
this.form.partspec = ''
@@ -518,7 +535,7 @@
getHeight() {
this.$nextTick(() => {
this.mainHeight = window.innerHeight - 85
- this.tableHeight = this.mainHeight - 255
+ this.tableHeight = this.mainHeight - 295
this.$refs.tableDataRef.doLayout()
})
}
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index c9a0aeb..8190dd6 100644
--- a/src/views/produce/stepReport.vue
+++ b/src/views/produce/stepReport.vue
@@ -74,8 +74,7 @@
v-model="workOrderCurrentValue"
:name="'produceCode'+item.code"
placeholder="璇锋壂鎻忔垨杈撳叆"
- style="width: 300px"
-
+ style="width: 200px"
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -83,8 +82,7 @@
<el-input
v-model="form.partcode"
placeholder="璇疯緭鍏�"
- style="width: 200px"
-
+ style="width: 150px"
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -93,7 +91,15 @@
v-model="form.partname"
placeholder="璇疯緭鍏�"
- style="width: 200px"
+ style="width: 150px"
+ @keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
+ />
+ </el-form-item>
+ <el-form-item label="閿�鍞崟鍙�" style=" display: flex;">
+ <el-input
+ v-model="form.socode"
+ placeholder="璇疯緭鍏�"
+ style="width: 150px"
@keyup.enter.native="val=>enterNative(val,'produceCode' + item.code)"
/>
</el-form-item>
@@ -102,8 +108,7 @@
v-model="form.wkshopcode"
filterable
:popper-append-to-body="false"
- style="width: 200px"
-
+ style="width: 150px"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -206,6 +211,17 @@
show-tooltip-when-overflow
sortable="custom"
/>
+ <el-table-column
+ prop="saleOrderCode"
+ label="閿�鍞崟鍙�"
+ sortable="custom"
+ min-width="160"
+ show-overflow-tooltip
+ >
+ <template slot-scope="{row}">
+ {{ row.saleOrderCode?row.saleOrderCode:'/' }}
+ </template>
+ </el-table-column>
<el-table-column
prop="partcode"
label="浜у搧缂栫爜"
@@ -911,6 +927,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ socode: '', // 閿�鍞崟鍙�
wocode: '', // 宸ュ崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -1634,6 +1651,7 @@
},
reset() {
this.form.wkshopcode = ''
+ this.form.socode = ''
this.form.wocode = ''
this.form.workOrderCurrentValue = ''
this.form.partcode = ''
--
Gitblit v1.9.3