no message

src/views/system/goods/add/components/goodsparameter.vue

@@ -64,28 +64,30 @@
         <!--        </el-table-column>-->
       </el-table>
     </div>
-    <div v-if="orgGoodsPam.pamTableList.length > 0" v-for="(item,index) in orgGoodsPam.pamTableList" :key="index"
-         class="single-spe-con">
-      <p style="margin: 10px 0;color: #333;font-size: 14px;font-weight: 400;">
-          <span v-show="orgGoodsPam.pamNameList.length === 1">
-            {{ orgGoodsPam.pamNameList[0].spec_name }} <span>：</span>{{ orgGoodsPam.pamDataList[index]}}
-          </span>
-        <span v-show="orgGoodsPam.pamNameList.length > 1">
-            <span v-for="(itemv,indexv) in orgGoodsPam.pamNameList" style="margin-right:20px;">
-            {{ orgGoodsPam.pamNameList[indexv].spec_name }} <span>：</span>{{ orgGoodsPam.pamDataList[index][indexv]}}
-          </span>
-          </span>
-      </p>
+    <div v-if="orgGoodsPam.pamTableList.length > 0"  class="single-spe-con">
+      
       <el-table
         border
         size="small"
-        :data="item"
+        :data="orgGoodsPam.pamTableList"
+         :span-method="objectSpanMethod1"
         style="width: 80%"
       >
+        <el-table-column
+        header-align="center"
+        align="center"
+        v-for="(item, index) in spacArr"
+        :key="index"
+        :label="item.spec_name"
+      >
+      <template slot-scope="scope">
+        1
+      </template>
+    </el-table-column>
         <el-table-column align="center" prop="js_price" label="协议价">
           <template slot="header">
             <span>协议价</span>
-            <el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
+            <el-tooltip placemetn="top">
               <span slot="content">点击可批量设置价格</span>
               <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('js_price')"></span>
             </el-tooltip>
@@ -102,7 +104,7 @@
         <el-table-column align="center" prop="price" label="指导价">
           <template slot="header">
             <span>指导价</span>
-            <el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
+            <el-tooltip placemetn="top" >
               <span slot="content">点击可批量设置价格</span>
               <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('price')"></span>
             </el-tooltip>
@@ -114,7 +116,7 @@
         <el-table-column align="center" prop="sc_price" label="市场价">
           <template slot="header">
             <span>市场价</span>
-            <el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
+            <el-tooltip placemetn="top" >
               <span slot="content">点击可批量设置价格</span>
               <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('sc_price')"></span>
             </el-tooltip>
@@ -126,7 +128,7 @@
         <el-table-column align="center" prop="stock" label="库存量">
           <template slot="header">
             <span>库存量</span>
-            <el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
+            <el-tooltip placemetn="top" >
               <span slot="content">点击可批量设置价格</span>
               <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('stock')"></span>
             </el-tooltip>
@@ -138,7 +140,7 @@
         <el-table-column align="center" prop="weight" label="重量">
           <template slot="header">
             <span>重量</span>
-            <el-tooltip placemetn="top" v-if="index==0 && orgGoodsPam.pamTableList.length >= 1">
+            <el-tooltip placemetn="top" >
               <span slot="content">点击可批量设置价格</span>
               <span class="spe-ali-icon0435 iconfont icon-iconset0435" @click="applyAllTable('weight')"></span>
             </el-tooltip>
@@ -152,20 +154,20 @@
               <span
                 v-show="!scope.row.thumb"
                 class="span-img"
-                @click="upPreSpeImg(index,scope.row)"
+                @click="upPreSpeImg(scope.$index,scope.row)"
               ></span>
             <span v-show="scope.row.thumb" class="span-img-con">
                 <img
                   class="spec-img"
                   :src="scope.row.thumb"
                   alt=""
-                  @click="changeSpeImg(index,scope.row)"
+                  @click="changeSpeImg(scope.$index,scope.row)"
                 />
-                <span class="span-img-del el-icon-delete del-span-block" @click="delSingleSpecImg(index,scope.row)"></span>
+                <span class="span-img-del el-icon-delete del-span-block" @click="delSingleSpecImg(scope.$index,scope.row)"></span>
               </span>
 
