1.10

pages/changeBox/index.vue

@@ -1,32 +1,32 @@
 <template>
 	<view class='container'>
 		<view class='content'>
-			<view>
-				<text class='title'>当前箱号</text>
-				<view class="vehicleList uni-row" style="overflow: auto;">
-					<view class="vehicleNo uni-row" v-for="(item,index) in vehicleList">
-						<text>{{item.carrierCode}}</text>
-						<text @click="handleDelVehicleNo(item)">×</text>
-					</view>
+			<view class='title uni-row'>
+				<text>当前箱号</text>
+			</view>
+			<view class="vehicleList uni-row">
+				<view class="vehicleNo uni-row" v-for="(item,index) in newBindList">
+					<text>{{item.carrierCode}}</text>
+					<text @click="handleDelVehicleNo(item,index)">×</text>
+				</view>
+			</view>
+			<view class="disuseList">
+				<view class="uni-row" style="align-items: center;justify-content: space-evenly;">
+					<view>箱号</view>
+					<view>是否废弃</view>
+					<view>废弃原因</view>
 				</view>
-				<view class="disuseList">
-					<view class="uni-row" style="align-items: center;justify-content: space-evenly;">
-						<view>箱号</view>
-						<view>是否废弃</view>
-						<view>废弃原因</view>
+				<view class="vehicleNo uni-row" v-for="(item,index) in discardVehicleList"
+					style="align-items: center;justify-content: space-around;">
+					<view class="uni-row discardVehicleNo"><text>{{item.carrierCode}}</text>
+						<text @click="handleDelDiscardVehicleList(item)">×</text>
+					</view>
+					<view class="uni-row">
+						<switch color="#ff0000" style="transform:scale(0.7)" @change="handleSwitchChange(item)" />
 					</view>
-					<view class="vehicleNo uni-row" v-for="(item,index) in discardVehicleList"
-						style="align-items: center;justify-content: space-around;">
-						<view class="uni-row discardVehicleNo"><text>{{item.carrierCode}}</text>
-							<text @click="handleDelDiscardVehicleList(item)">×</text>
-						</view>
-						<view class="uni-row">
-							<switch color="#ff0000" style="transform:scale(0.7)" @change="handleSwitchChange(item)" />
-						</view>
-						<view class="uni-row">
-							<uni-data-select v-model="item.reason" :localdata="abanonmentList" style="width: 240rpx;"
-								:clear="false"></uni-data-select>
-						</view>
+					<view class="uni-row">
+						<uni-data-select v-model="item.reason" :localdata="abanonmentList" style="width: 240rpx;"
+							:clear="false"></uni-data-select>
 					</view>
 				</view>
 			</view>
@@ -64,7 +64,8 @@
 		addCarrierReject
 	} from '@/api/business/carrier.js'
 
-	const vehicleList = ref([])
+	const bindList = ref([])
+	const newBindList = ref([])
 	const discardVehicleList = ref([])
 	const abanonmentList = ref([])
 
