Browse Source

调回单列表

chenrui 2 years ago
parent
commit
351472d566
3 changed files with 329 additions and 407 deletions
  1. 121 48
      pages/shuntBackManage/addBackOrder.vue
  2. 29 182
      pages/shuntBackManage/detailModal.vue
  3. 179 177
      pages/shuntBackManage/shelfList.vue

+ 121 - 48
pages/shuntBackManage/addBackOrder.vue

@@ -3,7 +3,7 @@
 		<view class="header_box">
 			<view class="headerName u-flex">
 				<text class="barBox"></text>
-				<view class="shelfName u-line-1">{{ shelfName }}对方的观点和个人就一个人国服日服固定板</view>
+				<view class="shelfName u-line-1">{{ shelfName }}</view>
 				<view class="screeningBox" @click="chooseShow = true">
 					<text>滞销天数</text>
 					<u-icon color="#666666" size="36" name="shaixuan" custom-prefix="iscm-icon"></u-icon>
@@ -27,34 +27,35 @@
 			</view>
 		</view>
 		<view class="backOrderCon">
-			<scroll-view scroll-y class="scroll-view">
-					<view class="partList-list-box">
+			<scroll-view scroll-y class="scroll-view" v-if="recallBillList && recallBillList.length>0" >
+				<u-checkbox-group :wrap="true"  @change="checkGroupChange">
+					<view class="partList-list-box" v-for="(item,index) in recallBillList" :key="item.id">
 						<view class="product flex align_center">
-							<view class="checkbox"><u-checkbox v-model="checked" name="A" @change="checkChange" size="40" shape="circle"></u-checkbox></view>
+							<view class="checkbox"><u-checkbox v-model="item.isChecked" :name="item.id" size="40" shape="circle"></u-checkbox></view>
 							<view class="flex align_center flex_1">
 								<view class="pimgs">
 									<u-image src="`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
 								</view>
 								<view class="pinfo">
 									<view class="pname">
-										<text>A01</text>
-										JQ-21026E
+										<text>{{item.shelfPlaceCode}}</text>
+										{{item.productCode}}
 									</view>
 									<view class="productName u-line-1">
-										名i嘻嘻嘻嘻嘻嘻
+										{{item.productName}}
 									</view>
 									<view class="ptxt flex align_center">
 										<view>
 											最大库容
-											<text class="pnums">100</text>
+											<text class="pnums">{{item.maxQty}}</text>
 										</view>
 										<view>
 											/货架库存
-											<text class="pnums">20</text>
+											<text class="pnums">{{item.qty}}</text>
 										</view>
 										<view>
 											/滞销
-											<text class="pnums">12个月23天</text>
+											<text class="pnums">{{item.unsalableDays}}</text>
 										</view>
 									</view>
 								</view>
@@ -62,38 +63,39 @@
 						</view>
 						<view class="ptools flex align_center justify_between">
 							<view class="ptools_l u-flex">
-								<view>
+								<view v-if="item.replenishBillQty && item.replenishBillQty!=0">
 									补货在途
-									<text class="pnums">1</text>
+									<text class="pnums">{{item.replenishBillQty}}</text>
 								</view>
-								<view>
-									/调回在途
-									<text class="pnums">2</text>
+								<view v-if="item.recallBillQty && item.recallBillQty!=0">
+									调回在途
+									<text class="pnums">{{item.recallBillQty}}</text>
 								</view>
 							</view>
 							<view class="pcurnums flex align_center">
 								<text>调回数量</text>
-								<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="shifa" :min="0" :max="10"></u-number-box></view>
+								<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="item.confirmQty" :min="0" :max="item.qty"></u-number-box></view>
 							</view>
 						</view>
 					</view>
-				<!-- <u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="240" :text="noDataText" img-width="120" v-if="list.length==0 && status!='loading'" mode="list"></u-empty> -->
+				</u-checkbox-group>
 			</scroll-view>
+			<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="200" :text="noDataText" img-width="120" v-else></u-empty>
 		</view>
 		<view class="backOrderFooter u-flex">
 			<view class="checkBox">
-				<u-checkbox-group><u-checkbox label-size="24" icon-size="26" v-model="allChecked" shape="circle">全选</u-checkbox></u-checkbox-group>
+				<u-checkbox-group><u-checkbox label-size="24" v-model="allChecked" shape="circle" @change="allCheckedChange">全选</u-checkbox></u-checkbox-group>
 			</view>
 			<view class="footerBox u-flex u-row-between">
 				<view class="footerBox_m u-flex">
 					<view class="middle_l">
 						已选
