前端

src/api/V2/warehouse/index.js

@@ -84,6 +84,8 @@ export const API_GET_RECEIPTTASKNO = '/inOutWarehouseTask/selectInOutWarehouseNo
 export const API_POST_EXPORT = '/warehouseBaseInfo/export'
 //打印增量
 export const API_GET_PRINT = '/commonConstantFalse/getInfo'
+// 仓位号
+export const API_GET_WAREHOUSE_BINNUMBER = '/warehouseBaseInfo/getWarehouse'
 
 
 

src/model/warehouse/index.js

@@ -40,7 +40,8 @@ import {
     API_GET_CHECKORUPDATE,
     API_GET_RECEIPTTASKNO,
     API_POST_EXPORT,
-    API_GET_PRINT
+    API_GET_PRINT,
+    API_GET_WAREHOUSE_BINNUMBER
 } from '@/api/V2/warehouse'
 // import { app } from 'electron'
 // 列表
@@ -124,4 +125,6 @@ export const getReceiptTaskNo = appRx.get(API_GET_RECEIPTTASKNO,errorCatcher, er
 export const postExport = appRx.post(API_POST_EXPORT)
 //打印增量
 export const  printAdd = appRx.get(API_GET_PRINT,errorCatcher, errorHandle, filter)
+//仓位号
+export const  getbinnumber = appRx.get(API_GET_WAREHOUSE_BINNUMBER,errorCatcher, errorHandle, filter)
 

src/views/warehouse/warehouseManagementRecord.vue

@@ -15,7 +15,14 @@
 				<img style="position: relative; top: 2px" width="19" height="19" src="../../../public/img/cangku.png"
 					alt="" />
 				<span style="color: #323233">{{ deptBudgetList.warehouseName }}</span>
-				<span class="ware" v-show="warehouseType==1">{{binNumber}}仓位(容量{{capacity}}吨)</span>
+				<div class="ware" v-show="warehouseType==1">
+					<!-- {{binNumber}}仓位(容量{{capacity}}吨) -->
+					<el-select filterable clearable v-model="binNumber" placeholder="请选择仓位" class="typeselect"
+              @change="binNumberChange">
+              <el-option v-for="item in binnumberList" :key="item.binNumber" :label="item.binNumber"
+                :value="item.binNumber" />
+            </el-select>
+				</div>
 				<span v-show="warehouseType==2">(临)</span>
 			</h2>
 			<p style="
@@ -88,6 +95,7 @@
 							<span v-else>{{ scope.$index + 1 }}</span>
 						</template>
 					</el-table-column>
+					<el-table-column prop="binNumber" label="仓位号" width="60px"> </el-table-column>
 					<el-table-column prop="goodsName" label="货名" width="60px"> </el-table-column>
 					<!-- <el-table-column prop="type" label="类型" width="60px"> </el-table-column> -->
 					<el-table-column prop="grossWeight" label="毛重（吨）" >
@@ -278,7 +286,8 @@
 	import {
 		addselectinfoList,
 		recordss,
-		getPrintInfo
+		getPrintInfo,
+		getbinnumber
 	} from '@/model/warehouse/index'
 	import {
 		downloadFile
@@ -309,6 +318,7 @@
 				//弹出框
 				dialogViewSpareMoney: false,
 				dialogApproveFormVisible: false,
+				binnumberList:[],
 				// 船舶类型
 				monetaryKey: null,
 				// 表格显示数据
@@ -377,6 +387,14 @@
 			})
 		},
 		methods: {
+			binNumberChange(e){
+				for (let i = 0; i < this.binnumberList.length; i++) {
+					if(this.binnumberList[i].binNumber==e){
+						this.deptBudgetList.positionId=this.binnumberList[i].id
+					}
+				}
+				this.getList()
+			},
 			//合计
 			getSummaries(param) {
 				const { columns, data } = param
@@ -529,6 +547,11 @@
 					endDate=this.value2[1]?this.value2[1]:''
 				}
 				if (this.warehouseType == 1) {
+					getbinnumber({id: this.deptBudgetList.baseId}).toPromise()
+						.then((response) => {
+							
+							this.binnumberList = response.warehousePositionInfoList
+						})
 					addselectinfoList({
 							compId: localStorage.getItem('ws-pf_compId'),
 							baseId: this.deptBudgetList.baseId,
@@ -704,11 +727,11 @@
 	.ware {
 		font-size: 12px;
 		color: rgb(255, 255, 255);
-		background: rgb(175, 181, 203);
 		padding: 3px;
 		position: relative;
 		top: -1px;
 		border-radius: 3px;
+		display: inline-block;
 		text-align: center;
 	}