待装箱、已装箱、打印温湿度排版、打印运单添加时间

common/index.scss

@@ -108,4 +108,7 @@ page{
 	.title_login_wx {
 		font-size: 26rpx;
 		margin-top: 12rpx;
-	}
+	}
+.home_card_statist	.u-scroll-list__indicator{
+		margin-top: 0px !important;
+}

components/x-form.vue

@@ -18,6 +18,25 @@
 					</view>
 				</u-form-item>
 				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
+					v-else-if="item.type == 'selectil'">
+					<view class="card_form_item_selectil frameil" @click="change(item)">
+						<view class="title_input_selectil" :class="model[`${item.field}`] ? '' : 'hsColor'">
+							{{model[`${item.field}`] || item.placeholder}}
+						</view>
+						<u-icon name="arrow-down" size="18px"></u-icon>
+					</view>
+				</u-form-item>
+				<!-- 保温箱选择 -->
+				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
+					v-else-if="item.type == 'selectkey' && getCooler()">
+					<view class="card_form_item_selectil frameil" @click="incubatorChange(item)">
+						<view class="title_input_selectil" :class="model[`${item.field}`] ? '' : 'hsColor'">
+							{{model[`${item.field + 'name'}`] || item.placeholder}} {{model[`${item.field}`]}}
+						</view>
+						<u-icon name="arrow-down" size="18px"></u-icon>
+					</view>
+				</u-form-item>
+				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
 					v-else-if="item.type == 'textarea'">
 					<view class="card_form_item">
 						<u-textarea v-model="model[`${item.field}`]" autoHeight
@@ -26,6 +45,24 @@
 				</u-form-item>
 			</view>
 		</u-form>
+		<u-popup :show="incubatorShow" closeable @close="close" @open="open">
+			<view class="card_incubator">
+				<view class="head_place">选择保温箱</view>
+				<view class="card_search">
+					<u-search placeholder="请输入保温箱名称" v-model="keyword" :showAction="false"
+						@change="searchChange"></u-search>
+				</view>
+				<view style="display: flex;flex-direction: column;" v-if="incubatorData.length > 0">
+					<view class="card_title_item" :class="item.name == model.coolerBoxIdname ? 'color_blue' : ''"
+						v-for="(item,index) in incubatorData" :key="index" @click="incubatorClick(item)">
+						{{item.name}}
+					</view>
+				</view>
+				<view style="margin-bottom: 20px;" v-else>
+					<u-empty mode="list" text="暂无保温箱" marginTop="50"></u-empty>
+				</view>
+			</view>
+		</u-popup>
 		<u-picker :defaultIndex="findIndex(model[fieldType], columns[0])" :show="show" :columns="columns"
 			keyName="label" @confirm="confirm($event, fieldType)" @cancel="cancel"></u-picker>
 	</view>
@@ -59,6 +96,10 @@
 				show: false,
 				columns: [],
 				fieldType: '',
+				incubatorShow: false,
+				incubatorData: [],
+				keyword: '',
+				incuType: '',
 			}
 		},
 		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
@@ -88,11 +129,45 @@
 					this.columns.push(e.options)
 				})
 			},
+			// 保温箱选择
+			incubatorChange(event) {
+				this.incuType = event.field
+				// console.log(event, 3254)
+				this.incubatorShow = true
+				this.$api.get('/api/cooler-box', {
+					page: 1,
+					pageSize: 999,
+					isBind: true,
+					name: this.keyword,
+				}).then(res => {
+					if (res.code == 200) {
+						this.incubatorData = res.data.list
+					}
+				})
+			},
+			// 选择保温箱
+			incubatorClick(event) {
+				this.$refs.uForm.validateField(this.incuType);
+				this.model[this.incuType] = event.id
+				this.$emit('incubatorClick', event)
+				this.incubatorShow = false
+			},
+			// 搜索
+			searchChange() {
+				this.incubatorData = []
+				this.incubatorChange()
+			},
 			// 选择确定
 			confirm(value, type) {
+				this.$refs.uForm.validateField(type);
 				this.show = false
 				this.model[type] = value.value[0].label
 			},
+			getCooler() {
+				if (this.model.deliveryCondition == "保温箱") {
+					return true
+				}
+			},
 			// 点击确定
 			cancel() {
 				this.show = false
@@ -103,6 +178,12 @@
 				}
 				return [list.findIndex((item) => (item.label === code || item.label === code))]
 			},
