From 6b35989783d91899169f89e21a7d3734d8cadc1d Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期日, 04 一月 2026 15:19:54 +0800
Subject: [PATCH] 1.海川开心
---
src/views/basicData/product/index.vue | 32 +++++++++++++++++++++++++-------
1 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index db5f096..350a704 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -25,9 +25,7 @@
:data="list"
@node-click="handleNodeClick"
:expand-on-click-node="false"
- default-expand-all
:default-expanded-keys="expandedKeys"
- :draggable="true"
:filter-node-method="filterNode"
:props="{ children: 'children', label: 'label' }"
highlight-current
@@ -99,7 +97,7 @@
@pagination="pagination"
></PIMTable>
</div>
- <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent>
+ <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent draggable>
<el-form
:model="form"
label-width="140px"
@@ -130,6 +128,7 @@
<el-dialog
v-model="modelDia"
title="瑙勬牸鍨嬪彿"
+ draggable
width="400px"
@close="closeModelDia"
@keydown.enter.prevent
@@ -147,6 +146,18 @@
<el-input
v-model="modelForm.model"
placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�(g*琚嬫暟)"
+ clearable
+ @keydown.enter.prevent
+ />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row>
+ <el-col :span="24">
+ <el-form-item label="鍏朵粬瑙勬牸鍨嬪彿锛�" prop="otherModel">
+ <el-input
+ v-model="modelForm.otherModel"
+ placeholder="璇疯緭鍏ュ叾浠栬鏍煎瀷鍙�"
clearable
@keydown.enter.prevent
/>
@@ -266,21 +277,22 @@
productName: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
},
modelForm: {
+ otherModel:'',
model: "",
unit: "",
speculativeTradingName: [],
},
modelRules: {
model: [
- { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+ // { required: true, message: "璇疯緭鍏�", trigger: "blur" },
{
pattern: /^[0-9*]*$/,
message: "鍙兘杈撳叆鏁板瓧鍜�*鍙�",
trigger: "blur"
}
],
- unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
- speculativeTradingName: [{ required: true, message: "璇烽�夋嫨缁戝畾鏈哄櫒", trigger: "change" }],
+ // unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+ // speculativeTradingName: [{ required: false, message: "璇烽�夋嫨缁戝畾鏈哄櫒", trigger: "change" }],
},
});
const { form, rules, modelForm, modelRules } = toRefs(data);
@@ -394,9 +406,15 @@
const submitModelForm = () => {
proxy.$refs.modelFormRef.validate((valid) => {
if (valid) {
+ let _modelForm = { ...modelForm.value };
+
+ if(_modelForm.otherModel){
+ _modelForm.model = _modelForm.otherModel;
+ }
+ delete _modelForm.otherModel;
// 灏嗛�変腑鐨勬満鍣ㄦ暟缁勮浆鎹负閫楀彿鍒嗛殧鐨勫瓧绗︿覆
const submitData = {
- ...modelForm.value,
+ ..._modelForm,
productId: currentId.value,
speculativeTradingName: modelForm.value.speculativeTradingName.join(',')
};
--
Gitblit v1.9.3