退仓测试以及bug修改

manifest.json

@@ -2,7 +2,7 @@
     "name" : "智能仓储2",
     "appid" : "__UNI__4E49201",
     "description" : "",
-    "versionName" : "1.0.3.7",
+    "versionName" : "1.0.3.8",
     "versionCode" : 200,
     "transformPx" : false,
     /* 5+App特有相关 */

pages/store-out-manage/store-out/store-out.vue

@@ -91,7 +91,7 @@
 				typeList: [
 					{ label: '出库', value: 20 },
 					{ label: '盘点删除', value: 21 },
-					{ label: '补出库', value: 23 },
+					{ label: '补出库', value: 29 },
 				],
 				roleKey:null,
 			};
@@ -132,6 +132,7 @@
 					
 				}
 				console.log(obj)
+				
 				this.$http.HandleMacStockInOut(obj).then(res => {
 					console.log(res)
 					if(res.code === 0) {

pages/warehouse/reviewDtl.vue

@@ -6,7 +6,7 @@
 				<span style="padding: 0 5rpx;color: #FFFFFF;">{{ userInfo.name }}</span>
 			</view>
 			<view slot="right" @tap="$utils.openNew(`/pages/warehouse/review`)">
-				<span style="color: #FFFFFF;">返回</span> 
+				<span style="color: #FFFFFF;">返回</span>
 			</view>
 		</uni-nav-bar>
 		<ul class="review-ul">
@@ -21,8 +21,8 @@
 						</view>
 						<view class="col" style="padding: 0 10rpx;">
 							{{j.materialMeters}}
-						</view style="padding: 0 10rpx;"> 
-						<view class="col" style="min-height:10rpx"> 
+						</view style="padding: 0 10rpx;">
+						<view class="col" style="min-height:10rpx" @click="openRfidModal(j.rfid)">
 							{{j.rfid ? j.rfid : ' '}}
 						</view>
 						<view class="col">
@@ -40,7 +40,7 @@
 			</li>
 		</ul>
 		<view class="footer-btn-warp" style="margin-top: 20rpx;">
-			<button class="cancel" style="background-color:red"  @tap="$utils.back()">取消</button>
+			<button class="cancel" style="background-color:red" @tap="$utils.back()">取消</button>
 			<button class="upload" style="background-color:blue" @click="submitCheck">确定</button>
 		</view>
 		<uni-popup ref="addModal" type="bottom">
@@ -57,7 +57,7 @@
 					</view>
 				</view>
 				<view style="height:40rpx;border-bottom: 1px solid #ccc;">
-					
+
 				</view>
 				<view class="ul">
 					<view class="li" v-for="(i,index) in selectMaterialDtl.stockBackDetailsList">
@@ -68,11 +68,11 @@
 							卷{{index + 1}}
 						</view>
 						<view class="input">
-							
+
 							<input type="number" :value="i.materialMeters" @input="((e)=>inputChange(e,index))">
 						</view>
 					</view>
-					
+
 				</view>
 				<!-- <button class="add-btn" @click="addList">在添加一卷</button> -->
 				<view class="footer-btn-warp" style="margin-top: 20rpx;">
@@ -83,7 +83,7 @@
 		</uni-popup>
 		<uni-popup ref="popup2" type="bottom">
 			<u-tabs-swiper ref="uTabs" :list="list" :current="current" @change="tabsChange" :is-scroll="false"
-			 swiperWidth="750"></u-tabs-swiper>
+				swiperWidth="750"></u-tabs-swiper>
 			<view class="search-box" v-if="current == 0">
 				<ul>
 					<li @click="selectMaterialList(i)" v-for="i in pickingToday" :key="i.id">
@@ -94,16 +94,10 @@
 					</view>
 				</ul>
 			</view>
-			<view  class="search-box" v-if="current == 1">
+			<view class="search-box" v-if="current == 1">
 				<view class="input-warp">
-					<u-input
-						v-model="req.search"
-						:searchIcon="true" 
-						:border="true" 
-						placeholder="请输入物料名称或编码"
-						@search="getSelectMaterialList"
-						class="search-input"
-						 />
+					<u-input v-model="req.search" :searchIcon="true" :border="true" placeholder="请输入物料名称或编码"
+						@search="getSelectMaterialList" class="search-input" />
 				</view>
 				<ul>
 					<li @click="selectMaterialList(i)" v-for="i in materialData" :key="i.id">
@@ -115,67 +109,81 @@
 				</ul>
 			</view>
 		</uni-popup>
+		<uni-popup ref="alertDialog" type="dialog">
+			<view  style="color:#fff;font-size: 34rpx;">
+				{{showModalId}}
+			</view>
+		</uni-popup>
 	</div>
 </template>
 
 <script>
 	import scan from './scan'
-	export default{
-		name:"xx",
-		components:{
+	export default {
+		name: "xx",
+		components: {
 			scan
 		},
-		data(){
-			return{
-				dtlData:{},
-				isEdit:false,
-				swiperCurrent:0,
-				current:0,
+		data() {
+			return {
+				dtlData: {},
+				isEdit: false,
+				swiperCurrent: 0,
+				current: 0,
 				list: [{
 					name: '今日领取的面料'
 				}, {
 					name: '选择其他'
 				}],
-				userInfo:this.$storage.getStorageSync('userInfo'),
-				form:{
-					operatorId:this.$storage.getStorageSync('userInfo').id,
-					backDetailList:[],
+				userInfo: this.$storage.getStorageSync('userInfo'),
+				form: {
+					operatorId: this.$storage.getStorageSync('userInfo').id,
+					backDetailList: [],
 				},
-				req:{
-					userId:this.$storage.getStorageSync('userInfo').id,
-					pageNum:1,
-					pageSize:10,
-					search:null,
-					materialCode:null,
+				req: {
+					userId: this.$storage.getStorageSync('userInfo').id,
+					pageNum: 1,
+					pageSize: 10,
+					search: null,
+					materialCode: null,
 				},
-				pickingToday:[],
-				materialData:[],
-				selectMaterialDtl:{},
-				updateIndex:null,
+				pickingToday: [],
+				materialData: [],
+				selectMaterialDtl: {},
+				updateIndex: null,
+				showModalId: null,
 			}
 		},
-		onLoad(option){
+		onLoad(option) {
 			const v = this
 			uni.getStorage({
 				key: 'reviewDtl',
-				success: function (res) {
+				success: function(res) {
 					console.log(res)
 					v.dtlData = res.data
-				} ,fail(err) {
+				},
+				fail(err) {
 					v.getDtl(option.id)
 				}
 			});
-			
+
 		},
-		created(){
+		created() {
 			this.selectList()
 			this.getSelectMaterialList()
 		},
-		methods:{
-			closeaddModal(){
+		methods: {
+			dialogClose(){
+				this.$refs.alertDialog.close()
+			},
+			openRfidModal(id) {
+				this.showModalId = id
+				this.$refs.alertDialog.open()
+			},
+			closeaddModal() {
 				this.$refs.addModal.close()
 			},
-			submitCheck(){
+			submitCheck() {
 				uni.showLoading({
 					title: '正在提交'
 				})
@@ -185,10 +193,10 @@
 					const element = v.dtlData.checkDetailsInfoList[i]
 					for (var j = 0; j < element.stockBackDetailsList.length; j++) {
 						const jelement = element.stockBackDetailsList[j]
-						if(!jelement.rfid){
+						if (!jelement.rfid) {
 							this.$msg.showToast('请扫描或生成所有面料！')
 							return
-						}else{
+						} else {
 							rfidItems.push(jelement.rfid)
 						}
 					}
@@ -204,65 +212,66 @@
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/stockBack/submitCheck',
 					method: 'POST',
-					header:{
-						'Content-Type' : 'application/json',
+					header: {
+						'Content-Type': 'application/json',
 					},
 					data: v.dtlData,
 					success: res => {
 						console.log(res)
-						if(res.data.code == 200){
+						if (res.data.code == 200) {
 							this.$http.HandleMacStockInOut(obj).then(res => {
 								console.log(res)
-								if(res.code === 0) {
+								if (res.code === 0) {
 									this.$msg.showToast(res.msg || '操作成功！')
 									this.timer = setTimeout(() => {
 										this.$utils.openNew(`/pages/warehouse/review`)
 									}, 2000)
 								}
 							})
-							
+
 						}
 						uni.hideLoading()
-					}, fail() {
+					},
+					fail() {
 						uni.hideLoading()
 					}
 				});
 			},
-			tagFn(index,jindex){
+			tagFn(index, jindex) {
 				const v = this
 				v.dtlData.index = index
 				v.dtlData.jindex = jindex
 				uni.setStorage({
 					key: 'reviewDtl',
 					data: v.dtlData,
-					success: function () {
+					success: function() {
 						v.$utils.open('/pages/warehouse/tag')
 					}
 				});
 			},
-			sacnFn(index,jindex){
+			sacnFn(index, jindex) {
 				const v = this
-				v.dtlData.index = index 
+				v.dtlData.index = index
 				v.dtlData.jindex = jindex
 				uni.setStorage({
 					key: 'reviewDtl',
 					data: v.dtlData,
-					success: function () {
+					success: function() {
 						v.$utils.open('/pages/warehouse/scan')
 					}
 				});
 			},
-			getDtl(_id){
+			getDtl(_id) {
 				console.log(_id)
 				const v = this
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/stockBack/checkDetails',
 					method: 'POST',
-					header:{
-						'Content-Type' : 'application/json',
+					header: {
+						'Content-Type': 'application/json',
 					},
 					data: {
-						stockBackId:_id
+						stockBackId: _id
 					},
 					success: res => {
 						this.dtlData = res.data.data
@@ -271,61 +280,61 @@
 					},
 				});
 			},
-			submitBack(){
+			submitBack() {
 				const v = this
 				console.log(v.form)
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/stockBack/submitBack',
 					method: 'POST',
-					header:{
-						'Content-Type' : 'application/json',
+					header: {
+						'Content-Type': 'application/json',
 					},
 					data: v.form,
 					success: res => {
 						console.log(res)
-						if(res.data.code == 200){
+						if (res.data.code == 200) {
 							this.$msg.showToast('操作成功！')
 							this.$utils.back()
 						}
 					},
 				});
-				
+
 			},
-			dtlDataListDlt(index){
-				this.dtlData.checkDetailsInfoList.splice(index,1)
+			dtlDataListDlt(index) {
+				this.dtlData.checkDetailsInfoList.splice(index, 1)
 			},
-			materialMetersListDelete(index){
-				this.dtlData.checkDetailsInfoList[this.updateIndex].stockBackDetailsList.splice(index,1)
+			materialMetersListDelete(index) {
+				this.dtlData.checkDetailsInfoList[this.updateIndex].stockBackDetailsList.splice(index, 1)
 			},
-			listUpdate(i,index){
+			listUpdate(i, index) {
 				console.log(i)
 				this.selectMaterialDtl = i
 				this.updateIndex = index
 				this.$refs.addModal.open()
 			},
-			listDelete(index){
-				this.form.backDetailList.splice(index,1)
+			listDelete(index) {
+				this.form.backDetailList.splice(index, 1)
 			},
-			pushList(){
-				if(this.updateIndex === null){
+			pushList() {
+				if (this.updateIndex === null) {
 					this.form.backDetailList.push(this.selectMaterialDtl)
-				}else{
+				} else {
 					this.form.backDetailList[this.updateIndex] = this.selectMaterialDtl
 				}
-				
+
 				this.selectMaterialDtl = {}
 				this.$refs.addModal.close()
 			},
-			inputChange(e,index){
-				
+			inputChange(e, index) {
+
 				this.selectMaterialDtl.stockBackDetailsList[index].materialMeters = e.detail.value
 				console.log(this.selectMaterialDtl)
 			},
 			tabsChange(index) {
 				this.swiperCurrent = index;
-				this.current = index; 
+				this.current = index;
 			},
-			addList(){
+			addList() {
 				this.selectMaterialDtl.materialMetersList.push({
 					"id": "1565274397500047361",
 					"stockBackId": "1565274397445521410",
@@ -335,25 +344,25 @@
 					"rfid": ""
 				})
 			},
-			selectMaterialList(i){
+			selectMaterialList(i) {
 				const v = this
 				this.dtlData.checkDetailsInfoList[this.updateIndex].materialId = i.code
 				this.dtlData.checkDetailsInfoList[this.updateIndex].materialName = i.name
 				console.log(i)
 				console.log(this.updateIndex)
 			},
-			openSelectModal(){
-				
+			openSelectModal() {
+
 				this.$refs.popup2.open()
 			},
-			
-			getSelectMaterialList(){
+
+			getSelectMaterialList() {
 				const v = this
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/material/selectList',
 					method: 'POST',
-					header:{
-						'Content-Type' : 'application/json',
+					header: {
+						'Content-Type': 'application/json',
 					},
 					data: v.req,
 					success: res => {
@@ -362,13 +371,13 @@
 					},
 				});
 			},
-			selectList(){
+			selectList() {
 				const v = this
 				uni.request({
 					url: 'http://120.79.80.64:8050' + '/cloudApi/stockBack/getPickingToday',
 					method: 'POST',
-					header:{
-						'Content-Type' : 'application/json',
+					header: {
+						'Content-Type': 'application/json',
 					},
 					data: v.req,
 					success: res => {
@@ -377,7 +386,7 @@
 					},
 				});
 			},
-			openModal(){
+			openModal() {
 				this.$refs.addModal.open('bottom')
 			},
 		},
@@ -385,99 +394,116 @@
 </script>
 
 <style scoped lang="less">
-	.review-ul{
-		padding: 0 20rpx; 
-		li{
+	.review-ul {
+		padding: 0 20rpx;
+
+		li {
 			background-color: #fff;
 			border-radius: 6rpx;
 			list-style: none;
 			margin-top: 20rpx;
-			.title{ 
+
+			.title {
 				height: 100rpx;
 				line-height: 100rpx;
 				font-size: 30rpx;
 				border-bottom: 1px solid #dcdcdc;
 				padding: 0 20rpx;
 			}
-			.lists{
-				.list-box{
+
+			.lists {
+				.list-box {
 					overflow: hidden;
 					line-height: 80rpx;
-					.col{
+
+					.col {
 						float: left;
 						width: 20%;
 						text-align: center;
 						overflow: hidden;
-						
-						button{
+
+						button {
 							width: 80%;
-							
+
 						}
 					}
 				}
 			}
 		}
 	}
-	.footer-btn-warp{
+
+	.footer-btn-warp {
 		display: flex;
 		padding: 20rpx;
-		button{
+
+		button {
 			width: 48%;
 			color: #fff;
 		}
 	}
-	.search-box{
-		.input-warp{
+
+	.search-box {
+		.input-warp {
 			padding: 40rpx;
 		}
-		.search-input{
-		}
+
+		.search-input {}
+
 		background-color: #fff;
-		
+
 		text-align: center;
-		ul{
-			li{
+
+		ul {
+			li {
 				padding: 25rpx 30rpx;
 				border-bottom: 1rpx solid #dcdcdc;
 				list-style: none;
 			}
 		}
-		.no-data{
+
+		.no-data {
 			padding: 100rpx;
 		}
 	}
-	.addModal-content{
+
+	.addModal-content {
 		background-color: #fff;
-		border-top-left-radius:20rpx;
-		border-top-right-radius:20rpx;
-		padding-top:40rpx;
-		.footer-btn-warp{
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
+		padding-top: 40rpx;
+
+		.footer-btn-warp {
 			display: flex;
 			padding: 20rpx;
-			button{
+
+			button {
 				width: 48%;
 				color: #fff;
 			}
 		}
-		.ul{
-			
-			.li{
+
+		.ul {
+
+			.li {
 				display: flex;
 				justify-content: space-between;
 				height: 80rpx;
 				line-height: 80rpx;
 				margin-top: 20rpx;
-				.input{
+
+				.input {
 					width: 70%;
-					input{
-						border:1rpx solid #dcdcdc;
+
+					input {
+						border: 1rpx solid #dcdcdc;
 						height: 78rpx;
 						line-height: 78rpx;
 						padding: 0 20rpx;
 					}
 				}
 			}
-			.delete-icon{
+
+			.delete-icon {
 				height: 80rpx;
 				width: 80rpx;
 				text-align: center;
@@ -487,20 +513,22 @@
 				background-color: #ccc;
 			}
 		}
-		.select-warp{
+
+		.select-warp {
 			height: 80rpx;
 			line-height: 80rpx;
-			padding: 0 20rpx ;
+			padding: 0 20rpx;
 			box-sizing: border-box;
 			display: flex;
 			justify-content: space-between;
-			
-			.show-text{
+
+			.show-text {
 				width: 70%;
-				border:1rpx solid #dcdcdc;
+				border: 1rpx solid #dcdcdc;
 				padding: 0 20rpx;
 			}
-			.add-icon{
+
+			.add-icon {
 				height: 80rpx;
 				width: 80rpx;
 				text-align: center;
@@ -511,22 +539,26 @@
 			}
 		}
 	}
-	.ul{
-		.li{
+
+	.ul {
+		.li {
 			background-color: #fff;
 			border-radius: 5rpx;
 			margin: 20rpx 20rpx 0;
-			.label{
+
+			.label {
 				height: 100rpx;
 				line-height: 100rpx;
 				font-weight: 30rpx;
 				border-bottom: 1rpx solid #ccc;
 				padding: 0 20rpx;
-				
+
 			}
-			.lists{
+
+			.lists {
 				border-bottom: 1rpx solid #ccc;
-				.list-box{
+
+				.list-box {
 					height: 100rpx;
 					line-height: 100rpx;
 					display: flex;
@@ -534,23 +566,27 @@
 					padding: 0 20rpx;
 				}
 			}
-			.list-btn-warp{
+
+			.list-btn-warp {
 				display: flex;
 				padding: 20rpx;
-				button{
+
+				button {
 					width: 48%;
 				}
 			}
 		}
 	}
-	.add-header{
+
+	.add-header {
 		height: 100rpx;
 		line-height: 100rpx;
 		font-size: 30rpx;
 		font-weight: bold;
 		overflow: hidden;
 		padding: 20rpx;
-		button{
+
+		button {
 			width: 200rpx;
 			color: #fff;
 			background-color: red;
@@ -558,4 +594,4 @@
 			margin: 14rpx 0;
 		}
 	}
-</style>
+</style>

unpackage/cache/apk/apkurl

@@ -1 +1 @@
-https://ide.dcloud.net.cn/build/download/05803fe0-2e8c-11ed-83d4-b11147dba0bf
+https://ide.dcloud.net.cn/build/download/63c6e190-3415-11ed-bcfc-d3d3cff173e8