Parcourir la source

优化PDA查询界面;
优化PDA装配操作流程。

SunYaLong il y a 1 an
Parent
commit
006bf87fc5

+ 9 - 0
TFT-PDA/pages.json

@@ -209,6 +209,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/Outstore/outassembleDtlNew",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "装配操作  步骤-2",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

+ 3 - 0
TFT-PDA/pages/Inspect/inspectRecordQuery.vue

@@ -25,6 +25,9 @@
 		<uni-section title="质检记录清单:" type="line" style="margin-bottom: 3px;padding: 3px;">
 			<view class="my-tips-view" v-if="isShowTips">没有查询到质检记录数据......</view>
 			<uni-pagination :total="total" :current="current" :pageSize="pageSize" @change="pageChange" title="标题文字" v-if="!isShowTips" style="margin: 4px;"/>
+			<view v-if="!isShowTips" style="text-align: center;">
+				<text class="example-info">数据总量:{{ total }}条,每页数据:{{ pageSize }}</text>
+			</view>
 			<view v-for="(newsitem,key) in inspectRecordList" :key="key">
 				<view class="myDeliverDetail" >
 					<view style="flex-direction: row;flex-direction: row;height: 25px;display: flex;padding: 2px;border-radius: 5px 5px;">

+ 2 - 2
TFT-PDA/pages/Instore/instoreDtlNew.vue

@@ -98,7 +98,7 @@
 					this.foucusIndex = 1
 					setTimeout(() => {
 						this.foucusIndex = 0;
-					}, 100)
+					}, 150)
 					return
 				}
 				
