From e401270301d8a11fd4a786d252b75548fd059d56 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期四, 21 五月 2026 16:55:11 +0800
Subject: [PATCH] feat: 报工补充加放数
---
src/views/productionManagement/productionReporting/index.vue | 17 +++++---
src/views/productionManagement/workOrder/index.vue | 37 ++++++++++++------
src/views/productionManagement/productionCosting/index.vue | 15 +++++++
3 files changed, 51 insertions(+), 18 deletions(-)
diff --git a/src/views/productionManagement/productionCosting/index.vue b/src/views/productionManagement/productionCosting/index.vue
index 5e90a0c..c437e78 100644
--- a/src/views/productionManagement/productionCosting/index.vue
+++ b/src/views/productionManagement/productionCosting/index.vue
@@ -149,6 +149,21 @@
minWidth: 100,
},
{
+ label: "鎶ュ簾鏁伴噺",
+ prop: "scrapQty",
+ minWidth: 100,
+ },
+ {
+ label: "琛ヤ骇鏁伴噺",
+ prop: "replenishQty",
+ minWidth: 100,
+ },
+ {
+ label: "鍔犳斁鏁�",
+ prop: "addQty",
+ minWidth: 100,
+ },
+ {
label: "鏈哄彴",
prop: "deviceName",
minWidth: 100,
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index 46a4a8a..6585237 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -19,12 +19,12 @@
style="width: 200px;"
@change="handleQuery" />
</el-form-item>
- <el-form-item label="瀹℃牳鐘舵��:">
- <el-select v-model="searchForm.auditStatus" placeholder="璇烽�夋嫨" style="width: 200px;" @change="handleQuery">
- <el-option v-for="item in auditStatusOptions" :key="item.value" :label="item.label" :value="item.value">
- </el-option>
- </el-select>
- </el-form-item>
+<!-- <el-form-item label="瀹℃牳鐘舵��:">-->
+<!-- <el-select v-model="searchForm.auditStatus" placeholder="璇烽�夋嫨" style="width: 200px;" @change="handleQuery">-->
+<!-- <el-option v-for="item in auditStatusOptions" :key="item.value" :label="item.label" :value="item.value">-->
+<!-- </el-option>-->
+<!-- </el-select>-->
+<!-- </el-form-item>-->
<el-form-item>
<el-button type="primary"
@click="handleQuery">鎼滅储</el-button>
@@ -295,6 +295,11 @@
width: 120,
},
{
+ label: "鍔犳斁鏁�",
+ prop: "addQty",
+ width: 120,
+ },
+ {
label: "鍗曚綅",
prop: "unit",
width: 120,
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 8d504ca..96c4bb5 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -192,6 +192,7 @@
step="1"
placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
style="width: 100%"
+ :class="{ 'over-limit': reportForm.quantity > reportForm.planQuantity }"
@input="handleQuantityInput"
/>
</el-form-item>
@@ -218,6 +219,18 @@
step="1"
placeholder="璇疯緭鍏ユ姤搴熸暟閲�"
@input="handleScrapQtyInput"
+ />
+ </el-form-item>
+ </el-col>
+
+ <el-col :span="12">
+ <el-form-item label="鍔犳斁鏁�" prop="addQty">
+ <el-input
+ v-model.number="reportForm.addQty"
+ type="number"
+ min="0"
+ step="1"
+ placeholder="璇疯緭鍏ュ姞鏀炬暟"
/>
</el-form-item>
</el-col>
@@ -1121,6 +1134,7 @@
planQuantity: 0,
quantity: null,
scrapQty: null,
+ addQty: 0,
startTime: "",
endTime: "",
userName: "",
@@ -1241,12 +1255,6 @@
}
const num = Number(value);
if (isNaN(num)) {
- return;
- }
- // 濡傛灉瓒呰繃寰呯敓浜ф暟閲�
- if (num > reportForm.planQuantity) {
- proxy.$modal.msgWarning("鏈鐢熶骇鏁伴噺涓嶈兘澶т簬寰呯敓浜ф暟閲�");
- reportForm.quantity = reportForm.planQuantity;
return;
}
// 濡傛灉灏忎簬1锛屾竻闄�
@@ -1456,6 +1464,7 @@
reportForm.replenishQty = 0;
reportForm.teamList = [];
reportForm.scrapQty = 0;
+ reportForm.addQty = 0;
reportForm.userIds = row.userIds || [];
const ids = (row.userIds || "")
@@ -1535,12 +1544,12 @@
return;
}
- if (quantity > reportForm.planQuantity) {
- ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
- confirmButtonText: "纭畾",
- });
- return;
- }
+ // if (quantity > reportForm.planQuantity) {
+ // ElMessageBox.alert("鏈鐢熶骇鏁伴噺涓嶈兘瓒呰繃寰呯敓浜ф暟閲�", "鎻愮ず", {
+ // confirmButtonText: "纭畾",
+ // });
+ // return;
+ // }
const submitData = {
...reportForm,
@@ -1805,4 +1814,8 @@
white-space: normal !important;
word-break: break-all;
}
+
+.over-limit .el-input__inner {
+ color: #f56c6c !important;
+}
</style>
--
Gitblit v1.9.3