|
@@ -55,12 +55,22 @@
|
|
</view>
|
|
</view>
|
|
<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
<text class="item-detail-text" v-if="item.affiliation=='SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
</view>
|
|
</view>
|
|
|
|
+ <view class="flex" v-if="item.productTypeSn=='543766811373752320'">
|
|
|
|
+ <u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
|
|
|
|
+ </view>
|
|
<view class="flex justify_between">
|
|
<view class="flex justify_between">
|
|
<view class="item-detail-text flex_1">
|
|
<view class="item-detail-text flex_1">
|
|
- <view @click="openPriceModal(item,1)">
|
|
|
|
- <text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice">{{item.price?'¥'+item.price:'暂无价格'}}</text>
|
|
|
|
- <text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&item.affiliation=='SHELF'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
|
|
|
|
- <u-icon name="arrow-right" v-if="priceShowVal"></u-icon>
|
|
|
|
|
|
+ <!-- 货架产品 -->
|
|
|
|
+ <view @click="openPriceModal(item,1,showShelfDetial)" v-if="item.affiliation=='SHELF'">
|
|
|
|
+ <text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
|
|
|
|
+ <text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
|
|
|
|
+ <u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
|
|
|
|
+ </view>
|
|
|
|
+ <!-- 非货架 -->
|
|
|
|
+ <view @click="openPriceModal(item,1,showNonShelfDetial)" v-else>
|
|
|
|
+ <text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice.non_shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
|
|
|
|
+ <text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice.non_shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
|
|
|
|
+ <u-icon name="arrow-right" v-if="priceShowVal&&showNonShelfDetial"></u-icon>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
<view class="item-detail-text" v-if="item.currentInven">
|
|
<view class="item-detail-text" v-if="item.currentInven">
|
|
@@ -69,7 +79,7 @@
|
|
</u-button>
|
|
</u-button>
|
|
<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
|
|
<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0" :max="item.currentInven"></u-number-box>
|
|
</view>
|
|
</view>
|
|
- <view class="item-detail-text" v-if="item.affiliation=='SUPER_CATALOGUE'||!item.currentInven">
|
|
|
|
|
|
+ <view class="item-detail-text" v-if="item.affiliation=='NON_SHELF'||!item.currentInven">
|
|
<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要急送</text>
|
|
<text v-if="!item.checked" @click="addPart(item)" class="phtxt">我要急送</text>
|
|
<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
|
|
<u-number-box v-else @change="updateVinNums" @blur="updateVinNums" v-model="item.qty" :index="item.productSn" :min="0"></u-number-box>
|
|
</view>
|
|
</view>
|
|
@@ -108,11 +118,14 @@
|
|
<text class="item-detail-text flex_1">{{item.code}}</text>
|
|
<text class="item-detail-text flex_1">{{item.code}}</text>
|
|
<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
<text class="item-detail-text">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
</view>
|
|
</view>
|
|
|
|
+ <view class="flex" v-if="item.productTypeSn=='543766811373752320'">
|
|
|
|
+ <u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
|
|
|
|
+ </view>
|
|
<view class="flex justify_between">
|
|
<view class="flex justify_between">
|
|
- <view class="item-detail-text flex_1" @click="openPriceModal(item,0)">
|
|
|
|
- <text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice">{{item.price?'¥'+item.price:'暂无价格'}}</text>
|
|
|
|
- <text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
|
|
|
|
- <u-icon name="arrow-right" v-if="priceShowVal"></u-icon>
|
|
|
|
|
|
+ <view class="item-detail-text flex_1" @click="openPriceModal(item,0,showShelfDetial)">
|
|
|
|
+ <text class="item-price" :style="{color:!item.price?'#666':''}" v-if="showCarPrice&&configPrice.shelf_price_show == '1'">{{item.price?'¥'+item.price:'暂无价格'}}</text>
|
|
|
|
+ <text class="item-price" :style="{color:!item.cost?'#666':''}" v-if="showCostPrice&&configPrice.shelf_cost_show == '1'">{{item.cost?'¥'+item.cost:'暂无价格'}}</text>
|
|
|
|
+ <u-icon name="arrow-right" v-if="priceShowVal&&showShelfDetial"></u-icon>
|
|
</view>
|
|
</view>
|
|
<view class="item-detail-text" v-if="item.currentInven">
|
|
<view class="item-detail-text" v-if="item.currentInven">
|
|
<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx',background:'#066cff'}" type="primary" size="mini">
|
|
<u-button shape="circle" @click="addPart(item)" v-if="!item.checked" :custom-style="{width:'48upx',height:'48upx',background:'#066cff'}" type="primary" size="mini">
|
|
@@ -150,7 +163,7 @@
|
|
<u-image width="44" height="44" :src="`/static/icon_shopping@3x.png`"></u-image>
|
|
<u-image width="44" height="44" :src="`/static/icon_shopping@3x.png`"></u-image>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <view v-if="(showCarPrice||showCostPrice)&&totalAmount">
|
|
|
|
|
|
+ <view>
|
|
<!-- 合计:<text>¥{{totalAmount}}</text> -->
|
|
<!-- 合计:<text>¥{{totalAmount}}</text> -->
|
|
</view>
|
|
</view>
|
|
<div>
|
|
<div>
|
|
@@ -178,7 +191,10 @@
|
|
<view class="item-detail-info">
|
|
<view class="item-detail-info">
|
|
<view class="flex justify_between">
|
|
<view class="flex justify_between">
|
|
<text class="item-detail-text flex_1">{{item.code}}</text>
|
|
<text class="item-detail-text flex_1">{{item.code}}</text>
|
|
- <text class="item-detail-text" v-if="item.affiliation!='SUPER_CATALOGUE'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
|
|
|
|
+ <text class="item-detail-text" v-if="item.affiliation!='NON_SHELF'">库存:{{item.currentInven?item.currentInven:0}} {{item.unit}}</text>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="flex" v-if="item.productTypeSn=='543766811373752320'" style="padding-bottom: 5px;">
|
|
|
|
+ <u-tag :text="item.origCode" mode="light" borderColor="#ffffff" shape="circle" type="success"></u-tag>
|
|
</view>
|
|
</view>
|
|
<view class="flex justify_between">
|
|
<view class="flex justify_between">
|
|
<view class="item-detail-text flex_1">
|
|
<view class="item-detail-text flex_1">
|
|
@@ -208,21 +224,37 @@
|
|
<!-- 价格查看 -->
|
|
<!-- 价格查看 -->
|
|
<u-popup v-model="showPriceModal" mode="center" length="80%" closeable>
|
|
<u-popup v-model="showPriceModal" mode="center" length="80%" closeable>
|
|
<view class="show-price-modal" v-if="tempData">
|
|
<view class="show-price-modal" v-if="tempData">
|
|
- <view>
|
|
|
|
|
|
+ <view class="itemlist">
|
|
<text>产品编码</text>
|
|
<text>产品编码</text>
|
|
<text>{{tempData.code||'--'}}</text>
|
|
<text>{{tempData.code||'--'}}</text>
|
|
</view>
|
|
</view>
|
|
- <view>
|
|
|
|
|
|
+ <view class="itemlist" v-if="tempData.productTypeSn=='543766811373752320'">
|
|
|
|
+ <text>原厂编码</text>
|
|
|
|
+ <text>{{tempData.origCode||'--'}}</text>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="itemlist">
|
|
<text>产品名称</text>
|
|
<text>产品名称</text>
|
|
<text>{{tempData.name||'--'}}</text>
|
|
<text>{{tempData.name||'--'}}</text>
|
|
</view>
|
|
</view>
|
|
<view v-if="tempData.affiliation=='SHELF'">
|
|
<view v-if="tempData.affiliation=='SHELF'">
|
|
- <text>进货价</text>
|
|
|
|
- <text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
|
|
|
|
|
|
+ <view class="itemlist" v-if="configPrice.shelf_cost_show == '1'">
|
|
|
|
+ <text>进货价</text>
|
|
|
|
+ <text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="itemlist" v-if="configPrice.shelf_price_show == '1'">
|
|
|
|
+ <text>车主价</text>
|
|
|
|
+ <text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
|
|
|
|
+ </view>
|
|
</view>
|
|
</view>
|
|
- <view>
|
|
|
|
- <text>车主价</text>
|
|
|
|
- <text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
|
|
|
|
|
|
+ <view v-else>
|
|
|
|
+ <view class="itemlist" v-if="configPrice.non_shelf_cost_show == '1'">
|
|
|
|
+ <text>进货价</text>
|
|
|
|
+ <text>{{tempData.cost?'¥'+tempData.cost:'暂无价格'}}</text>
|
|
|
|
+ </view>
|
|
|
|
+ <view class="itemlist" v-if="configPrice.non_shelf_price_show == '1'">
|
|
|
|
+ <text>车主价</text>
|
|
|
|
+ <text>{{tempData.price?'¥'+tempData.price:'暂无价格'}}</text>
|
|
|
|
+ </view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</u-popup>
|
|
</u-popup>
|
|
@@ -300,6 +332,15 @@
|
|
hasRedPacket(){
|
|
hasRedPacket(){
|
|
const rule = this.$store.state.vuex_rewardRule
|
|
const rule = this.$store.state.vuex_rewardRule
|
|
return rule&&rule.ruleStatus == 'release'
|
|
return rule&&rule.ruleStatus == 'release'
|
|
|
|
+ },
|
|
|
|
+ configPrice(){
|
|
|
|
+ return this.$store.state.vuex_configPrice
|
|
|
|
+ },
|
|
|
|
+ showShelfDetial(){
|
|
|
|
+ return this.configPrice.shelf_price_show == '1'&&this.configPrice.shelf_cost_show == '1'
|
|
|
|
+ },
|
|
|
|
+ showNonShelfDetial(){
|
|
|
|
+ return this.configPrice.non_shelf_price_show == '1'&&this.configPrice.non_shelf_cost_show == '1'
|
|
}
|
|
}
|
|
},
|
|
},
|
|
onLoad(opts) {
|
|
onLoad(opts) {
|
|
@@ -344,9 +385,9 @@
|
|
})
|
|
})
|
|
},
|
|
},
|
|
// 打开价格信息弹框
|
|
// 打开价格信息弹框
|
|
- openPriceModal(row,type){
|
|
|
|
|
|
+ openPriceModal(row,type,show){
|
|
console.log(row)
|
|
console.log(row)
|
|
- if(this.priceShowVal){
|
|
|
|
|
|
+ if(this.priceShowVal&&show){
|
|
if(type == 0){
|
|
if(type == 0){
|
|
row.affiliation = "SHELF"
|
|
row.affiliation = "SHELF"
|
|
}
|
|
}
|
|
@@ -517,7 +558,9 @@
|
|
cost: item.cost,
|
|
cost: item.cost,
|
|
currentInven: item.currentInven,
|
|
currentInven: item.currentInven,
|
|
code: item.code,
|
|
code: item.code,
|
|
|
|
+ origCode: item.origCode,
|
|
qty: item.qty,
|
|
qty: item.qty,
|
|
|
|
+ productTypeSn: item.productTypeSn,
|
|
images: item.images,
|
|
images: item.images,
|
|
checked: true,
|
|
checked: true,
|
|
affiliation: item.affiliation
|
|
affiliation: item.affiliation
|
|
@@ -723,7 +766,7 @@
|
|
}
|
|
}
|
|
.show-price-modal{
|
|
.show-price-modal{
|
|
padding: 30px 20px;
|
|
padding: 30px 20px;
|
|
- >view{
|
|
|
|
|
|
+ .itemlist{
|
|
display: flex;
|
|
display: flex;
|
|
align-items: center;
|
|
align-items: center;
|
|
justify-content: space-between;
|
|
justify-content: space-between;
|
|
@@ -802,6 +845,13 @@
|
|
.item-detail{
|
|
.item-detail{
|
|
.item-detail-info{
|
|
.item-detail-info{
|
|
padding: 10upx 0 4upx;
|
|
padding: 10upx 0 4upx;
|
|
|
|
+ /deep/ .u-tag{
|
|
|
|
+ word-break: break-all;
|
|
|
|
+ font-size: 28rpx;
|
|
|
|
+ color: #0fab04eee;
|
|
|
|
+ border: 0;
|
|
|
|
+ padding: 0.2rem 0.3rem;
|
|
|
|
+ }
|
|
> view{
|
|
> view{
|
|
padding-bottom: 10rpx;
|
|
padding-bottom: 10rpx;
|
|
align-items: center;
|
|
align-items: center;
|
|
@@ -887,6 +937,7 @@
|
|
}
|
|
}
|
|
.item-name{
|
|
.item-name{
|
|
font-size: 32rpx;
|
|
font-size: 32rpx;
|
|
|
|
+ margin-bottom: 5px;
|
|
.item-tempPart{
|
|
.item-tempPart{
|
|
background: #0055ff;
|
|
background: #0055ff;
|
|
color: #fff;
|
|
color: #fff;
|
|
@@ -903,8 +954,15 @@
|
|
.item-detail{
|
|
.item-detail{
|
|
.item-detail-info{
|
|
.item-detail-info{
|
|
padding: 10upx 0 4upx;
|
|
padding: 10upx 0 4upx;
|
|
|
|
+ /deep/ .u-tag{
|
|
|
|
+ word-break: break-all;
|
|
|
|
+ font-size: 28rpx;
|
|
|
|
+ color: #0fab04eee;
|
|
|
|
+ border: 0;
|
|
|
|
+ padding: 0.2rem 0.3rem;
|
|
|
|
+ }
|
|
> view{
|
|
> view{
|
|
- padding-bottom: 30rpx;
|
|
|
|
|
|
+ padding-bottom: 20rpx;
|
|
align-items: center;
|
|
align-items: center;
|
|
.item-detail-text{
|
|
.item-detail-text{
|
|
color: #999;
|
|
color: #999;
|