From 0c5b607e028bd756079cb328dd0914db2c9093f5 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 04 十二月 2025 14:59:55 +0800
Subject: [PATCH] 1.部署修改

---
 src/views/basicData/product/index.vue |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index d07f5a2..a6e1e6a 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -99,7 +99,7 @@
         @pagination="pagination"
       ></PIMTable>
     </div>
-    <el-dialog v-model="productDia" title="浜у搧" width="400px">
+    <el-dialog v-model="productDia" title="浜у搧" width="400px" @keydown.enter.prevent>
       <el-form
         :model="form"
         label-width="140px"
@@ -114,6 +114,7 @@
                 v-model="form.productName"
                 placeholder="璇疯緭鍏ヤ骇鍝佸悕绉�"
                 clearable
+                @keydown.enter.prevent
               />
             </el-form-item>
           </el-col>
@@ -131,6 +132,7 @@
       title="瑙勬牸鍨嬪彿"
       width="400px"
       @close="closeModelDia"
+      @keydown.enter.prevent
     >
       <el-form
         :model="modelForm"
@@ -144,8 +146,9 @@
             <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
               <el-input
                 v-model="modelForm.model"
-                placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+                placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�(g*琚嬫暟)"
                 clearable
+                @keydown.enter.prevent
               />
             </el-form-item>
           </el-col>
@@ -157,10 +160,29 @@
                 v-model="modelForm.unit"
                 placeholder="璇疯緭鍏ュ崟浣�"
                 clearable
+                @keydown.enter.prevent
               />
             </el-form-item>
           </el-col>
         </el-row>
+<!--        <el-row>-->
+<!--          <el-col :span="24">-->
+<!--            <el-form-item label="缁戝畾鏈哄櫒锛�" prop="speculativeTradingName">-->
+<!--              <el-select-->
+<!--                v-model="modelForm.speculativeTradingName"-->
+<!--                placeholder="璇烽�夋嫨缁戝畾鏈哄櫒"-->
+<!--                multiple-->
+<!--                clearable-->
+<!--                style="width: 100%"-->
+<!--              >-->
+<!--                <el-option label="鐐掓満1" value="鐐掓満1" />-->
+<!--                <el-option label="鐐掓満2" value="鐐掓満2" />-->
+<!--                <el-option label="鐐掓満3" value="鐐掓満3" />-->
+<!--                <el-option label="鐐掓満4" value="鐐掓満4" />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
+<!--        </el-row>-->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -208,6 +230,10 @@
     label: "鍗曚綅",
     prop: "unit",
   },
+  // {
+  //   label: "缁戝畾鏈哄櫒",
+  //   prop: "speculativeTradingName",
+  // },
   {
     dataType: "action",
     label: "鎿嶄綔",
@@ -242,10 +268,19 @@
   modelForm: {
     model: "",
     unit: "",
+    speculativeTradingName: [],
   },
   modelRules: {
-    model: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    model: [
+      { required: true, message: "璇疯緭鍏�", trigger: "blur" },
+      { 
+        pattern: /^[0-9*]*$/, 
+        message: "鍙兘杈撳叆鏁板瓧鍜�*鍙�", 
+        trigger: "blur" 
+      }
+    ],
     unit: [{ required: true, message: "璇疯緭鍏�", trigger: "blur" }],
+    speculativeTradingName: [{ required: true, message: "璇烽�夋嫨缁戝畾鏈哄櫒", trigger: "change" }],
   },
 });
 const { form, rules, modelForm, modelRules } = toRefs(data);
@@ -282,10 +317,15 @@
   modelOperationType.value = type;
   modelDia.value = true;
   modelForm.value.model = "";
-  modelForm.value.model = "";
+  modelForm.value.unit = "";
+  modelForm.value.speculativeTradingName = [];
   modelForm.value.id = "";
   if (type === "edit") {
     modelForm.value = { ...data };
+    // 濡傛灉鍚庣杩斿洖鐨勬槸瀛楃涓诧紝闇�瑕佽浆鎹负鏁扮粍
+    if (data.speculativeTradingName && typeof data.speculativeTradingName === 'string') {
+      modelForm.value.speculativeTradingName = data.speculativeTradingName.split(',');
+    }
   }
 };
 // 鎻愪氦浜у搧鍚嶇О淇敼
@@ -315,6 +355,7 @@
   proxy.$refs.formRef.resetFields();
   productDia.value = false;
 };
+
 // 鍒犻櫎浜у搧
 const remove = (node, data) => {
   let ids = [];
@@ -353,8 +394,13 @@
 const submitModelForm = () => {
   proxy.$refs.modelFormRef.validate((valid) => {
     if (valid) {
-      modelForm.value.productId = currentId.value;
-      addOrEditProductModel(modelForm.value).then((res) => {
+      // 灏嗛�変腑鐨勬満鍣ㄦ暟缁勮浆鎹负閫楀彿鍒嗛殧鐨勫瓧绗︿覆
+      const submitData = {
+        ...modelForm.value,
+        productId: currentId.value,
+        speculativeTradingName: modelForm.value.speculativeTradingName.join(',')
+      };
+      addOrEditProductModel(submitData).then((res) => {
         proxy.$modal.msgSuccess("鎻愪氦鎴愬姛");
         closeModelDia();
         getModelList();

--
Gitblit v1.9.3