提交 d46ba41b authored 作者: 王天霸's avatar 王天霸

no message

上级 de06c3e6
...@@ -467,8 +467,8 @@ export default { ...@@ -467,8 +467,8 @@ export default {
}, },
// 合并行数 // 合并行数
objectSpanMethod1({ row, column, rowIndex, columnIndex }) { objectSpanMethod1({ row, column, rowIndex, columnIndex }) {
if(this.shopTypes && this.shopTypes.length > 0) { if(this.spacArr && this.spacArr.length > 0) {
for (let s = 0; s < this.shopTypes.length; s++) { for (let s = 0; s < this.spacArr.length; s++) {
if (columnIndex == s) { if (columnIndex == s) {
const _row = this.spanArrS["spanArr" + s][rowIndex]; const _row = this.spanArrS["spanArr" + s][rowIndex];
const _col = _row > 0 ? 1 : 0; const _col = _row > 0 ? 1 : 0;
......
...@@ -72,6 +72,20 @@ ...@@ -72,6 +72,20 @@
<el-button type="primary" @click="saveSpecName" size="mini">确 定</el-button> <el-button type="primary" @click="saveSpecName" size="mini">确 定</el-button>
</span> </span>
</el-dialog> </el-dialog>
<!-- 规格 -->
<div class="goods-parameter">
<p class="tip-p">
<!-- <el-link class="edit-type-span el-icon-search" type="primary" :underline="false" @click="viewPriceExp">查看各类价格说明 -->
</el-link>
<span class="tip-span">所有商品价格均为含税价,必须开具发票</span>
</p>
</div>
</div> </div>
</template> </template>
...@@ -348,6 +362,7 @@ export default { ...@@ -348,6 +362,7 @@ export default {
this.$emit('calcSpeTable', goodsPam); this.$emit('calcSpeTable', goodsPam);
} else { } else {
let goodsParametersList = this.cartesian(proSpeData); let goodsParametersList = this.cartesian(proSpeData);
console.log(goodsParametersList)
let goodsPam = { let goodsPam = {
pamNameList: [], pamNameList: [],
pamDataList: [], pamDataList: [],
...@@ -517,4 +532,14 @@ export default { ...@@ -517,4 +532,14 @@ export default {
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
/* guige */
.goods-parameter {
padding: 20px;
}
/* 一般提示性文字 */
.tip-span {
color: #909399;
font-size: 12px;
}
</style> </style>
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
<p class="card-header-title floor-item-box-title"><span class="blue-block-goods blue-block-goods-title"></span>商品规格</p> <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"/> <GoodsSpecifications ref="goodsspecifications" :specificationsdata="specificationsdata" @calcSpeTable="calcSpeTable"/>
<!-- <keep-alive>--> <!-- <keep-alive>-->
<GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" /> <!-- <GoodsParameter ref="goodsparameter" :parameterdata="parameterdata" /> -->
<!-- </keep-alive>--> <!-- </keep-alive>-->
</div> </div>
</div> </div>
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
calcSpeTable(data) { calcSpeTable(data) {
//console.log('原始值',data); //console.log('原始值',data);
// 第一步,获取原来的值 // 第一步,获取原来的值
let spsjData2 = this.$refs.goodsparameter.orgGoodsPam; // let spsjData2 = this.$refs.goodsparameter.orgGoodsPam;
let spsjData2Clone = this.deepClone(spsjData2); let spsjData2Clone = this.deepClone(spsjData2);
// 第二步,重新渲染dom // 第二步,重新渲染dom
...@@ -412,7 +412,7 @@ ...@@ -412,7 +412,7 @@
let isGoodsPrice = true; let isGoodsPrice = true;
let goodsPriceMsg = ''; let goodsPriceMsg = '';
let spsjData1 = this.$refs.goodsparameter.singleSpecTable; let spsjData1 = this.$refs.goodsparameter.singleSpecTable;
let spsjData2 = this.$refs.goodsparameter.orgGoodsPam; // let spsjData2 = this.$refs.goodsparameter.orgGoodsPam;
// 如果有,则说明有规格组合数据 // 如果有,则说明有规格组合数据
if ( spsjData2.pamTableList && spsjData2.pamTableList.length > 0 ) { if ( spsjData2.pamTableList && spsjData2.pamTableList.length > 0 ) {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论