From 37a9da0f73da9b69e7d1c8488673520821e90b72 Mon Sep 17 00:00:00 2001
From: 张诺 <zhang_12370@163.com>
Date: 星期五, 24 四月 2026 16:50:53 +0800
Subject: [PATCH] feat(workOrder): 增加报工人权限控制与列显示
---
src/views/productionManagement/workOrder/index.vue | 224 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 192 insertions(+), 32 deletions(-)
diff --git a/src/views/productionManagement/workOrder/index.vue b/src/views/productionManagement/workOrder/index.vue
index cbf39d6..fbb21cb 100644
--- a/src/views/productionManagement/workOrder/index.vue
+++ b/src/views/productionManagement/workOrder/index.vue
@@ -98,12 +98,12 @@
</div>
<!-- <div class="info-item">
<span class="info-label">宸ュ崟鐘舵��</span>
- <span class="info-value">{{
- transferCardRowData.status === 1 ? '寰呯‘璁�' :
- transferCardRowData.status === 2 ? '寰呯敓浜�' :
- transferCardRowData.status === 3 ? '鐢熶骇涓�' :
- transferCardRowData.status === 4 ? '宸茬敓浜�' :
- transferCardRowData.status
+ <span class="info-value">{{
+ transferCardRowData.status === 1 ? '寰呯‘璁�' :
+ transferCardRowData.status === 2 ? '寰呯敓浜�' :
+ transferCardRowData.status === 3 ? '鐢熶骇涓�' :
+ transferCardRowData.status === 4 ? '宸茬敓浜�' :
+ transferCardRowData.status
}}</span>
</div> -->
<div class="info-item">
@@ -165,7 +165,7 @@
</div>
</el-dialog>
<el-dialog v-model="reportDialogVisible"
- title="鎶ュ伐"
+ :title="`鎶ュ伐(鏈哄彴:${currentReportRowData?.deviceName || '-'})`"
width="500px">
<el-form ref="reportFormRef"
:model="reportForm"
@@ -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"
@@ -269,7 +304,7 @@
</template>
<script setup>
- import { onMounted, ref, nextTick } from "vue";
+ import { onMounted, ref, nextTick, computed } from "vue";
import { ElMessageBox, ElMessage } from "element-plus";
import dayjs from "dayjs";
import {
@@ -283,6 +318,85 @@
import { getCurrentInstance, reactive, toRefs } from "vue";
import FilesDia from "./components/filesDia.vue";
const { proxy } = getCurrentInstance();
+
+ const currentUserId = ref("");
+ const currentUserName = ref("");
+
+ const ensureCurrentUser = async () => {
+ if (currentUserId.value) return;
+ try {
+ const res = await getUserProfile();
+ if (res?.code === 200) {
+ currentUserId.value = String(res?.data?.userId ?? "");
+ currentUserName.value = String(res?.data?.nickName ?? "");
+ }
+ } catch (err) {
+ console.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触", err);
+ }
+ };
+
+ const normalizeArray = (val) => {
+ if (val === null || val === undefined) return [];
+ if (Array.isArray(val)) return val;
+ if (typeof val === "string") {
+ return val
+ .split(/[,锛�;锛沑s]+/g)
+ .map((s) => s.trim())
+ .filter(Boolean);
+ }
+ return [val];
+ };
+
+ const isCurrentUserReportWorker = (row) => {
+ const uid = String(currentUserId.value || "");
+ if (!uid) return false;
+ if (!row) return false;
+
+ const candidateIds = [
+ row.reportUserIds,
+ row.reportWorkerIds,
+ row.userIds,
+ row.userIdList,
+ row.reportUserId,
+ row.userId,
+ ]
+ .flatMap((v) => normalizeArray(v))
+ .map((v) => String(v))
+ .filter(Boolean);
+
+ if (candidateIds.includes(uid)) return true;
+
+ const candidateNames = [
+ row.userNames,
+ row.reportUserNames,
+ row.reportWorkerNames,
+ row.userName,
+ ]
+ .flatMap((v) => normalizeArray(v))
+ .map((v) => String(v))
+ .filter(Boolean);
+
+ if (currentUserName.value && candidateNames.includes(currentUserName.value)) {
+ return true;
+ }
+
+ if (Array.isArray(row.reportWorkerList)) {
+ const list = row.reportWorkerList
+ .map((item) => String(item?.userId ?? item?.id ?? ""))
+ .filter(Boolean);
+ if (list.includes(uid)) return true;
+ const nameList = row.reportWorkerList
+ .map((item) => String(item?.userName ?? item?.nickName ?? ""))
+ .filter(Boolean);
+ if (currentUserName.value && nameList.includes(currentUserName.value)) return true;
+ }
+
+ return false;
+ };
+
+ const canOperateByReportWorker = computed(() => {
+ return (row) => isCurrentUserReportWorker(row);
+ });
const tableColumn = ref([
{
@@ -318,6 +432,10 @@
prop: "processName",
},
{
+ label: "鏈哄彴鍚嶇О",
+ prop: "deviceName",
+ },
+ {
label: "闇�姹傛暟閲�",
prop: "planQuantity",
width: "140",
@@ -332,6 +450,11 @@
prop: "completionStatus",
dataType: "slot",
slot: "completionStatus",
+ width: "140",
+ },
+ {
+ label: "鎶ュ伐浜�",
+ prop: "userNames",
width: "140",
},
{
@@ -366,6 +489,10 @@
clickFun: row => {
handleEdit(row);
},
+ // 褰撻渶姹傛暟閲忕瓑浜庡畬鎴愭暟閲忕殑鏃跺�欙紝鎸夐挳涓嶅彲鐐瑰嚮
+ disabled: row =>
+ Number(row?.planQuantity) === Number(row?.completeQuantity) ||
+ !canOperateByReportWorker.value(row),
},
{
name: "娴佽浆鍗�",
@@ -384,7 +511,10 @@
clickFun: row => {
showReportDialog(row);
},
- disabled: row => row.planQuantity <= 0,
+ disabled: row =>
+ Number(row?.planQuantity) <= Number(row?.completeQuantity) ||
+ row.planQuantity <= 0 ||
+ !canOperateByReportWorker.value(row),
},
// {
// name:"瀹℃牳",
@@ -418,12 +548,15 @@
planQuantity: 0,
quantity: null,
scrapQty: null,
+ startTime: "",
+ endTime: "",
userName: "",
workOrderId: "",
reportWork: "",
productProcessRouteItemId: "",
userId: "",
productMainId: null,
+ teamList:[]
});
// 鏈鐢熶骇鏁伴噺楠岃瘉瑙勫垯
@@ -516,6 +649,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" }],
};
@@ -691,6 +826,10 @@
};
const handleEdit = row => {
+ if (!isCurrentUserReportWorker(row)) {
+ ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶缂栬緫");
+ return;
+ }
editrow.value = JSON.parse(JSON.stringify(row));
editDialogVisible.value = true;
};
@@ -710,6 +849,10 @@
};
const showReportDialog = row => {
+ if (!isCurrentUserReportWorker(row)) {
+ ElMessage.warning("褰撳墠鐢ㄦ埛涓嶆槸璇ュ伐鍗曠殑鎶ュ伐浜猴紝鏃犳硶鎶ュ伐");
+ return;
+ }
currentReportRowData.value = row;
reportForm.planQuantity = row.planQuantity - row.completeQuantity;
reportForm.quantity =
@@ -718,22 +861,19 @@
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();
});
- // 鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛淇℃伅锛岃缃负榛樿閫変腑
- getUserProfile()
- .then(res => {
- if (res.code === 200) {
- reportForm.userId = res.data.userId;
- reportForm.userName = res.data.nickName;
- }
- })
- .catch(err => {
- console.error("鑾峰彇鐢ㄦ埛淇℃伅澶辫触", err);
- });
+ ensureCurrentUser().then(() => {
+ reportForm.userId = currentUserId.value;
+ reportForm.userName = currentUserName.value;
+ });
reportDialogVisible.value = true;
};
@@ -798,6 +938,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,
@@ -825,6 +979,11 @@
.then(res => {
if (res.code === 200) {
userOptions.value = res.data || [];
+ console.log(userOptions.value)
+ userOptions.value.unshift({
+ nickName:"浠绘剰鐢ㄦ埛",
+ userId:"-1",
+ })
}
})
.catch(err => {
@@ -856,6 +1015,7 @@
}
onMounted(() => {
+ ensureCurrentUser();
getList();
getUserList();
});
--
Gitblit v1.9.3