ysy 2 лет назад
Родитель
Сommit
2a89b752bb

+ 1 - 1
pages/pda/components/uni-steps.vue

@@ -85,7 +85,7 @@
 					return false
 					return false
 				}
 				}
 				
 				
-				if(item.number > 0 || index == this.active) {
+				if(item.count > 0 || index == this.active) {
 					this.taskId = item.taskId
 					this.taskId = item.taskId
 						this.$emit('selectStep', item);
 						this.$emit('selectStep', item);
 				} else {
 				} else {

+ 2 - 2
pages/pda/sample/components/qualityStat.vue

@@ -23,8 +23,8 @@
 					<view class="rx ww55 ">
 					<view class="rx ww55 ">
 						<view class="lable  rx-cc">废品数量</view>
 						<view class="lable  rx-cc">废品数量</view>
 						<view class="content rx-sc">
 						<view class="content rx-sc">
-			<view>{{item.quantity}}</view>
-			<view class="unit">{{item.unit}}</view>
+							<view>{{item.quantity}}</view>
+							<view class="unit">{{item.unit}}</view>
 						</view>
 						</view>
 					</view>
 					</view>
 
 

+ 1 - 1
pages/pda/sample/inspection/index.vue

@@ -219,7 +219,7 @@
 				if (this.List[0].normalQuality.formedNum - this.List[0].normalQuality.quantity  < 0) {
 				if (this.List[0].normalQuality.formedNum - this.List[0].normalQuality.quantity  < 0) {
 					uni.showToast({
 					uni.showToast({
 						icon: 'none',
 						icon: 'none',
-						title: '已质检数量不能大于合格数量'
+						title: '废品数量不能大于合格数量'
 					})
 					})
 					return false
 					return false
 				}
 				}

+ 14 - 14
pages/pda/sample/inspection/job.vue

@@ -16,7 +16,7 @@
 					<qualityStat :normalQuality='objData.normalQuality' v-if='objData'></qualityStat>
 					<qualityStat :normalQuality='objData.normalQuality' v-if='objData'></qualityStat>
 
 
 					<u-form labelPosition="left" labelWidth="180" labelAlign="left" style="margin-top: 40rpx;">
 					<u-form labelPosition="left" labelWidth="180" labelAlign="left" style="margin-top: 40rpx;">
-                         
+
 						<u-form-item label="合格数量:" class="required-form" borderBottom prop="formingNum">
 						<u-form-item label="合格数量:" class="required-form" borderBottom prop="formingNum">
 							<input class="uni-input" v-model="formingNum" type='digit'></input>
 							<input class="uni-input" v-model="formingNum" type='digit'></input>
 						</u-form-item>
 						</u-form-item>
@@ -126,33 +126,33 @@
 
 
 				})
 				})
 			},
 			},
-			
+
 			save() {
 			save() {
-			      
-				  this.objData.workReportInfo.formingNum = this.formingNum
-				  console.log(this.objData.workReportInfo)
-			
+
+				this.objData.workReportInfo.formingNum = this.formingNum
+				console.log(this.objData.workReportInfo)
+
 				if (Number(this.objData.workReportInfo.formingNum) < 0 || this.objData.workReportInfo.formingNum == null) {
 				if (Number(this.objData.workReportInfo.formingNum) < 0 || this.objData.workReportInfo.formingNum == null) {
 
 
 					uni.showToast({
 					uni.showToast({
 						icon: 'none',
 						icon: 'none',
 						title: '合格数量不能小于0'
 						title: '合格数量不能小于0'
 					})
 					})
-			
+
 					return false
 					return false
 				}
 				}
-			
-			
-		
-			
+
+
+
+
 				jobSave(this.objData).then(res => {
 				jobSave(this.objData).then(res => {
 					if (res) {
 					if (res) {
 						uni.navigateBack()
 						uni.navigateBack()
 					}
 					}
 				})
 				})
-			
-			
-			
+
+
+
 			}
 			}