From cb07563b69fc86095db2825df1340c47ba3f8f84 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 12 十一月 2025 18:01:04 +0800
Subject: [PATCH] 新疆-生产流程定制化

---
 src/views/basicData/product/index.vue |   51 ++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/views/basicData/product/index.vue b/src/views/basicData/product/index.vue
index b88d678..db5f096 100644
--- a/src/views/basicData/product/index.vue
+++ b/src/views/basicData/product/index.vue
@@ -146,7 +146,7 @@
             <el-form-item label="瑙勬牸鍨嬪彿锛�" prop="model">
               <el-input
                 v-model="modelForm.model"
-                placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�"
+                placeholder="璇疯緭鍏ヨ鏍煎瀷鍙�(g*琚嬫暟)"
                 clearable
                 @keydown.enter.prevent
               />
@@ -162,6 +162,24 @@
                 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>
@@ -213,6 +231,10 @@
     prop: "unit",
   },
   {
+    label: "缁戝畾鏈哄櫒",
+    prop: "speculativeTradingName",
+  },
+  {
     dataType: "action",
     label: "鎿嶄綔",
     align: "center",
@@ -246,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);
@@ -286,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(',');
+    }
   }
 };
 // 鎻愪氦浜у搧鍚嶇О淇敼
@@ -358,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