浏览代码

Merge branch 'develop_szhj07' of http://git.chelingzhu.com/jianguan-web/qpls-md-app into develop_szhj07

chenrui 2 年之前
父节点
当前提交
34c57de78b

+ 2 - 1
libs/tools.js

@@ -437,7 +437,8 @@ export const openMessagePage = function(data){
 	}
 	// 补货订单
 	if (data.extras.bizType == 'SHELF_REPLENISH') {
-		uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_CONFIRM' })
+		// uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=ALL' })
+		uni.navigateTo({url: '/pages/soldOut/shelfList'})
 	}
 	// 货架订单
 	if (data.extras.bizType == 'SHELF_ORDER') {

+ 2 - 2
main.js

@@ -44,12 +44,12 @@ Vue.prototype.$hasPermissions = function (value) {
 /*
 * 提示信息
 */ 
-Vue.prototype.toashMsg = function (title) {
+Vue.prototype.toashMsg = function (title,duration) {
 	title = title == undefined ? "系统繁忙" : title;
 	uni.showToast({
 		title:title,
 		icon:'none',
-		duration: 4000
+		duration: duration||4000
 	})
 }
 Vue.prototype.showLoading = function (title) {

+ 6 - 36
pages.json

@@ -246,25 +246,10 @@
 		},
 		{
 			"path" : "pages/replenishmentManage/outWarehousing",
-			"style" :
-			{
-				"navigationBarTitleText": "补货出库",
-				"navigationStyle":"custom",
-				"app-plus":{
-					"titleNView": {
-						"titleAlign": "left",
-						"buttons": [ //原生标题栏按钮配置,
-							{
-								"text": "\ue603 生成销售单" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "14",
-								"color": "#ffffff",
-								"width":"120px"
-							}
-						]
+			"style": {
+						"navigationStyle": "custom" ,// 隐藏系统导航栏
+						"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 					}
-				}
-			}
 		},
 		{
 			"path" : "pages/replenishmentManage/manualPrint",
@@ -292,25 +277,10 @@
 		},
 		{
 			"path" : "pages/replenishmentManage/signWarehousing",
-			"style" :
-			{
-				"navigationBarTitleText": "补货签收",
-				"navigationStyle":"custom",
-				"app-plus":{
-					"titleNView": {
-						"titleAlign": "left",
-						"buttons": [ //原生标题栏按钮配置,
-							{
-								"text": "\ue603 生成销售单" ,//原生标题栏增加分享按钮,点击事件可通过页面的 onNavigationBarButtonTap 函数进行监听u
-								"fontSrc": "/static/iconfont/iconfont.ttf",
-								"fontSize": "14",
-								"color": "#ffffff",
-								"width":"120px"
-							}
-						]
+			"style": {
+						"navigationStyle": "custom" ,// 隐藏系统导航栏
+						"navigationBarTextStyle": "white" // 状态栏字体为白色,只能为 white-白色,black-黑色 二选一
 					}
-				}
-			}
 		},
 		{
 			"path" : "pages/replenishmentManage/detail",

+ 5 - 3
pages/batchShelves/cartList.vue

@@ -101,7 +101,7 @@
 				 </view>
 				 <view class="tagbox flex">
 				 	<view>
-				 		<view class="tag" :class="delLayer.indexOf(item)>=0?'active':''" v-for="item in countData" :key="item" @click="chooseDelLay(item)">
+				 		<view class="tag" :class="delLayer.indexOf(item)>=0?'active':''" v-for="item in countData" :key="item.shelfTierCode" @click="chooseDelLay(item)">
 				 			{{item.shelfTierCode}}层
 				 		</view>
 				 	</view>
@@ -325,6 +325,9 @@
 							this.totalKs += item.category||0
 							this.totalNums += item.qty||0
 						})
+						if(res.data.length==0){
+							this.showPop = false
+						}
 					}
 				})
 			},
@@ -374,12 +377,11 @@
 						mask: true,
 						title: '正在删除...'
 					})
+					this.showDelLay =false
 					deleteBatch({ shelfSn: this.shelfSn, shelfTierCodeList:delLayerArr }).then(res => {
 					  if (res.status == 200) {
 						  this.toashMsg(res.message)
 						  this.pageInit(true)
-						  this.showDelLay =false;
-						  this.showPop =false;
 					  }
 					   uni.hideLoading()
 					})

+ 2 - 2
pages/batchShelves/searchProduct.vue

