|
|
@@ -69,7 +69,11 @@
|
|
|
<div class="reservesInfo_item" v-if="warehouseType == '1'"><div class="reservesInfo_GoodsName">{{item.goodsName}}</div>
|
|
|
<span class="reservesInfo_Amount">{{item.stockNum == 0 ? "-":item.stockNum}}(吨)</span><br/>
|
|
|
<span v-if="item.stockNum&&item.cost" class="reservesInfo_Amount">{{item.cost == 0 ? "-":item.cost}}(元/吨)</span>
|
|
|
- <span v-else class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span>
|
|
|
+ <span v-else class="reservesInfo_Amount">{{item.conversionCost == 0 ? "-":item.conversionCost}}(元/吨)</span><br/>
|
|
|
+ <div style="display:grid">
|
|
|
+ <span v-if="item.cargoWeight && item.cargoWeight != 0" class="reservesInfo_Amount">含转入:{{ item.cargoWeight }}(吨)</span>
|
|
|
+ <span v-if="item.redemptionWeight && item.redemptionWeight != 0" class="reservesInfo_Amount">待赎回:{{ item.redemptionWeight }}(吨)</span>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
<div class="reservesInfo_item" v-if="warehouseType == '2'"><div class="reservesInfo_GoodsName">{{item.goodsName}}(吨)</div><span class="reservesInfo_Amount">{{item.surplus == 0 ? "-":item.surplus}}</span></div>
|
|
|
</div>
|
|
|
@@ -1364,7 +1368,7 @@
|
|
|
background: #ffffff;
|
|
|
margin: 20px 10px;
|
|
|
padding-bottom: 10px;
|
|
|
- height: 500px;
|
|
|
+ height: 550px;
|
|
|
/deep/.el-table .el-table__body .cell,/deep/.el-table .cell{
|
|
|
text-align: center;
|
|
|
|
|
|
@@ -1432,7 +1436,7 @@
|
|
|
.reservesInfo{
|
|
|
display: inline-flex;
|
|
|
.reservesInfo_item{
|
|
|
- width: 120px;
|
|
|
+ width: 140px;
|
|
|
background: #F5F7FA;
|
|
|
// height: 54px;
|
|
|
text-align: center;
|
zxz