@@ -146,7 +146,7 @@
 				this.foucusIndex = 1
 				setTimeout(() => {
 					this.foucusIndex = 0;
-				}, 100)
+				}, 150)
 			},
 			isEmptyStr(s) {
 				if (s == undefined || s === '') {

+ 7 - 4
TFT-PDA/pages/Instore/instoreRecordQuery.vue

@@ -25,11 +25,14 @@
 		<uni-section title="入库记录清单:" type="line" style="margin-bottom: 3px;padding: 3px;">
 			<view class="my-tips-view" v-if="isShowTips">没有查询到入库记录数据......</view>
 			<uni-pagination :total="total" :current="current" :pageSize="pageSize" @change="pageChange" title="标题文字" v-if="!isShowTips" style="margin: 4px;"/>
+			<view v-if="!isShowTips" style="text-align: center;">
+				<text class="example-info">数据总量:{{ total }}条,每页数据:{{ pageSize }}</text>
+			</view>
 			<view v-for="(newsitem,key) in instoreRecordList" :key="key">
 				<view class="myDeliverDetail" >
 					<view style="flex-direction: row;flex-direction: row;height: 25px;display: flex;padding: 2px;border-radius: 5px 5px;">
 						<text style="align-self: center;">物料编号:</text>
-						<text style="align-self: center;">{{newsitem.materialCode}}</text>
+						<text style="align-self: center;font-size: 30rpx;font-weight: bold;">{{newsitem.materialCode}}</text>
 						<text :class="newsitem.keyFlag ? 'keyFlagRed' : 'keyFlagGray'" style="align-self: center;margin-left: 20px;">{{newsitem.keyFlag ? '★' : '■'}}</text>
 					</view>
 					<view class="line-h"></view>
@@ -41,11 +44,11 @@
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">规格型号/图号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">生产令号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">BN/SN:</text>
@@ -53,7 +56,7 @@
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">入库数量:</text>
-								<text style="align-self: center;font-size: 30rpx;font-weight: bold;color: blue;">{{newsitem.inStoreQty}}</text>
+								<text style="align-self: center;font-size: 35rpx;font-weight: bold;color: blue;">{{newsitem.inStoreQty}}</text>
 							</view>
 							<!-- <view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">质检人:</text>

+ 1 - 1
TFT-PDA/pages/Outstore/outassemble01.vue

@@ -87,7 +87,7 @@
 				this.foucusIndex = 0
 			},
 			goDetailPage(item) {
-				let urlStr = '/pages/Outstore/outassembleDtl?bomNo=' + item.bomNo;
+				let urlStr = '/pages/Outstore/outassembleDtlNew?bomNo=' + item.bomNo;
 				uni.navigateTo({
 					url: urlStr
 				});

+ 229 - 0
TFT-PDA/pages/Outstore/outassembleDtlNew.vue

@@ -0,0 +1,229 @@
+<template>
+	<view>
+		<view class="uni-form-item uni-column">
+			<view class="uni-flex uni-row">
+				<view class="title" style="width: 150rpx;">生产令号:</view>
+				<input class="uni-input" style="font-size: 40rpx;font-weight: bold;color: black;" disabled="true" v-model="bomNo"/>
+			</view>
+			<view class="uni-flex uni-row" style="margin-top: 3px;margin-bottom: 3px;">
+				<view class="title" style="width: 150rpx;">物料号:</view>
+				<input class="uni-input" style="margin-right: 5px;" :focus="foucusIndex === 0" v-model="materialSpecCode" placeholder="请输入物料信息" @confirm="confirmFun"/>
+			</view>
+			<view class="uni-flex uni-row">
+				<button type="primary" style="-webkit-flex: 1;flex: 1;margin-left: 5px;" @click="queryFun">查    询</button>
+				<button type="primary" style="-webkit-flex: 1;flex: 1;margin-left: 5px;margin-right: 5px;" @click="resetCondition">重    置</button>
+			</view>
+		</view>
+		<uni-section title="关键件清单数据:" type="line" style="margin-bottom: 3px;padding: 3px;">
+			<view class="my-tips-view" v-if="isShowTips">没有查询到关键件清单数据......</view>
+			<view v-for="(newsitem,key) in sapOutTaskList" :key="key">
+				<view class="myDeliverDetail" @click="myDeliverDetailClick(newsitem)">
+					<view style="flex-direction: row;flex-direction: row;height: 25px;display: flex;padding: 2px;border-radius: 5px 5px;">
+						<text style="align-self: center;">物料编号:</text>
+						<text style="align-self: center;font-size: 30rpx;font-weight: bold;">{{newsitem.materialCode}}</text>
+						<!-- <text :class="newsitem.keyFlag ? 'keyFlagRed' : 'keyFlagGray'" style="align-self: center;margin-left: 20px;">{{newsitem.keyFlag ? '★' : '■'}}</text> -->
+					</view>
+					<view class="line-h"></view>
+					<view style="flex-direction: row;flex-direction: row;display: flex;-webkit-justify-content: space-between;justify-content: space-between;">
+						<view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">物料名称:</text>
+								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.materialName}}</text>
+							</view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">规格型号/图号:</text>
+								<text style="align-self: center;font-size: 35rpx;font-weight: bold;color: blue;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
+							</view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">生产令号:</text>
+								<text style="align-self: center;font-size: 35rpx;font-weight: bold;color: blue;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
+							</view>
+							<!-- <view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">BN/SN:</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.bnSnCode}}</text>
+							</view> -->
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">装配需求数量:</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;">{{newsitem.qty}}</text>
+							</view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">已装配数量:</text>
+								<text style="align-self: center;font-size: 35rpx;font-weight: bold;color: red;">{{newsitem.assembleQty}}</text>
+							</view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">创建人:</text>
+								<text style="align-self: center;font-size: 30rpx;">{{newsitem.createBy}}</text>
+							</view>
+							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
+								<text style="align-self: center;color: #555;font-size: 25rpx;">创建时间:</text>
+								<text style="align-self: center;font-size: 30rpx;">{{newsitem.createTime}}</text>
+							</view>
+						</view>
+						<view v-if="newsitem.assembleQty < newsitem.qty" style="border-radius: 35px;width: 35px; background-color: lime;height: 35px;align-self: center;margin-right: 5px;"></view>
+						<view v-else style="border-radius: 35px;width: 35px; background-color: lightgray;height: 35px;align-self: center;margin-right: 5px;"></view>
+					</view>
+				</view>
+			</view>
+		</uni-section>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				bomNo: '',
+				foucusIndex: 0,
+				materialSpecCode: '',
+				isShowTips: true,
+				sapOutTaskList:[],
+			}
+		},
+        onLoad(option) {
+			this.bomNo = option.bomNo;
+			uni.$on('addAssembleDtlData', this.addAssembleDtlData)
+        },
+		onUnload() {
+			uni.$off('addAssembleDtlData', this.addAssembleDtlData)
+		},
+		methods: {
+			async queryFun() {
+				if(this.isEmptyStr(this.materialSpecCode)) {
+					uni.showToast({
+						title: '物料信息 不能为空!',
+						icon: 'none',
+						duration: 1500,
+						mask:true,
+					})
+					this.foucusIndex = 1
+					setTimeout(() => {
+						this.foucusIndex = 0;
+					}, 100)
+					return
+				}
+				
+				uni.showLoading({
+					title: "正在查询...",
+					mask: true,
+				})
+				this.sapOutTaskList = []
+				let parm = {
+					url : '/business/SapBomRecord/QuerySapBomRecordListForMaterialSpec?bomNo=' + this.bomNo + '&materialSpecCode=' + this.materialSpecCode,
+					data: {
+					},
+					method: 'POST',
+					isHaveToken : true
+				}
+				let retData = await getApp().RequestData(parm)
+				// console.log(retData)
+				if(retData.isSuccess) {
+					if(retData.data.code == 200) {
+						let len = retData.data.data.length
+						this.sapOutTaskList = retData.data.data
+						if(len > 0) {
+							this.isShowTips = false
+						}
+						else {
+							this.isShowTips = true
+							this.resetCondition()
+						}
+					}
+					else {
+						this.isShowTips = true
+						this.resetCondition()
+					}
+				}
+				else {
+					this.isShowTips = true
+					this.resetCondition()
+				}
+				uni.hideLoading()
+			},
+			resetCondition() {
+				this.foucusIndex++
+				// console.log(this.foucusIndex)
+				this.materialSpecCode = ''
+				this.sapOutTaskList = []
+				this.isShowTips = true
+				setTimeout(() => {
+					this.foucusIndex = 0;
+					// console.log('额呵呵呵!!!')
+				}, 150)
+				// this.foucusIndex = 0;
+			},
+			isEmptyStr(s) {
+				if (s == undefined || s === '') {
+					return true
+				}
+				return false
+			},
+			myDeliverDetailClick(model) {
+				model.bomNo = this.bomNo;
+				if(model.assembleQty >= model.qty) {
+					uni.showToast({
+						title: '已全部出库',
+						icon: 'error',
+						mask: true,
+						duration: 1500
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/Outstore/outassembleOperate',
+						success() {
+							uni.$emit('sendCheckedDeliverDtlData',model)
+							// console.log(model)
+						}
+					});
+				}
+			},
+			addAssembleDtlData(data) {
+				// console.log(data)
+				this.sapOutTaskList.forEach((item) => {
+					if(item.id === data.id) {
+						item.assembleQty += Number(data.assembleNum);
+					}
+				})
+				let isFinish = this.sapOutTaskList.some(x => x.assembleQty < x.qty)
+				if(!isFinish) {
+					// console.log(111)
+					this.resetCondition()
+					// console.log(1221)
+				}
+				else {
+					this.queryFun()
+				}
+			},
+			confirmFun() {
+				this.queryFun()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.my-tips-view {
+		/* margin-top: 50px; */
+		text-align: center;
+		color: #999999;
+		font-size: 20px;
+		font-weight: normal;
+	}
+	.myDeliverDetail {
+		border: 1px solid #cccccc;
+		border-radius: 5px;
+		margin-top: 1px;
+	}
+	.myDeliverDetail:active {
+		background-color: aliceblue;
+	}
+	.line-h {
+	    height: 1rpx;
+	    background-color: #cccccc;
+	}
+	.keyFlagRed {
+		color: red;
+	}
+	.keyFlagGray {
+		color: lightgray;
+	}
+</style>

+ 14 - 8
TFT-PDA/pages/Outstore/outassembleOperate.vue

@@ -133,9 +133,12 @@
 			},
 			submitResult() {
 				this.myVerify();
-				
+				uni.showLoading({
+					title: "正在提交数据...",
+					mask: true,
+				})
 				let tmpMd = this.sapBomDtlMd;
-				tmpMd.assembleNum = this.assembleNum;
+				tmpMd.assembleNum = Number(this.assembleNum);
 				tmpMd.BnSnCode = this.scanBnSnCode;
 				// console.log(tmpMd)
 				let userMsg = uni.getStorageSync('userInfo')
@@ -154,17 +157,20 @@
 							uni.navigateBack({
 								url: '/pages/Outstore/outassembleDtl',
 								success: () => {
+									uni.hideLoading()
 									uni.$emit('addAssembleDtlData',tmpMd);
 								}
 							});
 						}
 						else {
+							uni.hideLoading()
 							this.popTitleMsg = '请重新扫码!!'
 							this.popMsg = `新增装配数据失败:【${retMd.msg}】`
 							this.$refs.popup.open('center')
 						}
 					},
 					fail: (err) => {
+						uni.hideLoading()
 						this.popTitleMsg = '请重新扫码!!'
 						this.popMsg = `新增装配数据失败:【${err}】`
 						this.$refs.popup.open('center')
@@ -185,7 +191,7 @@
 					this.foucusIndex = 0
 					return;
 				}
