|
|
@@ -105,7 +105,8 @@
|
|
|
<template v-if="item.goods">
|
|
|
<li v-for="price in item.goods.prices">
|
|
|
<div>{{price.start}}+</div>
|
|
|
- <div v-if="item.currencyName == 'RMB'">¥{{price.rMBPrice}}</div>
|
|
|
+ <!--{{item.goods.currencyName}}-->
|
|
|
+ <div v-if="item.goods.currencyName === 'RMB'">¥{{price.rMBPrice}}</div>
|
|
|
<div v-else>${{price.uSDPrice}}</div>
|
|
|
</li>
|
|
|
</template>
|
|
|
@@ -241,7 +242,7 @@
|
|
|
</span>
|
|
|
<div style="clear:both"></div>
|
|
|
<div class="uploadImgBtn pull-left" v-if="MaterielItem.standard !== 1">上传规格书<input type="file" class="com-input" @change.stop="update" accept=".pdf" /></div>
|
|
|
- <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="MaterielItem.standard !== 1 && MaterielItem.Regulpic !== '' && MaterielItem.IsSave" >该规格书正在审核中</div>
|
|
|
+ <div style="color: #ea0f42;font-size: 0.2rem;line-height: 0.47rem;margin-left: 0.2rem" class="pull-left" v-if="(MaterielItem.productAttachSubmit && MaterielItem.productAttachSubmit.uploadAttach) && MaterielItem.standard !== 1 && MaterielItem.Regulpic !== '' && MaterielItem.IsSave" >该规格书正在审核中</div>
|
|
|
</div>
|
|
|
|
|
|
<div class="update-materiel-wrapper-list clearfix">
|
|
|
@@ -414,10 +415,10 @@
|
|
|
},
|
|
|
// 编辑上架
|
|
|
toAddpro(item, index) {
|
|
|
- // if (item.erpReserve === '' || item.erpReserve === 0 || !item.erpReserve) {
|
|
|
- // this.setRemindText(`当前物料库存为0,请先入库`)
|
|
|
- // return false
|
|
|
- // }
|
|
|
+ if (item.erpReserve === '' || item.erpReserve === 0 || !item.erpReserve) {
|
|
|
+ this.setRemindText(`当前物料库存为0,请先入库`)
|
|
|
+ return false
|
|
|
+ }
|
|
|
if (item.minPackQty === '' || item.minPackQty === 0 || !item.minPackQty) {
|
|
|
this.setRemindText(`请先编辑物料,最小包装数选项`)
|
|
|
return false
|