11

src/views/houseSelfCollect/newWeighingManagement.vue

@@ -24,10 +24,7 @@
 
         <div class="bottom">
           <div class="bg-left titleup"><span class="word_css">实时监控</span></div>
-          <!-- <div>
-            <canvas id="video" class="canvas"></canvas>
-          </div> -->
-          <!-- <div class="videoImg">
+           <!-- <div class="videoImg">
             <div class="videoImg-row">
                 <video id="videoElement" autoplay muted width="50%"></video>
               <video id="videoElement1" autoplay muted width="50%"></video>
@@ -44,7 +41,6 @@
               </div>
             </div>
           </div> -->
-          <!-- <img :src="imgSrc1.videoSrc.videoSrc2" alt="" class="" style="width:100%"/> -->
           <div v-if="!monitorUrl1" class="video1">
             <img src="../../../public/img/quesheng@2x.png" alt="" class="img1" />
             <div>监控视频未连接</div>
@@ -197,7 +193,7 @@
                 </el-option>
               </el-select>
               <el-button @click='refreshClick(1)' type="primary">刷新</el-button>
-              <el-button @click='refreshClick' type="primary">{{ timer? refresh: '自动刷新' }}</el-button>
+              <el-button @click='refreshClick' type="primary">{{ timer ? refresh : '自动刷新' }}</el-button>
               <!-- <el-checkbox v-model="checked">默认</el-checkbox> -->
             </div>
             <div class="screen frame">
@@ -216,7 +212,7 @@
 
             <el-table ref="singleTable" :data="carList" highlight-current-row @current-change="handleCurrentChange"
               current-row-key="id"
-              style="width: 100%; overflow-y: scroll !important;; height: calc(100% - 20vh);margin-top:20px">
+              style="width: 100%; overflow-y: scroll !important;; height: calc(100vh - 54vh);margin-top:20px">
               <el-table-column property="number" label="业务编号">
               </el-table-column>
               <el-table-column property="carNumber" label="车牌号">
@@ -281,8 +277,7 @@
             </el-option>
           </el-select>
         </div>
-        <div
-          v-if="warehouseName == '鲅鱼圈金信库' || warehouseName == '白城内陆港' || warehouseName == '杜尔伯特家禾库' || warehouseName == '甘南宏旗库' || warehouseName == '洮南新友谊兴旺库' || warehouseName == '哈尔滨依兰库' || warehouseName == '山东园丰库'">
+        <div v-if="warehouseName=='鲅鱼圈金信库'||warehouseName=='白城内陆港'||warehouseName=='杜尔伯特家禾库'||warehouseName=='甘南宏旗库'||warehouseName=='洮南新友谊兴旺库'||warehouseName=='哈尔滨依兰库'||warehouseName=='山东园丰库'">
           <div class="print-type-ew">
             <el-checkbox v-model="checked" @change="changeEw">打印额外票据</el-checkbox>
             <el-checkbox v-model="ddchecked" @change="changeEwDD">单独打印额外票据</el-checkbox>
@@ -305,6 +300,40 @@
                 </el-option>
               </el-select>
             </div>
+            
+          </div>
+        </div>
+        <div v-if="warehouseName=='鲅鱼圈金信库'">
+          <div class="print-type-ew">
+            <el-checkbox v-model="outchecked" @change="changeOut">是否打印出库</el-checkbox>
+          </div>
+          <div class="ew-print" v-if="printout">
+            <div class="row">
+              <div>出库发货单位：</div>
+              <!-- <div>{{companyName}}</div> -->
+              <el-select v-model="inshipments" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in ewCustomerOptions" :key="item.value" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </div>
+            <div class="row">
+              <div>出库收货单位：</div>
+              <!-- <div>{{companyNameEW}}</div> -->
+              <el-select v-model="outshipments" placeholder="请选择" style="width: 75%;">
+                <el-option v-for="item in companyNameEWOptions" :key="item.value" :label="item.label"
+                  :value="item.value">
+                </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>
@@ -327,15 +356,22 @@ import {
   selectWarehouseSelf,
   getsettleaccout,
   newSubmit,
+  getbinNumber,
   getToken,
   getRom,
 } from '@/model/houseSelfCollect/index'
