chenrui 3 anni fa
parent
commit
d9f07931cc

+ 8 - 0
api/shelf.js

@@ -19,6 +19,14 @@ export const shelfProductList = (params) => {
     method: 'post'
     method: 'post'
   })
   })
 }
 }
+//  货架  详情
+export const shelfDetail = (params) => {
+  return axios.request({
+    url: `shelf/queryBySn/${params.sn}`,
+    data: params,
+    method: 'post'
+  })
+}
 // 货架  货位产品 列表 分页
 // 货架  货位产品 列表 分页
 export const getShelfProductList = (params) => {
 export const getShelfProductList = (params) => {
 	let url = `shelf/placeProduct/queryPage/${params.pageNo}/${params.pageSize}`
 	let url = `shelf/placeProduct/queryPage/${params.pageNo}/${params.pageSize}`

+ 16 - 0
api/shelfReplenish.js

@@ -76,4 +76,20 @@ export const shelfReplenishStateCount = (params) => {
     data: params,
     data: params,
     method: 'post'
     method: 'post'
   })
   })
+}
+//  补货单 扫描条形码 记录是否扫描
+export const shelfReplenishDetailOutScan = (params) => {
+  return axios.request({
+    url: 'shelfReplenish/detail/outScan',
+    data: params,
+    method: 'post'
+  })
+}
+//  补货单 出库
+export const shelfReplenishOutStock = (params) => {
+  return axios.request({
+    url: 'shelfReplenish/outStock',
+    data: params,
+    method: 'post'
+  })
 }
 }

+ 7 - 0
libs/tools.js

@@ -12,6 +12,13 @@ export function objToUrl(obj) {
 
 
   return uri;
   return uri;
 }
 }
