From ff77023946ed6b0b46fbea8d78bdc23712891aeb Mon Sep 17 00:00:00 2001
From: 小小儁爺 <1694218219@qq.com>
Date: 星期二, 21 十月 2025 10:24:39 +0800
Subject: [PATCH] 1.针对报工数量为零的做校验
---
src/views/produce/stepReport.vue | 58 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/src/views/produce/stepReport.vue b/src/views/produce/stepReport.vue
index 5e992a7..ef7f81f 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="浜у搧缂栫爜"
@@ -468,8 +484,9 @@
/>
</el-select>
</el-form-item>
- <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" prop="startqty" label="鍚堟牸鏁伴噺" class="dialogFormItem">
- <el-input v-model="dialogForm.startqty" oninput="value=value.replace(/[^\d]/g,'')" style="width: 200px" />
+ <el-form-item v-if="activeName==='鐢熶骇鍒楄〃'" label="鍚堟牸鏁伴噺" class="dialogFormItem">
+ <!-- oninput="value=value.replace(/[^\d]/g,'')"-->
+ <el-input v-model="dialogForm.startqty" placeholder="璇疯緭鍏�" type="number" style="width: 200px" />
</el-form-item>
<el-form-item v-if="activeName==='澶栧崗鍙戞枡'||activeName==='澶栧崗鏀舵枡'" prop="wxcode" label="澶栧崗渚涙柟" class="dialogFormItem">
@@ -900,7 +917,7 @@
import { handleDatetime2 } from '@/utils/global'
import QRCode from 'qrcodejs2'
export default {
- name: 'SCKBG',
+ name: 'StepReport',
components: {
Pagination
},
@@ -911,6 +928,7 @@
tableHeight: 0,
form: {
wkshopcode: '',
+ socode: '', // 閿�鍞崟鍙�
wocode: '', // 宸ュ崟鍙�
partcode: '', // 浜у搧缂栫爜
partname: '', // 浜у搧鍚嶇О
@@ -950,7 +968,7 @@
'nextstepprice': '',
'stepdesc': '',
'planqty': 0,
- 'startqty': 0, //
+ 'startqty': '', //
'noreportqty': 0, // 鏈姤鏁伴噺
'reportqty': 0, // 宸叉姤鏁伴噺
'noputqty': 0, // 涓嶈壇鏁伴噺
@@ -1215,7 +1233,7 @@
this.dialogForm.nextstepprice = res.data1.nextstepprice
this.dialogForm.stepdesc = res.data1.stepdesc
this.dialogForm.planqty = res.data1.planqty
- this.dialogForm.startqty = res.data1.startqty
+ this.dialogForm.startqty = parseFloat(res.data1.startqty) === 0 ? '' : parseFloat(res.data1.startqty)
this.dialogForm.noreportqty = res.data1.noreportqty // 鍚堟牸鏁伴噺
this.dialogForm.reportqty = res.data1.reportqty
this.dialogForm.noputqty = res.data1.noputqty // 涓嶈壇鏁伴噺
@@ -1256,7 +1274,7 @@
this.dialogForm.nextstepprice = res.nextstepprice
this.dialogForm.stepdesc = res.stepdesc
this.dialogForm.planqty = res.planqty
- this.dialogForm.startqty = res.startqty
+ this.dialogForm.startqty = parseFloat(res.startqty) === 0 ? '' : parseFloat(res.startqty)
this.dialogForm.noreportqty = res.noreportqty// 鏈姤鏁伴噺
this.dialogForm.reportqty = res.reportqty // 宸叉姤鏁伴噺
this.dialogForm.noputqty = res.noputqty
@@ -1296,7 +1314,7 @@
'nextstepprice': '',
'stepdesc': '',
'planqty': 0,
- 'startqty': 0, //
+ 'startqty': '', //
'noreportqty': 0, // 鏈姤鏁伴噺
'reportqty': 0, // 宸叉姤鏁伴噺
'noputqty': 0, // 涓嶈壇鏁伴噺
@@ -1346,6 +1364,15 @@
if (parseFloat(this.dialogForm.noreportqty) < parseFloat(this.dialogForm.startqty) + parseFloat(this.dialogForm.noputqty)) {
return this.$message.info('鍚堟牸鏁伴噺鍔犱笉鑹暟閲忎笉鑳藉ぇ浜庝簡鏈姤鏁伴噺!')
}
+ console.log(this.dialogForm.startqty, 'this.dialogForm.startqty')
+
+ if (parseFloat(this.dialogForm.startqty) === 0 && this.defectTableData.length === 0) {
+ return this.$message.info('鍚堟牸鏁伴噺涓嶈兘涓洪浂锛�')
+ }
+ if (parseFloat(this.dialogForm.startqty) <= 0) {
+ return this.$message.info('璇疯緭鍏ュぇ浜庨浂鐨勫悎鏍兼暟閲忥紒')
+ }
+
let inbarcode = ''
if (this.tableData.find(i => i.id === this.radioSelected).isend === 'Y') {
const data1 = {
@@ -1542,7 +1569,7 @@
dialogVisible2Close() {
this.qrForm.qrvalue = ''
- this.qrForm.startqty = ''
+ this.qrForm.startqty = 0
this.qrForm.wo_code = ''
this.qrForm.partcode = ''
this.qrForm.partname = ''
@@ -1634,6 +1661,7 @@
},
reset() {
this.form.wkshopcode = ''
+ this.form.socode = ''
this.form.wocode = ''
this.form.workOrderCurrentValue = ''
this.form.partcode = ''
--
Gitblit v1.9.3