@@ -14,7 +14,7 @@ class StoreItem extends Model
use ModelTimeFormat;
protected $fillable=[
'store_id','asn_line_code','name',
- 'sku','barcode','depository_id','amount','quality','status','commodity_id'
+ 'sku','barcode','depository_id','amount','quality','status','commodity_id','expected_amount'
];
protected $appends=[
'store_asn_code',
@@ -343,7 +343,7 @@
if (!res)return "ASN单不存在明细项";
let details = [];
res.forEach(item=>{
- details.push({name:"",amount:item.amount,bar_code:"",commodity_id:item.commodity_id});
+ details.push({name:"",amount:item.expected_amount,bar_code:"",commodity_id:item.commodity_id});
});
this.details = details;
this.fileName = (details.length)+"条明细";
@@ -154,7 +154,7 @@
<div class="row" v-for="(detail,i) in info.details" v-if="i!==0">
<div class="col-5 font-weight-bold text-overflow-warp">@{{ detail.commodity_id ? (detail.commodity ? detail.commodity.name : '') : detail.name }}</div>
<div class="col-4 text-secondary text-overflow-warp">@{{ detail | getCommodity }}</div>
- <div class="col-2 text-secondary">@{{ detail.expected_amount }}</div>
+ <div class="col-2 text-secondary">@{{ detail.amount }}</div>
</div>
<div class="text-center m-auto small cursor-pointer" v-if="info.details.length>1" @click="upAllDetail(info.id)">