前端

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -286,6 +286,7 @@
                 </el-option>
               </el-select>
             </div>
+            
           </div>
         </div>
         <div v-if="warehouseName=='鲅鱼圈金信库'">
@@ -310,6 +311,15 @@
                 </el-option>
               </el-select>
             </div>
+            <div class="row">
+              <div>出库仓位号：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="outbinNumber" placeholder="请选择仓位号" style="width: 75%;">
+                <el-option v-for="item in binNumberList1" :key="item.id" :label="item.binNumber"
+                  :value="item.binNumber">
+                </el-option>
+              </el-select>
+            </div>
           </div>
         </div>
       </div>
@@ -330,7 +340,8 @@ import {
   getinspectLookGoods,
   selectWarehouseSelf,
   getsettleaccout,
-  newSubmit
+  newSubmit,
+  getbinNumber
 } from '@/model/houseSelfCollect/index'
 import {
   addstorageputList
@@ -441,6 +452,8 @@ export default {
       isShowBalance: false,
       currentPage: 1,
       pageSize: 50,
+      outbinNumber:'',
+      binNumberList1:[],
       deptCircularPage: {},
       deptBudgetTotal: 0,
       pList: [],
@@ -1000,12 +1013,14 @@ export default {
                   this.$set(_data,'printtype','out')
                   _data.compName = this.outshipments;
                   _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
                   this.dialogDataList.push(_data)
                 }else{
                   var _data = JSON.parse(JSON.stringify(this.dialogData))
                   this.$set(_data,'printtype','out')
                   _data.compName = this.outshipments;
                   _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
                   this.dialogDataList.push(_data)
                 }  
               }
@@ -2110,7 +2125,13 @@ export default {
                       }
                     }
                   }
-                  this.isShowPrintType = true
+                  if(this.warehouseName=='鲅鱼圈金信库'){
+                    getbinNumber({id:that.cangid}).toPromise().then((response) => {
+                    this.binNumberList1=response.warehousePositionInfoList
+                    this.isShowPrintType = true
+                    })
+                  }
+                  
                   this.getList()
                 })
                 // addstorageputList(that.inOutData).toPromise().then((response) => {
@@ -2736,7 +2757,7 @@ export default {
   right: 0;
   margin: auto;
   width: 440px;
-  height: 406px;
+  height: 446px;
   background: white;
   border-radius: 10px;
   z-index: 999;

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -165,6 +165,15 @@
                 </el-option>
               </el-select>
             </div>
+            <div class="row">
+              <div>出库仓位号：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="outbinNumber" placeholder="请选择仓位号" style="width: 75%;">
+                <el-option v-for="item in binNumberList1" :key="item.id" :label="item.binNumber"
+                  :value="item.binNumber">
+                </el-option>
+              </el-select>
+            </div>
           </div>
         </div>
       </div>
@@ -265,7 +274,8 @@
     changeCustomer,
     getcustomer,
     importWordYk,
-    getweighingDelete
+    getweighingDelete,
+    getbinNumber
   } from '@/model/houseSelfCollect/index'
    import {
     getReceiptTaskNo,
@@ -289,7 +299,9 @@
         // binNumberId: '', //仓位Id
         // warehouseType: '',
         compId: '',
+        outbinNumber:'',
         printType:0,
+        binNumberList1:[],
         UserInfo:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')),
         pickerOptions: {
           shortcuts: [{
@@ -1056,17 +1068,17 @@
                   this.$set(_data,'printtype','out')
                   _data.compName = this.outshipments;
                   _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
                   this.dialogDataList.push(_data)
                 }else{
                   var _data = JSON.parse(JSON.stringify(this.dialogData))
                   this.$set(_data,'printtype','out')
                   _data.compName = this.outshipments;
                   _data.customer = this.inshipments
+                  _data.binNumber = this.outbinNumber
                   this.dialogDataList.push(_data)
-                }
-                  
-                }
-                console.log(this.dialogDataList)
+                }  
+              }
               this.printBig('', this.radio)
             })
             .catch((response) => {
@@ -1128,7 +1140,7 @@
         }
 
       },
-      print(row, type, pageType) {
+      async print(row, type, pageType) {
        this.printType=type
         //打印
         if (type == 1) { //
@@ -1154,7 +1166,9 @@
               }
             }
           }
+          
           this.isShowPrintType = true
+          
         } else {
           if (row.serviceManagementType == 1 && (this.warehouseName == '鲅鱼圈金信库' || this.warehouseName == '杜尔伯特家禾库'||this.warehouseName=='洮南新友谊兴旺库'||this.warehouseName=='甘南宏旗库' || this.warehouseName == '白城内陆港' || this.warehouseName == '哈尔滨依兰库'||this.warehouseName=='山东园丰库')) {
             if (row.seller && row.buyer) {
@@ -1173,6 +1187,10 @@
             }
           }
           this.idPrint = row.id
+          if(type==2&&this.warehouseName=='鲅鱼圈金信库'){
+            var data=await getbinNumber({id:row.warehouseId}).toPromise()
+            this.binNumberList1=data.warehousePositionInfoList
+          }
           this.isShowPrintType = true
           this.onePrint = true //单个打印标识
         }
@@ -1386,7 +1404,7 @@
     right: 0;
     margin: auto;
     width: 440px;
-    height: 406px;
+    height: 446px;
     background: white;
     border-radius: 10px;
     z-index: 999;