+			close() {
+				this.incubatorShow = false
+			},
+			open() {
+
+			},
 			//子组件校验，传递到父组件
 			async validateForm() {
 				let flag = null
@@ -121,4 +202,83 @@
 	.card_form_item {
 		width: 100%;
 	}
+
+	.card_form_item_selectil {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 6px 9px;
+		height: 52rpx;
+	}
+
+	.title_input_selectil {
+		font-size: 30rpx;
+		// width: 100%;
+	}
+
+	.hsColor {
+		color: rgb(192, 196, 204);
+	}
+
+	// 伪元素1rpx边框
+	.frameil {
+		position: relative; //重要
+	}
+
+	.frameil::after {
+		position: absolute;
+		content: '';
+		border: 2rpx solid #dadbde;
+		width: 200%;
+		height: 200%;
+		top: 0;
+		left: 0;
+		transform: scale(0.5);
+		transform-origin: 0 0;
+		pointer-events: none;
+		border-radius: 20rpx;
+		/* 使伪元素不会阻止鼠标事件 */
+	}
+
+	.card_incubator {
+		min-height: 600rpx;
+		max-height: 900rpx;
+	}
+
+	.head_place {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		padding: 20rpx;
+	}
+
+	.card_search {
+		margin: 20rpx;
+	}
+
+	.card_title_item {
+		position: relative;
+		padding: 30rpx;
+		// border-bottom: 1rpx solid #dadbde;
+	}
+
+	.color_blue {
+		color: #2979ff;
+	}
+
+	.card_title_item:before {
+		content: " ";
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		width: 100%;
+		height: 1px;
+		border-top: 1px solid #e7e6e4;
+		-webkit-transform-origin: 0 0;
+		transform-origin: 0 0;
+		-webkit-transform: scaleY(0.5);
+		transform: scaleY(0.5);
+	}
 </style>

components/x-orderManagement.vue

@@ -30,9 +30,7 @@
 					@click.stop="modifyOrder(item)">
 					<u-button size="small" type="warning" text="修改订单"></u-button>
 				</view>
-				<view class="btn_printil markd10"
-					v-if="item.status == 2 && userInfo.userType === 'sys' || item.status == 3 && userInfo.userType === 'sys'"
-					@click.stop="printBarCode(item)">
+				<view class="btn_printil markd10" v-if="printbarCode(item.status)" @click.stop="printBarCode(item)">
 					<u-button size="small" type="primary" text="打印条码"></u-button>
 				</view>
 			</view>
@@ -102,6 +100,10 @@
 							return '未入库'
 						} else if (value == 5) {
 							return '已入库'
+						} else if (value == 9) {
+							return '待装箱'
+						} else if (value == 10) {
+							return '已装箱'
 						} else {
 							return '已出库'
 						}
@@ -109,6 +111,10 @@
 						// 司机
 						if (value == 2) {
 							return '未装车'
+						} else if (value == 9) {
+							return '待装箱'
+						} else if (value == 10) {
+							return '已装箱'
 						} else if (value == 4) {
 							return '已装车'
 						} else if (value == 6) {
@@ -134,6 +140,10 @@
 						// 仓管
 						if (value == 3) {
 							return '#ff9900'
+						} else if (value == 9) {
+							return '#ff9900'
+						} else if (value == 10) {
+							return '#19be6b'
 						} else if (value == 5) {
 							return '#19be6b'
 						} else {
@@ -143,6 +153,10 @@
 						// 司机
 						if (value == 2) {
 							return '#ff9900'
+						} else if (value == 9) {
+							return '#ff9900'
+						} else if (value == 10) {
+							return '#19be6b'
 						} else if (value == 4) {
 							return '#19be6b'
 						} else if (value == 6) {
@@ -160,6 +174,14 @@
 						return '#606266'
 					}
 				}
+			},
+			// 打印运单
+			printbarCode(type) {
+				if (this.userInfo.userType === 'sys' && [2, 3, 9].includes(type)) {
+					return true
+				} else {
+					return false
+				}
 			}
 		}
 	}

components/x-statistics.vue

@@ -1,19 +1,26 @@
 <template>
 	<!-- 首页统计 -->
-	<view class="home_card">
-		<view class="card_item_home" v-for="(item,index) in list" :key="index" @click="goOrder(index)">
-			<view class="home_head">
-				<view class="home_line" :style="{backgroundColor:item.color,}"></view>
-				<view class="home_item_title">{{item.value || 0}}</view>
-			</view>
-			<view class="item_subheading">{{item.title}}</view>
-			<view class="home_bottom_item">
-				<view class="home_right_icon center_in">
-					<u-icon name="arrow-right" size="15" color="#fff"></u-icon>
+	<view class="home_card_statist">
+		<u-scroll-list :indicator="list.length > 5 ? true : false" style="width: 100%;">
+			<view :class="list.length > 5 ? 'card_two_lines' : 'card_left_lines'">
+				<view class="card_item_home"
+					:style="{width:(list.length > 5? '300rpx' : 'calc(50% - 40rpx)'),margin:(list.length > 5? '0rpx 0rpx 20rpx 20rpx' : '20rpx 20rpx 0rpx 20rpx')}"
+					v-for="(item,index) in list" :key="index" @click="goOrder(index)">
+					<view class="home_head">
+						<view class="home_line" :style="{backgroundColor:item.color,}"></view>
+						<view class="home_item_title">{{item.value || 0}}</view>
+					</view>
+					<view class="item_subheading">{{item.title}}</view>
+					<view class="home_bottom_item">
+						<view class="home_right_icon center_in">
+							<u-icon name="arrow-right" size="15" color="#fff"></u-icon>
+						</view>
+						<span :style="{color: item.color}" class="iconfont home_icon_image" :class="item.icon"></span>
+					</view>
 				</view>
-				<span :style="{color: item.color}" class="iconfont home_icon_image" :class="item.icon"></span>
+				<view style="width: 20rpx;height: 100%;" v-if="list.length > 5"></view>
 			</view>
-		</view>
+		</u-scroll-list>
 	</view>
 </template>
 