+import {
+  addstorageputList
+} from '@/model/warehouse/index'
+import {
+    getcomp
+  } from '@/model/indexRx'
 import weightCheckPrint from './component/weightCheckPrint.vue'
 import BalanceAlert from '@/components/balanceAlert'
 import html2canvas from 'html2canvas'
 import axios from 'axios'
 import configText from '../../../vue.config.js'
-import { whetherWebSocket1, whetherWebSocket2 } from '@/utils/webSocket';
+
 export default {
   components: {
     weightCheckPrint,
@@ -367,8 +403,6 @@ export default {
                 this.inWarehouseType = _saomaData.managementType
               }
             } else if (localStorage.getItem('houseSelfCollect_house1')) {
-              // this.ip1 = 
-              // this.ip2 = 
               this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
               for (var i = 0; i < response.length; i++) {
                 if (this.warehouseName == this.warehouseList[i].warehouseName) {
@@ -389,7 +423,6 @@ export default {
                 compId: localStorage.getItem('ws-pf_compId'),
                 ip1: this.warehouseList[0].shexiang1,
                 ip2: this.warehouseList[0].shexiang2
-
               }))
               this.warehouseName = this.warehouseList[0].warehouseName
               localStorage.setItem('ck', this.warehouseName)
@@ -433,35 +466,22 @@ export default {
         }
       },
       deep: true, //true 深度监听
-    },
-    // 'global.videoSrc1':{
-    //     handler(neww,old){
-    //       console.log(neww,old,121212)
-    //            //  这里写业务   
-    //     },
-    //     deep: true
-    // },
-
+    }
   },
   data() {
     return {
       player: null,
-      // VideoSrc: '',
-      // VideoSrc1:'',
       ip1: '',
       ip2: '',
       rom1: '',
       rom2: '',
-      warehouseInfo: {},
-      carNumber1: this.$store.state.user.carNumber1,
-      carNumber2: this.$store.state.user.carNumber2,
-      // // carNumber: '辽HLZ126',
-      // imgSrc1: this.$store.state.user,
       timer: '',
       refresh: 60,
       isShowBalance: false,
       currentPage: 1,
       pageSize: 50,
+      outbinNumber:'',
+      binNumberList1:[],
       deptCircularPage: {},
       deptBudgetTotal: 0,
       pList: [],
@@ -475,6 +495,8 @@ export default {
         type: '',
         weight: '',
       },
+      outchecked:false,
+        printout:false,
       currentRow: null,
       inspect: {},
       types: 1,
@@ -596,13 +618,15 @@ export default {
       companyNameEWOptions: [{
         value: '天津建源供应链管理有限公司',
         label: '天津建源供应链管理有限公司'
-      }, {
+      },{
         value: '厦门建发物产有限公司',
         label: '厦门建发物产有限公司'
       }],
       companyName: '黑龙江利润元粮食贸易有限公司',
       companyNameEW: '厦门建发物产有限公司',
       ewCustomer: '黑龙江利润元粮食贸易有限公司',
+      inshipments:'黑龙江中天昊元贸易有限公司',
+        outshipments:'黑龙江中天昊元贸易有限公司',
       ewradio: '',
       ddchecked: false,
       checked: false,
@@ -620,139 +644,142 @@ export default {
     }
   },
   mounted() {
-
     localStorage.setItem('serverIp', configText.devServer.proxy['/pb'].target)
-    if (localStorage.getItem('compNameoptions')) {
-      var company = JSON.parse(localStorage.getItem('compNameoptions'))
-
-      var extra = company.filter((item) => {
-        return item != '黑龙江中天昊元贸易有限公司'
-          && item != '黑龙江利润元粮食贸易有限公司'
-          && item != '黑龙江众利合粮食贸易有限公司'
-          && item != '黑龙江鑫满仓粮食贸易有限公司'
-          && item != '黑龙江谷香粮食贸易有限公司'
-          && item != '黑龙江秋收有限公司'
-          && item != '黑龙江欣洋粮食贸易有限公司'
-          && item != '黑龙江益储益运粮食贸易有限公司'
-          && item != '黑龙江启兴粮食贸易有限公司'
-      })
-      if (extra.length > 0) {
-        this.companyNameOptions = [
+    getcomp({userMobilePhone:JSON.parse(localStorage.getItem('ws_login_getTenantInfoByUser')).loginInfo.userMobilePhone}).toPromise().then((res)=>{
+        this.compNameoptions=res
+    if (this.compNameoptions.length>0) {
+      var company=this.compNameoptions
+        
+        var extra=company.filter((item)=>{
+          return item!='黑龙江中天昊元贸易有限公司'
+          &&item!='黑龙江利润元粮食贸易有限公司'
+          &&item!= '黑龙江众利合粮食贸易有限公司'
+          &&item!='黑龙江鑫满仓粮食贸易有限公司'
+          &&item!='黑龙江谷香粮食贸易有限公司'
+          &&item!='黑龙江秋收有限公司'
+          &&item!= '黑龙江欣洋粮食贸易有限公司'
+          &&item!='黑龙江益储益运粮食贸易有限公司'
+          &&item!='黑龙江启兴粮食贸易有限公司'
+        })
+        if(extra.length>0){
+          this.companyNameOptions=[
           {
-            value: '黑龙江中天昊元贸易有限公司',
-            label: '黑龙江中天昊元贸易有限公司'
-          }, {
-            value: '黑龙江利润元粮食贸易有限公司',
-            label: '黑龙江利润元粮食贸易有限公司'
-          }, {
-            value: '黑龙江众利合粮食贸易有限公司',
-            label: '黑龙江众利合粮食贸易有限公司'
-          }, {
-            value: '黑龙江鑫满仓粮食贸易有限公司',
-            label: '黑龙江鑫满仓粮食贸易有限公司'
-          }, {
-            value: '黑龙江欣洋粮食贸易有限公司',
-            label: '黑龙江欣洋粮食贸易有限公司'
-          }, {
-            value: '黑龙江谷香粮食贸易有限公司',
-            label: '黑龙江谷香粮食贸易有限公司'
-          }, {
-            value: '黑龙江秋收有限公司',
-            label: '黑龙江秋收有限公司'
-          }, {
-            value: '黑龙江益储益运粮食贸易有限公司',
-            label: '黑龙江益储益运粮食贸易有限公司'
-          }, {
-            value: '黑龙江启兴粮食贸易有限公司',
-            label: '黑龙江启兴粮食贸易有限公司'
-          }]
-
-        this.ewCustomerOptions = [
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+        
+          this.ewCustomerOptions= [
           {
-            value: '天津建源供应链管理有限公司',
-            label: '天津建源供应链管理有限公司'
-          }, {
-            value: '黑龙江中天昊元贸易有限公司',
-            label: '黑龙江中天昊元贸易有限公司'
-          }, {
-            value: '黑龙江利润元粮食贸易有限公司',
-            label: '黑龙江利润元粮食贸易有限公司'
-          }, {
-            value: '黑龙江众利合粮食贸易有限公司',
-            label: '黑龙江众利合粮食贸易有限公司'
-          }, {
-            value: '黑龙江鑫满仓粮食贸易有限公司',
-            label: '黑龙江鑫满仓粮食贸易有限公司'
-          }, {
-            value: '黑龙江欣洋粮食贸易有限公司',
-            label: '黑龙江欣洋粮食贸易有限公司'
-          }, {
-            value: '黑龙江谷香粮食贸易有限公司',
-            label: '黑龙江谷香粮食贸易有限公司'
-          }, {
-            value: '黑龙江秋收有限公司',
-            label: '黑龙江秋收有限公司'
-          }, {
-            value: '黑龙江益储益运粮食贸易有限公司',
-            label: '黑龙江益储益运粮食贸易有限公司'
-          }, {
-            value: '黑龙江启兴粮食贸易有限公司',
-            label: '黑龙江启兴粮食贸易有限公司'
-          }]
-        this.companyNameEWOptions = [
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+          this.companyNameEWOptions=[
           {
-            value: '天津建源供应链管理有限公司',
-            label: '天津建源供应链管理有限公司'
-          }, {
-            value: '黑龙江中天昊元贸易有限公司',
-            label: '黑龙江中天昊元贸易有限公司'
-          }, {
-            value: '黑龙江利润元粮食贸易有限公司',
-            label: '黑龙江利润元粮食贸易有限公司'
-          }, {
-            value: '黑龙江众利合粮食贸易有限公司',
-            label: '黑龙江众利合粮食贸易有限公司'
-          }, {
-            value: '黑龙江鑫满仓粮食贸易有限公司',
-            label: '黑龙江鑫满仓粮食贸易有限公司'
-          }, {
-            value: '黑龙江欣洋粮食贸易有限公司',
-            label: '黑龙江欣洋粮食贸易有限公司'
-          }, {
-            value: '黑龙江谷香粮食贸易有限公司',
-            label: '黑龙江谷香粮食贸易有限公司'
-          }, {
-            value: '黑龙江秋收有限公司',
-            label: '黑龙江秋收有限公司'
-          }, {
-            value: '黑龙江益储益运粮食贸易有限公司',
-            label: '黑龙江益储益运粮食贸易有限公司'
-          }, {
-            value: '黑龙江启兴粮食贸易有限公司',
-            label: '黑龙江启兴粮食贸易有限公司'
-          }]
-        if (localStorage.getItem('print_company_name')) {
-          this.companyName = localStorage.getItem('print_company_name')
-        } else {
-          this.companyName = extra[0]
-        }
-        if (localStorage.getItem('print_company_name_ew')) {
-          this.companyNameEW = localStorage.getItem('print_company_name_ew')
-        } else {
-          this.companyNameEW = extra[0]
-        }
-        if (localStorage.getItem('print_customer_name_ew')) {
-          this.ewCustomer = localStorage.getItem('print_customer_name_ew')
-        } else {
-          this.ewCustomer = extra[0]
-        }
-        for (let i = 0; i < extra.length; i++) {
-          this.ewCustomerOptions.push({ value: extra[i], label: extra[i] })
-          this.companyNameOptions.push({ value: extra[i], label: extra[i] })
-          this.companyNameEWOptions.push({ value: extra[i], label: extra[i] })
+          value: '天津建源供应链管理有限公司',
+          label: '天津建源供应链管理有限公司'
+        },{
+          value: '黑龙江中天昊元贸易有限公司',
+          label: '黑龙江中天昊元贸易有限公司'
+        }, {
+          value: '黑龙江利润元粮食贸易有限公司',
+          label: '黑龙江利润元粮食贸易有限公司'
+        }, {
+          value: '黑龙江众利合粮食贸易有限公司',
+          label: '黑龙江众利合粮食贸易有限公司'
+        }, {
+          value: '黑龙江鑫满仓粮食贸易有限公司',
+          label: '黑龙江鑫满仓粮食贸易有限公司'
+        },{
+          value: '黑龙江欣洋粮食贸易有限公司',
+          label: '黑龙江欣洋粮食贸易有限公司'
+        },{
+          value: '黑龙江谷香粮食贸易有限公司',
+          label: '黑龙江谷香粮食贸易有限公司'
+        },{
+          value: '黑龙江秋收有限公司',
+          label: '黑龙江秋收有限公司'
+        },  {
+          value: '黑龙江益储益运粮食贸易有限公司',
+          label: '黑龙江益储益运粮食贸易有限公司'
+        }, {
+          value: '黑龙江启兴粮食贸易有限公司',
+          label: '黑龙江启兴粮食贸易有限公司'
+        }]
+           if(localStorage.getItem('print_company_name')){
+            this.companyName=localStorage.getItem('print_company_name')
+          }else{
+            this.companyName=extra[0]
+          }
+          if(localStorage.getItem('print_company_name_ew')){
+            this.companyNameEW=localStorage.getItem('print_company_name_ew')
+          }else{
+            this.companyNameEW=extra[0]
+          }
+          if(localStorage.getItem('print_customer_name_ew')){
+            this.ewCustomer=localStorage.getItem('print_customer_name_ew')
+          }else{
+            this.ewCustomer=extra[0]
+          }
+          for (let i = 0; i < extra.length; i++) {
+            this.ewCustomerOptions.push({value: extra[i],label:extra[i]})
+            this.companyNameOptions.push({value: extra[i],label:extra[i]})
+            this.companyNameEWOptions.push({value: extra[i],label:extra[i]})
+          }
         }
       }
-    }
+    })
+    // this.getVideos()
     this.isShowBalance = true
     var _saomaData = JSON.parse(localStorage.getItem('saoma_data')) //判断是否扫码进来的
     // }
@@ -784,7 +811,6 @@ export default {
               break
             }
           }
-
           localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
         } else if (localStorage.getItem('houseSelfCollect_house1')) {
           this.warehouseName = JSON.parse(localStorage.getItem('houseSelfCollect_house1')).value
@@ -808,7 +834,7 @@ export default {
             count: this.warehouseList[0].count,
             No: this.warehouseList[0].commonWarehouseNo,
             allowEdit: this.warehouseList[0].allowEdit,
-            compId: localStorage.getItem('ws-pf_compId'),
+            compId: localStorage.getItem('ws-pf_compId')
           }))
           this.warehouseName = this.warehouseList[0].warehouseName
           localStorage.setItem('ck', this.warehouseName)
@@ -834,8 +860,6 @@ export default {
         } else if (this.tpyeNo == 2) {
           this.information = '皮重'
         }
-
-        // this.getVideos(this.ip1, this.ip2, this.rom1, this.rom2)
         this.getList()
       })
   },
