前端

public/static/printdry.html

@@ -163,15 +163,16 @@
                       <td class="col" >{{printData.carNo}}</td>
                   </tr>
                   <tr class="row">
-                      <td colspan="3" class="col col-bgc">收货单位</td>
-                      <td class="col" colspan="5">{{print_company_name}}</td>
+                      <td colspan="3" class="col col-bgc">收货仓库</td>
+                      <td class="col" colspan="5" v-if="print_company_name!='白城市鹏羽粮食贸易有限公司'">{{print_company_name}}</td>
+                      <td class="col" colspan="5" v-else>北京天维康油脂调销中心有限公司</td>
                   </tr>
                   <tr class="row">
                       <td class="col col-bgc">货名</td>
                       <td class="col">{{printData.goodsName}}</td>
                       <td class="col col-bgc">类型</td>
                       <td class="col">干粮</td>
-                      <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                      <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
                       <td class="col">
                       </td>
                       <td class="col col-bgc">不完善粒（%）</td>
@@ -270,7 +271,7 @@
                     <td class="col">{{printData.goodsName}}</td>
                     <td class="col col-bgc">类型</td>
                     <td class="col">干粮</td>
-                    <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容量（克/升）' : '蛋白'}}</td>
+                    <td class="col col-bgc">{{printData.goodsName != '大豆' ? '容重（克/升）' : '蛋白'}}</td>
                     <td class="col">
                     </td>
                     <td class="col col-bgc">不完善粒（%）</td>

src/views/warehousenew/dryRecord.vue

@@ -50,6 +50,7 @@
                 <el-table-column prop="dryNumber" label="业务编号"></el-table-column>
                 <el-table-column prop="carNo" label="车牌号" width="130"></el-table-column>
                 <el-table-column prop="goodsName" label="货名"></el-table-column>
+                <el-table-column prop="binNumber" label="仓位号"></el-table-column>
                 <el-table-column prop="weigher" label="检斤员"></el-table-column>
                 <el-table-column prop="grossWeight" label="毛重（公斤）" width="100"></el-table-column>
                 <el-table-column prop="tare" label="皮重（公斤）" width="100"></el-table-column>

src/views/warehousenew/dryWarehousing.vue

@@ -92,6 +92,13 @@
                                                 <el-button @click="carNoTypechange" v-if="tpyeNo == 2">{{ cartips }}
                                                 </el-button>
                                             </ws-form-item>
+                                            <ws-form-item v-if="tpyeNo == 2 && warehouseType == 1" label="仓位号" span="1" prop="inOutTaskNo">
+                                              <el-select @change="binNumberchange" filterable clearable
+                                                v-model="weighingList.binNumber" placeholder="请选择仓位号" class="typeselect">
+                                                <el-option v-for="item in positionInfos" :key="item.id" :label="item.binNumber"
+                                                  :value="item.binNumber" />
+                                              </el-select>
+                                            </ws-form-item>
                                             <ws-form-item label="毛重(KG)" span="1" prop="grossWeight">
                                                 <ws-input type="number" @mousewheel.native.prevent
                                                     v-model="weighingList.grossWeight" @input="calculation"
@@ -237,6 +244,7 @@ export default {
                 tare: '',
                 netWeight: 0
             },
+            positionInfos:[],
             deptBudgetList: {},
             warehouseList: [],
             goodsNameList: [],
@@ -335,7 +343,7 @@ export default {
         this.selectWarehouse()
         this.getGoodsList()
         this.isShowBalance = true
-        this.openPort()
+        console.log(localStorage.getItem('compNameoptions'))
         if(localStorage.getItem('compNameoptions')){
         var company=JSON.parse(localStorage.getItem('compNameoptions'))
         
@@ -350,6 +358,7 @@ export default {
           &&item!='黑龙江益储益运粮食贸易有限公司'
           &&item!='黑龙江启兴粮食贸易有限公司'
         })
+        console.log(extra,1111111111111111)
         if(extra.length>0){
           this.companyNameOptions=[
           {
@@ -460,6 +469,7 @@ export default {
           }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]})
@@ -467,8 +477,17 @@ export default {
           }
         }
       }
+        this.openPort()
+        
     },
     methods: {
+      binNumberchange(e) {
+        for (let i = 0; i < this.positionInfos.length; i++) {
+          if (this.positionInfos[i].binNumber == e) {
+            this.weighingList.positionId = this.positionInfos[i].id
+          }
+        }
+      },
         changeEw(e) {
         this.ddchecked = false
         if (e) {
@@ -755,10 +774,10 @@ export default {
                                 this.weighingList.netWeight = ''
                                 getdrylist({id:this.weighingList.id}).toPromise()
                                 .then((response) => {
-                                    console.log(1111111111)
                                     this.printData=response
                                     this.isShowPrintTypeBills=true
                                 })
+                                console.log(this.weighingList)
                                 this.getList()
                             })
                     }
@@ -770,6 +789,14 @@ export default {
         },
         tabClick(val) {
             this.weighingList = {}
+            for (let i = 0; i < this.warehouseList.length; i++) {
+                if (this.warehouseList[i].warehouseName == this.warehouseName) {
+                    this.warehouseId = this.warehouseList[i].id
+                    this.weighingList.baseId = this.warehouseList[i].id
+                    this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
+                    this.positionInfos =  this.warehouseList[i].positionInfos
+                }
+            }
             this.index = val
             if (val == 0) {
                 this.information = '皮重'
@@ -787,6 +814,7 @@ export default {
                     this.warehouseId = this.warehouseList[i].id
                     this.weighingList.baseId = this.warehouseList[i].id
                     this.weighingList.warehouseNo = this.warehouseList[i].commonWarehouseNo
+                    this.positionInfos =  this.warehouseList[i].positionInfos
                     // if (this.warehouseList[i].allowEdit == 1) {
                     //     this.disabled = false
                     // } else {
@@ -831,11 +859,16 @@ export default {
                         this.weighingList.warehouseNo = obj.No
                         this.getCarXiaLa()
                         this.getList()
+                        for (let i = 0; i < response.length; i++) {
+                          this.positionInfos = response[i].positionInfos
+                          
+                        }
                     } else {
                         this.warehouseName = response[0].warehouseName
                         this.weighingList.baseId = response[0].id
                         this.warehouseId = response[0].id
                         this.weighingList.warehouseNo = response[0].commonWarehouseNo
+                        this.positionInfos = response[0].positionInfos
                         if (response[0].allowEdit == 1) {
                             this.disabled = false
                         } else {
@@ -845,6 +878,7 @@ export default {
                         this.getList()
                     }
                     this.deptBudgetList.warehouseName = this.warehouseName
+                    
                 })
         },
         getList() {