From 4d69cfa12fbcda321b35ff0c1e693e84df37f22b Mon Sep 17 00:00:00 2001
From: DongZeLiang <2746733890@qq.com>
Date: Fri, 22 Mar 2024 14:57:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/product/info/index.vue | 38 ++++++++++++++++++++++++++++++--
 vue.config.js                    |  2 +-
 2 files changed, 37 insertions(+), 3 deletions(-)

diff --git a/src/views/product/info/index.vue b/src/views/product/info/index.vue
index 4ece47c..1346ecd 100644
--- a/src/views/product/info/index.vue
+++ b/src/views/product/info/index.vue
@@ -335,6 +335,7 @@
           <el-table
             :data="skuList"
             border
+            max-height="500"
             style="width: 100%">
             <el-table-column v-for="title in titleList" :prop="title.prop" :label="title.label">
               <template slot-scope="scope">
@@ -723,14 +724,47 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+          let attrValueList = [];
+          for (const templateAttributeGroup of this.categoryCommonElement.templateAttributeGroupList) {
+            templateAttributeGroup.attributeList.map(attribute => attrValueList.push({id: attribute.id, value: attribute.value}))
+          }
+
+          this.categoryCommonElement.templateAttributeList.map(attribute => attrValueList.push({id: attribute.id, value: attribute.value}))
+          this.attributeCheckedList.map(attribute => attrValueList.push({id: attribute.id, value: attribute.value}))
+          let ruleInfo = this.ruleList.find(ruleInfo => ruleInfo.id === this.form.ruleId);
+          const {ruleAttrList} = ruleInfo;
+          let ruleAttrSize = ruleAttrList.length;
+          let productSkuList = this.skuList.map(skuInfo => {
+            let sku = "";
+            for (let index = 0; ; index++) {
+              sku += skuInfo["prop"+index];
+              if (index+1 >= ruleAttrSize){
+                break;
+              }else {
+                sku += "-";
+              }
+            }
+            return {
+              sku: sku,
+              image: skuInfo.image,
+              stock: skuInfo.stock,
+              price: skuInfo.price
+            }
+          })
+          let productAddReq = {
+            projectAddModel: this.form,
+            attrValueList: attrValueList,
+            productSkuList: productSkuList
+          };
+          console.log(productAddReq)
           if (this.form.id != null) {
-            updateInfo(this.form).then(response => {
+            updateInfo(productAddReq).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.open = false;
               this.getList();
             });
           } else {
-            addInfo(this.form).then(response => {
+            addInfo(productAddReq).then(response => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
diff --git a/vue.config.js b/vue.config.js
index 1874469..17d9a1d 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http://10.1.20.79:8080`,
+        target: `http://127.0.0.1:8080`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''