소스 검색

bug 修复

lilei 2 년 전
부모
커밋
f82314954e
5개의 변경된 파일13개의 추가작업 그리고 8개의 파일을 삭제
  1. 2 1
      libs/tools.js
  2. 5 3
      pages/batchShelves/cartList.vue
  3. 2 2
      pages/batchShelves/searchProduct.vue
  4. 2 1
      pages/xtNotice/xtNotice.vue
  5. 2 1
      pages/xtNotice/xtNoticeDetail/xtNoticeDetail.vue

+ 2 - 1
libs/tools.js

@@ -437,7 +437,8 @@ export const openMessagePage = function(data){
 	}
 	}
 	// 补货订单
 	// 补货订单
 	if (data.extras.bizType == 'SHELF_REPLENISH') {
 	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') {
 	if (data.extras.bizType == 'SHELF_ORDER') {

+ 5 - 3
pages/batchShelves/cartList.vue

@@ -101,7 +101,7 @@
 				 </view>
 				 </view>
 				 <view class="tagbox flex">
 				 <view class="tagbox flex">
 				 	<view>
 				 	<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}}层
 				 			{{item.shelfTierCode}}层
 				 		</view>
 				 		</view>
 				 	</view>
 				 	</view>
@@ -325,6 +325,9 @@
 							this.totalKs += item.category||0
 							this.totalKs += item.category||0
 							this.totalNums += item.qty||0
 							this.totalNums += item.qty||0
 						})
 						})
+						if(res.data.length==0){
+							this.showPop = false
+						}
 					}
 					}
 				})
 				})
 			},
 			},
@@ -374,12 +377,11 @@
 						mask: true,
 						mask: true,
 						title: '正在删除...'
 						title: '正在删除...'
 					})
 					})
+					this.showDelLay =false
 					deleteBatch({ shelfSn: this.shelfSn, shelfTierCodeList:delLayerArr }).then(res => {
 					deleteBatch({ shelfSn: this.shelfSn, shelfTierCodeList:delLayerArr }).then(res => {
 					  if (res.status == 200) {
 					  if (res.status == 200) {
 						  this.toashMsg(res.message)
 						  this.toashMsg(res.message)
 						  this.pageInit(true)
 						  this.pageInit(true)
-						  this.showDelLay =false;
-						  this.showPop =false;
 					  }
 					  }
 					   uni.hideLoading()
 					   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>
 							<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>
 						<view v-else>
 						<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-icon name="plus"></u-icon> 添加
 							</u-button>
 							</u-button>
 						</view>
 						</view>
@@ -187,7 +187,7 @@
 				shelfCartSave(params).then(res => {
 				shelfCartSave(params).then(res => {
 					uni.hideLoading()
 					uni.hideLoading()
 					if(res.status == 200){
 					if(res.status == 200){
-						this.toashMsg(res.message)
+						// this.toashMsg(res.message)
 						this.getProductList()
 						this.getProductList()
 					}
 					}
 				})
 				})

+ 2 - 1
pages/xtNotice/xtNotice.vue

@@ -142,7 +142,8 @@
 				}
 				}
 				// 补货订单
 				// 补货订单
 				if (data.notice.extInfo.bizType == 'SHELF_REPLENISH') {
 				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') {
 				if (data.notice.extInfo.bizType == 'SHELF_ORDER') {

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

@@ -81,7 +81,8 @@
 			  }
 			  }
 			  // 补货订单
 			  // 补货订单
 			  if (data.extInfo.bizType == 'SHELF_REPLENISH') {
 			  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') {
 			  if (data.extInfo.bizType == 'SHELF_ORDER') {