-				if(this.scanMaterialCode !== this.sapBomDtlMd.materialCode) {
+				if(this.scanMaterialCode !== this.sapBomDtlMd.materialSpec) {
 					this.popTitleMsg = '请重新扫码!!'
 					let tmpMatCode = this.scanMaterialCode
 					this.popMsg = `物料号:【${tmpMatCode}】扫码确认错误`
@@ -205,7 +211,7 @@
 					this.foucusIndex = 0
 					return;
 				}
-				if(this.scanMaterialCode !== this.sapBomDtlMd.materialCode) {
+				if(this.scanMaterialCode !== this.sapBomDtlMd.materialSpec) {
 					this.popTitleMsg = '请重新扫码!!'
 					let tmpMatCode = this.scanMaterialCode
 					this.popMsg = `物料号:【${tmpMatCode}】扫码确认错误`
@@ -253,7 +259,7 @@
 									this.scanBnSnCode = ''
 									// this.foucusIndex = 2
 									this.resetFoucus(1)
-								}, 2000)
+								}, 1000)
 							}
 							else {
 								this.outTaskQty = retData.data.data
@@ -264,7 +270,7 @@
 										this.isMaskClick = true
 										// this.foucusIndex = 2
 										this.resetFoucus(2)
-									}, 2000)
+									}, 1000)
 								}
 								else {
 									showMsg = '已出库数量为:' + this.outTaskQty									
@@ -315,7 +321,7 @@
 					this.foucusIndex = 0
 					return;
 				}