@@ -880,33 +904,6 @@ export default {
           });
         }
       }
-
-      // getCarNumber({
-      //   flag: type,
-      //   ip1: this.ip1,
-      //   ip2: this.ip2
-      // })
-      //   .toPromise()
-      //   .then((response) => {
-      //     console.log(111)
-      //     console.log(response)
-
-      //   })
-      //   .catch((response) => {
-
-      //   })
-      // console.log('定位车辆')
-      // console.log(this.carList)
-      // for (let i = 0; i < this.carList.length; i++) {
-      //   if ('黑AU4139' == this.carList[i].carNumber) {
-      //     this.setCurrent(this.carList[2])
-      //   } else {
-      //     this.$message({
-      //       message: '未识别到车辆信息',
-      //       type: 'warning'
-      //     });
-      //   }
-      // }
     },
     getVideos(ip1, ip2, rom1, rom2) {
       if (rom1) {
@@ -978,11 +975,14 @@ export default {
       //   .catch((response) => { 
 
       //   })
-
-
-
-
     },
+    changeOut(e) {
+        if (e) {
+          this.printout = true
+        } else {
+          this.printout = false
+        }
+      },
     refreshClick(type) {
       let that = this
       if (type == 1) {
@@ -1107,43 +1107,61 @@ export default {
       this.isShowPrintType = false
     },
     async typePrintClick(type) {
-      localStorage.setItem('print_company_name', this.companyName)
-      localStorage.setItem('print_company_name_ew', this.companyNameEW)
-      localStorage.setItem('print_customer_name_ew', this.ewCustomer)
-      getPrint({
-        id: this.idPrint
-      })
-        .toPromise()
-        .then((response) => {
-
-          localStorage.removeItem('print_in_data')
-          this.dialogDataList = [] //点击确认时先清空要打印的数组
-          this.dialogData = response
-          if (response.compName == '黑龙江秋收有限公司') {
-            this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
-          } else {
-            this.dialogData.compName = this.companyName
-          }
-          if (this.checked) {
-            this.dialogDataList.push(this.dialogData)
-            var _datas = JSON.stringify(this.dialogData)
-            _datas = JSON.parse(_datas)
-            _datas.compName = this.companyNameEW;
-            _datas.customer = this.ewCustomer
-            this.dialogDataList.push(_datas)
-          } else if (this.ddchecked) {
-            _datas = this.dialogData
-            _datas.compName = this.companyNameEW;
-            _datas.customer = this.ewCustomer
-            this.dialogDataList.push(_datas)
-          } else {
-            this.dialogData.compName = this.companyName
-            this.dialogDataList.push(this.dialogData)
-          }
-
-          localStorage.setItem('print_in_data', JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
-          window.open('../../../../static/weightCheck.html?type=2&tableData=')
+        localStorage.setItem('print_company_name',this.companyName)
+        localStorage.setItem('print_company_name_ew',this.companyNameEW)
+        localStorage.setItem('print_customer_name_ew',this.ewCustomer)
+        getPrint({
+            id: this.idPrint
+          })
+          .toPromise()
+          .then((response) => {
+            
+           localStorage.removeItem('print_in_data')
+            this.dialogDataList = [] //点击确认时先清空要打印的数组
+            this.dialogData = response
+            if (response.compName == '黑龙江秋收有限公司') {
+              this.dialogData.compName = '黑龙江中天昊元贸易有限公司'
+            }else{
+                this.dialogData.compName = this.companyName
+              }
+            if (this.checked) {
+              this.dialogDataList.push(this.dialogData)
+              var _datas = JSON.stringify(this.dialogData)
+              _datas = JSON.parse(_datas)
+              _datas.compName = this.companyNameEW;
+              _datas.customer = this.ewCustomer
+              this.dialogDataList.push(_datas)
+            } else if (this.ddchecked) {
+              _datas = this.dialogData
+              _datas.compName = this.companyNameEW;
+              _datas.customer = this.ewCustomer
+              this.dialogDataList.push(_datas)
+            } else {
+              this.dialogData.compName = this.companyName
+              this.dialogDataList.push(this.dialogData)
+            }
+            
+            if(this.outchecked){
+                if(!this.checked&&!this.ddchecked){
+                  this.dialogDataList=[]
+                  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)
+                }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)
+                }  
+              }
+            localStorage.setItem('print_in_data',JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+            // window.open('../../../../static/weightCheck.html?type=2&tableData=' + JSON.stringify(this.dialogDataList).replace(/%/g, 'baifenhao'))
+            window.open('../../../../static/weightCheck.html?type=2&tableData=' )
           // this.printBig("", this.radio)
         })
         .catch((response) => { })
@@ -1160,22 +1178,17 @@ export default {
             count: this.warehouseList[i].count,
             No: this.warehouseList[i].commonWarehouseNo,
             allowEdit: this.warehouseList[i].allowEdit,
-            compId: localStorage.getItem('ws-pf_compId'),
-            rom1: this.warehouseList[i].rom1,
-            rom2: this.warehouseList[i].rom2
+            compId: localStorage.getItem('ws-pf_compId')
           }))
           this.cangid = this.warehouseList[i].id
           this.monitorUrl1 = this.warehouseList[i].monitorUrl1
           this.monitorUrl2 = this.warehouseList[i].monitorUrl2
-          this.rom1 = this.warehouseList[i].rom1
-          this.rom2 = this.warehouseList[i].rom2
           this.allowEdit = this.warehouseList[i].allowEdit
           if (this.allowEdit == 0) {
             this.disabled = true
           } else if (this.allowEdit == 1) {
             this.disabled = false
           }
-          // this.getVideos(this.warehouseList[i].shexiang1, this.warehouseList[i].shexiang2, this.rom1, this.rom2)
         }
       }
       this.getList()
@@ -1260,6 +1273,7 @@ export default {
         // 货名
         getinspectLookGoods({
           warehouseId: this.cangid,
+          flag: '1',
         }).toPromise()
           .then((response) => {
             this.purchasePriceList = response
@@ -1354,18 +1368,18 @@ export default {
         console.log(this.mList)
 
         var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
-
-        if (_saomaData) {
-          let _array = JSON.parse(JSON.stringify(this.mList))
-          for (let i = 0; i < this.mList.length; i++) {
-            if (this.mList[i].number == _saomaData.number) {
-              _array.splice(i, 1)
-              _array.unshift(this.mList[i]);
-            }
-          }
-          this.mList = _array
-          localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
-        }
+       
+       if (_saomaData) {
+         let _array = JSON.parse(JSON.stringify(this.mList))
+         for (let i = 0; i < this.mList.length; i++) {
+           if (this.mList[i].number == _saomaData.number) {
+             _array.splice(i, 1)
+             _array.unshift(this.mList[i]);
+           }
+         }
+         this.mList = _array
+         localStorage.removeItem('saoma_data'); //第一次进来结束后清除缓存
+       }
         this.carList = this.mList
         this.carList1 = this.mListTotal
         for (let i = 0; i < this.mList.length; i++) {
@@ -1394,7 +1408,7 @@ export default {
         this.index = 1
         console.log(this.pList)
         var _saomaData = JSON.parse(localStorage.getItem('saoma_data'))
-
+       
         if (_saomaData) {
           let _array = JSON.parse(JSON.stringify(this.pList))
           for (let i = 0; i < this.pList.length; i++) {
@@ -1970,68 +1984,68 @@ export default {
                 //毛检保存前进行校验
                 var arr = {}
                 // if (this.purchasePriceList.length != 0) {
-                for (let i = 0; i < this.purchasePriceList.length; i++) {
-                  if (
-                    this.weighingList.goodsName ==
-                    this.purchasePriceList[i].goodsName
-                  ) {
-                    arr = JSON.parse(JSON.stringify(this.purchasePriceList[i]))
-                    arr.saleLimit = this.purchasePriceList[i].saleLimit
+                  for (let i = 0; i < this.purchasePriceList.length; i++) {
+                    if (
+                      this.weighingList.goodsName ==
+                      this.purchasePriceList[i].goodsName
+                    ) {
+                      arr = JSON.parse(JSON.stringify(this.purchasePriceList[i]))
+                      arr.saleLimit = this.purchasePriceList[i].saleLimit
+                    }
                   }
-                }
-                // console.log('1111111',arr)
-                if (Object.keys(arr).length != 0) {
-                  getamount({
-                    compId: localStorage.getItem('ws-pf_compId'),
-                    customerNumberCard: this.weighingList.customerNumberCard,
-                    goodsName: this.weighingList.goodsName,
-                  })
-                    .toPromise()
-                    .then((response) => {
-                      //累计售粮超上限不能完成毛检保存
-                      let count = (
-                        arr.saleLimit -
-                        response / 1000
-                      ).toFixed(2)
-                      if (count - this.weighingList.grossWeight / 1000 < 0) {
-                        this.$alert(
-                          '该客户累计销售' +
-                          this.weighingList.goodsName +
-                          (response / 1000).toFixed(2) +
-                          '吨，还可售粮' +
-                          count +
-                          '吨',
-                          '提示', {
-                          confirmButtonText: '确定',
-                          // callback: (action) => {
-                          //   this.$message({
-                          //     type: 'info',
-                          //     message: `累计售粮已超出上限`,
-                          //   })
-                          // },
-                        })
-                      }
-                      //累计售粮没有超上限完成毛检保存
-                      grossWeight(this.weighingList)
-                        .toPromise()
-                        .then((response) => {
-                          if (this.reader) {
-                            this.reader.cancel()
-                          }
-                          this.$notify.success({
-                            title: '成功',
-                            message: '保存成功',
+                  // console.log('1111111',arr)
+                  if (Object.keys(arr).length != 0) {
+                    getamount({
+                      compId: localStorage.getItem('ws-pf_compId'),
+                      customerNumberCard: this.weighingList.customerNumberCard,
+                      goodsName: this.weighingList.goodsName,
+                    })
+                      .toPromise()
+                      .then((response) => {
+                        //累计售粮超上限不能完成毛检保存
+                        let count = (
+                          arr.saleLimit -
+                          response / 1000
+                        ).toFixed(2)
+                        if (count - this.weighingList.grossWeight / 1000 < 0) {
+                          this.$alert(
+                            '该客户累计销售' +
+                            this.weighingList.goodsName +
+                            (response / 1000).toFixed(2) +
+                            '吨，还可售粮' +
+                            count +
+                            '吨',
+                            '提示', {
+                            confirmButtonText: '确定',
+                            // callback: (action) => {
+                            //   this.$message({
+                            //     type: 'info',
+                            //     message: `累计售粮已超出上限`,
+                            //   })
+                            // },
                           })
-                          this.getList()
-                        })
+                        } 
+                          //累计售粮没有超上限完成毛检保存
+                          grossWeight(this.weighingList)
+                            .toPromise()
+                            .then((response) => {
+                              if (this.reader) {
+                                this.reader.cancel()
+                              }
+                              this.$notify.success({
+                                title: '成功',
+                                message: '保存成功',
+                              })
+                              this.getList()
+                            })
+                      })
+                    return
+                  }
+                  else {
+                    this.$alert(this.weighingList.goodsName + '的收购价格正在审核中,请审核通过后进行操作', {
+                      confirmButtonText: '确定',
                     })
-                  return
-                }
-                else {
-                  this.$alert(this.weighingList.goodsName + '的收购价格正在审核中,请审核通过后进行操作', {
-                    confirmButtonText: '确定',
-                  })
-                }
+                  }
                 // }
                 // else {
                 //   this.$message.error('该仓库未设置收购价格或收购价格正在审核中,请审核通过后进行操作')
@@ -2178,7 +2192,7 @@ export default {
             // console.log(this.inWarehouseType)
             //贸易入库需要再走入库接口
             if (this.inWarehouseType == 1) {
-              //贸易入库皮检
+               //贸易入库皮检
               getsettleaccout({//查看结算单
                 id: this.weighingList.warehouseInOutId
               }).toPromise().then((response) => {
@@ -2229,8 +2243,8 @@ export default {
                     this
                       .warehouseName == '哈尔滨依兰库' || this
                         .warehouseName == '白城内陆港' || this
-                          .warehouseName == '山东园丰库' || this
-                            .warehouseName == '杜尔伯特家禾库' || this.warehouseName == '甘南宏旗库' || this.warehouseName == '洮南新友谊兴旺库')) {
+                          .warehouseName == '山东园丰库'|| this
+                          .warehouseName == '杜尔伯特家禾库'||this.warehouseName=='甘南宏旗库'||this.warehouseName=='洮南新友谊兴旺库')) {
                     if (this.weighingList.seller && this.weighingList.buyer) {
                       let cang = {}
                       cang.value = this.weighingList.seller
@@ -2246,7 +2260,15 @@ export default {
                       }
                     }
                   }
-                  this.isShowPrintType = true
+                  if(this.warehouseName=='鲅鱼圈金信库'){
+                    getbinNumber({id:that.cangid}).toPromise().then((response) => {
+                    this.binNumberList1=response.warehousePositionInfoList
+                    this.isShowPrintType = true
+                    })
+                  }else{
+                    this.isShowPrintType = true
+                  }
+                  
                   this.getList()
                 })
                 // addstorageputList(that.inOutData).toPromise().then((response) => {
@@ -2310,7 +2332,7 @@ export default {
                   .then((response) => {
                     //累计售粮超上限不能完成皮检保存
                     let count = (
-                      arr2.saleLimit - response / 1000
+                       arr2.saleLimit - response / 1000
                     ).toFixed(2)
                     if (count - this.weighingList.netWeight / 1000 < 0) {
                       this.$alert(
@@ -2329,7 +2351,7 @@ export default {
                               message: `累计售粮已超出上限`,
                             })
                           },
-                        })
+                      })
                     }
                     else {
                       //累计售粮没有超上限完成皮检保存
@@ -2872,7 +2894,7 @@ export default {
   right: 0;
   margin: auto;
   width: 440px;
-  height: 320px;
+  height: 446px;
   background: white;
   border-radius: 10px;
   z-index: 999;
@@ -2975,30 +2997,4 @@ export default {
   width: 300px;
   height: 300px
 }
-
-.videoImg {
-  // display: flex;
-  // flex-direction: column;
-  // align-items: center;
-  // justify-content: center;
-}
-
-.videoImg-row {
-  display: flex;
-  margin-bottom: 20px;
-}
-
-.carnumber-style {
-  // background: red;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-
-  width: 50%;
-
-  .btn {
-    margin-bottom: 10px;
-  }
-}
 </style>