From 012aa7fd84c4de6216f5be6e8a05ed52f7fdf429 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 09 十二月 2025 13:16:28 +0800
Subject: [PATCH] 1.海川开心-给admin开放所有可编辑,删除的权限。

---
 src/views/equipmentManagement/measurementEquipment/index.vue              |    6 ------
 src/views/productionManagement/operationScheduling/components/formDia.vue |   20 ++++++++++++++------
 src/views/customerService/feedbackRegistration/index.vue                  |    6 ------
 src/views/inventoryManagement/stockManagement/index.vue                   |    6 ------
 src/views/productionManagement/productionDispatching/index.vue            |    7 +++++++
 5 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/src/views/customerService/feedbackRegistration/index.vue b/src/views/customerService/feedbackRegistration/index.vue
index df15942..f1a55e3 100644
--- a/src/views/customerService/feedbackRegistration/index.vue
+++ b/src/views/customerService/feedbackRegistration/index.vue
@@ -169,12 +169,6 @@
 const handleDelete = () => {
 	let ids = [];
 	if (selectedRows.value.length > 0) {
-		// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-		const unauthorizedData = selectedRows.value.filter(item => item.checkUserId !== userStore.id);
-		if (unauthorizedData.length > 0) {
-			proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-			return;
-		}
 		ids = selectedRows.value.map((item) => item.id);
 	} else {
 		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/equipmentManagement/measurementEquipment/index.vue b/src/views/equipmentManagement/measurementEquipment/index.vue
index eddd15e..363a85a 100644
--- a/src/views/equipmentManagement/measurementEquipment/index.vue
+++ b/src/views/equipmentManagement/measurementEquipment/index.vue
@@ -221,12 +221,6 @@
 const handleDelete = () => {
 	let ids = [];
 	if (selectedRows.value.length > 0) {
-		// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-		const unauthorizedData = selectedRows.value.filter(item => item.userId !== userStore.id);
-		if (unauthorizedData.length > 0) {
-			proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-			return;
-		}
 		ids = selectedRows.value.map((item) => item.id);
 	} else {
 		proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/inventoryManagement/stockManagement/index.vue b/src/views/inventoryManagement/stockManagement/index.vue
index 2494562..2fcacb3 100644
--- a/src/views/inventoryManagement/stockManagement/index.vue
+++ b/src/views/inventoryManagement/stockManagement/index.vue
@@ -518,12 +518,6 @@
 const handleDelete = () => {
   let ids = []
   if (selectedRows.value.length > 0) {
-		// 妫�鏌ユ槸鍚︽湁浠栦汉缁存姢鐨勬暟鎹�
-		const unauthorizedData = selectedRows.value.filter(item => item.createBy !== userStore.nickName);
-		if (unauthorizedData.length > 0) {
-			proxy.$modal.msgWarning("涓嶅彲鍒犻櫎浠栦汉缁存姢鐨勬暟鎹�");
-			return;
-		}
     ids = selectedRows.value.map(item => item.id);
   } else {
     proxy.$modal.msgWarning('璇烽�夋嫨鏁版嵁')
diff --git a/src/views/productionManagement/operationScheduling/components/formDia.vue b/src/views/productionManagement/operationScheduling/components/formDia.vue
index b2f283d..e0aa92d 100644
--- a/src/views/productionManagement/operationScheduling/components/formDia.vue
+++ b/src/views/productionManagement/operationScheduling/components/formDia.vue
@@ -122,27 +122,35 @@
 const pendingNum = ref(0);
 const userList = ref([])
 const receive = ref('')
+const sunqianUserId = ref('')
 
 // 鎵撳紑寮规
 const openDialog = (type, row) => {
   operationType.value = type;
   dialogFormVisible.value = true;
-	userListNoPageByTenantId().then((res) => {
-		userList.value = res.data;
-	});
 	pendingNum.value = row?.pendingNum ?? 0;
 	unitFromRow.value = row?.unit ?? '';
 	idFromRow.value = row?.id ?? '';
 	specificationModelFromRow.value = row?.specificationModel ?? '';
-	tableData.value = [createRow()];
+	
+	userListNoPageByTenantId().then((res) => {
+		userList.value = res.data;
+		// 鎵惧埌瀛欏�╃殑鐢ㄦ埛ID骞惰缃负榛樿鍊�
+		const sunqianUser = userList.value.find(user => user.nickName === '瀛欏��');
+		if (sunqianUser) {
+			sunqianUserId.value = sunqianUser.userId;
+		}
+		// 鍦ㄧ敤鎴峰垪琛ㄥ姞杞藉畬鎴愬悗鍒涘缓琛屾暟鎹�
+		tableData.value = [createRow()];
+	});
 }
 
 const createRow = () => ({
 	id: idFromRow.value,
-	process: '',
+	process: '鍖呰',
 	schedulingDate: '',
 	schedulingNum: null,
-	schedulingUserId: '',
+	schedulingUserId: sunqianUserId.value, // 榛樿璁剧疆涓哄瓩鍊╃殑鐢ㄦ埛ID
 	workHours: null,
 	unit: unitFromRow.value,
 	remark: '',
diff --git a/src/views/productionManagement/productionDispatching/index.vue b/src/views/productionManagement/productionDispatching/index.vue
index 8a8e621..e58e87e 100644
--- a/src/views/productionManagement/productionDispatching/index.vue
+++ b/src/views/productionManagement/productionDispatching/index.vue
@@ -50,6 +50,12 @@
 				<span class="search_title ml10">褰曞叆鏃ユ湡锛�</span>
 				<el-date-picker v-model="searchForm.entryDate" value-format="YYYY-MM-DD" format="YYYY-MM-DD" type="daterange"
 										placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
+				<el-checkbox
+					style="margin-left: 10px"
+					v-model="searchForm.status"
+					label="涓嶆樉绀哄緟鎺掓暟閲�0"
+					@change="handleQuery"
+				/>
 				<el-button type="primary" @click="handleQuery" style="margin-left: 10px">鎼滅储</el-button>
 			</div>
 			<div>
@@ -154,6 +160,7 @@
 		label: "寰呮帓鏁伴噺",
 		prop: "pendingQuantity",
 		width: 100,
+		fixed: 'right',
 	},
 ]);
 const tableData = ref([]);

--
Gitblit v1.9.3