-            <input type="file" style="display: none;" :ref=" 'hxz' + index " accept="image/*"
-                   @change="changeIMG(index,scope.row)">
+            <input type="file" style="display: none;" :ref=" 'hxz' + scope.$index " accept="image/*"
+                   @change="changeIMG(scope.$index,scope.row)">
           </template>
         </el-table-column>
       </el-table>
@@ -223,6 +225,7 @@ export default {
   },
   data() {
     return {
+      spacArr:[],
       orgGoodsPam: {},
       preTableTitle: [],
       isHoverSpeImg: false,
@@ -244,14 +247,21 @@ export default {
   },
   watch:{
     'parameterdata': function(val) {
-      //debugger
+      debugger
       this.orgGoodsPam = val;
+      if(val.pamNameList){
+        this.spacArr = val.pamNameList
+      console.log(val)
+      }
     },
   },
   created() {
     this.cateFee = this.$store.state.user.cateFee;
+    debugger
   },
   mounted() {
+    console.log(this.parameterdata)
+    debugger
     if(this.parameterdata.pamTableList && this.parameterdata.pamTableList.length > 0) {
       this.orgGoodsPam = this.parameterdata;
     }else {
@@ -455,6 +465,41 @@ export default {
 
       return slPriceNum
     },
+     // 合并行数
+     objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
+      if(this.shopTypes && this.shopTypes.length > 0) {
+        for (let s = 0; s < this.shopTypes.length; s++) {
+          if (columnIndex == s) {
+            const _row = this.spanArrS["spanArr" + s][rowIndex];
+            const _col = _row > 0 ? 1 : 0;
+            return {
+              rowspan: _row,
+              colspan: _col,
+            };
+            // columnIndex === 1 找到第二列，合并他的列数
+          }
+        }
+      }
+
+
+      // columnIndex === 0 找到第一列，实现合并随机出现的行数
+      // if (columnIndex === 0) {
+      //   const _row = this.spanArr[rowIndex];
+      //   const _col = _row > 0 ? 1 : 0;
+      //   return {
+      //     rowspan: _row,
+      //     colspan: _col
+      //   };
+      //   // columnIndex === 1 找到第二列，合并他的列数
+      // } else if (columnIndex === 1) {
+      //   const _row = this.spanArr1[rowIndex];
+      //   const _col = _row > 0 ? 1 : 0;
+      //   return {
+      //     rowspan: _row,
+      //     colspan: _col
+      //   };
+      // }
+    },
   } // methods end
 }
 </script>

src/views/system/goods/add/components/goodsspecifications.vue

@@ -343,6 +343,7 @@ export default {
           pamNameList: [],
           pamDataList: [],
           pamTableList: [],
+          specs:[]
         };
         this.$emit('calcSpeTable', goodsPam);
       } else {
@@ -351,10 +352,11 @@ export default {
           pamNameList: [],
           pamDataList: [],
           pamTableList: [],
+          specs:[]
         };
         goodsPam.pamNameList = this.speNameList;
         goodsPam.pamDataList = goodsParametersList;
-
+        goodsPam.specs = 
         goodsParametersList.forEach((item)=> {
           let prePamTable = [
             { js_price:'', sl_price:'', price:'', sc_price:'', stock:'', weight:'', thumb:'',spec_values: [] }
@@ -439,6 +441,7 @@ export default {
               res.push(t);
             });
           });
+          debugger
           return res
         });
       }

src/views/system/goods/add/index.vue

@@ -37,12 +37,6 @@
           <div class="floor-item-box">
             <p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品规格</p>
             <GoodsSpecifications ref="goodsspecifications" :specificationsdata="specificationsdata" @calcSpeTable="calcSpeTable"/>
-          </div>
-        </div>
-        <!-- 商品售价 -->
-        <div class="floor-item">
-          <div class="floor-item-box">
-            <p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品售价</p>
             <!--            <keep-alive>-->
             <GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" />
             <!--            </keep-alive>-->
@@ -135,6 +129,7 @@
         specificationsdata: [],
         /* 商品售价 */
         parameterdata: {
+          specs:[],
           pamDataList: [],
           pamNameList: [],
           pamTableList: [],
@@ -204,6 +199,7 @@
             if(res.data.specs_group && res.data.specs_group.length > 0) {
               //this.parameterdata
               let prePriceArr = [];
+              this.parameterdata.specs = res.data.specs
               this.parameterdata.pamTableList = [];
               this.parameterdata.pamDataList = [];
               res.data.specs_group.forEach((item)=> {