1.31

api/business/dayWorkItem.js

@@ -6,7 +6,7 @@ import req from '@/utils/request.js'
  */
 export function getDayWorkItemList(data) {
 	return req.request({
-		url:'/business/dayworkItem/list',
+		url: '/business/dayworkItem/list',
 		method: 'GET',
 		data: data
 	})
@@ -15,7 +15,7 @@ export function getDayWorkItemList(data) {
 
 export function updateDayWorkItem(data) {
 	return req.request({
-		url:'/business/dayworkItem',
+		url: '/business/dayworkItem',
 		method: 'POST',
 		data: data
 	})
@@ -23,7 +23,7 @@ export function updateDayWorkItem(data) {
 
 export function updateDayWorkItemBatch(data) {
 	return req.request({
-		url:'/business/dayworkItem/updateBatch',
+		url: '/business/dayworkItem/updateBatch',
 		method: 'PUT',
 		data: data
 	})
@@ -31,7 +31,7 @@ export function updateDayWorkItemBatch(data) {
 
 export function saveDayWorkItem(data) {
 	return req.request({
-		url:'/business/dayworkItem',
+		url: '/business/dayworkItem',
 		method: 'POST',
 		data: data
 	})
@@ -39,7 +39,7 @@ export function saveDayWorkItem(data) {
 
 export function saveDayWorkItemBatch(data) {
 	return req.request({
-		url:'/business/dayworkItem/saveBatch',
+		url: '/business/dayworkItem/saveBatch',
 		method: 'POST',
 		data: data
 	})
@@ -47,7 +47,7 @@ export function saveDayWorkItemBatch(data) {
 
 export function getDayworkItemByCarrierId(data) {
 	return req.request({
-		url:'/business/dayworkItem/getDayworkItemByCarrier',
+		url: '/business/dayworkItem/getDayworkItemByCarrier',
 		method: 'GET',
 		data: data
 	})
@@ -55,8 +55,16 @@ export function getDayworkItemByCarrierId(data) {
 
 export function saveproTem(data) {
 	return req.request({
-		url:'/business/dayworkItem/proTem',
+		url: '/business/dayworkItem/proTem',
 		method: 'POST',
 		data: data
 	})
 }
+
+export function isCurProcessFinish(data) {
+	return req.request({
+		url: '/business/dayworkItem/startStatus',
+		method: 'GET',
+		data: data
+	})
+}

components/dialog-end-work/dialog-end-work.vue

@@ -280,10 +280,17 @@
 	}
 
 	function handleAddWasteInfo() {
-		wasteInfo.value.push({
-			rejectNum: '',
-			reason: ''
-		})
+		if(wasteInfo.value.some(item => item.rejectNum == '' || item.reason == '')){
+			uni.showToast({
+				icon: 'none',
+				title: '请填写废品量或废品原因再点击添加'
+			})
+		}else{
+			wasteInfo.value.push({
+				rejectNum: '',
+				reason: ''
+			})
+		}
 	}
 
 	function handleDeleteWasteInfo(index) {

pages/changeBox/index.vue

@@ -25,8 +25,10 @@
 						<switch color="#ff0000" style="transform:scale(0.7)" @change="handleSwitchChange(item)" />
 					</view>
 					<view class="uni-row" v-if="item.checked">
-						<uni-data-select v-model="item.abandonmentReason" :localdata="abanonmentList"
-							style="width: 240rpx;" :clear="false"></uni-data-select>
+						<uni-easyinput v-if="inpShow" v-model="item.abandonmentReason" focus placeholder="请输入废箱原因"
+						style="width: 240rpx;"></uni-easyinput>
+						<uni-data-select v-else v-model="item.abandonmentReason" :localdata="abanonmentList"
+							style="width: 240rpx;" :clear="false" @change="abandonmentReasonChange(item)"></uni-data-select>
 					</view>
 					<!-- 占空位用 -->
 					<view class="uni-row" v-if="!item.checked">
@@ -73,6 +75,7 @@
 	const newBindList = ref([])
 	const discardVehicleList = ref([])
 	const abanonmentList = ref([])
+	const inpShow = ref(false)
 
 	let dayWorkInfo = store.dayworkInfo;
 
@@ -97,7 +100,7 @@
 			for (var i = 0; i < res.data.length; i++) {
 				abanonmentList.value[i] = {
 					text: res.data[i].dictLabel,
-					value: res.data[i].dictValue
+					value: res.data[i].dictLabel
 				}
 			}
 		})
@@ -106,6 +109,14 @@
 	function handleSwitchChange(item) {
 		item.checked = !item.checked
 	}
+	
+	function abandonmentReasonChange(item){
+		if(item.abandonmentReason == '其他原因'){
+			inpShow.value = true;
+		}else{
+			inpShow.value = false;
+		}
+	}
 
 	// function handleSelectRejectReason(item) {
 	// 	for (var i = 0; i < abanonmentList.value.length; i++) {
@@ -115,7 +126,7 @@
 	// 	}
 	// }
 	function handleDelVehicleNo(item, index) {
-		if (bindList.value.includes(item)) {
+		if (bindList.value.some(carrier => carrier.carrierCode == item.carrierCode)) {
 			console.log(bindList.value)
 			newBindList.value.splice(index, 1);
 			let discardVehicleInfo = {

pages/reportingForWork/index.vue

@@ -98,6 +98,9 @@
 	import {
 		checkBizDayworkCarriers
 	} from '@/api/business/dayWork.js'
+	import {
+		isCurProcessFinish
+	} from '@/api/business/dayWorkItem.js'
 
 	const listData = ref([]) // 回显 
 	const curPlan = ref({}) // 接收生产计划单信息 
@@ -196,26 +199,25 @@
 	}
 
 	function handleStartProcessing(item) {
-		let flag = false;
-		for (let i = 0; i < listData.value.length; i++) {
-			if(listData.value[i].status == 3){
-				flag = true;
-				break;
+		// 查询当前工序是否完成再判断是否进行报工
+		isCurProcessFinish({
+			deptId: store.dayworkInfo.id,
+			processId: listData.value[0].processId
+		}).then(res => {
+			if (store.dayworkInfo.status == 4) {
+				uni.showToast({
+					icon: 'none',
+					title: '当前批次已完成'
+				})
+			} else if (!res.data) {
+				uni.showToast({
+					icon: 'none',
+					title: '该工序已完成,不能继续报工'
+				})
+			} else {
+				selectEquipment.value.open(item);
 			}
-		}
-		if (store.dayworkInfo.status == 4) {
-			uni.showToast({
-				icon: 'none',
-				title: '当前批次已完成'
-			})
-		} else if (flag) {
-			uni.showToast({
-				icon: 'none',
-				title: '该工序已完成,请转到下一工序再报工'
-			})
-		} else {
-			selectEquipment.value.open(item);
-		}
+		})
 	}
 
 	/**