-				if(this.scanMaterialCode !== this.sapBomDtlMd.materialCode) {
+				if(this.scanMaterialCode !== this.sapBomDtlMd.materialSpec) {
 					this.popTitleMsg = '请重新扫码!!'
 					let tmpMatCode = this.scanMaterialCode
 					this.popMsg = `物料号:【${tmpMatCode}】扫码确认错误`
@@ -402,7 +408,7 @@
 				})
 			},
 			previewImage11() {
-				// ToDo: 暂未实现 从后端获取图片并预览大图  孙亚龙
+				// ToDo: 暂未实现 从后端获取图片并预览大图  孙亚龙 20230613
 				// 预览图片
 				uni.previewImage({
 					urls: this.previewImagePath

+ 7 - 4
TFT-PDA/pages/Outstore/outassembleRecordQuery.vue

@@ -21,11 +21,14 @@
 		<uni-section title="装配记录清单:" type="line" style="margin-bottom: 3px;padding: 3px;">
 			<view class="my-tips-view" v-if="isShowTips">没有查询到装配记录数据......</view>
 			<uni-pagination :total="total" :current="current" :pageSize="pageSize" @change="pageChange" title="标题文字" v-if="!isShowTips" style="margin: 4px;"/>
+			<view v-if="!isShowTips" style="text-align: center;">
+				<text class="example-info">数据总量:{{ total }}条,每页数据:{{ pageSize }}</text>
+			</view>
 			<view v-for="(newsitem,key) in outassembleRecordList" :key="key">
 				<view class="myDeliverDetail" >
 					<view style="flex-direction: row;flex-direction: row;height: 25px;display: flex;padding: 2px;border-radius: 5px 5px;">
 						<text style="align-self: center;">物料编号:</text>
-						<text style="align-self: center;">{{newsitem.materialCode}}</text>
+						<text style="align-self: center;font-size: 30rpx;font-weight: bold;">{{newsitem.materialCode}}</text>
 						<text :class="newsitem.keyFlag ? 'keyFlagRed' : 'keyFlagGray'" style="align-self: center;margin-left: 20px;">{{newsitem.keyFlag ? '★' : '■'}}</text>
 					</view>
 					<view class="line-h"></view>
@@ -37,11 +40,11 @@
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">规格型号/图号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">生产令号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">BN/SN:</text>
@@ -49,7 +52,7 @@
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">装配数量:</text>
-								<text style="align-self: center;font-size: 30rpx;font-weight: bold;color: blue;">{{newsitem.assembleQty}}</text>
+								<text style="align-self: center;font-size: 35rpx;font-weight: bold;color: blue;">{{newsitem.assembleQty}}</text>
 							</view>
 							<!-- <view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">质检人:</text>

+ 7 - 5
TFT-PDA/pages/Outstore/outstoreDtlNew.vue

@@ -98,7 +98,7 @@
 					this.foucusIndex = 1
 					setTimeout(() => {
 						this.foucusIndex = 0;
-					}, 100)
+					}, 150)
 					return
 				}
 				