+// 获取地址栏参数
+export function getQueryString(url, name) {
+	var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)")
+	var r = url.substr(1).match(reg)
+	if(r!=null) return  unescape(r[2])
+	return null
+}
 // 节流函数
 // 节流函数
 export function throttle(fn, gaptime) {
 export function throttle(fn, gaptime) {
 	if (gaptime == null || gaptime == undefined) {
 	if (gaptime == null || gaptime == undefined) {

+ 1 - 1
pages/common/partList.vue

@@ -31,7 +31,7 @@
 								</view>
 								</view>
 								<view v-if="pageType=='sendOutGoods'">
 								<view v-if="pageType=='sendOutGoods'">
 									实发:<text class="pnums">{{item.confirmQty||item.confirmQty==0?item.confirmQty:'--'}}{{item.product&&item.product.unit?item.product.unit:'--'}}</text>
 									实发:<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:'--'}}</text>
+									/已扫:<text class="pnums">{{item.scanQty||item.scanQty==0?item.scanQty:'--'}}</text>
 								</view>
 								</view>
 								<view v-if="pageType=='replenishmentDetailc'">
 								<view v-if="pageType=='replenishmentDetailc'">
 									<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}</text>
 									<text class="pnums">{{item.qty||item.qty==0?item.qty:'--'}}</text>

+ 32 - 21
pages/common/printTag/printTag.vue

@@ -3,17 +3,16 @@
 		<view class="print-nums flex flex_column align_center justify_center">
 		<view class="print-nums flex flex_column align_center justify_center">
 			<view>打印数量</view>
 			<view>打印数量</view>
 			<view class="u-ninput">
 			<view class="u-ninput">
-				<u-number-box :min="1" color="#000" bg-color="#fff" size="30" :input-height="70" :input-width="100"></u-number-box>
+				<u-number-box :min="1" v-model="printNum" color="#000" bg-color="#fff" size="30" :input-height="70" :input-width="100"></u-number-box>
 			</view>
 			</view>
 		</view>
 		</view>
 		<view class="shelf-info">
 		<view class="shelf-info">
 			<view class="shelf-info-title">
 			<view class="shelf-info-title">
-				<view>西安车领主常青二路数字货架</view>
-				<view><text class="pno">A02</text></view>
+				<view>{{infoData&&infoData.shelfName || '--'}}</view>
 			</view>
 			</view>
-			<view>产品编码:JO-21026E</view>
-			<view>产品名称:箭牌机油滤清器 10款进口大众途锐...</view>
-			<view>库存数量:3</view>
+			<view>产品编码:{{fromPage == 'smdy'?infoData.productCode : infoData.productEntity&&infoData.productEntity.code}}</view>
+			<view>产品名称:{{fromPage == 'smdy'?infoData.productName : infoData.productEntity&&infoData.productEntity.productName}}</view>
+			<view>{{fromPage == 'smdy'?'实发':'库存'}}数量:{{fromPage == 'smdy'?infoData.confirmQty : infoData.qty}}</view>
 		</view>
 		</view>
 		<view class="buttons flex align_center justify_center">
 		<view class="buttons flex align_center justify_center">
 			<view v-if="fromPage == 'bdtq'"><u-button @click="cansel" shape="circle" plain>返回列表</u-button></view>
 			<view v-if="fromPage == 'bdtq'"><u-button @click="cansel" shape="circle" plain>返回列表</u-button></view>
@@ -26,6 +25,7 @@
 </template>
 </template>
 
 
 <script>
 <script>
+	import { shelfDetail } from '@/api/shelf'
 	import kkPrinter from '@/components/kk-printer/index.vue';
 	import kkPrinter from '@/components/kk-printer/index.vue';
 	export default {
 	export default {
 		components:{
 		components:{
@@ -33,31 +33,42 @@
 		},
 		},
 		data() {
 		data() {
 			return {
 			return {
-				part: null,
+				infoData: null,
 				fromPage: '',
 				fromPage: '',
-				printInfo: null
+				printInfo: null,
+				printNum: 0
 			}
 			}
 		},
 		},
-		onLoad(opts) {
-			this.fromPage = opts.from
-			this.printInfo = {
-				dealerName: '剪冠汽配西安长ab路店123汽配西安长青二路',
-				shelfName: '西安车领主常青二路数字货架',
-				productCode: 'JO-21026E',
-				productName: '箭牌机油滤清器 10款进口大众途锐...',
-				shelfPlaceCode: 'A01',
-				currentInven: 3,
-				printDate: '2021-12-21 15:30',
-				printUser: '张三',
-				barCode: 'dealerSn=1033242&shelfSn=342326735950757888&productCode=RPF2340&shelfPlaceCode=A01&shelfPlaceSn=123213'
+		onLoad(options) {
+			const _this = this
+			_this.fromPage = options.page
+			_this.infoData = options.data ? JSON.parse(options.data) : {}
+			if(_this.fromPage == 'bdtq'){
+				shelfDetail({ sn: _this.infoData.shelfSn }).then(res => {
+					if(res.status == 200 && res.data){
+						_this.infoData.shelfName = res.data.shelfName
+						_this.printInfo = {
+							dealerName: '剪冠汽配西安长ab路店123汽配西安长青二路',
+							shelfName: _this.infoData.shelfName || '',
+							productCode: _this.infoData.productEntity&&_this.infoData.productEntity.code || '',
+							productName: _this.infoData.productEntity&&_this.infoData.productEntity.productName || '',
+							shelfPlaceCode: _this.infoData.shelfPlaceCode || '',
+							currentInven: 3,
+							printDate: '2021-12-21 15:30',
+							printUser: '张三',
+							barCode: 'dealerSn=1033242&shelfSn=342326735950757888&productCode=RPF2340&shelfPlaceCode=A01&shelfPlaceSn=123213'
+						}
+					}
+				})
 			}
 			}
-			console.log(this.printInfo.shelfName.length,'=====')
+			_this.printNum = _this.fromPage == 'smdy' ? _this.infoData.confirmQty : _this.infoData.qty
 		},
 		},
 		onUnload() {
 		onUnload() {
 			this.$refs.kkprinter.closeConnect()
 			this.$refs.kkprinter.closeConnect()
 		},
 		},
 		methods: {
 		methods: {
 			cansel(){
 			cansel(){
+				uni.$emit('refreshBL')
 				uni.navigateBack()
 				uni.navigateBack()
 			},
 			},
 			textFormat(command,text,maxFontNums,left,top,lightHeight){
 			textFormat(command,text,maxFontNums,left,top,lightHeight){

+ 1 - 2
pages/latePlay/chooseProduct.vue

@@ -154,8 +154,7 @@
 				}
 				}
 			},
 			},
 			print(data){
 			print(data){
-				
-				uni.navigateTo({ url: "/pages/common/printTag/printTag?id="+data.id+"&from=bdtq" })
+				uni.navigateTo({ url: "/pages/common/printTag/printTag?page=bdtq&data="+JSON.stringify(data) })
 			}
 			}
 		}
 		}
 	}
 	}

