From 51bf36b25bd2065a1d1ff9a0c3981b57b54aa119 Mon Sep 17 00:00:00 2001
From: zhangwencui <1064582902@qq.com>
Date: 星期四, 30 四月 2026 10:16:01 +0800
Subject: [PATCH] 报工按钮点击控制，指定报工人回显，批号去掉校验
---
src/views/inventoryManagement/stockManagement/New.vue | 9 +--------
src/views/productionManagement/workOrderEdit/index.vue | 5 +++++
src/views/productionManagement/workOrderManagement/index.vue | 20 +++++++++++++++++++-
3 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/views/inventoryManagement/stockManagement/New.vue b/src/views/inventoryManagement/stockManagement/New.vue
index 1c9b333..2addb95 100644
--- a/src/views/inventoryManagement/stockManagement/New.vue
+++ b/src/views/inventoryManagement/stockManagement/New.vue
@@ -57,14 +57,7 @@
style="width: 100%" />
</el-form-item>
<el-form-item label="鎵瑰彿"
- prop="batchNo"
- :rules="[
- {
- required: true,
- message: '璇疯緭鍏ユ壒鍙�',
- trigger: 'blur',
- }
- ]">
+ prop="batchNo">
<el-input v-model="formState.batchNo"
placeholder="璇疯緭鍏ユ壒鍙�" />
</el-form-item>
diff --git a/src/views/productionManagement/workOrderEdit/index.vue b/src/views/productionManagement/workOrderEdit/index.vue
index fe75df3..693fea0 100644
--- a/src/views/productionManagement/workOrderEdit/index.vue
+++ b/src/views/productionManagement/workOrderEdit/index.vue
@@ -204,6 +204,11 @@
width: "140",
},
{
+ label: "鎸囧畾鎶ュ伐浜�",
+ prop: "userNames",
+ width: "180",
+ },
+ {
label: "鎿嶄綔",
width: "200",
align: "center",
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index c1b0474..1231339 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -265,7 +265,9 @@
import { getCurrentInstance, reactive, toRefs } from "vue";
import MaterialDialog from "./components/MaterialDialog.vue";
import FileList from "@/components/Dialog/FileList.vue";
+ import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
+ const userStore = useUserStore();
const tableColumn = ref([
{
@@ -368,7 +370,22 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row => row.planQuantity <= 0,
+ disabled: row => {
+ if (row.planQuantity <= 0) return true;
+ if (!row.userIds) return true;
+ try {
+ const userIds =
+ typeof row.userIds === "string"
+ ? JSON.parse(row.userIds)
+ : row.userIds;
+ if (Array.isArray(userIds)) {
+ return !userIds.some(id => String(id) === String(userStore.id));
+ }
+ return true;
+ } catch (e) {
+ return true;
+ }
+ },
},
],
},
@@ -801,6 +818,7 @@
};
onMounted(() => {
+ userStore.getInfo();
getList();
// 鑾峰彇鐢ㄦ埛鍒楄〃
userListNoPageByTenantId().then(res => {
--
Gitblit v1.9.3