-						<text>2</text>
+						<text>{{chooseArr.length}}</text>
 						款/
-						<text>15</text>
+						<text>{{totalNum}}</text>
 					</view>
-					<view class="middle_r" @click="detailFlag=true">
+					<view class="middle_r" @click="seeDetail">
 						<text>查看明细</text>
 						<u-icon name="arrow-up" color="#999" size="28"></u-icon>
 					</view>
@@ -117,12 +119,13 @@
 			</view>
 		</u-popup>
 		<!-- 查看明细弹窗 -->
-		<detailModal :detailShow="detailFlag"  @close="detailFlag=false"></detailModal>
+		<detailModal @clearList='clearOneList' @clearAllList="clearAll" :detailShow="detailFlag" :chooseData="chooseArr"  @close="detailFlag=false"></detailModal>
 	</view>
 </template>
 
 <script>
 import { reportPage } from '@/api/vinLog';
+import { controlQueryList } from '@/api/shelf';
 import detailModal from './detailModal'
 export default {
 	components: {
@@ -130,7 +133,15 @@ export default {
 	},
 	data() {
 		return {
-			detailFlag:false,
+			shelfSn: '',
+			shelfName: '',
+			recallBillList:[],//回调单列表
+			chooseArr:[],
+			noDataText: '暂无调回单',
+			totalNum: 0,
+			
+			detailFlag:false,//查看详情
+			
 			chooseShow: false,
 			checked: true,
 			keyword: '',
@@ -150,13 +161,10 @@ export default {
 			],
 			isSortFlag: 0,
 			list: [],
-			shelfSn: '',
-			shelfName: '',
-			pageNo: 1,
-			pageSize: 10,
-			noDataText: '暂无数据',
+			
+			
 			status: 'loading',
-			totalNum: 0,
+			
 			total: 0,
 			theme: '',
 			customBtnStyle: {
@@ -175,9 +183,7 @@ export default {
 		this.shelfSn = options.shelfSn;
 		this.shelfName = options.shelfName;
 		let ajaxData = {
-			pageNo: this.pageNo,
-			pageSize: this.pageSize,
-			shelfSn: this.shelfSn
+			shelfSn: options.shelfSn
 		};
 		this.loadData(ajaxData);
 	},
@@ -188,32 +194,89 @@ export default {
 			return true;
 		}
 	},
-
 	methods: {
 		// 获取数字货架列表
 		loadData(params) {
 			const _this = this;
 			_this.status = 'loading';
-			reportPage(params).then(res => {
+			controlQueryList(params).then(res => {
 				if (res.status == 200) {
-					if (this.pageNo > 1) {
-						this.list = this.list.concat(res.data.list || []);
-					} else {
-						this.list = res.data.list || [];
-					}
-					this.totalNum = res.data.count || 0;
-				} else {
-					this.list = [];
-					this.totalNum = 0;
-					this.noDataText = res.message;
+					res.data.forEach(item=>{
+						item.isChecked= false
+						item.confirmQty = item.qty
+					})
+					this.recallBillList=res.data;
 				}
-				this.status = 'loadmore';
 			});
 		},
-		chooseSort(i) {
-			this.isSortFlag = i;
-			this.handelSort();
+		
+		checkGroupChange(e){
+			let newArr=[];
+			e.forEach(item=>{
+				this.recallBillList.map(info =>{
+					if(item == info.id) {
+						newArr.push(info);
+					}
+				})
+			})
+			this.chooseArr = newArr;
+			let flag = this.recallBillList.every(con => con.isChecked )
+			if(flag){
+				this.allChecked = true
+			}else{
+				this.allChecked = false
+			}
+			this.calculateTotal()
+		},
+		// 全选
+		allCheckedChange(e){
+			 if(e.value){
+				this.recallBillList.map(item=>{
+					item.isChecked = true;
+				})
+				this.chooseArr = this.recallBillList;
+			 }else{
+				 this.recallBillList.map(item=>{
+				 	item.isChecked = false;
+				 })
+				 this.chooseArr =[]
+			 }
+			 this.calculateTotal()
+		},
+		// 计算选中总件数
+		calculateTotal(){
+			 this.totalNum = this.recallBillList.filter(item=>{
+				 return item.isChecked
+			 }).reduce((pre,cur)=>{
+				 return pre + cur.confirmQty
+			 },0)	
+		},
+		//查看选中详情
+		seeDetail(){
+			if(this.chooseArr.length == 0){
+				uni.showToast({
+					title:'请先选择调回单',
+					icon:'none'
+				})
+			}else{
+				this.detailFlag = true;
+			}
+		},
+		// 详情删除其中一条选中数据
+		clearOneList(id){
+			let i =this.recallBillList.findIndex(val =>{
+				return val.id == id;
+			})
+			this.recallBillList[i].isChecked = false
+			this.calculateTotal();
+		},
+		clearAll(){
+			this.recallBillList.map(item=>{
+				item.isChecked = false;
+			})
+			this.chooseArr = []
 		},
+		
 		reset() {
 			this.isSortFlag = 0;
 			this.pageNo = 1;
@@ -343,7 +406,11 @@ export default {
 	.backOrderCon {
 		width: 100%;
 		height: calc(100vh - 280rpx);
+		.scroll-view{
+			height: 100%;
+		
 		.partList-list-box {
+			width: 700rpx;
 			padding: 10px 0;
 			border-bottom: 2rpx solid #f5f5f5;
 			&:last-child {
@@ -402,6 +469,11 @@ export default {
 				.ptools_l{
 					font-size: 24rpx;
 					color: #999;
+					view{
+						:nth-child(2)::before{
+							content: '/';
+						}
+					}
 					.pnums {
 						color: #ff5500;
 						padding: 0 4rpx;
@@ -434,6 +506,7 @@ export default {
 				}
 			}
 		}
+		}
 	}
 	.backOrderFooter {
 		height: 98rpx;

+ 29 - 182
pages/shuntBackManage/detailModal.vue

@@ -2,12 +2,12 @@
 	<u-popup v-model="isShow" mode="bottom" height="800" border-radius="25">
 		<view class="head u-flex u-row-between">
 			<text>已选产品</text>
-			<text>清空列表</text>
+			<text @click="clearAllList">清空列表</text>
 		</view>
-		<scroll-view scroll-y class="scroll-view">
-			<view class="partList-list-box">
+		<scroll-view scroll-y class="scroll-view" v-if="list.length>0">
+			<view class="partList-list-box" v-for="(con,i) in list" :key="con.id">
 				<view class="product flex align_center">
-					<view class="checkbox">
+					<view class="checkbox" @click="clearList(con.id,i)">
 						<u-icon name="close-circle" color="#999" size="40"></u-icon>
 					</view>
 					<view class="checkboxRight flex align_center flex_1">
@@ -16,24 +16,24 @@
 						</view>
 						<view class="pinfo">
 							<view class="pname">
-								<text>A01</text>
-								JQ-21026E
+								<text>{{con.shelfPlaceCode}}</text>
+								{{con.productCode}}
 							</view>
 							<view class="productName u-line-1">
-								名i嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻
+								{{con.productName}}
 							</view>
 							<view class="ptxt flex align_center">
 								<view>
 									最大库容
-									<text class="pnums">100</text>
+									<text class="pnums">{{con.maxQty}}</text>
 								</view>
 								<view>
 									/货架库存
-									<text class="pnums">20</text>
+									<text class="pnums">{{con.qty}}</text>
 								</view>
 								<view>
 									/滞销
-									<text class="pnums">12个月23天</text>
+									<text class="pnums">{{con.unsalableDays}}</text>
 								</view>
 							</view>
 						</view>
@@ -41,175 +41,23 @@
 				</view>
 				<view class="ptools flex align_center justify_between">
 					<view class="ptools_l u-flex">
-						<view>
+						<view v-if="con.replenishBillQty && con.replenishBillQty!=0">
 							补货在途
-							<text class="pnums">1</text>
+							<text class="pnums">{{con.replenishBillQty}}</text>
 						</view>
-						<view>
-							/调回在途
-							<text class="pnums">2</text>
+						<view v-if="con.recallBillQty && con.recallBillQty!=0">
+							调回在途
+							<text class="pnums">{{con.recallBillQty}}</text>
 						</view>
 					</view>
 					<view class="pcurnums flex align_center">
 						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="shifa" :min="0" :max="10"></u-number-box></view>
-					</view>
-				</view>
-			</view>
-			<view class="partList-list-box">
-				<view class="product flex align_center">
-					<view class="checkbox">
-						<u-icon name="close-circle" color="#999" size="40"></u-icon>
-					</view>
-					<view class="checkboxRight flex align_center flex_1">
-						<view class="pimgs">
-							<u-image src="`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
-						</view>
-						<view class="pinfo">
-							<view class="pname">
-								<text>A01</text>
-								JQ-21026E
-							</view>
-							<view class="productName u-line-1">
-								名i嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻
-							</view>
-							<view class="ptxt flex align_center">
-								<view>
-									最大库容
-									<text class="pnums">100</text>
-								</view>
-								<view>
-									/货架库存
-									<text class="pnums">20</text>
-								</view>
-								<view>
-									/滞销
-									<text class="pnums">12个月23天</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="ptools flex align_center justify_between">
-					<view class="ptools_l u-flex">
-						<view>
-							补货在途
-							<text class="pnums">1</text>
-						</view>
-						<view>
-							/调回在途
-							<text class="pnums">2</text>
-						</view>
-					</view>
-					<view class="pcurnums flex align_center">
-						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="shifa" :min="0" :max="10"></u-number-box></view>
-					</view>
-				</view>
-			</view>
-			<view class="partList-list-box">
-				<view class="product flex align_center">
-					<view class="checkbox">
-						<u-icon name="close-circle" color="#999" size="40"></u-icon>
-					</view>
-					<view class="checkboxRight flex align_center flex_1">
-						<view class="pimgs">
-							<u-image src="`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
-						</view>
-						<view class="pinfo">
-							<view class="pname">
-								<text>A01</text>
-								JQ-21026E
-							</view>
-							<view class="productName u-line-1">
-								名i嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻
-							</view>
-							<view class="ptxt flex align_center">
-								<view>
-									最大库容
-									<text class="pnums">100</text>
-								</view>
-								<view>
-									/货架库存
-									<text class="pnums">20</text>
-								</view>
-								<view>
-									/滞销
-									<text class="pnums">12个月23天</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="ptools flex align_center justify_between">
-					<view class="ptools_l u-flex">
-						<view>
-							补货在途
-							<text class="pnums">1</text>
-						</view>
-						<view>
-							/调回在途
-							<text class="pnums">2</text>
-						</view>
-					</view>
-					<view class="pcurnums flex align_center">
-						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="shifa" :min="0" :max="10"></u-number-box></view>
-					</view>
-				</view>
-			</view>
-			<view class="partList-list-box">
-				<view class="product flex align_center">
-					<view class="checkbox">
-						<u-icon name="close-circle" color="#999" size="40"></u-icon>
-					</view>
-					<view class="checkboxRight flex align_center flex_1">
-						<view class="pimgs">
-							<u-image src="`../../static/${$config('themePath')}/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
-						</view>
-						<view class="pinfo">
-							<view class="pname">
-								<text>A01</text>
-								JQ-21026E
-							</view>
-							<view class="productName u-line-1">
-								名i嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻嘻
-							</view>
-							<view class="ptxt flex align_center">
-								<view>
-									最大库容
-									<text class="pnums">100</text>
-								</view>
-								<view>
-									/货架库存
-									<text class="pnums">20</text>
-								</view>
-								<view>
-									/滞销
-									<text class="pnums">12个月23天</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="ptools flex align_center justify_between">
-					<view class="ptools_l u-flex">
-						<view>
-							补货在途
-							<text class="pnums">1</text>
-						</view>
-						<view>
-							/调回在途
-							<text class="pnums">2</text>
-						</view>
-					</view>
-					<view class="pcurnums flex align_center">
-						<text>调回数量</text>
-						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="shifa" :min="0" :max="10"></u-number-box></view>
+						<view class="u-ninput"><u-number-box color="#000" :input-height="60" bg-color="#fff" v-model="con.confirmQty" :min="0" :max="10"></u-number-box></view>
 					</view>
 				</view>
 			</view>
 		</scroll-view>
+		<u-empty :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="200" text="暂无选中回调单" img-width="120" v-else></u-empty>
 	</u-popup>
 </template>
 
@@ -219,27 +67,26 @@
 			detailShow: { //  弹框显示状态
 				type: Boolean,
 				default: false
+			},
+			chooseData:{
+				type: Array,
+				default:()=>[]
 			}
 		},
 		data() {
 			return {
 				isShow:this.detailShow,
-				list:[]
+				list:this.chooseData
 			}
 		},
 		methods: {
-			// 确认
-			handleConfirm(){
-				 this.$emit("ok")
-				 this.isShow = false
+			clearList(id,i){
+				this.chooseData.splice(i,1);
+				 this.$emit("clearList",id)
 			},
-			// 获取列表数据
-			getList(){
-				queryWaitListByShelfSn({shelfSn: this.infoData.shelfSn}).then(res => {
-					if(res.status == 200){
-						this.list = res.data||[]
-					}
-				})
+			clearAllList(){
+				this.list = [];
+				 this.$emit("clearAllList")
 			}
 		},
 		watch: {
@@ -252,7 +99,7 @@
 				if (!newValue) {
 					this.$emit('close')
 				}else{
-					this.getList()
+					this.list = this.chooseData
 				}
 			}
 		}

+ 179 - 177
pages/shuntBackManage/shelfList.vue

@@ -2,226 +2,228 @@
 	<view class="moreShelfPart flex flex_column">
 		<view class="moreShelfPart-search">
 			<u-search
-			placeholder="请输入货架名称搜索" 
-			v-model="shelfName" 
-			:show-action="isGobleSearch" 
-			@input="change"
-			@focus="isGobleSearch=true"
-			@blur="isGobleSearch=false"
-			@custom="getShelfList" 
-			@search="getShelfList" 
-			@clear="clearSearch"
-			:action-style="{'color': '#fff', 'font-size': '24upx', 'background-color': '#57a3f3', 'border-radius': '6upx', 'padding': '12upx 0'}">
-			</u-search>
+				placeholder="请输入货架名称搜索"
+				v-model="shelfName"
+				:show-action="isGobleSearch"
+				@input="change"
+				@focus="isGobleSearch = true"
+				@blur="isGobleSearch = false"
+				@custom="getShelfList"
+				@search="getShelfList"
+				@clear="clearSearch"
+				:action-style="{ color: '#fff', 'font-size': '24upx', 'background-color': '#57a3f3', 'border-radius': '6upx', padding: '12upx 0' }"
+			></u-search>
 		</view>
 		<view class="moreShelfPart-body">
 			<view class="nav-right">
-				<view 
-				class="nav-right-item" 
-				v-for="(item, index) in shelfList" 
-				:key="item.id" 
-				@click="viewDetail(item)"
-				>
+				<view class="nav-right-item" v-for="(item, index) in shelfList" :key="item.id" @click="viewDetail(item)">
 					<view class="item-info">
 						<view class="item-name clearFix">
 							<text class="barBox"></text>
-							<text class="itemName">{{item.shelfName}}</text>
+							<text class="itemName">{{ item.shelfName }}</text>
 						</view>
 						<view class="item-detail">
 							<view>
 								产品款数:
-								<text class="item-detail-text">{{item.scanVinCount || 0}}</text>
+								<text class="item-detail-text">{{ item.shelfPlaceBindNum || 0 }}</text>
 							</view>
 							<view>
 								库存总量:
-								<text class="item-detail-text">{{item.scanVinCount || 0}}</text>
+								<text class="item-detail-text">{{ item.qty || 0 }}</text>
 							</view>
 						</view>
 					</view>
 				</view>
-				<view v-if="shelfList&&shelfList.length==0">
-					<u-empty v-if="status!='loading'" :src="`/static/${$config('themePath')}/def_no_data@3x.png`" icon-size="180" :text="noDataText" mode="list" :margin-top="100"></u-empty>
-				</view>
-				<view style="padding: 20upx;" v-if="shelfList.length">
-					<u-loadmore :status="status" />
+				<view v-if="shelfList && shelfList.length == 0">
+					<u-empty
+						v-if="status != 'loading'"
+						:src="`/static/${$config('themePath')}/def_no_data@3x.png`"
+						icon-size="180"
+						:text="noDataText"
+						mode="list"
+						:margin-top="100"
+					></u-empty>
 				</view>
+				<view style="padding: 20upx;" v-if="shelfList.length"><u-loadmore :status="status" /></view>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import { getShelfList } from '@/api/shelf'
-	import { clzConfirm } from '@/libs/tools'
-	export default {
-		data() {
-			return {
-				shelfName: '',
-				isGobleSearch: false,
-				shelfList: [],
-				noDataText: '暂无货架',
-				status: 'loading',
-				tempData: null,
-				pageNo:1,
-				pageSize:20
-			}
+import { getShelfList } from '@/api/shelf';
+import { clzConfirm } from '@/libs/tools';
+export default {
+	data() {
+		return {
+			shelfName: '',
+			isGobleSearch: false,
+			shelfList: [],
+			noDataText: '暂无货架',
+			status: 'loading',
+			tempData: null,
+			pageNo: 1,
+			pageSize: 20
+		};
+	},
+	onLoad() {
+		this.getShelfList();
+	},
+	methods: {
+		clearSearch() {
+			this.pageNo = 1;
+			this.shelfName = '';
+			this.shelfList = [];
+			console.log('111:')
+			this.$nextTick(() => {
+				this.getShelfList();
+			});
 		},
-		onLoad() {
-			this.getShelfList()
+		change(v) {
+			if (v == '') {
+				this.clearSearch();
+			}else{
+				this.pageNo = 1;
+			}
 		},
-		methods: {
-			clearSearch(){
-				this.shelfName = ''
-				this.shelfList = []
-				this.getShelfList()
-			},
-			change(v){
-				if(v==''){
-					this.clearSearch()
-				}
-			},
-			// 获取数字货架列表
-			getShelfList(){
-				const _this = this
-				// if(this.shelfName == ''){
-				// 	this.pageNo = 1
-				// 	this.total = 0
-				// }
-				let params = {
-				    pageNo: _this.pageNo,
-				    pageSize: _this.pageSize,
-					shelfName: _this.shelfName
-				}
-				_this.status = 'loading'
-				getShelfList(params).then(res => {
-					if(res.status == 200){
-						let list = res.data.list
-						if (list && list.length){
-							// 分页 拼接数据
-							if(_this.pageNo>1){
-								_this.shelfList = _this.shelfList.concat(res.data.list || [])
-							}else{
-								_this.shelfList = res.data.list
-							}
-							_this.total = res.data.count
-							if (_this.shelfList.length == res.data.count) {//是否是最后一页
-								_this.status = 'nomore'
-							} else {
-								_this.status = 'loadmore'
-							}
+		// 获取数字货架列表
+		getShelfList() {
+			const _this = this;
+			let params = {
+				pageNo: _this.pageNo,
+				pageSize: _this.pageSize,
+				shelfName: _this.shelfName
+			};
+			_this.status = 'loading';
+			getShelfList(params).then(res => {
+				if (res.status == 200) {
+					let list = res.data.list;
+					if (list && list.length) {
+						// 分页 拼接数据
+						if (_this.pageNo > 1) {
+							_this.shelfList = _this.shelfList.concat(res.data.list || []);
+						} else {
+							_this.shelfList = res.data.list;
+						}
+						_this.total = res.data.count;
+						if (_this.shelfList.length == res.data.count) {
+							//是否是最后一页
+							_this.status = 'nomore';
 						} else {
-							_this.shelfList = list || []
-							_this.total = 0
-							_this.status = 'nomore'
-							_this.noDataText = '没有查询到相关货架'
+							_this.status = 'loadmore';
 						}
-						_this.noDataText = '暂无货架'
-					}else{
-						_this.status = 'loadmore'
-						_this.shelfList = []
-						_this.total = 0
-						_this.noDataText = res.message ? res.message : '网络似乎出错了,请稍后再试'
+					} else {
+						_this.shelfList = list || [];
+						_this.total = 0;
+						_this.status = 'nomore';
+						_this.noDataText = '没有查询到相关货架';
 					}
-				})
-				
-			},
-			viewDetail(item){
-				uni.navigateTo({
-					url:"/pages/shuntBackManage/addBackOrder"
-				})
-			}
-		},
-		// 上拉加载更多
-		onReachBottom () {
-			if(this.shelfList.length < this.total ){
-				if(this.isGobleSearch&&this.shelfName==''){
-					return
+					_this.noDataText = '暂无货架';
+				} else {
+					_this.status = 'loadmore';
+					_this.shelfList = [];
+					_this.total = 0;
+					_this.noDataText = res.message ? res.message : '网络似乎出错了,请稍后再试';
 				}
-				this.pageNo++
-				this.getShelfList()
-			}else{
-				this.status = "nomore"
-			}
+			});
+		},
+		viewDetail(item) {
+			uni.navigateTo({
+				url: '/pages/shuntBackManage/addBackOrder?shelfSn='+ item.shelfSn+'&shelfName='+item.shelfName
+			});
+		}
+	},
+	// 上拉加载更多
+	onReachBottom() {
+		if (this.shelfList.length < this.total) {
+			// if (this.isGobleSearch && this.shelfName == '') {
+			// 	return;
+			// }
+			this.pageNo++;
+			this.getShelfList();
+		} else {
+			this.status = 'nomore';
 		}
 	}
+};
 </script>
 
 <style lang="less">
-	.moreShelfPart{
-		width: 100%;
-		height: 100vh;
-		background-color: #f8f8f8;
-		.moreShelfPart-search{
-			padding: 20rpx;
-		}
-		.moreShelfPart-body{
-			flex-grow: 1;
-		}
-		.nav-right{
-			padding: 0 30upx;
-			box-sizing: border-box;
-			overflow: auto;
-			.nav-right-item{
-				padding:20upx;
-				border: 2rpx solid #f5f5f5;
-				border-radius: 15upx;
-				margin-bottom: 20upx;
-				box-shadow: 3rpx 3rpx 8rpx #eee;
-				background-color: #ffff;
-				&:active{
-					background: #f8f8f8;
-				}
-				.item-info{
-					.item-name{
-						font-size: 30upx;
-						vertical-align: middle;
-						.barBox {
-							display: block;
-							height: 30rpx;
-							width: 6rpx;
-							background: #9DA8B5;
-							margin-right: 10rpx;
-							border-radius: 10rpx;
-							float: left;	
-							margin-top:9rpx;
-						}
-						.itemName{
-							vertical-align: top;
-						}
+.moreShelfPart {
+	width: 100%;
+	height: 100vh;
+	background-color: #f8f8f8;
+	.moreShelfPart-search {
+		padding: 20rpx;
+	}
+	.moreShelfPart-body {
+		flex-grow: 1;
+	}
+	.nav-right {
+		padding: 0 30upx;
+		box-sizing: border-box;
+		overflow: auto;
+		.nav-right-item {
+			padding: 20upx;
+			border: 2rpx solid #f5f5f5;
+			border-radius: 15upx;
+			margin-bottom: 20upx;
+			box-shadow: 3rpx 3rpx 8rpx #eee;
+			background-color: #ffff;
+			&:active {
+				background: #f8f8f8;
+			}
+			.item-info {
+				.item-name {
+					font-size: 30upx;
+					vertical-align: middle;
+					.barBox {
+						display: block;
+						height: 30rpx;
+						width: 6rpx;
+						background: #9da8b5;
+						margin-right: 10rpx;
+						border-radius: 10rpx;
+						float: left;
+						margin-top: 9rpx;
 					}
-					.clearFix::after{
-						clear: both;
-						content:'';
-						display:block;
-						visibility: hidden;
-					}
-					.item-detail{
-						margin-top: 15rpx;
-						display: flex;
-						align-items: center;
-						color: #9DA8B5;
-						font-size: 26upx;
-						:nth-child(1){
-							margin-right: 50rpx;
-						}
-						.item-detail-text{
-							font-size: 26upx;
-							color: #333;
-						}
+					.itemName {
+						vertical-align: top;
 					}
 				}
-				.button-box{
+				.clearFix::after {
+					clear: both;
+					content: '';
+					display: block;
+					visibility: hidden;
+				}
+				.item-detail {
+					margin-top: 15rpx;
 					display: flex;
-					margin-top: 20upx;
-					button{
-						margin: 0 10upx;
+					align-items: center;
+					color: #9da8b5;
+					font-size: 26upx;
+					:nth-child(1) {
+						margin-right: 50rpx;
 					}
-					> text{
-						font-size: 24upx;
-						color: #00aaff;
+					.item-detail-text {
+						font-size: 26upx;
+						color: #333;
 					}
 				}
 			}
+			.button-box {
+				display: flex;
+				margin-top: 20upx;
+				button {
+					margin: 0 10upx;
+				}
+				> text {
+					font-size: 24upx;
+					color: #00aaff;
+				}
+			}
 		}
 	}
+}
 </style>