+ 108 - 0
pages/replenishmentManage/chooseTypeModal.vue

@@ -0,0 +1,108 @@
+<template>
+	<u-mask class="commonModal" :show="isShow" :mask-click-able="false">
+		<view class="modal-con">
+			<view class="modal-title">选择配送方式</view>
+			<view class="modal-main">
+				<u-radio-group v-model="form.dispatchType" width="50%" style="width: 100%;">
+					<u-radio name="1">送货上门</u-radio>
+					<u-radio name="2">快递到店</u-radio>
+				</u-radio-group>
+				<view style="padding: 20upx 0 16upx;">备注</view>
+				<u-input v-model="form.remarks" placeholder="请输入出库备注(最多500字符)" type="textarea" :maxlength="500" :border="true" />
+			</view>
+			<view class="modal-footer">
+				<view class="button-cancel" @click="isShow=false">取消</view>
+				<view class="button-confirm" @click="handleConfirm">提交</view>
+			</view>
+		</view>
+	</u-mask>
+</template>
+
+<script>
+	export default {
+		props: {
+			openModal: { //  弹框显示状态
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				isShow: this.openModal, //  是否打开弹框
+				form: {
+				  dispatchType: undefined,
+				  remarks: ''
+				},
+			}
+		},
+		methods: {
+			// 确认
+			handleConfirm(){
+				const _this = this;
+				//  表单校验
+				if (!_this.form.dispatchType) {
+					uni.showToast({ icon: 'none', title: '请选择配送方式' });
+					return;
+				}
+				this.$emit('confirm', _this.form)
+			}
+		},
+		watch: {
+			//  父页面传过来的弹框状态
+			openModal (newValue, oldValue) {
+				this.isShow = newValue
+			},
+			//  重定义的弹框状态
+			isShow (newValue, oldValue) {
+			  if (!newValue) {
+			    this.$emit('close')
+			  }
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.commonModal{
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		z-index: 9999999;
+		.modal-con{
+			width: 78%;
+			margin: 59% auto 0;
+			background-color: #fff;
+			border-radius: 24upx;
+			.modal-title{
+				text-align: center;
+				font-size: 30upx;
+				color: #000;
+				padding: 30upx 30upx 0;
+			}
+			.modal-main{
+				margin: 40upx 30upx 30upx;
+			}
+			.modal-footer{
+				font-size: 30upx;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				text-align: center;
+				border-top: 1upx solid #E5E5E5;
+				.button-cancel{
+					color: #999;
+					border-right: 1upx solid #E5E5E5;
+					flex-grow: 1;
+					padding: 20upx 0;
+				}
+				.button-confirm{
+					color: #2A86F4;
+					flex-grow: 1;
+					padding: 20upx 0;
+				}
+			}
+		}
+	}
+</style>

+ 4 - 4
pages/replenishmentManage/confirm.vue

@@ -131,10 +131,10 @@
 			confirmFun (params) {
 			confirmFun (params) {
 				shelfReplenishConfirm(params).then(res => {
 				shelfReplenishConfirm(params).then(res => {
 					if (res.status == 200) {
 					if (res.status == 200) {
-						if(res.status == 200){
-							uni.$emit('refreshBL')
-							uni.navigateBack()
-						}
+						this.toashMsg(res.message)
+						uni.$emit('refreshBL')
+						uni.navigateBack()
+					}else{
 						this.toashMsg(res.message)
 						this.toashMsg(res.message)
 					}
 					}
 				})
 				})

+ 1 - 1
pages/replenishmentManage/outWarehousing.vue

@@ -123,7 +123,7 @@
 			},
 			},
 			// 发货出库
 			// 发货出库
 			goSendOutGoods(){
 			goSendOutGoods(){
-				uni.navigateTo({ url: "/pages/replenishmentManage/sendOutGoods?sn="+this.replenishBillSn })
+				uni.navigateTo({ url: "/pages/replenishmentManage/sendOutGoods?sn="+this.replenishBillSn+'&shelfSn='+this.basicInfoData.shelfSn })
 			}
 			}
 		}
 		}
 	}
 	}

