From d1733a6f090c0caf96c30c4b2f4f08c7d43c8d3c Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期三, 18 三月 2026 14:35:34 +0800
Subject: [PATCH] Merge branch 'dev_银川_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management into dev_银川_中盛建材
---
src/views/productionManagement/productionProcess/index.vue | 31 ++++++++++++++++++++++++++-----
1 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/src/views/productionManagement/productionProcess/index.vue b/src/views/productionManagement/productionProcess/index.vue
index 37bb89c..9994b94 100644
--- a/src/views/productionManagement/productionProcess/index.vue
+++ b/src/views/productionManagement/productionProcess/index.vue
@@ -70,7 +70,7 @@
<el-button type="primary"
size="small"
:disabled="!selectedProcess"
- @click="handleSelectParam">
+ @click="openParamDialog">
<el-icon>
<Plus />
</el-icon>閫夋嫨鍙傛暟
@@ -377,13 +377,11 @@
name: [{ required: true, message: "璇疯緭鍏ュ伐搴忓悕绉�", trigger: "blur" }],
salaryQuota: [
{
- required: true,
+ required: false,
message: "璇疯緭鍏ュ伐璧勫畾棰�",
trigger: "blur",
validator: (rule, value, callback) => {
- if (value === null || value === undefined || value === "") {
- callback(new Error("璇疯緭鍏ュ伐璧勫畾棰�"));
- } else if (isNaN(value) || value < 0) {
+ if (isNaN(value) || value < 0) {
callback(new Error("宸ヨ祫瀹氶蹇呴』鏄潪璐熸暟瀛�"));
} else {
callback();
@@ -683,6 +681,29 @@
}
});
};
+ const openParamDialog = () => {
+ paramSearchKeyword.value = "";
+ if (!selectedProcess.value) {
+ ElMessage.warning("璇峰厛閫夋嫨涓�涓伐搴�");
+ return;
+ }
+ // 鑾峰彇鍙�夊弬鏁板垪琛�
+ getBaseParamList({
+ paramName: paramSearchKeyword.value,
+ current: paramPage.current,
+ size: paramPage.size,
+ }).then(res => {
+ if (res.code === 200) {
+ filteredParamList.value = res.data?.records || [];
+ paramPage.total = res.data?.total || 0;
+ } else {
+ ElMessage.error(res.msg || "鏌ヨ澶辫触");
+ }
+ });
+ console.log(filteredParamList.value, "鍙�夊弬鏁板垪琛�");
+ selectedParam.value = null;
+ paramDialogVisible.value = true;
+ };
// 鍙傛暟鎿嶄綔
const handleSelectParam = () => {
--
Gitblit v1.9.3