@@ -41,6 +48,20 @@
 					color: '#4bc7fc',
 					value: null,
 				}, {
+					sign: 9,
+					id: 'truck',
+					title: '待装箱',
+					icon: 'icon-bepacked',
+					color: '#fece56',
+					value: null,
+				}, {
+					sign: 10,
+					id: 'signfor',
+					title: '已装箱',
+					icon: 'icon-boxed',
+					color: '#9ddd54',
+					value: null,
+				}, {
 					sign: 3,
 					id: 'truck',
 					title: '未入库',
@@ -63,6 +84,20 @@
 					value: null,
 				}],
 				list2: [{
+					sign: 9,
+					id: 'truck',
+					title: '待装箱',
+					icon: 'icon-bepacked',
+					color: '#fece56',
+					value: null,
+				}, {
+					sign: 10,
+					id: 'signfor',
+					title: '已装箱',
+					icon: 'icon-boxed',
+					color: '#9ddd54',
+					value: null,
+				}, {
 					sign: 2,
 					id: 'truck',
 					title: '未装车',
@@ -172,7 +207,7 @@
 </script>
 
 <style lang="scss">
-	.home_card {
+	.home_card_statist {
 		display: flex;
 		flex-direction: row;
 		flex-wrap: wrap;
@@ -204,9 +239,28 @@
 		color: #909399;
 	}
 
-	.card_item_home {
+	.card_two_lines {
+		display: flex;
+		flex-flow: column wrap;
+		height: 580rpx;
+		list-style-type: none;
 		margin-top: 20rpx;
-		width: calc(50% - 40rpx);
+	}
+
+	.card_left_lines {
+		display: flex;
+		height: 580rpx;
+		width: 100%;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-evenly;
+	}
+
+	.card_item_home {
+		flex: none;
+		// margin: 0rpx 20rpx 20rpx 20rpx;
+		// width: calc(50% - 40rpx);
+		// width: 300rpx;
 		background-color: #fff;
 		border-radius: 20rpx;
 	}

pages/codeLogin.vue

@@ -34,7 +34,7 @@
 				</view>
 				<view class="agreement_title">我已阅读并同意<span class="protocol_title">《用户协议》</span>、<span
 						class="protocol_title">《隐私政策》</span>,
-					并授权宝智达气瓶使用该宝智达气瓶账号信息（如昵称、头像、收货地址）进行统一管理
+					并授权宝智达冷链运输使用该宝智达冷链运输账号信息（如昵称、头像、收货地址）进行统一管理
 				</view>
 			</view>
 			<view class="card_btn">

pages/home/index.vue

@@ -42,15 +42,15 @@
 					}, {
 						id: 'truck',
 						title: '扫码装车',
-						icon: 'icon-fankudengji',
+						icon: 'icon-truck',
 						color: '#fece56',
 					},
-					// {
-					// 	id: 'unload',
-					// 	title: '扫码下车',
-					// 	icon: 'icon-chukudan',
-					// 	color: '#fe880e',
-					// },
+					{
+						id: 'encasement',
+						title: '扫码装箱',
+						icon: 'icon-fankudengji',
+						color: '#fe880e',
+					},
 					{
 						id: 'signfor',
 						title: '扫码签收',
@@ -74,12 +74,12 @@
 						icon: 'icon-fankudengji',
 						color: '#9ddd54',
 					},
-					// {
-					// 	id: 'out',
-					// 	title: '扫码出库',
-					// 	icon: 'icon-chukudan',
-					// 	color: '#fece56',
-					// },
+					{
+						id: 'encasement',
+						title: '扫码装箱',
+						icon: 'icon-chukudan',
+						color: '#fece56',
+					},
 					{
 						id: 'add',
 						title: '添加运单',
@@ -114,7 +114,7 @@
 		methods: {
 			getOperate(value) {
 				if (this.token) {
-					if (['truck', 'unload', 'signfor', 'put', 'out'].includes(value.id)) {
+					if (['truck', 'unload', 'signfor', 'put', 'out', 'encasement'].includes(value.id)) {
 						uni.navigateTo({
 							url: '/pages/order/delivery?id=' + value.id + '&title=' + value.title
 						});

pages/login.vue

@@ -41,7 +41,7 @@
 				</view>
 				<view class="agreement_title">我已阅读并同意<span class="protocol_title">《用户协议》</span>、<span
 						class="protocol_title">《隐私政策》</span>,
-					并授权宝智达气瓶使用该宝智达气瓶账号信息（如昵称、头像、收货地址）进行统一管理
+					并授权宝智达冷链运输使用该宝智达冷链运输账号信息（如昵称、头像、收货地址）进行统一管理
 				</view>
 			</view>
 			<view class="card_btn">

pages/mine/index.vue

@@ -15,7 +15,7 @@
 					<view class="mine_title">登录/注册</view>
 				</view>
 			</view>
-			<view class="order_card">
+			<view class="order_card" :style="{padding:(tableList.length > 5 ? '20rpx 20rpx 0rpx 20rpx' : '20rpx')}">
 				<view class="order_head">
 					<view class="head_left">我的运单</view>
 					<!-- <view class="head_right">
@@ -24,13 +24,18 @@
 				</view> -->
 				</view>
 				<view class="card_order">
-					<view class="item_order" v-for="(item,index) in tableList" :key="index" @click="goOrder(index)">
-						<view class="card_tab_image center_in"
-							:style="{background: item.bgColor,backgroundColor:item.colorBg}">
-							<span class="iconfont icon_image" :class="item.icon"></span>
+					<u-scroll-list :indicator="tableList.length > 5 ? true : false" style="width: 100%;">
+						<view :class="tableList.length > 5 ? 'card_majority' : 'card_minority'">
+							<view class="item_order" v-for="(item,index) in tableList" :key="index"
+								@click="goOrder(index)">
+								<view class="card_tab_image center_in"
+									:style="{background: item.bgColor,backgroundColor:item.colorBg}">
+									<span class="iconfont icon_image" :class="item.icon"></span>
+								</view>
+								<view class="order_title">{{item.title}}</view>
+							</view>
 						</view>
-						<view class="order_title">{{item.title}}</view>
-					</view>
+					</u-scroll-list>
 				</view>
 			</view>
 			<view class="card_system">
@@ -105,6 +110,16 @@
 					colorBg: '#4bc7fc',
 					bgColor: 'linear-gradient(to right, #84d4f6, #4bc7fc)',
 				}, {
+					title: '待装箱',
+					icon: 'icon-bepacked',
+					colorBg: '#db8e3e',
+					bgColor: 'linear-gradient(to right, #f6d445, #fecb0e)',
+				}, {
+					title: '已装箱',
+					icon: 'icon-boxed',
+					colorBg: '#9ddd54',
+					bgColor: 'linear-gradient(to right, #b9f377, #9ddd54)',
+				}, {
 					title: '未入库',
 					icon: 'icon-chukudan',
 					colorBg: '#fe880e',
@@ -126,6 +141,16 @@
 						colorBg: '#4bc7fc',
 						bgColor: 'linear-gradient(to right, #84d4f6, #4bc7fc)',
 					}, {
+						title: '待装箱',
+						icon: 'icon-bepacked',
+						colorBg: '#db8e3e',
+						bgColor: 'linear-gradient(to right, #f6d445, #fecb0e)',
+					}, {
+						title: '已装箱',
+						icon: 'icon-boxed',
+						colorBg: '#9ddd54',
+						bgColor: 'linear-gradient(to right, #b9f377, #9ddd54)',
+					}, {
 						title: '未装车',
 						icon: 'icon-xiehuofei',
 						colorBg: '#fe880e',
@@ -141,7 +166,7 @@
 						icon: 'icon-xiehuo',
 						colorBg: '#9ddd54',
 						bgColor: 'linear-gradient(to right, #b9f377, #9ddd54)',
-					}, 
+					},
 					{
 						title: '已签收',
 						icon: 'icon-qianshou_fill',
@@ -244,7 +269,7 @@
 						method: 'GET',
 						header: {},
 						success: (result) => {
-							console.log(result.data.code,14)
+							console.log(result.data.code, 14)
 							if (result.data.code === 0) {
 								setTimeout(() => {
 									_this.isCheckVersion = false;
@@ -264,7 +289,7 @@
 														uni.hideLoading();
 														if (downloadResult
 															.statusCode === 200
-															) {
+														) {
 															plus.runtime
 																.install(
 																	downloadResult
@@ -275,7 +300,7 @@
 																		console
 																			.log(
 																				'App安装成功！'
-																				);
+																			);
 																		uni.showModal({
 																			title: 'App安装成功!',
 																			showCancel: false
@@ -284,11 +309,11 @@
 																			.restart();
 																	},
 																	function(
-																	e) {
+																		e) {
 																		console
 																			.log(
 																				'App安装失败！'
-																				);
+																			);
 																	})
 														}
 													}
@@ -413,11 +438,24 @@
 	}
 
 	.item_order {
+		width: 20%;
+		flex: none;
 		display: flex;
 		flex-direction: column;
 		align-items: center;
 	}
 
+	.card_minority {
+		width: 100%;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.card_majority {
+		width: 100%;
+		display: flex;
+	}
+
 	.card_tab_image {
 		width: 80rpx;
 		height: 80rpx;

pages/order/addWaybill.vue

@@ -7,7 +7,8 @@
 		<view class="title_waybill">收件人:</view>
 		<x-form ref="recipients" :list="list" :model="recipientsModel" :rules="rules"></x-form>
 		<view class="title_waybill">物品信息:</view>
-		<x-form ref="goods" :list="goodsList" :model="goodsModel" :rules="goodsRules"></x-form>
+		<x-form ref="goods" :list="goodsList" :model="goodsModel" :rules="goodsRules"
+			@incubatorClick="incubatorClick"></x-form>
 		<view style="width: 100%;height: 150rpx;"></view>
 		<view class="btn_print" @click="printWaybill">
 			<u-button type="primary" :text="headline"></u-button>
@@ -37,6 +38,8 @@
 				goodsModel: {
 					temperatureInterval: '',
 					deliveryCondition: '',
+					coolerBoxId: '',
+					coolerBoxIdname: '',
 					cargoType: '',
 					quantity: '',
 					remark: '',
@@ -48,11 +51,17 @@
 						message: '请输入姓名',
 						trigger: ['blur', 'change']
 					},
-					phone: {
+					phone: [{
 						required: true,
 						message: '请输入电话',
 						trigger: ['blur', 'change']
-					},
+					}, {
+						validator: (rule, value, callback) => {
+							return uni.$u.test.mobile(value);
+						},
+						message: '电话号码不正确',
+						trigger: ['change', 'blur'],
+					}],
 					address: {
 						required: true,
 						message: '请输入地址',
@@ -75,6 +84,17 @@
 						message: '请选择货物类型',
 						trigger: ['blur', 'change']
 					},
+					coolerBoxId: {
+						type: 'number',
+						required: true,
+						message: '请选择保温箱',
+						trigger: ['blur', 'change']
+					},
+					quantity: {
+						required: true,
+						message: '请输入数量',
+						trigger: ['blur', 'change']
+					},
 				},
 				list: pickupRulesil(),
 				goodsList: formRules(),
@@ -124,6 +144,7 @@
 						consigneeAddressDetails: this.recipientsModel.address,
 						...this.goodsModel,
 					}
+					delete params.coolerBoxIdname
 					params.quantity = Number(params.quantity)
 					uni.showLoading();
 					if (this.type == 1) {
@@ -178,6 +199,12 @@
 				} else {
 					uni.$u.toast('请先完善表单')
 				}
+			},
+			// 保温箱
+			incubatorClick(value) {
+				this.goodsModel.coolerBoxId = value.id
+				this.goodsModel.coolerBoxIdname = value.name
+				this.$forceUpdate()
 			}
 		}
 	}

pages/order/delivery.vue

@@ -127,6 +127,9 @@
 						} else if (this.selectiveType == 'truck') {
 							// 扫码装车
 							this.scanCodes('/api/waybill/car-in')
+						} else if (this.selectiveType == 'encasement') {
+							// 扫码装箱
+							this.scanCodes('/api/waybill/cooler-box-in')
 						} else if (this.selectiveType == 'unload') {
 							// 扫码下车
 							this.scanCodes('/api/waybill/car-out')

pages/order/humiture.vue

@@ -27,8 +27,7 @@
 					</view>
 					<view v-show="item.collapseil">
 						<x-humiture ref="humiture" :taskId="item.id" :waybillNo="orderList.waybillNo"
-							:current="item.presentNum" :probeList="item.deviceSensorList"
-							@sectionChange="sectionChange"></x-humiture>
+							:current="item.presentNum" :probeList="item.deviceSensorList"></x-humiture>
 					</view>
 				</view>
 			</view>

pages/order/index.vue

@@ -3,7 +3,7 @@
 	<view>
 		<u-navbar title="我的运单" autoBack placeholder></u-navbar>
 		<view class="tab_order">
-			<u-tabs :list="tableList" lineColor="#333333" lineWidth="60" :scrollable="false" :current="current"
+			<u-tabs :list="tableList" lineColor="#333333" lineWidth="40" :scrollable="scrollable" :current="current"
 				@change="tabClick"></u-tabs>
 		</view>
 		<view class="card_order_mangement" v-if="orderList.length > 0">
@@ -22,6 +22,12 @@
 				list: [{
 					name: '全部',
 				}, {
+					id: 9,
+					name: '待装箱',
+				}, {
+					id: 10,
+					name: '已装箱',
+				}, {
 					id: 3,
 					name: '未入库',
 				}, {
@@ -34,6 +40,12 @@
 				list1: [{
 						name: '全部',
 					}, {
+						id: 9,
+						name: '待装箱',
+					}, {
+						id: 10,
+						name: '已装箱',
+					}, {
 						id: 2,
 						name: '未装车',
 					}, {
@@ -69,6 +81,7 @@
 				loadingMore: true,
 				loading: '加载中',
 				status: null,
+				scrollable:false,
 			}
 		},
 		onReachBottom() {
@@ -90,6 +103,7 @@
 			if (userInfo.userType == 'sys') {
 				if (userInfo.type == 2) {
 					// 仓管
+					this.scrollable = true
 					this.tableList = this.list
 					let statusType = ''
 					if (this.current != 0 || this.current) {
@@ -99,6 +113,7 @@
 					this.getList()
 				} else if (userInfo.type == 3) {
 					// 司机
+					this.scrollable = true
 					this.tableList = this.list1
 					let statusType = ''
 					if (this.current != 0 || this.current) {

pages/order/orderDetails.vue

@@ -129,6 +129,10 @@
 						// 仓管
 						if (value == 3) {
 							return '未入库'
+						} else if (value == 9) {
+							return '待装箱'
+						} else if (value == 10) {
+							return '已装箱'
 						} else if (value == 5) {
 							return '已入库'
 						} else {
@@ -138,6 +142,10 @@
 						// 司机
 						if (value == 2) {
 							return '未装车'
+						} else if (value == 9) {
+							return '待装箱'
+						} else if (value == 10) {
+							return '已装箱'
 						} else if (value == 4) {
 							return '已装车'
 						} else if (value == 6) {
@@ -163,6 +171,10 @@
 						// 仓管
 						if (value == 3) {
 							return '#ff9900'
+						} else if (value == 9) {
+							return '#ff9900'
+						} else if (value == 10) {
+							return '#19be6b'
 						} else if (value == 5) {
 							return '#19be6b'
 						} else {
@@ -172,6 +184,10 @@
 						// 司机
 						if (value == 2) {
 							return '#ff9900'
+						} else if (value == 9) {
+							return '#ff9900'
+						} else if (value == 10) {
+							return '#19be6b'
 						} else if (value == 4) {
 							return '#19be6b'
 						} else if (value == 6) {
@@ -220,6 +236,7 @@
 		color: #606266;
 		font-size: 30rpx;
 	}
+
 	.title_delivery {
 		font-size: 30rpx;
 		font-weight: 600;

pages/order/quantum.vue

@@ -74,7 +74,7 @@
 		onLoad(value) {
 			const arr = this.$cache.getCache('commodity')
 			this.waybillList = JSON.parse(arr)
-			console.log(this.waybillList, 14)
+			// console.log(this.waybillList, 14)
 			var userInfo = this.$cache.getCache('userInfo')
 			this.userInfo = userInfo
 			if (value.printType == 'barCode') {
@@ -308,9 +308,10 @@
 							.printBarcode(code128)
 							.setSize(1, 1)
 							.setAlign('LT')
-							.text('  ')
-							.text(codeValue + ' \n')
+							// .text('  ')
+							// .text(codeValue + ' \n')
 							// .print(printerUtil.fillLine())
+							
 							.setAlign('LT')
 							.setSize(1, 2)
 							.setSize(2, 1)
@@ -323,7 +324,6 @@
 								.waybillList
 								.senderAddressPhone.substr(7) + ' \n')
 							.print(shippingAddress(this.waybillList.senderAddressDetails))
-							// .print(printerUtil.fillLine())
 							.setSize(1, 2)
 							.setSize(2, 1)
 							.setBold()
@@ -336,6 +336,8 @@
 								.consigneeAddressPhone.substr(7) + ' \n')
 							.print(shippingAddress(this.waybillList.consigneeAddressDetails))
 							.print(printerUtil.fillLine())
+							.print('下单时间:' + this.waybillList.orderTime)
+							// .print(printerUtil.fillLine())
 							.text('备注:')
 							.text('货物类型：' + this.waybillList.cargoType + ' \n')
 							.print('     温度需求：' + this.waybillList.temperatureInterval)
@@ -371,61 +373,96 @@
 							// .print('结束时间：' + item.endTime)
 							// .print(printerUtil.fillLine())
 							item.arr.forEach((item1, index1) => {
-								printerJobs
-									.print('日期:' + item1.time + '单位℃ ')
-									.text('时间 ')
-									.text('|')
-									.text(' ')
-									.text('T1  ')
-									.text(' ')
-									.text('|')
-									.text(' ')
-									.text('T2  ')
-									.text(' ')
-									.text('|')
-									.text(' ')
-									.text('T3  ')
-									.text(' ')
-									.text('|')
-									.text(' ')
-									.text('T4  \n')
-								item1.arr.forEach((item2, index2) => {
+								if (item1.arrNum < 2) {
 									printerJobs
-										.text(`${item2[0].time}`)
+										.print('日期:' + item1.time + '单位℃ ')
+										.text('时间 ')
 										.text('|')
 										.text(' ')
-										.text(
-											`${item2[0] == '---' ? '----' : character(item2[0].T_t) }`
-										)
+										.text('T1  ')
 										.text(' ')
 										.text('|')
 										.text(' ')
-										.text(
-											`${item2[1] == '---' ? '----' : character(item2[1].T_t) }`
-										)
+										.text('T2  ')
 										.text(' ')
 										.text('|')
 										.text(' ')
-										.text(
-											`${item2[2] == '---' ? '----' : character(item2[2].T_t) }`
-										)
+										.text('T3  ')
 										.text(' ')
 										.text('|')
 										.text(' ')
-										.text(
-											`${item2[3] == '---' ? '----' : character(item2[3].T_t) }`
-										)
+										.text('T4  \n')
+									item1.arr.forEach((item2, index2) => {
+										printerJobs
+											.text(`${item2[0].time}`)
+											.text('|')
+											.text(' ')
+											.text(
+												`${item2[0] == '---' ? '----' : character(item2[0].T_t) }`
+											)
+											.text(' ')
+											.text('|')
+											.text(' ')
+											.text(
+												`${item2[1] == '---' ? '----' : character(item2[1].T_t) }`
+											)
+											.text(' ')
+											.text('|')
+											.text(' ')
+											.text(
+												`${item2[2] == '---' ? '----' : character(item2[2].T_t) }`
+											)
+											.text(' ')
+											.text('|')
+											.text(' ')
+											.text(
+												`${item2[3] == '---' ? '----' : character(item2[3].T_t) }`
+											)
 
-									function character(value) {
-										var arr = value.toFixed(1)
-										if (arr.length == 3) {
-											var arr1 = arr + ' '
-											return arr1
-										} else {
-											return arr
+										function character(value) {
+											var arr = value.toFixed(1)
+											if (arr.length == 3) {
+												var arr1 = arr + ' '
+												return arr1
+											} else {
+												return arr
+											}
 										}
-									}
-								})
+									})
+								} else {
+									printerJobs
+										.print('日期:' + item1.time + '单位℃ ')
+										.text('时间')
+										.text('|')
+										.text('温度(℃)')
+										.text('   ')
+										.text('时间')
+										.text('|')
+										.text('温度(℃)  \n')
+									item1.arr.forEach((item2, index2) => {
+										printerJobs
+											.text(`${item2[0].time}`)
+											.text('|')
+											.text(
+												`${item2[0] == '---' ? '----' : character(item2[0].T_t) }`
+											)
+											.text('|')
+											.text(
+												`${item2[1] == '---' ? '----' : character(item2[1].T_t) }`
+											)
+											.text(' ')
+
+										function character(value) {
+											var arr = value.toFixed(1)
+											if (arr.length == 3) {
+												var arr1 = arr + ' '
+												return arr1
+											} else {
+												return arr
+											}
+										}
+									})
+								}
 							})
 							// printerJobs.println()
 						}
@@ -488,6 +525,8 @@
 								dataList.title = item.car.carNo
 							} else if (item.warehouse.id) {
 								dataList.title = item.warehouse.name
+							} else if (item.coolerBox.id) {
+								dataList.title = item.coolerBox.name
 							}
 							arrList.push(dataList)
 						})
@@ -587,12 +626,35 @@
 								const flag = areAllUndefined(result1, result2, result3,
 									result4)
 								if (!flag) {
-									let list2 = [
-										result1 == undefined ? '---' : result1,
-										result2 == undefined ? '---' : result2,
-										result3 == undefined ? '---' : result3,
-										result4 == undefined ? '---' : result4,
-									]
+									function countFalseObjects(objects) {
+										let count = 0;
+										for (let i = 0; i < objects.length; i++) {
+											if (objects[i] === undefined) {
+												count++;
+											}
+										}
+										return count;
+									}
+									const arrNum = countFalseObjects([result1, result2,
+										result3, result4
+									])
+									let list2 = []
+									if (arrNum < 2) {
+										list2.push(result1 == undefined ? '---' : result1)
+										list2.push(result2 == undefined ? '---' : result2)
+										list2.push(result3 == undefined ? '---' : result3)
+										list2.push(result4 == undefined ? '---' : result4)
+									} else {
+										list2.push(result1 == undefined ? '---' : result1)
+										list2.push(result2 == undefined ? '---' : result2)
+									}
+									// let list2 = [
+									// 	result1 == undefined ? '---' : result1,
+									// 	result2 == undefined ? '---' : result2,
+									// 	result3 == undefined ? '---' : result3,
+									// 	result4 == undefined ? '---' : result4,
+									// ]
+									item3.arrNum = arrNum
 									item3.arr.push(list2)
 								}
 

pages/order/waybill.js

@@ -1,9 +1,9 @@
 export const formRules = () => {
 	return [{
 		field: 'temperatureInterval',
-		type: 'select',
+		type: 'selectil',
 		label: '温度需求',
-		placeholder: '请选择',
+		placeholder: '请选择温度需求',
 		required: true,
 		options: [{
 				label: '常温',
@@ -24,9 +24,9 @@ export const formRules = () => {
 		],
 	}, {
 		field: 'deliveryCondition',
-		type: 'select',
+		type: 'selectil',
 		label: '配送要求',
-		placeholder: '请选择',
+		placeholder: '请选择配送要求',
 		required: true,
 		options: [{
 				label: '保温箱',
@@ -50,8 +50,15 @@ export const formRules = () => {
 			}
 		],
 	}, {
+		field: 'coolerBoxId',
+		type: 'selectkey',
+		label: '保温箱',
+		placeholder: '请选择保温箱',
+		required: true,
+		options: [],
+	}, {
 		field: 'cargoType',
-		type: 'select',
+		type: 'selectil',
 		label: '货物类型',
 		placeholder: '请选择',
 		required: true,

static/fonts/demo_index.html

@@ -55,6 +55,30 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">待装箱</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">已装箱</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe71b;</span>
+                <div class="name">扫码装车</div>
+                <div class="code-name">&amp;#xe71b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">合并装箱</div>
+                <div class="code-name">&amp;#xe607;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe685;</span>
                 <div class="name">外接探头</div>
                 <div class="code-name">&amp;#xe685;</div>
@@ -198,9 +222,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1712472193622') format('woff2'),
-       url('iconfont.woff?t=1712472193622') format('woff'),
-       url('iconfont.ttf?t=1712472193622') format('truetype');
+  src: url('iconfont.woff2?t=1724056907926') format('woff2'),
+       url('iconfont.woff?t=1724056907926') format('woff'),
+       url('iconfont.ttf?t=1724056907926') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -227,6 +251,42 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-bepacked"></span>
+            <div class="name">
+              待装箱
+            </div>
+            <div class="code-name">.icon-bepacked
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-boxed"></span>
+            <div class="name">
+              已装箱
+            </div>
+            <div class="code-name">.icon-boxed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-truck"></span>
+            <div class="name">
+              扫码装车
+            </div>
+            <div class="code-name">.icon-truck
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-encasement"></span>
+            <div class="name">
+              合并装箱
+            </div>
+            <div class="code-name">.icon-encasement
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-waijietantou"></span>
             <div class="name">
               外接探头
@@ -444,6 +504,38 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bepacked"></use>
+                </svg>
+                <div class="name">待装箱</div>
+                <div class="code-name">#icon-bepacked</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-boxed"></use>
+                </svg>
+                <div class="name">已装箱</div>
+                <div class="code-name">#icon-boxed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-truck"></use>
+                </svg>
+                <div class="name">扫码装车</div>
+                <div class="code-name">#icon-truck</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-encasement"></use>
+                </svg>
+                <div class="name">合并装箱</div>
+                <div class="code-name">#icon-encasement</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-waijietantou"></use>
                 </svg>
                 <div class="name">外接探头</div>

static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4491859 */
-  src: url('@/static/fonts/iconfont.woff2?t=1712472193622') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1712472193622') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1712472193622') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1724056907926') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1724056907926') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1724056907926') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-bepacked:before {
+  content: "\e660";
+}
+
+.icon-boxed:before {
+  content: "\e662";
+}
+
+.icon-truck:before {
+  content: "\e71b";
+}
+
+.icon-encasement:before {
+  content: "\e607";
+}
+
 .icon-waijietantou:before {
   content: "\e685";
 }

static/fonts/iconfont.json

@@ -6,6 +6,34 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "25069989",
+      "name": "待装箱",
+      "font_class": "bepacked",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "25070009",
+      "name": "已装箱",
+      "font_class": "boxed",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "28870414",
+      "name": "扫码装车",
+      "font_class": "truck",
+      "unicode": "e71b",
+      "unicode_decimal": 59163
+    },
+    {
+      "icon_id": "40923539",
+      "name": "合并装箱",
+      "font_class": "encasement",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
       "icon_id": "17611374",
       "name": "外接探头",
       "font_class": "waijietantou",

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,7 +1,7 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/indexRouter","pages/login","pages/codeLogin","pages/register","pages/home/particulars","pages/order/index","pages/order/delivery","pages/order/orderDetails","pages/order/quantum","pages/order/addWaybill","pages/mine/password","pages/order/logisticsDetails","pages/order/humiture"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"冷链物流","compilerVersion":"4.08","entryPagePath":"pages/indexRouter","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniConfig = {"pages":["pages/indexRouter","pages/login","pages/codeLogin","pages/register","pages/home/particulars","pages/order/index","pages/order/delivery","pages/order/orderDetails","pages/order/quantum","pages/order/addWaybill","pages/mine/password","pages/order/logisticsDetails","pages/order/humiture"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"darkmode":false,"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"冷链物流","compilerVersion":"4.24","entryPagePath":"pages/indexRouter","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
 var __uniRoutes = [{"path":"/pages/indexRouter","meta":{"isQuit":true},"window":{"navigationStyle":"custom"}},{"path":"/pages/login","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/codeLogin","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/register","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/home/particulars","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/index","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/delivery","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/orderDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/quantum","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/addWaybill","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/mine/password","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/logisticsDetails","meta":{},"window":{"navigationStyle":"custom"}},{"path":"/pages/order/humiture","meta":{},"window":{"navigationStyle":"custom"}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});

unpackage/dist/dev/app-plus/static/fonts/demo_index.html

@@ -55,6 +55,30 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe660;</span>
+                <div class="name">待装箱</div>
+                <div class="code-name">&amp;#xe660;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe662;</span>
+                <div class="name">已装箱</div>
+                <div class="code-name">&amp;#xe662;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe71b;</span>
+                <div class="name">扫码装车</div>
+                <div class="code-name">&amp;#xe71b;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe607;</span>
+                <div class="name">合并装箱</div>
+                <div class="code-name">&amp;#xe607;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe685;</span>
                 <div class="name">外接探头</div>
                 <div class="code-name">&amp;#xe685;</div>
@@ -198,9 +222,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1712472193622') format('woff2'),
-       url('iconfont.woff?t=1712472193622') format('woff'),
-       url('iconfont.ttf?t=1712472193622') format('truetype');
+  src: url('iconfont.woff2?t=1724056907926') format('woff2'),
+       url('iconfont.woff?t=1724056907926') format('woff'),
+       url('iconfont.ttf?t=1724056907926') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -227,6 +251,42 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont icon-bepacked"></span>
+            <div class="name">
+              待装箱
+            </div>
+            <div class="code-name">.icon-bepacked
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-boxed"></span>
+            <div class="name">
+              已装箱
+            </div>
+            <div class="code-name">.icon-boxed
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-truck"></span>
+            <div class="name">
+              扫码装车
+            </div>
+            <div class="code-name">.icon-truck
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-encasement"></span>
+            <div class="name">
+              合并装箱
+            </div>
+            <div class="code-name">.icon-encasement
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont icon-waijietantou"></span>
             <div class="name">
               外接探头
@@ -444,6 +504,38 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-bepacked"></use>
+                </svg>
+                <div class="name">待装箱</div>
+                <div class="code-name">#icon-bepacked</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-boxed"></use>
+                </svg>
+                <div class="name">已装箱</div>
+                <div class="code-name">#icon-boxed</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-truck"></use>
+                </svg>
+                <div class="name">扫码装车</div>
+                <div class="code-name">#icon-truck</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-encasement"></use>
+                </svg>
+                <div class="name">合并装箱</div>
+                <div class="code-name">#icon-encasement</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-waijietantou"></use>
                 </svg>
                 <div class="name">外接探头</div>

unpackage/dist/dev/app-plus/static/fonts/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 4491859 */
-  src: url('@/static/fonts/iconfont.woff2?t=1712472193622') format('woff2'),
-       url('@/static/fonts/iconfont.woff?t=1712472193622') format('woff'),
-       url('@/static/fonts/iconfont.ttf?t=1712472193622') format('truetype');
+  src: url('@/static/fonts/iconfont.woff2?t=1724056907926') format('woff2'),
+       url('@/static/fonts/iconfont.woff?t=1724056907926') format('woff'),
+       url('@/static/fonts/iconfont.ttf?t=1724056907926') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-bepacked:before {
+  content: "\e660";
+}
+
+.icon-boxed:before {
+  content: "\e662";
+}
+
+.icon-truck:before {
+  content: "\e71b";
+}
+
+.icon-encasement:before {
+  content: "\e607";
+}
+
 .icon-waijietantou:before {
   content: "\e685";
 }

unpackage/dist/dev/app-plus/static/fonts/iconfont.json

@@ -6,6 +6,34 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "25069989",
+      "name": "待装箱",
+      "font_class": "bepacked",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "25070009",
+      "name": "已装箱",
+      "font_class": "boxed",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "28870414",
+      "name": "扫码装车",
+      "font_class": "truck",
+      "unicode": "e71b",
+      "unicode_decimal": 59163
+    },
+    {
+      "icon_id": "40923539",
+      "name": "合并装箱",
+      "font_class": "encasement",
+      "unicode": "e607",
+      "unicode_decimal": 58887
+    },
+    {
       "icon_id": "17611374",
       "name": "外接探头",
       "font_class": "waijietantou",