+ 16 - 14
pages/replenishmentManage/scanCodePrint.vue

@@ -15,7 +15,7 @@
 <script>
 <script>
 	import partList from '@/pages/common/partList.vue'
 	import partList from '@/pages/common/partList.vue'
 	import commonModal from '@/pages/common/commonModal.vue'
 	import commonModal from '@/pages/common/commonModal.vue'
-	import { shelfReplenishDetailList, shelfReplenishQrCode } from '@/api/shelfReplenish'
+	import { shelfReplenishDetailList, shelfReplenishQrCode, shelfReplenishDetailOutScan } from '@/api/shelfReplenish'
 	export default {
 	export default {
 		components: { partList, commonModal },
 		components: { partList, commonModal },
 		data() {
 		data() {
@@ -33,6 +33,11 @@
 		onLoad(options) {
 		onLoad(options) {
 			this.replenishBillSn = options.sn
 			this.replenishBillSn = options.sn
 			this.getPartList()
 			this.getPartList()
+			// 监听整改完成后刷新事件
+			uni.$on('refreshBL', this.modalConfirm)
+		},
+		onUnload() {
+			uni.$off('refreshBL')
 		},
 		},
 		methods: {
 		methods: {
 			// 查询列表
 			// 查询列表
@@ -44,7 +49,6 @@
 							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
 							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
 						})
 						})
 						this.partList = res.data || []
 						this.partList = res.data || []
-						console.log(this.partList,'this.partList')
 					}else{
 					}else{
 						this.partList = []
 						this.partList = []
 					}
 					}
