Merge branch '2.8关联bug'

src/views/system/goodsimport/goodsgement.vue

@@ -263,18 +263,18 @@
       <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">
+            <span v-for="(item, index) in scope.row.objArr" :key="index">
               {{ `${item.name}: ${item.spec_values}` }}
             </span>
           </template>
         </el-table-column>
         <el-table-column label="库存量" width="160px" prop="stock" align="center">
           <template slot-scope="scope">
-            <el-input v-model.trim="scope.row.stock" />
+            <el-input v-model="scope.row.stock" />
           </template>
         </el-table-column>
       </el-table>
-      <el-table :data="[1]" class="hot-edit-goods-table" border v-else>
+      <el-table :data="speListone" class="hot-edit-goods-table" border v-else>
         <el-table-column label="规格项" prop="spe" align="center">
           <template slot-scope="scope">
             默认
@@ -375,6 +375,7 @@
         },
         freightOptions: [],
         speList: [],
+        speListone:[],
         stock: 0,
         rowInfo: null
       };
@@ -697,6 +698,7 @@
 
             // 规格组合
             this.speList = []
+            this.speListone = []
             if (res.data.specs && res.data.specs_group) {
               let nameArr = []
               res.data.specs.map(item => {
@@ -722,9 +724,15 @@
                 }
                 this.speList[i].objArr = arr
               }
+            }else{
+              debugger
+              this.speListone.push({
+                stock:res.data.stock
+              })
             }
           }
         });
+        console.log(this.speList)
       },
       /** 保存 不下架 编辑商品 */
       saveHotEditGoods() {
@@ -742,7 +750,7 @@
           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
+          stock: this.speList.length ? undefined : this.speListone[0].stock
         }
 
         saveHotEditGoodsData(data).then(res=> {

src/views/system/shop/brand.vue

@@ -83,7 +83,7 @@
       ></pagination>
     </el-card> 
     <!-- 新增/修改/详情 -->
-    <el-dialog :title="brandTitle" :visible.sync="isOpen" width="70%" class="brandInf-add" center
+    <el-dialog :title="brandTitle" v-if="isOpen" :visible.sync="isOpen" width="70%" class="brandInf-add" center
                :close-on-click-modal="false" :before-close="handleCancel">
       <el-form :model="brandForm" :rules="brandRules" ref="brandForm" label-width="140px">
         <el-row v-if="indexBrandId != 0 && brandForm.status != 3">
@@ -547,6 +547,11 @@
       },
       /** 编辑 品牌 */
       editBrand(row) {
+        this.brandImgFileList= [];
+        this.certImgFileList= [];
+        this.factoryImgFileList= [];
+        this.shopImgFileList= [];
+        // debugger
         this.indexBrandId = row.id;
         let data = {
           id : this.indexBrandId
@@ -565,6 +570,7 @@
             let brandArr = [];
             let brandUrl = {};
             brandArr = this.brandForm.brand_logo.split(",");
+            // debugger
             if (brandArr.length > 0) {
               brandArr.forEach(item=> {
                 brandUrl = {};
@@ -806,7 +812,7 @@
         this.certImgFileList= [];
         this.factoryImgFileList= [];
         this.shopImgFileList= [];
-
+        // debugger
         this.validityLongTermVal = false;
         this.validityConcreteTime = ''
         Object.assign(this.brandForm, this.$options.data().brandForm)