From 6faf65a6a7e72b7ecff52355f798fd00a516ba77 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:37:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_NEW_pro' into dev_NEW_pro
---
src/views/productionManagement/workOrderManagement/index.vue | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/src/views/productionManagement/workOrderManagement/index.vue b/src/views/productionManagement/workOrderManagement/index.vue
index c1b0474..dda27fc 100644
--- a/src/views/productionManagement/workOrderManagement/index.vue
+++ b/src/views/productionManagement/workOrderManagement/index.vue
@@ -244,6 +244,7 @@
@refresh="getList" />
<FileList v-if="fileDialogVisible"
v-model:visible="fileDialogVisible"
+ :editable="!currentWorkOrderRow?.endOrder"
:record-type="'production_operation_task'"
:record-id="currentWorkOrderId" />
</div>
@@ -264,8 +265,11 @@
import QRCode from "qrcode";
import { getCurrentInstance, reactive, toRefs } from "vue";
import MaterialDialog from "./components/MaterialDialog.vue";
- import FileList from "@/components/Dialog/FileList.vue";
+ const FileList = defineAsyncComponent(() => import("@/components/Dialog/FileList.vue"));
+
+ import useUserStore from "@/store/modules/user";
const { proxy } = getCurrentInstance();
+ const userStore = useUserStore();
const tableColumn = ref([
{
@@ -368,7 +372,23 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row => row.planQuantity <= 0,
+ showHide: row => !row.endOrder,
+ disabled: row => {
+ if (row.planQuantity <= 0) return true;
+ if (!row.userIds) return false;
+ 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;
+ }
+ },
},
],
},
@@ -614,9 +634,11 @@
const printTransferCard = () => {
window.print();
};
+ const currentWorkOrderRow = ref(null);
const openWorkOrderFiles = row => {
currentWorkOrderId.value = row.id;
+ currentWorkOrderRow.value = row;
fileDialogVisible.value = true;
};
@@ -801,6 +823,7 @@
};
onMounted(() => {
+ userStore.getInfo();
getList();
// 鑾峰彇鐢ㄦ埛鍒楄〃
userListNoPageByTenantId().then(res => {
--
Gitblit v1.9.3