联调商品编辑接口

src/api/module/goodsgement.js

@@ -75,7 +75,7 @@ export function cancelOnsaleAllData(data) {
 // 保存 不下架编辑商品数据
 export function saveHotEditGoodsData(data) {
   return request({
-    url: '/system/goodsNew/cancelOnsaleAll',
+    url: '/system/goodsNew/onsaleUpdate',
     method: 'post',
     data: data
   })

src/views/system/goodsimport/goodsgement.vue

@@ -260,13 +260,31 @@
           </el-select>
         </el-form-item>
       </el-form>
-      <el-table :data="speList" class="hot-edit-goods-table" border>
-        <el-table-column label="规格项" prop="spe" align="center"></el-table-column>
+      <el-table :data="speList" class="hot-edit-goods-table" border v-if="speList.length">
+        <el-table-column label="规格项" prop="spe" align="center">
+          <template slot-scope="scope">
+            <span v-for="(item, index) in scope.row.objArr">
+              {{ `${item.name}: ${item.spec_values}` }}
+            </span>
+          </template>
+        </el-table-column>
         <el-table-column label="库存量" width="160px" prop="stock" align="center"></el-table-column>
       </el-table>
+      <el-table :data="[1]" class="hot-edit-goods-table" border v-else>
+        <el-table-column label="规格项" prop="spe" align="center">
+          <template slot-scope="scope">
+            默认
+          </template>
+        </el-table-column>
+        <el-table-column label="库存量" width="160px" prop="stock" align="center">
+          <template slot-scope="scope">
+            {{ stock }}
+          </template>
+        </el-table-column>
+      </el-table>
       <span slot="footer" class="dialog-footer">
         <el-button size="small" @click="cancelHotEditGoods">取 消</el-button>
-        <el-button size="small" type="primary" @click="saveHotEditGoods">确 定</el-button>
+        <el-button size="small" type="primary" @click="saveHotEditGoods">保 存</el-button>
       </span>
     </el-dialog>
   </div>
@@ -352,9 +370,9 @@
           aftersale_time: 7
         },
         freightOptions: [],
-        speList: [
-          { spe: 'ak47', stock: 89},
-        ]
+        speList: [],
+        stock: 0,
+        rowInfo: null
       };
     },
     components: {
@@ -667,53 +685,70 @@
         getGoodsNew(data).then(res=> {
           if (res.code == 1 && res.data) {
             this.isHotEditGoods = true;
-            // todo：
+            this.stock = res.data.stock
+            this.rowInfo = res.data
+            this.hotEditGoodsForm.delay_compensate = res.data.delay_compensate
+            this.hotEditGoodsForm.freight_id = res.data.freight_id
+            this.hotEditGoodsForm.aftersale_time = res.data.aftersale_time
+
+            // 规格组合
             this.speList = []
-            res.data.specs = [
-              {
-                spec_name: '颜色',
-                spec_value: [
-                  {
-                    value: '白色'
-                  },
-                  {
-                    value: '黑色'
-                  },
-                ]
-              }
-            ]
-            res.data.specs_group = [
-              {
-                stock: '360',
-              },
-              {
-                stock: '1000',
-              }
-            ]
-            // this.speList.push
             if (res.data.specs && res.data.specs_group) {
-              for (let i = 0, len = res.data.specs.length; i < len; i++) {
-                for (let j = 0, len = res.data.specs[i].spec_value.length; j < len; j++) {
-                  this.speList.push({
-                    spec_name: res.data.specs[i].spec_name, // 颜色
-                    spec_value: res.data.specs[i].spec_value[j].value, // 容量
-                    // stock: res.data.specs_group[i].stock // 库存
+              let nameArr = []
+              res.data.specs.map(item => {
+                nameArr.push(item.spec_name)
+              })
+
+              for (let i = 0, len = res.data.specs_group.length; i < len; i++) {
+                this.speList.push({
+                  nameArr,
+                  spec_name: res.data.specs_group[i].spec_values,
+                  stock: res.data.specs_group[i].stock,
+                  id: res.data.specs_group[i].id
+                })
+              }
+
+              for (let i = 0, len = this.speList.length; i < len; i++) {
+                let arr = []
+                for (let j = 0, len = res.data.specs.length; j < len; j++) {
+                  arr.push({
+                    name: this.speList[i].nameArr[j],
+                    spec_values: this.speList[i].spec_name[j]
                   })
                 }
+                this.speList[i].objArr = arr
               }
             }
-            console.log(this.speList)
           }
         });
       },
       /** 保存 不下架 编辑商品 */
       saveHotEditGoods() {
-        let data = {}
+        let groupArr = []
+        this.speList.map(item => {
+          groupArr.push({
+            id: item.id,
+            stock: item.stock
+          })
+        })
 
-        console.log(672,this.hotEditGoodsForm);
-        return
-        saveHotEditGoodsData().then(res=> {
+        let data = {
+          goods_id: this.rowInfo.goods_id,
+          delay_compensate: this.hotEditGoodsForm.delay_compensate,
+          aftersale_time: this.hotEditGoodsForm.aftersale_time,
+          freight_id: this.hotEditGoodsForm.freight_id,
+          specs_group: this.speList.length ? groupArr : undefined,
+          stock: this.speList.length ? undefined : this.stock
+        }
 
+        saveHotEditGoodsData(data).then(res=> {
+          if (res.code == 1) {
+            this.$message({
+              type: 'success',
+              message: '保存成功'
+            })
+            this.getList()
+          }
         });
       },
       /** 不下架编辑 退出*/