前端

src/views/outboundManagement/weighingManagementNew.vue

@@ -2310,6 +2310,9 @@
               }
           }
         }
+        if(!this.weighingList.contractNo){
+          return
+        }
         getcontract({contractNo:this.weighingList.contractNo,warehouseName:this.warehouseName,compId:localStorage.getItem('ws-pf_compId')}).toPromise().then((response) => {
           this.outContractNo=response
             this.shipInfoList=this.outContractNo.shipInfoList

src/views/profitable/cashout.vue

@@ -29,7 +29,7 @@
               <ws-option label="粮款" value="粮款" style="color: #8890b1" />
               <ws-option label="非粮款" value="非粮款" style="color: #8890b1" />
               <ws-option label="保证金" value="保证金" style="color: #8890b1" />
-              <ws-option label="利息" value="利息" style="color: #8890b1" />
+              <!-- <ws-option label="利息" value="利息" style="color: #8890b1" /> -->
             </ws-select>
           </el-form-item>
 

src/views/warehousenew/gooddetail.vue

@@ -190,7 +190,6 @@ import {
             currentPage: this.currentPage,
             pageSize:this.pageSize ,
             searchType:this.searchType,
-            
             dropFlag:0,
             compId:localStorage.getItem('ws-pf_compId'),
           })

src/views/warehousenew/warehousingOrder.vue

@@ -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
         }
       }