提交

pages/sorting/form.vue

@@ -18,13 +18,13 @@
 		<view class="unfit-container">
 			<view class="unfit-item-container uni-column" v-for="(item, index) in unfitInfos" :key="index">
 				<view class="title uni-row">
-					<text>检查项-{{ item.title }}</text>
+					<text>检查标准-{{ item.checkStandard }}</text>
 					<uni-icons type="trash" size="24" color="#fc6565" @click="handleDelUnfit(index)" />
 				</view>
-				<view class="standard">检查标准：{{ item.standard }}</view>
+				<!-- <view class="standard">检查标准：{{ item.checkStandard }}</view> -->
 				<view class="result uni-row">
 					<view class="label">检查结果</view>
-					<input v-model="item.result" placeholder="请输入检查结果" />
+					<input v-model="item.reason" placeholder="请输入检查结果" />
 					<view class="label" style="text-align: right; padding-right: 16rpx;">数量</view>
 					<input class="number" type="number" v-model="item.rejectNum" placeholder=""
 						@blur="rejectNumberChange" />
@@ -39,7 +39,7 @@
 				<view class="question uni-column">
 					<view class="label uni-row">
 						<text>问题描述</text>
-						<text style="color: #fcab53">{{ showStatus(item.status) }}</text>
+						<text :style="{ color: showStatusColor(item.status) }">{{ showStatus(item.status) }}</text>
 					</view>
 					<view class="content">{{ item.content }}</view>
 				</view>
@@ -61,10 +61,10 @@
 			</view>
 			<view class="remark uni-row">
 				<view class="label">备注</view>
-				<textarea />
+				<textarea v-model="dayworkItem.remark" />
 			</view>
 
-			<view class="btns-container uni-row">
+			<view class="btns-container uni-row" v-if="Number(dayworkItem.status) < 3">
 				<view v-if="checkFinishable()" class="finished-btn" @click.stop="handleFinishDaywork">结束报工</view>
 				<view v-if="!checkFinishable()" class="pause-btn" @click.stop="handleUpdateDaywork">暂停</view>
 				<view class="question-btn uni-column" @click.stop="handleAddConsultation">
@@ -148,9 +148,12 @@
 	}
 	const addUnfitInfo = (data) => {
 		const info = {
+			inspectionInstructionId: data.id,
 			title: data.title,
 			standard: data.standard,
-			result: '',
+			checkStandard: data.standard,
+			type: data.type,
+			reason: '',
 			number: 1
 		}
 		unfitInfos.value.push(info)
@@ -248,21 +251,35 @@
 			case 0:
 				return '未确认'
 			case 1:
-				return '合格'
-			case 2:
 				return '不合格'
+			case 2:
+				return '合格'
 			default:
 				return ''
 		}
 	}
 
+	const showStatusColor = (status) => {
+		// console.log(status)
+		switch (status) {
+			case 0:
+				return '#fcab53'
+			case 1:
+				return '#fc044f'
+			case 2:
+				return '#1deb19'
+			default:
+				return ''
+		}
+	}
 	const rejectNumberChange = () => {
 		let sumReject = 0
 		unfitInfos.value.forEach(v => {
-			sumReject += v.rejectNum
+			sumReject += Number(v.rejectNum)
 		})
 		dayworkItem.value.rejectNum = sumReject
-		dayworkItem.value.qualifiedNum = dayworkItem.value.prodNum - dayworkItem.rejectNum
+		dayworkItem.value.qualifiedNum = dayworkItem.value.prodNum - dayworkItem.value.rejectNum
+		console.log(dayworkItem.value)
 	}
 
 	const handleFinishDaywork = () => {
@@ -272,7 +289,8 @@
 			id: dayworkItem.value.id,
 			prodNum: dayworkItem.value.prodNum,
 			rejectNum: dayworkItem.value.rejectNum,
-			qualifiedNum: dayworkItem.value.qualifiedNum
+			qualifiedNum: dayworkItem.value.qualifiedNum,
+			remark: dayworkItem.value.remark
 		}
 		finish(saveData).then(res => {
 			if (res.code === 200) {
@@ -286,6 +304,25 @@
 		})
 	}
 	const handleUpdateDaywork = () => {
+		const saveData = {
+			rejectList: unfitInfos.value,
+			consult: consultations.value,
+			id: dayworkItem.value.id,
+			prodNum: dayworkItem.value.prodNum,
+			rejectNum: dayworkItem.value.rejectNum,
+			qualifiedNum: dayworkItem.value.qualifiedNum,
+			remark: dayworkItem.value.remark
+		}
+		update(saveData).then(res => {
+			if (res.code === 200) {
+				uni.navigateBack()
+			} else {
+				uni.showToast({
+					icon: 'none',
+					title: res.message
+				})
+			}
+		})
 
 	}
 </script>

pages/sorting/options.vue

@@ -111,8 +111,8 @@
 				optionList1.value = res.data.instructions
 				optionList2.value = res.data.standards
 				handleTabBarClick(currentTabName.value)
-				console.log(optionList1.value, res.data.instructions)
-				console.log(optionList2.value, res.data.standards)
+				// console.log(optionList1.value, res.data.instructions)
+				// console.log(optionList2.value, res.data.standards)
 			} else {
 				uni.showToast({
 					icon: 'none',
@@ -136,8 +136,10 @@
 
 	const handleOptionChecked = (data) => {
 		uni.$emit('addUnfitInfoEvent', {
+			id: data.id,
 			title: data.title,
-			standard: data.standard
+			standard: data.standard,
+			type: data.type
 		})
 		uni.navigateBack()
 	}