@@ -45,7 +45,7 @@
 							<u-number-box :long-press="false" :index="item.id" :input-height="60" @blur="updateNums" @minus="updateNums" @plus="updateNums" color="#000" bg-color="#fff" v-model="item.shelfCartApi.qty" :min="1"></u-number-box>
 						</view>
 						<view v-else>
-							<u-button @click="addItem(item)" plain style="height: 50rpx;line-height: 50rpx;" size="mini" shape="circle">
+							<u-button :loading="status == 'loading'" @click="addItem(item)" plain style="height: 50rpx;line-height: 50rpx;" size="mini" shape="circle">
 								<u-icon name="plus"></u-icon> 添加
 							</u-button>
 						</view>
@@ -187,7 +187,7 @@
 				shelfCartSave(params).then(res => {
 					uni.hideLoading()
 					if(res.status == 200){
-						this.toashMsg(res.message)
+						// this.toashMsg(res.message)
 						this.getProductList()
 					}
 				})

+ 9 - 9
pages/common/partList.vue

@@ -27,18 +27,18 @@
 								</view>
 								<view v-if="pageType=='replenishmentSign'||pageType=='manualPrint'||pageType=='scanCodePrint'">
 									{{item.billState == 'FINISH'?'签收数量':'补货数量'}}:
-									<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
+									<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
 								</view>
 								<view v-if="pageType=='replenishmentOut'">
-								   补货数量<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
+								   补货数量<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
 								</view>
 								<view v-if="pageType=='replenishmentDetail'">
-									补货<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>/
+									补货<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}</text>/
 									签收<text class="pnums">{{item.putQty||item.putQty==0?item.putQty:'--'}}</text>
 									({{item.product&&item.product.unit?item.product.unit:'--'}})
 								</view>
 								<view v-if="pageType=='sendOutGoods'">
-									补货<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}</text>
+									补货<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}</text>
 									/已扫<text class="pnums">{{item.scanQty||item.scanQty==0?item.scanQty:'--'}}</text>
 									({{item.product&&item.product.unit?item.product.unit:'--'}})
 								</view>
