From 16c55c8b1939e2c5ac7f6cdaa34b273657e743e4 Mon Sep 17 00:00:00 2001
From: yyb <995253665@qq.com>
Date: 星期五, 03 四月 2026 11:33:47 +0800
Subject: [PATCH] 添加发货状态筛选和优化发货逻辑
---
src/views/basicData/product/index.vue | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index c9058aa..98eaf75 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -73,7 +73,7 @@
<el-button type="primary" @click="openModelDia('add')">
鏂板瑙勬牸鍨嬪彿
</el-button>
- <ImportExcel @uploadSuccess="getModelList" />
+ <ImportExcel :product-id="currentId" @uploadSuccess="getModelList" />
<el-button
type="danger"
@click="handleDelete"
@@ -152,6 +152,19 @@
</el-row>
<el-row>
<el-col :span="24">
+ <el-form-item label="鍘氬害锛�" prop="thickness">
+ <el-input
+ v-model="modelForm.thickness"
+ placeholder="璇疯緭鍏ュ帤搴�"
+ clearable
+ @keydown.enter.prevent
+ @blur="modelForm.thickness = formatThicknessTo15(modelForm.thickness)"
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
<el-form-item label="鍗曚綅锛�" prop="unit">
<el-input
v-model="modelForm.unit"
@@ -206,6 +219,12 @@
prop: "model",
},
{
+ label: "鍘氬害",
+ prop: "thickness",
+ // 鍒楄〃灞曠ず鏃剁粺涓�淇濈暀 15 浣嶅皬鏁�
+ formatData: (val) => formatThicknessTo15(val),
+ },
+ {
label: "鍗曚綅",
prop: "unit",
},
@@ -245,14 +264,24 @@
},
modelForm: {
model: "",
- unit: "",
+ thickness: "",
},
modelRules: {
model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ thickness: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
});
const { form, rules, modelForm, modelRules } = toRefs(data);
+
+// 鎶婂帤搴︽牸寮忓寲鎴愬浐瀹� 15 浣嶅皬鏁帮紙鐢ㄤ簬灞曠ず/鎻愪氦锛�
+const formatThicknessTo15 = (val) => {
+ if (val === null || val === undefined) return "";
+ const s = String(val).trim();
+ if (s === "") return "";
+ const n = Number(s);
+ if (Number.isNaN(n)) return s;
+ return n.toFixed(15);
+};
// 鏌ヨ浜у搧鏍�
const getProductTreeList = () => {
treeLoad.value = true;
@@ -286,8 +315,8 @@
modelOperationType.value = type;
modelDia.value = true;
modelForm.value.model = "";
- modelForm.value.model = "";
modelForm.value.id = "";
+ modelForm.value.thickness = "";
if (type === "edit") {
modelForm.value = { ...data };
}
@@ -359,6 +388,7 @@
proxy.$refs.modelFormRef.validate((valid) => {
if (valid) {
modelForm.value.productId = currentId.value;
+ modelForm.value.thickness = formatThicknessTo15(modelForm.value.thickness);
addOrEditProductModel(modelForm.value).then((res) => {
proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
closeModelDia();
--
Gitblit v1.9.3