From 0559c9ae13bf1eab94aaaf9ed1247b484321c4c3 Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 23 九月 2025 10:32:52 +0800
Subject: [PATCH] 1.报工新增：合格数量不能为零
---
src/views/produce/stepReport.vue | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index c9a0aeb..fa82347 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: '', // 浜у搧鍚嶇О
@@ -1346,6 +1363,11 @@
if (parseFloat(this.dialogForm.noreportqty) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鍚堟牸鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
}
+
+ if (parseFloat(this.dialogForm.startqty) === 0 && this.defectTableData.length === 0) {
+ return this.$message.info('鍚堟牸鏁伴噺涓嶈兘涓洪浂锛�')
+ }
+
let inbarcode = ''
if (this.tableData.find(i => i.id === this.radioSelected).isend === 'Y') {
const data1 = {
@@ -1634,6 +1656,7 @@
},
reset() {
this.form.wkshopcode = ''
+ this.form.socode = ''
this.form.wocode = ''
this.form.workOrderCurrentValue = ''
this.form.partcode = ''
--
Gitblit v1.9.3