@@ -131,21 +131,21 @@
 				this.pageType = this.fromPage
 				newValue.map(item => {
 					if(_this.pageType=='replenishmentSign'){  // 补货签收
-						this.totalNums = this.totalNums + item.confirmQty
+						this.totalNums = this.totalNums + item.qty
 					}else if(_this.pageType=='replenishmentOut'||_this.pageType=='sendOutGoods'){  // 补货出库
-						this.totalNums = this.totalNums + item.confirmQty
+						this.totalNums = this.totalNums + item.qty
 					}else if(_this.pageType=='manualPrint'){  // 补货-手动打印
-						this.totalNums = this.totalNums + item.confirmQty
+						this.totalNums = this.totalNums + item.qty
 						item.printQty = item.printQty ? item.printQty : 1
 					}else if(_this.pageType=='scanCodePrint'){  // 补货-扫码打印
-						this.totalNums = this.totalNums + item.confirmQty
+						this.totalNums = this.totalNums + item.qty
 						item.printQty = item.printQty ? item.printQty : 1
 					}else if(_this.pageType=='replenishmentDetail'){  // 补货详情-已完成
 						this.totalNums = this.totalNums + item.putQty
 					}else if(_this.pageType=='replenishmentDetailc'){  // 补货详情-已取消
 						this.totalNums = this.totalNums + item.qty
 					}else if(_this.pageType=='shuntBackDetail'){  // 调回详情-已完成
-						this.totalNums = this.totalNums + item.confirmQty
+						this.totalNums = this.totalNums + item.qty
 					}else{
 						this.totalNums = this.totalNums + item.qty
 					}

+ 2 - 0
pages/replenishmentManage/detail.vue

@@ -142,8 +142,10 @@
 			// 查询列表
 			getPartList(){
 				const _this = this
+				this.showLoading()
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
 					console.log(res.data)
+					uni.hideLoading()
 					if(res.status == 200 && res.data){
 						this.partList = res.data || []
 					}else{

+ 90 - 3
pages/replenishmentManage/outWarehousing.vue

@@ -1,5 +1,11 @@
 <template>
-	<view class="replenishment-outWarehousing-wrap" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
+	<view class="replenishment-outWarehousing-wrap">
+		<u-navbar back-text="补货出库" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
+			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
+				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+				<text style="margin-left: 6rpx;">生成销售单</text>
+			</view>
+		</u-navbar>
 		<view class="replenishment-outWarehousing-body">
 			<view class="head-info" v-if="basicInfoData">
 				<view class="states">
@@ -30,12 +36,53 @@
 		<common-modal :openModal="confirmModal" title="确认信息无误并进行出库吗?" confirmText="确认" @confirm="modalConfirm" @close="confirmModal=false">
 			<u-input type='textarea' v-model="remarks" :maxlength="100" placeholder="请输入出库备注(最多100字符)" border :height="100"></u-input>
 		</common-modal>
+		<!-- 生成销售单 -->
+		<common-modal v-if="showModal" :showTitle="false" :openModal="showModal" @confirm="showModalConfirm" @close="showModal=false">
+			<view style="font-size: 28upx;">
+				<view style="padding: 10upx;margin: 20upx 0;" class="flex align_center justify_between">
+					<view>产品总款数:<text style="color: red;">{{partList.length}}</text></view>
+					<view>产品总件数:<text style="color: red;">{{totalNums}}</text></view>
+				</view>
+				<view v-if="salesOrderList.length">
+					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
+					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
+					<view>
+						<view 
+						v-for="item in salesOrderList" 
+						:key="item.id"
+						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
+						class="flex align_center justify_between"
+						@click="viewSales(item)"
+						>
+							<text>{{item.salesBillNo}}</text>
+							<view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else>
+					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>
+					<view>
+						<view 
+						v-for="item in salesOrderList" :key="item.id"
+						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
+						class="flex align_center justify_between">
+							<text>{{item.orderNo}}</text>
+							<view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</common-modal>
 	</view>
 </template>
 
 <script>
 	import commonModal from '@/pages/common/commonModal.vue'
-	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishOutStock } from '@/api/shelfReplenish'
+	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishOutStock, queryRelationSalesBill } from '@/api/shelfReplenish'
 	import partList from '@/pages/common/partList.vue'
 	export default {
 		components: { partList, commonModal },
@@ -57,7 +104,8 @@
 					background: '#fff'
 				},
 				confirmModal: false,
-				remarks: ''
+				remarks: '',
+				showModal: false
 			}
 		},
 		onReady() {
@@ -70,6 +118,16 @@
 			this.replenishBillSn = option.sn
 			this.getDetail()
 			this.getPartList()
+			this.getSalesOrder()
+		},
+		computed: {
+			totalNums() {
+				let ret = 0
+				this.partList.map(item => {
+					ret = ret + item.qty
+				})
+				return ret
+			}
 		},
 		methods: {
 			// 查询详情
@@ -130,6 +188,35 @@
 			// 发货出库
 			goSendOutGoods(){
 				uni.navigateTo({ url: "/pages/replenishmentManage/sendOutGoods?sn="+this.replenishBillSn+'&shelfSn='+this.basicInfoData.shelfSn })
+			},
+			// 查询关联销售单
+			getSalesOrder () {
+			  queryRelationSalesBill({ replenishBillSn: this.replenishBillSn }).then(res => {
+			    if (res.status == 200) {
+			      this.salesOrderList = res.data
+			    } else {
+			      this.salesOrderList = []
+			    }
+			  })
+			},
+			// 生成销售单
+			creatSalesOrder(){
+				this.showModal = true
+			},
+			showModalConfirm(){
+				this.showLoading("正在生成销售单...")
+				createSalesBill({ replenishBillSn: this.replenishBillSn }).then(res => {
+					if (res.status == 200) {
+						this.getSalesOrder()
+					}
+					this.showModal = false
+					this.toashMsg(res.message)
+					uni.hideLoading()
+				})
+			},
+			// 查看销售单
+			viewSales(data){
+				uni.navigateTo({ url: '/pages/sales/edit?pageType=detail&data='+JSON.stringify(data) })
 			}
 		}
 	}

+ 1 - 1
pages/replenishmentManage/replenishmentList.vue

@@ -21,7 +21,7 @@
 						<view class="check-col">
 							<view>补货单号:{{item.replenishBillNo}}</view>
 							<view class="flex align_center justify_between">
-								<view v-if="item.billState=='WAIT_OUT_STOCK' || item.billState=='WAIT_CHECK' || item.billState=='CANCEL'">补货数量:{{item.totalConfirmQty}}</view>
+								<view v-if="item.billState=='WAIT_OUT_STOCK' || item.billState=='WAIT_CHECK' || item.billState=='CANCEL'">补货数量:{{item.totalQty}}</view>
 								<view v-if="item.billState=='FINISH'">签收数量:{{item.totalPutQty}}</view>
 							</view>
 						</view>

