From affb0876f58e628c31fee12cf8cf7e9f1748142c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 23 七月 2025 11:27:09 +0800
Subject: [PATCH] 1.生产管理联调
---
src/views/productionManagement/productionReporting/index.vue | 10 ++++++----
src/views/productionManagement/operationScheduling/index.vue | 14 ++++++++++----
2 files changed, 16 insertions(+), 8 deletions(-)
diff --git a/src/views/productionManagement/operationScheduling/index.vue b/src/views/productionManagement/operationScheduling/index.vue
index 3b35180..e0fc7fc 100644
--- a/src/views/productionManagement/operationScheduling/index.vue
+++ b/src/views/productionManagement/operationScheduling/index.vue
@@ -15,9 +15,9 @@
placeholder="璇烽�夋嫨" clearable @change="changeDaterange" />
</el-form-item>
<el-form-item label="鐘舵��:">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" style="width: 140px" clearable>
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" @change="handleQuery" style="width: 140px" clearable>
<el-option label="寰呮帓浜�" :value="1"></el-option>
- <el-option label="宸叉帓浜�" :value="0"></el-option>
+ <el-option label="宸叉帓浜�" :value="3"></el-option>
<el-option label="鎺掍骇涓�" :value="2"></el-option>
</el-select>
</el-form-item>
@@ -73,7 +73,7 @@
prop: "status",
dataType: "tag",
formatData: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "宸叉帓浜�";
} else if (params == 1) {
return "寰呮帓浜�";
@@ -82,7 +82,7 @@
}
},
formatType: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "success";
} else if (params == 1) {
return "primary";
@@ -220,6 +220,12 @@
const handleDelete = () => {
let ids = [];
if (selectedRows.value.length > 0) {
+ // 鏂板锛氬垽鏂槸鍚︽湁宸叉帓浜х殑鏁版嵁
+ const hasScheduled = selectedRows.value.some(item => item.status == 3);
+ if (hasScheduled) {
+ proxy.$modal.msgWarning("宸叉帓浜ф暟鎹笉鑳藉彇娑堟帓浜�");
+ return;
+ }
ids = selectedRows.value.map((item) => item.id);
} else {
proxy.$modal.msgWarning("璇烽�夋嫨鏁版嵁");
diff --git a/src/views/productionManagement/productionReporting/index.vue b/src/views/productionManagement/productionReporting/index.vue
index f65697d..b823b6a 100644
--- a/src/views/productionManagement/productionReporting/index.vue
+++ b/src/views/productionManagement/productionReporting/index.vue
@@ -17,7 +17,7 @@
<el-form-item label="鐘舵��:">
<el-select v-model="searchForm.status" placeholder="璇烽�夋嫨鐘舵��" style="width: 140px" clearable>
<el-option label="寰呯敓浜�" :value="1"></el-option>
- <el-option label="宸叉姤宸�" :value="0"></el-option>
+ <el-option label="宸叉姤宸�" :value="3"></el-option>
<el-option label="鐢熶骇涓�" :value="2"></el-option>
</el-select>
</el-form-item>
@@ -109,6 +109,7 @@
size="small"
@click="changeEditType(scope.row)"
v-if="!scope.row.editType"
+ :disabled="scope.row.parentStatus === 3"
>缂栬緫</el-button
>
<el-button
@@ -168,7 +169,7 @@
prop: "status",
dataType: "tag",
formatData: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "宸叉姤宸�";
} else if (params == 1) {
return "寰呯敓浜�";
@@ -177,7 +178,7 @@
}
},
formatType: (params) => {
- if (params == 0) {
+ if (params == 3) {
return "success";
} else if (params == 1) {
return "primary";
@@ -314,7 +315,8 @@
if (index > -1) {
expandData.value = res.data.map(item => ({
...item,
- pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0)
+ pendingNum: (Number(item.schedulingNum) || 0) - (Number(item.finishedNum) || 0),
+ parentStatus: row.status // 鏂板鐖惰〃鐘舵��
}));
}
expandedRowKeys.value.push(row.id);
--
Gitblit v1.9.3