@@ -53,27 +57,25 @@
 			// 扫码结果
 			// 扫码结果
 			scanResult(qrCode){
 			scanResult(qrCode){
 				const _this = this
 				const _this = this
-				console.log(qrCode)
 				uni.showLoading({
 				uni.showLoading({
 					title: "正在查询产品信息"
 					title: "正在查询产品信息"
 				})
 				})
 				shelfReplenishQrCode({
 				shelfReplenishQrCode({
-					qrCode: qrCode,
+					productQrCode: qrCode,
 					replenishBillSn: this.replenishBillSn
 					replenishBillSn: this.replenishBillSn
 				}).then(res => {
 				}).then(res => {
-					console.log(res)
 					if(res.status == 200){
 					if(res.status == 200){
-						uni.navigateTo({ url: "/pages/common/printTag/printTag?sn="+item.replenishBillSn })
+						let params = {
+							shelfName: res.data&&res.data[0]&&res.data[0].shelf&&res.data[0].shelf.shelfName,
+							productName: res.data&&res.data[0]&&res.data[0].product&&res.data[0].product.name,
+							productCode: res.data&&res.data[0]&&res.data[0].product&&res.data[0].product.code,
+							confirmQty: res.data&&res.data[0]&&res.data[0].confirmQty,
+							shelfSn: res.data&&res.data[0]&&res.data[0].shelfSn,
+							shelfSn: res.data&&res.data[0]&&res.data[0].shelfSn
+						}
+						uni.navigateTo({ url: "/pages/common/printTag/printTag?page=smdy&data="+JSON.stringify(params) })
 					}else{
 					}else{
 						this.confirmModal = true
 						this.confirmModal = true
-						// clzConfirm({
-						// 	title: '扫码失败',
-						// 	content: res.message,
-						// 	showCancel: false,
-						// 	success: (ret) => { 
-						// 		_this.barcode.start()
-						// 	}
-						// })
 					}
 					}
 					uni.hideLoading()
 					uni.hideLoading()
 				})
 				})

+ 113 - 34
pages/replenishmentManage/sendOutGoods.vue

@@ -1,40 +1,104 @@
 <template>
 <template>
 	<view class="sendOutGoods-wrap">
 	<view class="sendOutGoods-wrap">
-		<view class="barCode" id="barcode"></view>
-		<view class="info-body">
-			<view class="info partList">
-				<!-- 补货产品 -->
-				<partList :list="partList" title="补货产品" model="view" fromPage="sendOutGoods" ref="partList" noDataText="暂无产品"></partList>
+		<view class="sendOutGoods-con">
+			<view class="barCode" id="barcode"></view>
+			<view class="info-body">
+				<view class="info partList">
+					<!-- 补货产品 -->
+					<partList :list="partList" title="补货产品" model="view" fromPage="sendOutGoods" ref="partList" noDataText="暂无产品"></partList>
+				</view>
 			</view>
 			</view>
 		</view>
 		</view>
+		<view class="sendOutGoods-footer">
+			<u-button @click="handleOutGoods" type="success" :custom-style="customStyle" hover-class="none" shape="circle">立即出库</u-button>
+		</view>
 		<!-- 确认弹框 -->
 		<!-- 确认弹框 -->
-		<common-modal v-if="confirmModal" :openModal="confirmModal" title="扫码失败" content="确认对该数字货架进行补货吗?" confirmText="好的" :isCancel="false" @confirm="modalConfirm" @close="confirmModal=false" />
+		<common-modal v-if="confirmModal" :openModal="confirmModal" title="扫码失败" :content="contModal" confirmText="好的" :isCancel="false" @confirm="modalConfirm" @close="confirmModal=false" />
+		<!-- 出库确认弹框 -->
+		<common-modal v-if="confirmOutModal" :openModal="confirmOutModal" title="出库" content="此补货单产品已经全部扫描完成,确认出库吗?" confirmText="确认出库" @confirm="modalOutConfirm" @close="confirmOutModal=false" />
+		<!-- 选择配送方式弹框 -->
+		<choose-type-modal v-if="chooseModal" :openModal="chooseModal" @confirm="modalChooseType" @close="chooseModal=false" />
 	</view>
 	</view>
 </template>
 </template>
 
 
 <script>
 <script>
 	import partList from '@/pages/common/partList.vue'
 	import partList from '@/pages/common/partList.vue'
+	import chooseTypeModal from './chooseTypeModal.vue'
 	import commonModal from '@/pages/common/commonModal.vue'
 	import commonModal from '@/pages/common/commonModal.vue'
-	import { shelfReplenishDetailList, shelfReplenishQrCode } from '@/api/shelfReplenish'
+	import { getQueryString } from '@/libs/tools'
+	import { shelfReplenishDetailList, shelfReplenishDetailOutScan, shelfReplenishOutStock } from '@/api/shelfReplenish'
 	export default {
 	export default {
-		components: { partList, commonModal },
+		components: { partList, commonModal, chooseTypeModal },
 		data() {
 		data() {
 			return {
 			return {
 				barcode:null,
 				barcode:null,
 				replenishBillSn: null,
 				replenishBillSn: null,
+				shelfSn: null,
 				partList: [],
 				partList: [],
-				confirmModal: false
+				confirmModal: false,
+				customStyle: {
+					borderRadius:'100rpx',
+					fontSize:'30rpx',
+					background: this.$config('primaryColor')
+				},
+				isAll: false,
+				contModal: '',
+				confirmOutModal: false,
+				chooseModal: false
 			}
 			}
 		},
 		},
 		onReady() {
 		onReady() {
 			// 初始化摄像头
 			// 初始化摄像头
-			// this.init()
+			this.init()
 		},
 		},
 		onLoad(options) {
 		onLoad(options) {
-			this.replenishBillSn = options.replenishBillSn
+			this.replenishBillSn = options.sn
+			this.shelfSn = options.shelfSn
 			this.getPartList()
 			this.getPartList()
 		},
 		},
 		methods: {
 		methods: {
+			// 立即出库
+			handleOutGoods(){
+				if(this.isAll){
+					this.confirmOutModal = true
+				}else{
+					this.toashMsg("请全部扫描完成后,再进行出库操作")
+				}
+			},
+			// 选择配送方式
+			modalChooseType(data){
+				const _this = this
+				const arr = []
+				_this.partList.map((item, index) => {
+				  arr.push({
+				    productSn: item.productSn,
+				    confirmQty: item.confirmQty,
+				    replenishBillDetailSn: item.replenishBillDetailSn
+				  })
+				})
+				const params = {
+				  replenishBillSn: _this.replenishBillSn,
+				  detailList: arr,
+				  dispatchType: data.dispatchType,
+				  remarks: data.remarks,
+				  shelfSn: _this.shelfSn
+				}
+				console.log(params)
+				shelfReplenishOutStock(params).then(res => {
+					console.log(res)
+				  if (res.status == 200) {
+				    _this.toashMsg(res.message)
+					_this.chooseModal = false
+					uni.navigateTo({ url: '/pages/replenishmentManage/replenishmentList?billState=WAIT_OUT_STOCK' })
+				  }else{
+					  _this.toashMsg(res.message)
+				  }
+				})
+			},
+			// 确认出库
+			modalOutConfirm(){
+				this.chooseModal = true
+			},
 			// 查询列表
 			// 查询列表
 			getPartList(){
 			getPartList(){
 				const _this = this
 				const _this = this
@@ -52,23 +116,21 @@
 			// 扫码结果
 			// 扫码结果
 			scanResult(qrCode){
 			scanResult(qrCode){
 				const _this = this
 				const _this = this
-				shelfReplenishQrCode({
-					qrCode: qrCode,
-					replenishBillSn: this.replenishBillSn
+				shelfReplenishDetailOutScan({
+					productSn: getQueryString('&'+qrCode, 'productSn'),
+					replenishBillDetailSn: getQueryString('&'+qrCode, 'replenishBillDetailSn')
 				}).then(res => {
 				}).then(res => {
+					console.log(res)
 					if(res.status == 200){
 					if(res.status == 200){
 						_this.toashMsg("扫码成功!")
 						_this.toashMsg("扫码成功!")
-						uni.navigateTo({ url: "/pages/common/printTag/printTag?sn="+item.replenishBillSn })
+						_this.getPartList()
+						if(res.data && res.data.totalConfirmQty && res.data.totalScanQty && res.data.totalConfirmQty == res.data.totalScanQty){
+							_this.isAll = true
+							_this.handleOutGoods()
+						}
 					}else{
 					}else{
+						this.contModal = res.message
 						this.confirmModal = true
 						this.confirmModal = true
-						// clzConfirm({
-						// 	title: '扫码失败',
-						// 	content: res.message,
-						// 	showCancel: false,
-						// 	success: (ret) => { 
-						// 		_this.barcode.start()
-						// 	}
-						// })
 					}
 					}
 				})
 				})
 			},
 			},
@@ -120,21 +182,38 @@
 		height: 100vh;
 		height: 100vh;
 	}
 	}
 	.sendOutGoods-wrap{
 	.sendOutGoods-wrap{
+		position: relative;
 		width: 100%;
 		width: 100%;
 		height: 100%;
 		height: 100%;
-		.barCode{
-			height: 28%;
-		}
-		.info-body{
-			flex-flow: 1;
+		overflow: hidden;
+		padding-bottom: 136upx;
+		.sendOutGoods-con{
+			width: 100%;
+			height: 100%;
 			overflow: auto;
 			overflow: auto;
-			height: 72%;
+			.barCode{
+				height: 30%;
+			}
+			.info-body{
+				flex-flow: 1;
+				overflow: auto;
+				height: 70%;
+			}
+			.info{
+				background-color: #FFFFFF;
+				padding: 10rpx 30upx;
+				font-size: 32rpx;
+				margin-top: 20rpx;
+			}
 		}
 		}
-		.info{
-			background-color: #FFFFFF;
-			padding: 10rpx 30upx;
-			font-size: 32rpx;
-			margin-top: 20rpx;
+		.sendOutGoods-footer{
+			padding: 26upx 32upx 30upx;
+			background-color: #fff;
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 100%;
+			box-shadow: 3px 1px 7px #eee;
 		}
 		}
 	}
 	}
 </style>
 </style>

+ 3 - 5
pages/shuntBackManage/cancellingStocks.vue

@@ -73,11 +73,9 @@
 			getDetail(){
 			getDetail(){
 				shelfRecallFindBySn({sn: this.recallBillSn}).then(res => {
 				shelfRecallFindBySn({sn: this.recallBillSn}).then(res => {
 					if(res.status == 200){
 					if(res.status == 200){
-						if(res.status == 200){
-							this.basicInfoData = res.data || null
-						}else{
-							this.basicInfoData = null
-						}
+						this.basicInfoData = res.data || null
+					}else{
+						this.basicInfoData = null
 					}
 					}
 				})
 				})
 			},
 			},