+ 92 - 3
pages/replenishmentManage/signWarehousing.vue

@@ -1,5 +1,11 @@
 <template>
-	<view class="replenishment-putWarehousing-wrap" :style="`backgroundImage:linear-gradient(180deg, ${$config('primaryColor')}, #F5F6F7 12%)`">
+	<view class="replenishment-putWarehousing-wrap">
+		<u-navbar back-text="补货签收" :border-bottom="false" :background="{backgroundColor: $config('primaryColor')}" back-icon-color="#fff" :back-text-style="{ color: '#fff' }">
+			<view slot='right' style="padding: 0 30upx;color: #ffffff;" @click="creatSalesOrder">
+				<u-icon name="chuangjiandingdan" custom-prefix="iscm-icon"></u-icon>
+				<text style="margin-left: 6rpx;">生成销售单</text>
+			</view>
+		</u-navbar>
 		<view class="replenishment-putWarehousing-body">
 			<view class="head-info" v-if="basicInfoData">
 				<view class="states">
@@ -31,12 +37,53 @@
 		</view>
 		<!-- 确认弹框 -->
 		<common-modal :openModal="confirmModal" content="签收后数字货架的产品数量将增加,确认签收吗?" confirmText="确认签收" @confirm="modalConfirm" @close="confirmModal=false" />
+		<!-- 生成销售单 -->
+		<common-modal v-if="showModal" :showTitle="false" :openModal="showModal" @confirm="showModalConfirm" @close="showModal=false">
+			<view style="font-size: 28upx;">
+				<view style="padding: 10upx;margin: 20upx 0;" class="flex align_center justify_between">
+					<view>产品总款数:<text style="color: red;">{{partList.length}}</text></view>
+					<view>产品总件数:<text style="color: red;">{{totalNums}}</text></view>
+				</view>
+				<view v-if="salesOrderList.length">
+					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
+					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
+					<view>
+						<view 
+						v-for="item in salesOrderList" 
+						:key="item.id"
+						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
+						class="flex align_center justify_between"
+						@click="viewSales(item)"
+						>
+							<text>{{item.salesBillNo}}</text>
+							<view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view v-else>
+					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>
+					<view>
+						<view 
+						v-for="item in salesOrderList" :key="item.id"
+						style="color: #00aaff;border-bottom: 1px solid #eee;padding: 10upx 0;" 
+						class="flex align_center justify_between">
+							<text>{{item.orderNo}}</text>
+							<view>
+								<u-icon name="arrow-right"></u-icon>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</common-modal>
 	</view>
 </template>
 
 <script>
 	import commonModal from '@/pages/common/commonModal.vue'
-	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishPutStock } from '@/api/shelfReplenish'
+	import { shelfReplenishDetail, shelfReplenishDetailList, shelfReplenishPutStock, queryRelationSalesBill } from '@/api/shelfReplenish'
 	import partList from '@/pages/common/partList.vue'
 	export default {
 		components: { partList, commonModal },
@@ -53,7 +100,8 @@
 					fontSize:'30rpx',
 					background: this.$config('primaryColor')
 				},
-				confirmModal: false
+				confirmModal: false,
+				showModal: false
 			}
 		},
 		onReady() {
@@ -66,6 +114,16 @@
 			this.replenishBillSn = option.sn
 			this.getDetail()
 			this.getPartList()
+			this.getSalesOrder()
+		},
+		computed: {
+			totalNums() {
+				let ret = 0
+				this.partList.map(item => {
+					ret = ret + item.qty
+				})
+				return ret
+			}
 		},
 		methods: {
 			// 查询详情
@@ -81,7 +139,9 @@
 			// 查询列表
 			getPartList(){
 				const _this = this
+				this.showLoading()
 				shelfReplenishDetailList({ replenishBillSn: this.replenishBillSn }).then(res => {
+					uni.hideLoading()
 					if(res.status == 200 && res.data){
 						_this.totalQty = 0
 						_this.confirmQty = 0
@@ -143,6 +203,35 @@
 						_this.confirmQty += Number(item.putQty)
 					}
 				})
+			},
+			// 查询关联销售单
+			getSalesOrder () {
+			  queryRelationSalesBill({ replenishBillSn: this.replenishBillSn }).then(res => {
+			    if (res.status == 200) {
+			      this.salesOrderList = res.data
+			    } else {
+			      this.salesOrderList = []
+			    }
+			  })
+			},
+			// 生成销售单
+			creatSalesOrder(){
+				this.showModal = true
+			},
+			showModalConfirm(){
+				this.showLoading("正在生成销售单...")
+				createSalesBill({ replenishBillSn: this.replenishBillSn }).then(res => {
+					if (res.status == 200) {
+						this.getSalesOrder()
+					}
+					this.showModal = false
+					this.toashMsg(res.message)
+					uni.hideLoading()
+				})
+			},
+			// 查看销售单
+			viewSales(data){
+				uni.navigateTo({ url: '/pages/sales/edit?pageType=detail&data='+JSON.stringify(data) })
 			}
 		}
 	}

