|
@@ -508,7 +508,7 @@
|
|
|
</el-form-item>
|
|
|
</el-form>
|
|
|
<el-form :inline="true" label-width="120px" class="demo-form-inline">
|
|
|
- <el-form-item label="是否赎回">
|
|
|
+ <el-form-item label="货权接收公司">
|
|
|
<el-radio v-model="rolloutData.systemIdentification" label="1">易粮易运用户</el-radio>
|
|
|
<el-radio v-model="rolloutData.systemIdentification" label="0">非易粮易运用户</el-radio>
|
|
|
</el-form-item>
|
|
@@ -1025,7 +1025,12 @@ export default {
|
|
|
for (let i = 0; i < this.binNumberList.length; i++) {
|
|
|
if(this.binNumberList[i].binNumber==e){
|
|
|
item.positionId=this.binNumberList[i].id
|
|
|
- item.weight=this.binNumberList[i].goodsweight
|
|
|
+ // item.weight=this.binNumberList[i].goodsweight
|
|
|
+ if(this.binNumberList[i].goodsweight>(this.rolloutData.transferOutWeight1-this.rollweight)){
|
|
|
+ item.weight=this.rolloutData.transferOutWeight1-this.rollweight
|
|
|
+ }else if(this.binNumberList[i].goodsweight>(this.rolloutData.transferOutWeight1-this.rollweight)){
|
|
|
+ item.weight=this.binNumberList[i].goodsweight
|
|
|
+ }
|
|
|
item.goodsweight=this.binNumberList[i].goodsweight
|
|
|
}
|
|
|
}
|