wangxin 1 gadu atpakaļ
vecāks
revīzija
06e10c1fde

+ 6 - 2
pages/fastProductionPlan/index.vue

@@ -52,10 +52,13 @@
 		</view>
 
 
-		<view v-if="listData.length==0" style="color: #999;margin: 50% auto;">
-			<text>扫码开始快速报工</text>
+		<view v-if="listData.length==0" style="color: #999;">
+			<image style="width: 420rpx; height: 420rpx; padding-top: 30% ; margin: auto;"
+				src="../../static/images/fastProductionPlan.png" />
+
 		</view>
 		<view v-if="listData.length==0" class='bottom-btn-container'>
+			<text style="margin: auto; padding-bottom: 10%;">扫箱码开始快速报工</text>
 			<button class="start-batch-btn uni-row" type=primary @click='handleAdd'>扫码开始报工</button>
 		</view>
 		<view v-if="listData.length>0" class='btn uni-row'>
@@ -140,6 +143,7 @@
 			}
 			uni.hideLoading();
 		})
+
 	}
 
 	function handleAdd() {

+ 20 - 2
pages/processInspection/form.vue

@@ -241,11 +241,30 @@
 
 	//结束报工按钮
 	function endWork() {
+		let unf = unfitInfos.value;
+		for (var i = 0; i < unfitInfos.length; i++) {
+			if (!unf.checkStandard && !unf.checkResult && !unf.rejectNum) {
+				uni.showToast({
+					icon: 'none',
+					title: "废品信息不能为空",
+					duration: 2000
+				})
+				return;
+			}
+
+		}
+
+		save();
+
+
+	}
+
+
+	function save() {
 		processInspecion.value.dayworkItemConsults = consultations.value;
 		processInspecion.value.dayworkItemRejects = unfitInfos.value;
 		processInspecion.value.user = store.userInfo;
 
-		console.log("结束报工保存", processInspecion.value);
 		saveProcessInspecion(processInspecion.value).then(res => {
 			if (res.code == 200) {
 				uni.navigateTo({
@@ -264,7 +283,6 @@
 
 
 
-
 	//咨询样式
 	function selectType(item) {
 		for (var i = 0; i < consul.length; i++) {

BIN
static/images/fastProductionPlan.png