+ 9 - 13
pages/shelfSetting/shelfSet.vue

@@ -301,11 +301,10 @@
 				}
 				shelfSave(params).then(res => {
 					 if (res.status == 200) {
-					  uni.showToast({
-						icon: 'none',
-						title: res.message
-					  })
-					  this.getShelfDetal()
+					  this.toashMsg(res.message)
+					  setTimeout(()=>{
+						  this.getShelfDetal()
+					  },4000)
 					 }
 				})
 			},
@@ -328,10 +327,7 @@
 				}).then(res => {
 					if(res.status == 200){
 						this.getShelfPriceShow()
-						uni.showToast({
-							icon: 'none',
-							title: res.message
-						})
+						this.toashMsg(res.message)
 					}
 					uni.hideLoading()
 				})
@@ -347,10 +343,10 @@
 				})
 			},
 			getShelfPlace(flag){
-				uni.showLoading({
-					mask: true,
-					title: '正在查询...'
-				})
+				// uni.showLoading({
+				// 	mask: true,
+				// 	title: '正在查询...'
+				// })
 				getProductPlace({ shelfSn: this.shelfSn }).then(res => {
 				  uni.hideLoading()
 				  if (res.status == 200 && res.data) {

+ 1 - 1
pages/soldOut/creatOrder.vue

@@ -377,7 +377,7 @@
 			  }).then(res => {
 			    if (res.status == 200) {
 			      this.toashMsg(res.message)
-				  uni.navigateBack()
+				  uni.redirectTo({ url: "/pages/replenishmentManage/outWarehousing?sn="+res.data.replenishBillSn })
 			    }
 				uni.hideLoading()
 			  })

+ 3 - 2
pages/soldOut/shelfList.vue

@@ -60,7 +60,7 @@
 						<view class="item-detail">
 							<view>
 								最后一次补货时间:
-								<text class="item-detail-text">{{item.lastDate}}</text>
+								<text class="item-detail-text">{{item.lastDate||'--'}}</text>
 							</view>
 						</view>
 					</view>
@@ -189,6 +189,7 @@
 						return
 					}
 					this.pageNo++
+					this.status = 'loading'
 					const s = (this.pageNo-1)*this.pageSize
 					const e = s + this.pageSize
 					this.shelfList = this.shelfList.concat(this.allList.slice(s,e))
@@ -197,7 +198,7 @@
 				}
 			},
 			viewDetail (row) {
-			  if (row.productCategory) {
+			  if (row.productCategory&&row.productQty) {
 			    this.tempData = row
 			    uni.navigateTo({
 			    	url: "/pages/soldOut/creatOrder?data="+encodeURIComponent(JSON.stringify(this.tempData))

+ 2 - 1
pages/xtNotice/xtNotice.vue

@@ -142,7 +142,8 @@
 				}
 				// 补货订单
 				if (data.notice.extInfo.bizType == 'SHELF_REPLENISH') {
-					uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_CONFIRM' })
+					// uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=All' })
+					uni.navigateTo({url: '/pages/soldOut/shelfList'})
 				}
 				// 货架订单
 				if (data.notice.extInfo.bizType == 'SHELF_ORDER') {

+ 2 - 1
pages/xtNotice/xtNoticeDetail/xtNoticeDetail.vue

@@ -81,7 +81,8 @@
 			  }
 			  // 补货订单
 			  if (data.extInfo.bizType == 'SHELF_REPLENISH') {
-				uni.redirectTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_CONFIRM' })
+				// uni.redirectTo({ url: '/pages/replenishmentManage/replenishmentList?billState=ALL' })
+				uni.redirectTo({url: '/pages/soldOut/shelfList'})
 			  }
 			  // 货架订单
 			  if (data.extInfo.bizType == 'SHELF_ORDER') {