From 195770f92f7d739ffba6447fdbf3a3d5b9e009fa Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 24 四月 2026 16:32:57 +0800
Subject: [PATCH] fix(生产订单): 修复绑定工艺路线时的材料规格验证和显示问题
---
src/views/productionManagement/workOrder/index.vue | 87 +++++++++++++++++++++++++++++++++++++------
1 files changed, 75 insertions(+), 12 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index 583fe2a..c86090b 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -186,6 +186,15 @@
placeholder="璇疯緭鍏ユ湰娆＄敓浜ф暟閲�"
@input="handleQuantityInput" />
</el-form-item>
+ <el-form-item label="琛ヤ骇鏁伴噺"
+ prop="replenishQty">
+ <el-input v-model.number="reportForm.replenishQty"
+ type="number"
+ min="0"
+ step="1"
+ style="width: 300px"
+ placeholder="璇疯緭鍏ヨˉ浜ф暟閲�" />
+ </el-form-item>
<el-form-item label="鎶ュ簾鏁伴噺"
prop="scrapQty">
<el-input v-model.number="reportForm.scrapQty"
@@ -197,17 +206,43 @@
@input="handleScrapQtyInput" />
</el-form-item>
<el-form-item label="鐝粍淇℃伅">
- <el-select v-model="reportForm.userId"
- style="width: 300px"
- placeholder="璇烽�夋嫨鐝粍淇℃伅"
- clearable
- filterable
- @change="handleUserChange">
- <el-option v-for="user in userOptions"
- :key="user.userId"
- :label="user.nickName"
- :value="user.userId" />
+ <el-select
+ v-model="reportForm.teamList"
+ multiple
+ filterable
+ clearable
+ collapse-tags
+ value-key="userId"
+ placeholder="璇烽�夋嫨鐝粍鎴愬憳"
+ style="width: 300px"
+ >
+ <el-option
+ v-for="user in userOptions"
+ :key="user.userId"
+ :label="user.nickName"
+ :value="{ userId: user.userId, userName: user.nickName }"
+ />
</el-select>
+ </el-form-item>
+ <el-form-item label="寮�濮嬫椂闂�"
+ prop="startTime">
+ <el-date-picker v-model="reportForm.startTime"
+ type="datetime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�"
+ clearable />
+ </el-form-item>
+ <el-form-item label="缁撴潫鏃堕棿"
+ prop="endTime">
+ <el-date-picker v-model="reportForm.endTime"
+ type="datetime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ format="YYYY-MM-DD HH:mm:ss"
+ style="width: 300px"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿"
+ clearable />
</el-form-item>
<el-form-item label="瀹℃牳浜�" prop="auditUserId">
<el-select v-model="reportForm.auditUserId"
@@ -424,12 +459,15 @@
planQuantity: 0,
quantity: null,
scrapQty: null,
+ startTime: "",
+ endTime: "",
userName: "",
workOrderId: "",
reportWork: "",
productProcessRouteItemId: "",
userId: "",
productMainId: null,
+ teamList:[]
});
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
@@ -522,6 +560,8 @@
const reportFormRules = {
quantity: [{ required: true, validator: validateQuantity, trigger: "blur" }],
scrapQty: [{ validator: validateScrapQty, trigger: "blur" }],
+ startTime: [{ required: true, message: "璇烽�夋嫨寮�濮嬫椂闂�", trigger: "change" }],
+ endTime: [{ required: true, message: "璇烽�夋嫨缁撴潫鏃堕棿", trigger: "change" }],
auditUserId: [{ required: true, message: "璇烽�夋嫨瀹℃牳浜�", trigger: "change" }],
};
@@ -724,8 +764,12 @@
reportForm.workOrderId = row.id;
reportForm.reportWork = row.reportWork;
reportForm.productMainId = row.productMainId;
- reportForm.scrapQty =
- row.scrapQty !== undefined && row.scrapQty !== null ? row.scrapQty : null;
+ reportForm.startTime = "";
+ reportForm.endTime = "";
+ reportForm.replenishQty = 0;
+ reportForm.teamList = [];
+ reportForm.scrapQty = 0;
+
nextTick(() => {
reportFormRef.value?.clearValidate();
});
@@ -804,6 +848,20 @@
return;
}
+ if (!reportForm.startTime || !reportForm.endTime) {
+ ElMessageBox.alert("寮�濮嬫椂闂村拰缁撴潫鏃堕棿涓嶈兘涓虹┖", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
+ if (dayjs(reportForm.startTime).isSame(dayjs(reportForm.endTime)) || dayjs(reportForm.startTime).isAfter(dayjs(reportForm.endTime))) {
+ ElMessageBox.alert("寮�濮嬫椂闂村繀椤诲皬浜庣粨鏉熸椂闂�", "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ });
+ return;
+ }
+
const submitData = {
...reportForm,
quantity: quantity,
@@ -831,6 +889,11 @@
.then(res => {
if (res.code === 200) {
userOptions.value = res.data || [];
+ console.log(userOptions.value)
+ userOptions.value.unshift({
+ nickName:"浠绘剰鐢ㄦ埛",
+ userId:"-1",
+ })
}
})
.catch(err => {
--
Gitblit v1.9.3