@@ -140,13 +140,13 @@
 				uni.hideLoading()
 			},
 			resetCondition() {
+				this.foucusIndex = 1
 				this.materialSpecCode = ''
 				this.sapOutTaskList = []
 				this.isShowTips = true
-				this.foucusIndex = 1
 				setTimeout(() => {
 					this.foucusIndex = 0;
-				}, 100)
+				}, 150)
 			},
 			isEmptyStr(s) {
 				if (s == undefined || s === '') {
@@ -156,7 +156,7 @@
 			},
 			myDeliverDetailClick(model) {
 				model.outTaskNo = this.outTaskNo;
-				if(model.instoreQty >= model.checkQty) {
+				if(model.outQty >= model.qty) {
 					uni.showToast({
 						title: '已全部出库',
 						icon: 'error',
@@ -168,12 +168,13 @@
 						url: '/pages/Outstore/outstoreOperate',
 						success() {
 							uni.$emit('sendCheckedDeliverDtlData',model)
-							console.log(model)
+							// console.log(model)
 						}
 					});
 				}
 			},
 			addOutstoreData(data) {
+				// console.log(data)
 				this.sapOutTaskList.forEach((item) => {
 					if(item.id === data.id) {
 						item.outQty += Number(data.OutNum);
@@ -181,6 +182,7 @@
 				})
 				let isFinish = this.sapOutTaskList.some(x => x.outQty < x.qty)
 				if(!isFinish) {
+					// console.log(111)
 					this.resetCondition()
 				}
 				else {

+ 13 - 6
TFT-PDA/pages/Outstore/outstoreOperate.vue

@@ -147,9 +147,13 @@
 					return;
 				}
 				
+				uni.showLoading({
+					title: "正在提交数据...",
+					mask: true,
+				})
 				let tmpMd = this.outTaskDtlMd;
-				tmpMd.outStoreQty = this.outNum;
-				tmpMd.OutNum = this.outNum;
+				tmpMd.outStoreQty = Number(this.outNum);
+				tmpMd.OutNum = Number(this.outNum);
 				tmpMd.BnSnCode = this.scanBnSnCode;
 				let parm = {
 					url : '/business/OutOutstoreRecord/AddOutstoreRecord',
@@ -161,14 +165,16 @@
 				if(retData.isSuccess) {
 					if(retData.data.code == 200) {
 						uni.navigateBack({
-							url: '/pages/Outstore/outstoreDtl',
+							url: '/pages/Outstore/outstoreDtlNew',
 							success: () => {
+								uni.hideLoading()
 								uni.$emit('addOutstoreData',tmpMd);
 							}
 						});
-						console.log(retData.data)
+						// console.log(retData.data)
 					}
 					else {
+						uni.hideLoading()
 						// console.log(retData.data)
 						uni.showToast({
 							title: '接口错误!' + retData.data.msg,
@@ -179,6 +185,7 @@
 					}
 				}
 				else {
+					uni.hideLoading()
 					// console.log(retData)
 					uni.showToast({
 						title: '接口异常!' + retData.retMsg,
@@ -273,7 +280,7 @@
 									this.scanBnSnCode = ''
 									// this.foucusIndex = 2
 									this.resetFoucus(1)
-								}, 2000)
+								}, 1000)
 							}
 							else {
 								this.stockQty = retData.data.data
@@ -283,7 +290,7 @@
 									this.isMaskClick = true
 									// this.foucusIndex = 2
 									this.resetFoucus(2)
-								}, 2000)
+								}, 1000)
 							}
 						}
 						else {

+ 7 - 4
TFT-PDA/pages/Outstore/outstoreRecordQuery.vue

@@ -25,11 +25,14 @@
 		<uni-section title="出库记录清单:" type="line" style="margin-bottom: 3px;padding: 3px;">
 			<view class="my-tips-view" v-if="isShowTips">没有查询到出库记录数据......</view>
 			<uni-pagination :total="total" :current="current" :pageSize="pageSize" @change="pageChange" title="标题文字" v-if="!isShowTips" style="margin: 4px;"/>
+			<view v-if="!isShowTips" style="text-align: center;">
+				<text class="example-info">数据总量:{{ total }}条,每页数据:{{ pageSize }}</text>
+			</view>
 			<view v-for="(newsitem,key) in outstoreRecordList" :key="key">
 				<view class="myDeliverDetail" >
 					<view style="flex-direction: row;flex-direction: row;height: 25px;display: flex;padding: 2px;border-radius: 5px 5px;">
 						<text style="align-self: center;">物料编号:</text>
-						<text style="align-self: center;">{{newsitem.materialCode}}</text>
+						<text style="align-self: center;font-size: 30rpx;font-weight: bold;">{{newsitem.materialCode}}</text>
 						<text :class="newsitem.keyFlag ? 'keyFlagRed' : 'keyFlagGray'" style="align-self: center;margin-left: 20px;">{{newsitem.keyFlag ? '★' : '■'}}</text>
 					</view>
 					<view class="line-h"></view>
@@ -41,18 +44,18 @@
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">规格型号/图号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.materialSpec}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">生产令号:</text>
-								<text style="align-self: center;font-size: 25rpx;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
+								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.bomNo}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
 								<text style="align-self: center;color: #555;font-size: 25rpx;">BN/SN:</text>
 								<text style="align-self: center;font-size: 30rpx;font-weight: bold;word-wrap: break-word;width: 200px;">{{newsitem.bnSnCode}}</text>
 							</view>
 							<view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">