@@ -83,8 +84,8 @@
 		getDayworkCarrierList(data).then(res => {
 			console.log(res)
 			if (res.code == 200) {
-				vehicleList.value = res.rows;
-				console.log(vehicleList.value)
+				bindList.value = res.rows;
+				newBindList.value = res.rows;
 			}
 		})
 		getDictInfoByType('reason_for_abandonment').then((res) => {
@@ -108,20 +109,26 @@
 	// 		}
 	// 	}
 	// }
-	function handleDelVehicleNo(item) {
-		vehicleList.value.splice(item, 1);
-		let discardVehicleInfo = {
-			carrierCode: item.carrierCode,
-			checked: false,
-			reason: '',
-			carrierId: item.carrierId
+	function handleDelVehicleNo(item, index) {
+		if (bindList.value.includes(item)) {
+			newBindList.value.splice(index, 1);
+			let discardVehicleInfo = {
+				carrierCode: item.carrierCode,
+				checked: false, 
+				reason: '',
+				carrierId: item.carrierId,
+				isAbandoned: 1,
+				operationDate: new Date()
+			}
+			discardVehicleList.value.push(discardVehicleInfo)
+		} else {
+			newBindList.value.splice(index, 1);
 		}
-		discardVehicleList.value.push(discardVehicleInfo)
 	}
 
 	function handleDelDiscardVehicleList(item) {
 		discardVehicleList.value.splice(item, 1)
-		vehicleList.value.push(item)
+		newBindList.value.push(item)
 	}
 
 	function handleScanCode() {
@@ -139,8 +146,8 @@
 					})
 					return;
 				}
-				for (let i = 0; i < vehicleList.value.length; i++) {
-					if (vehicleList.value[i].carrierId === vehicleObj.carrierId) {
+				for (let i = 0; i < newBindList.value.length; i++) {
+					if (newBindList.value[i].carrierId === vehicleObj.carrierId) {
 						uni.showToast({
 							icon: "error",
 							title: "载具已存在",
@@ -149,51 +156,28 @@
 						return;
 					}
 				}
-				vehicleList.value.push(JSON.parse(res.result));
+				newBindList.value.push(JSON.parse(res.result));
 			}
 		});
 	}
 
 	function handleSubmit() {
-		dayWorkInfo.dayworkCarriers = vehicleList.value;
-		saveDayWork(dayWorkInfo).then(res => {
-			if (res.code === 200) {
-				uni.showToast({
-					icon: 'success',
-					title: '添加成功'
-				});
-				// uni.$emit('batchReporting-addBatch')
-				uni.$emit('dayworkItemUpdate');
-				uni.navigateBack({
-					url: '/pages/batchReporting/index'
-				})
-			} else {
-				uni.showToast({
-					icon: 'error',
-					title: res.msg
-				});
-			}
-		})
-
 		let carrierRejectList = []
-		let flag = true;
 		for (var i = 0; i < discardVehicleList.value.length; i++) {
 			if (discardVehicleList.value[i].checked && discardVehicleList.value[i].reason == "") {
 				uni.showToast({
-					icon: 'error',
+					icon: 'none',
 					title: '第' + (i + 1) + '条未选择废弃原因'
 				});
-				flag = false;
+				return;
 			}
 			if (discardVehicleList.value[i].checked && discardVehicleList.value[i].reason !== "") {
 				carrierRejectList.push(discardVehicleList.value[i])
 			}
 		}
-		if (carrierRejectList.length > 0 && flag) {
+		if (carrierRejectList.length > 0) {
 			addCarrierReject(carrierRejectList).then((response) => {
-				if (response.code == 200) {
-
-				} else {
+				if (response.code == 200) {} else {
 					uni.showToast({
 						icon: 'error',
 						title: '添加失败',
@@ -201,6 +185,25 @@
 				}
 			})
 		}
+		dayWorkInfo.dayworkCarriers = newBindList.value;
+		saveDayWork(dayWorkInfo).then(res => {
+			if (res.code === 200) {
+				uni.showToast({
+					icon: 'success',
+					title: '添加成功'
+				});
+				// uni.$emit('batchReporting-addBatch')
+				uni.$emit('dayworkItemUpdate');
+				uni.navigateBack({
+					url: '/pages/batchReporting/index'
+				})
+			} else {
+				uni.showToast({
+					icon: 'error',
+					title: res.msg
+				});
+			}
+		})
 	}
 </script>
 
@@ -238,19 +241,20 @@
 
 	.content {
 		width: 90%;
-		height: 80%;
+		height: calc(100% - 100rpx - 100rpx - 80rpx);
 		background-color: rgba(255, 255, 255, 1);
 		margin: 50rpx auto;
 		padding-bottom: 50rpx;
 		border-radius: 12rpx;
 
 		.vehicleList {
-			justify-content: flex-start;
+			justify-content: baseline;
+			align-content: flex-start;
 			flex-wrap: wrap;
 			width: 100%;
-			height: 500rpx;
+			height: 480rpx;
+			padding: 0 64rpx;
 			overflow: auto;
-			padding: 0 80rpx;
 
 			.vehicleNo {
 				padding: 0 10rpx;
@@ -263,11 +267,11 @@
 				border-radius: 6rpx;
 			}
 		}
-		
+
 		.disuseList {
-			border-top:2rpx solid #e1e1e1;
-			height: 500rpx; 
-			overflow: auto; 
+			border-top: 2rpx solid #e1e1e1;
+			height: calc(100% - 480rpx);
+			overflow: auto;
 			width: 90%;
 			margin: 0 auto;
 			padding-top: 10rpx;