-								<text style="align-self: center;color: #555;font-size: 25rpx;">出库数量:</text>
+								<text style="align-self: center;color: #555;font-size: 35rpx;">出库数量:</text>
 								<text style="align-self: center;font-size: 30rpx;font-weight: bold;color: blue;">{{newsitem.outStoreQty}}</text>
 							</view>
 							<!-- <view style="flex-direction: row;flex-direction: row;display: flex;padding: 2px;">

+ 60 - 22
TFT-PDA/pages/login/login.vue

@@ -116,32 +116,70 @@ export default {
 			method: 'POST',
 			isHaveToken : false
 		}
-		let retData = await getApp().RequestData(parm)
-		if(retData.isSuccess) {
-			if(retData.data.code == 200) {
-				uni.setStorage({
-					key: 'userInfo',
-					data: {username : "admin", tokenStr : retData.data.data},
-				})
-				uni.switchTab({
-					url:"/pages/tabBar/inspect/inspect",
-				})
-			}
-			else {
-				let type = "登录失败!" + retData.data.msg + "!"
+		await getApp().RequestData(parm).then(
+			value => {
+				let retData = value
+				if(retData.isSuccess) {
+					if(retData.data.code == 200) {
+						uni.hideLoading()
+						uni.setStorage({
+							key: 'userInfo',
+							data: {username : "admin", tokenStr : retData.data.data},
+						})
+						uni.switchTab({
+							url:"/pages/tabBar/inspect/inspect",
+						})
+					}
+					else {
+						uni.hideLoading()
+						let type = "登录失败!" + retData.data.msg + "!"
+						this.msgType = 'error'
+						this.messageText = `${type}`
+						this.$refs.message.open()
+					}
+				}
+				else {
+					uni.hideLoading()
+					let type = "登录失败!" + retData.retMsg + "!"
+					this.msgType = 'error'
+					this.messageText = `${type}`
+					this.$refs.message.open()
+				}
+			},
+			err => {
+				let retData = err
+				uni.hideLoading()
+				let type = "登录失败!" + retData.retMsg + "!"
 				this.msgType = 'error'
 				this.messageText = `${type}`
 				this.$refs.message.open()
 			}
-		}
-		else {
-			console.log(11)
-			let type = "登录失败!" + retData.retMsg + "!"
-			this.msgType = 'error'
-			this.messageText = `${type}`
-			this.$refs.message.open()
-		}
-		uni.hideLoading()
+		);
+		// console.log(retData)
+		// if(retData.isSuccess) {
+		// 	if(retData.data.code == 200) {
+		// 		uni.setStorage({
+		// 			key: 'userInfo',
+		// 			data: {username : "admin", tokenStr : retData.data.data},
+		// 		})
+		// 		uni.switchTab({
+		// 			url:"/pages/tabBar/inspect/inspect",
+		// 		})
+		// 	}
+		// 	else {
+		// 		let type = "登录失败!" + retData.data.msg + "!"
+		// 		this.msgType = 'error'
+		// 		this.messageText = `${type}`
+		// 		this.$refs.message.open()
+		// 	}
+		// }
+		// else {
+		// 	console.log(11)
+		// 	let type = "登录失败!" + retData.retMsg + "!"
+		// 	this.msgType = 'error'
+		// 	this.messageText = `${type}`
+		// 	this.$refs.message.open()
+		// }
 	},
 	BtnExitClick() {
 		let app = getApp()