最新

.env.js

@@ -1,10 +1,10 @@
 const UNI_APP = {
-	APP_DEV_URL: 'https://colddelivery.coldbaozhida.com/cold_delivery',
-	APP_PROD_URL: 'https://colddelivery.coldbaozhida.com/cold_delivery',
-	APP_LINK_URL: 'https://colddelivery.coldbaozhida.com',
-	// APP_DEV_URL: 'http://182.43.247.65:6280', //测试
-	// APP_PROD_URL: 'http://182.43.247.65:6280', //测试
-	// APP_LINK_URL: 'http://182.43.247.65:6280', //测试
+	// APP_DEV_URL: 'https://colddelivery.coldbaozhida.com/cold_delivery',
+	// APP_PROD_URL: 'https://colddelivery.coldbaozhida.com/cold_delivery',
+	// APP_LINK_URL: 'https://colddelivery.coldbaozhida.com',
+	APP_DEV_URL: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
+	APP_PROD_URL: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
+	APP_LINK_URL: 'http://colddeliverytest.coldbaozhida.com:9090/cold_delivery', //测试
 	// APP_DEV_URL: 'http://192.168.11.15:6280', //本地
 	// APP_PROD_URL: 'http://192.168.11.15:6280', //本地
 	// APP_LINK_URL: 'http://192.168.11.15:6280', //本地

components/x-form.vue

@@ -13,6 +13,7 @@
 							<u-icon name="scan" size="18px"></u-icon>
 							<span>扫一扫</span>
 						</view>
+						<view class="title_unit" v-if="item.unit">{{item.unit}}</view>
 					</view>
 				</u-form-item>
 				<u-form-item :required="item.required ? true : false" :label="item.label" :prop="item.field"
@@ -105,7 +106,8 @@
 							<u-tag :text="getTagName(item)" closable plain @close="closeFreeze(item)"></u-tag>
 						</view>
 						<view v-if="tagFlag">
-							<input class="input_tag" :focus="tagFocus" v-model="value" @blur="tagBlur"></input>
+							<input class="input_tag" type="number" :focus="tagFocus" v-model="value"
+								@blur="tagBlur"></input>
 						</view>
 						<view style="margin-top: 20rpx;" v-else>
 							<u-tag text="+新增" plain @click="addTagClick"></u-tag>
@@ -225,8 +227,8 @@
 							})
 						})
 					}
+					this.selectedData = JSON.parse(JSON.stringify(this.model.freezeClaim))
 					this.freezeShow = true
-					this.getSelected()
 				} else {
 					this.$emit('selector', value)
 				}
@@ -381,27 +383,33 @@
 						}
 					}
 				})
-				this.getSelected()
-				this.$forceUpdate()
-			},
-			// 获取已选
-			getSelected() {
-				var arr = []
-				this.freezeList.forEach(item => {
-					if (item.flag) {
-						arr.push(item.value)
+				if (event.flag) {
+					this.selectedData.push(event.value)
+				} else {
+					function removeElement(arr, element) {
+						return arr.filter(function(item) {
+							return item !== element;
+						});
 					}
-				})
-				this.selectedData = arr
+					this.selectedData = removeElement(this.selectedData, event.value)
+				}
+				this.$forceUpdate()
 			},
 			// 获取选择名称
 			getTagName(event) {
 				let name
-				this.freezeList.forEach(item => {
-					if (event == item.value) {
-						name = item.label
+				let index = this.freezeList.findIndex((item) => item.value === event);
+				// 如果有就替换，没有就添加
+				if (index !== -1) {
+					let arr1 = this.freezeList.find(item1 => {
+						return item1.value === event;
+					});
+					if (arr1) {
+						name = arr1.label
 					}
-				})
+				} else {
+					name = event
+				}
 				return name
 			},
 			// 数组展示
@@ -425,9 +433,23 @@
 			},
 			// 失去焦点
 			tagBlur(event) {
-				if (!event) {
+				var arr = {
+					value: Number(this.value),
+				}
+				this.freezeSelect(arr)
+				if (!this.value) {
+					this.tagFlag = false
+				} else {
+					var arr1 = this.value.split('小时')
+					this.selectedData.push(Number(arr1[0]))
+					this.value = ''
 					this.tagFlag = false
 				}
+				this.selectedData = this.uniqueArray(this.selectedData)
+			},
+			// 去重
+			uniqueArray(arr) {
+				return [...new Set(arr)];
 			},
 			// 单个表单验证
 			formValidation(event) {
@@ -572,11 +594,23 @@
 	}
 
 	.input_tag {
-		min-width: 110rpx;
+		width: fit-content;
+		width: -webkit-fit-content;
+		width: -moz-fit-content;
+		width: 70rpx;
+		min-width: 50rpx;
 		margin-top: 20rpx;
 		padding: 0rpx 20rpx;
-		height: 56rpx;
+		height: 52rpx;
 		border-radius: 6rpx;
 		border: 1rpx solid #dadbde;
+		font-size: 26rpx;
+		text-align: center;
+	}
+
+	.title_unit {
+		display: flex;
+		align-items: center;
+		margin-left: 10rpx;
 	}
 </style>

components/x-orderManagement.vue

@@ -77,7 +77,7 @@
 					<view class="img_sign_rejection">拒收原因</view>
 					<u-textarea v-model="rejectionValue" placeholder="请输入拒收原因" autoHeight></u-textarea>
 				</view>
-				<u-button style="margin-top: 30rpx;" size="small" type="primary" text="确定"
+				<u-button style="margin-top: 30rpx;" size="small" type="primary" text="确定" :loading="signLoading"
 					@click="confirm()"></u-button>
 			</view>
 		</u-popup>
@@ -173,6 +173,7 @@
 				title: '确定完成该订单？',
 				content: '确定完成后将无法分配运单，重新下单后即可分配',
 				orderId: null,
+				signLoading: false,
 			}
 		},
 		mounted() {
@@ -265,6 +266,7 @@
 					verify = this.verification(params)
 				}
 				if (verify) {
+					this.signLoading = true
 					this.$api.post('/api/waybill/receipt', params).then(res => {
 						if (res.code == 200) {
 							this.signForShow = false
@@ -273,6 +275,7 @@
 						} else {
 							uni.$u.toast(res.msg)
 						}
+						this.signLoading = false
 					})
 				}
 			},

pages/home/IceManagement.vue

@@ -13,8 +13,8 @@
 		<view style="display: flex;flex-direction: column;" v-if="list.length > 0">
 			<view class="card_item_iceraft" v-for="(item,index) in list" :key="index">
 				<view class="top_title space_between">
-					<view class="title_Icecode">编号： {{item.code}}</view>
-					<view :style="{color: filterColor(item.iceRaftRecord.status)}">
+					<view class="title_Icecode">编号： <span>{{item.code}}</span></view>
+					<view class="state_title_ice" :style="{color: filterColor(item.iceRaftRecord.status)}">
 						{{matchingType(item.iceRaftRecord.status)}}
 					</view>
 				</view>
@@ -231,12 +231,20 @@
 
 	.title_Icecode {
 		color: #000000;
-		font-size: 32rpx;
+		font-size: 30rpx;
+
+		span {
+			font-weight: bold;
+		}
+	}
+
+	.state_title_ice {
+		font-size: 30rpx;
 	}
 
 	.title_itemIce {
 		color: #000000;
-		font-size: 30rpx;
+		font-size: 28rpx;
 		margin-top: 10rpx;
 
 		span {

pages/homePage.vue

@@ -1,9 +1,9 @@
 <template>
 	<view class="home_app_bgc">
 		<u-navbar placeholder bgColor="#a9e3f1" leftIcon="" @rightClick="rightClick">
-			<!-- <view class="u-nav-slot" slot="left">
-				贵州宝智达科技有限公司
-			</view> -->
+			<view class="u-nav-slot" slot="left">
+				{{userInfo.dept.appName}}<span v-if="userInfo.dept.appName">-</span>智慧冰排管理系统
+			</view>
 			<view class="u-nav-slot" slot="right">
 				<u-icon name="list-dot" size="30" color="#fff"></u-icon>
 			</view>
@@ -23,7 +23,7 @@
 						<view class="mine_title">登录/注册</view>
 					</view>
 				</view>
-				<view class="order_card_home">
+				<view class="order_card_home" v-if="!iceRaftManage">
 					<view class="order_title_head" @click="getOperate('order',0)">
 						<span>我的订单</span>
 						<u-icon name="arrow-right-double" size="20" color="#000"></u-icon>
@@ -39,8 +39,24 @@
 						</view>
 					</view>
 				</view>
+				<view class="bp_Card_width" v-else>
+					<view class="bpzs_cardil" @click="getOperate('manage')">
+						<span class="iconfont image_bp icon-bingpaiguanli"></span>
+						<span class="title_bpzsil">冰排追溯管理</span>
+					</view>
+					<view class="right_bpzs_card">
+						<view class="bpcrk_cardil" @click="getOperate('enter','冰排入库')">
+							<span class="iconfont image_cr icon-bingpairuku"></span>
+							<span class="title_bpzsil">冰排入库</span>
+						</view>
+						<view class="bpcrk_cardil" @click="getOperate('out','冰排装箱')">
+							<span class="iconfont image_cr icon-bingpaichuku"></span>
+							<span class="title_bpzsil">冰排装箱</span>
+						</view>
+					</view>
+				</view>
 			</view>
-			<view class="bp_Card_width">
+			<view class="bp_Card_width" v-if="!iceRaftManage">
 				<view class="bpzs_card" @click="getOperate('manage')">
 					<span class="iconfont image_bp icon-bingpaiguanli"></span>
 					<span class="title_bpzs">冰排追溯管理</span>
@@ -77,14 +93,14 @@
 				</view>
 				<u-icon name="arrow-right" size="20"></u-icon>
 			</view>
-			<view class="card_bottom_add" @click="getOperate('add')">
+			<view class="card_bottom_add" @click="getOperate('add')" v-if="!iceRaftManage">
 				<view style="display: flex;align-items: center;">
 					<span class="iconfont icon-tianjiadingdan icon_bottom"></span>
 					<span>添加订单</span>
 				</view>
 				<u-icon name="arrow-right" size="20"></u-icon>
 			</view>
-			<view class="card_bottom_add" @click="getOperate('book')">
+			<view class="card_bottom_add" @click="getOperate('book')" v-if="!iceRaftManage">
 				<view style="display: flex;align-items: center;">
 					<span class="iconfont icon-dizhibu icon_bottom"></span>
 					<span>地址簿</span>
@@ -99,7 +115,7 @@
 					<view class="card_mine_message">
 						<view class="card_rectangle">
 							<view class="card_circle"></view>
-							<view class="left_order_head" @click="getOperate('order',0)">
+							<view class="left_order_head" @click="getOperate('order',0)" v-if="!iceRaftManage">
 								<!-- <u-icon name="order" size="30" color="#5ac725"></u-icon> -->
 								<span class="iconfont icon_fast icon-quanbudingdan"></span>
 							</view>
@@ -115,7 +131,7 @@
 					</view>
 					<image class="card_mine_image" src="../static/portrait.png" mode=""></image>
 				</view>
-				<view class="classify_card" @click="getOperate('book')">
+				<view class="classify_card" @click="getOperate('book')" v-if="!iceRaftManage">
 					<span>地址簿</span>
 					<u-icon name="arrow-right"></u-icon>
 				</view>
@@ -172,6 +188,8 @@
 				height: '',
 				// 是否释冷
 				iceColdFlag: true,
+				// 是否只展示冰排管理
+				iceRaftManage: false,
 			}
 		},
 		onShow() {
@@ -182,8 +200,10 @@
 			var userInfo = this.$cache.getCache('userInfo')
 			if (token) {
 				if (userInfo) {
+					this.iceRaftManage = userInfo.dept.iceRaftManage
 					this.userInfo = userInfo
 				} else {
+					this.getUserInfo()
 					this.userInfo = {}
 				}
 			} else {
@@ -193,15 +213,14 @@
 				this.userInfo = {}
 			}
 		},
-		mounted() {
-			this.getUserInfo()
-		},
+		mounted() {},
 		methods: {
 			getUserInfo() {
 				this.$api.get('/api/user/profile').then(res => {
 					if (res.code == 200) {
 						if (this.token) {
 							this.userInfo = res.data.user
+							this.iceRaftManage = res.data.user.dept.iceRaftManage
 							this.$cache.setCache('userInfo', this.userInfo)
 						}
 					} else {
@@ -425,6 +444,17 @@
 		background-image: linear-gradient(-225deg, #7edfe4 0%, #ffffff 48%, #7edfe4 100%);
 	}
 
+	.bpzs_cardil {
+		display: flex;
+		align-items: center;
+		flex-direction: column;
+		justify-content: center;
+		width: 45%;
+		height: 300rpx;
+		border-radius: 10rpx;
+		background-image: linear-gradient(-225deg, rgba(126, 223, 228, .6) 0%, rgba(255, 255, 255, .6) 48%, rgba(126, 223, 228, .6) 100%);
+	}
+
 	.image_bp {
 		font-size: 70px;
 		color: #19be6b;
@@ -436,6 +466,11 @@
 		color: #19be6b;
 	}
 
+	.title_bpzsil {
+		font-size: 36rpx;
+		color: #019d48;
+	}
+
 	.right_bpzs_card {
 		display: flex;
 		width: 55%;
@@ -454,6 +489,16 @@
 		background-image: linear-gradient(-225deg, #7edfe4 0%, #ffffff 48%, #7edfe4 100%);
 	}
 
+	.bpcrk_cardil {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 97%;
+		height: 145rpx;
+		border-radius: 10rpx;
+		background-image: linear-gradient(-225deg, rgba(126, 223, 228, .6) 0%, rgba(255, 255, 255, .6) 48%, rgba(126, 223, 228, .6) 100%);
+	}
+
 	.image_cr {
 		margin-right: 20rpx;
 		font-size: 30px;

pages/login.vue

@@ -5,7 +5,7 @@
 		<view class="card_login">
 			<view class="card_head_logo">
 				<image class="mine_image" src="../static/logo.png" mode=""></image>
-				<view class="welcome_title">欢迎登录宝智达冷链送药</view>
+				<view class="welcome_title">欢迎登录智配送App</view>
 			</view>
 			<u--form labelPosition="left" :model="formList" :rules="rules" ref="uForm">
 				<u-form-item label="账号" prop="username" labelWidth="50" borderBottom ref="item1">
@@ -118,12 +118,12 @@
 					}).then((res) => {
 						if (res.code == 200) {
 							this.$cache.setToken(res.token)
-							// this.getUserInfo()
+							this.getUserInfo()
 
-							uni.redirectTo({
-								url: '/pages/homePage'
-								// url: '/pages/indexRouter'
-							})
+							// uni.redirectTo({
+							// 	url: '/pages/homePage'
+							// 	// url: '/pages/indexRouter'
+							// })
 						} else {
 							uni.showToast({
 								title: res.msg,

pages/order/Incubator.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 选择保温箱、 -->
 	<view>
-		<u-navbar autoBack placeholder></u-navbar>
+		<u-navbar title="保温箱管理" autoBack placeholder></u-navbar>
 		<u-sticky :customNavHeight="navbarHeight()">
 			<view class="search_card">
 				<u-search :showAction="false" v-model="keyword" @change="searchChange"
@@ -36,8 +36,8 @@
 							<view style="display: flex;align-items: center;height: 60rpx;">
 								<span class="iconfont icon-bingpaiguanli icon_ice"></span>
 								<view style="margin-left: 5rpx;">
-									<view class="ice_title">{{item1.label}}</view>
 									<view class="ice_code">{{item1.code}}</view>
+									<view class="ice_title">{{item1.label}}</view>
 								</view>
 							</view>
 							<view style="display: flex;flex-direction: column;">
@@ -61,7 +61,8 @@
 						@click.stop="endCooling(item.ice_raft)">
 						<u-button size="small" type="warning" text="结束释冷"></u-button>
 					</view>
-					<view style="flex: 1;" v-if="item.useStatus && item.useStatus == '1'" @click.stop="endOfUseil(item)">
+					<view style="flex: 1;" v-if="item.useStatus && item.useStatus == '1'"
+						@click.stop="endOfUseil(item)">
 						<u-button size="small" type="error" text="结束使用"></u-button>
 					</view>
 				</view>
@@ -119,7 +120,7 @@
 		},
 		mounted() {
 			var userInfo = this.$cache.getCache('userInfo')
-			console.log(userInfo,356)
+			console.log(userInfo, 356)
 			this.isCoolerInfo = userInfo.dept
 			this.getIncubator()
 		},
@@ -496,7 +497,7 @@
 	}
 
 	.ice_title {
-		font-size: 28rpx;
+		font-size: 20rpx;
 	}
 
 	.icon_ice {
@@ -507,6 +508,7 @@
 
 	.ice_code {
 		font-size: 24rpx;
+		font-weight: bold;
 	}
 
 	.title_cryophilic {

pages/order/addIceRaft.vue

@@ -5,7 +5,7 @@
 		<x-form ref="recipients" :list="list" :model="recipientsModel" :rules="rules"></x-form>
 		<view style="width: 100%;height: 150rpx;"></view>
 		<view class="btn_print" @click="printWaybill">
-			<u-button type="primary" :text="headline"></u-button>
+			<u-button type="primary" :loading="printLoading" :text="headline"></u-button>
 		</view>
 	</view>
 </template>
@@ -22,19 +22,35 @@
 					id: null,
 					code: '',
 					label: '',
-					status: '',
+					status: '正常',
 					freezeClaim: [],
 					suitableForCold: null,
 					iceColdAddress: '',
 				},
 				rules: {
-					code: {
+					code: [{
 						required: true,
 						message: '请输入编号',
 						trigger: ['blur', 'change']
-					},
-					label: {
+					}, {
 						required: true,
+						validator: (rule, value, callback) => {
+							if (!value) {
+								return callback(new Error('请输入数值'));
+							}
+							if (!/^(\d+)?(\.\d+)?$/.test(value)) {
+								return callback(new Error('请输入有效的数值'));
+							}
+							// 如果需要校验整数，可以使用下面的正则表达式
+							// if (!/^\d+$/.test(value)) {
+							//   return callback(new Error('请输入整数'));
+							// }
+							return callback();
+						},
+						trigger: 'blur'
+					}],
+					label: {
+						required: false,
 						message: '请输入冰排备注',
 						trigger: ['blur', 'change']
 					},
@@ -49,21 +65,70 @@
 						message: '请输入冷冻要求',
 						trigger: ['blur', 'change']
 					},
+					suitableForCold: [{
+						required: false,
+						message: '请输入释冷温度',
+						trigger: ['blur', 'change']
+					}, {
+						required: false,
+						validator: (rule, value, callback) => {
+							if (!value && rule.required) {
+								return callback(new Error('请输入释冷温度'));
+							}
+							if (value) {
+								if (!/^(\d+)?(\.\d+)?$/.test(value)) {
+									return callback(new Error('请输入有效的数值'));
+								}
+							}
+							return callback();
+						},
+						trigger: ['blur', 'change']
+					}],
+					coolingRequirement: [{
+						required: false,
+						message: '请输入释冷要求',
+						trigger: ['blur', 'change']
+					}, {
+						required: false,
+						validator: (rule, value, callback) => {
+							if (!value && rule.required) {
+								return callback(new Error('请输入释冷要求'));
+							}
+							if (value) {
+								if (!/^(\d+)?(\.\d+)?$/.test(value)) {
+									return callback(new Error('请输入有效的数值'));
+								}
+							}
+							return callback();
+						},
+						trigger: ['blur', 'change']
+					}],
 					iceColdAddress: {
-						required: true,
+						required: false,
 						message: '请输入释冷地点',
 						trigger: ['blur', 'change']
 					},
-					suitableForCold: {
-						required: true,
-						message: '请输入释冷温度',
+					sort: {
+						required: false,
+						validator: (rule, value, callback) => {
+							if (!value && rule.required) {
+								return callback(new Error('请输入排序编号'));
+							}
+							if (value) {
+								if (!/^(\d+)?(\.\d+)?$/.test(value)) {
+									return callback(new Error('请输入有效的数值'));
+								}
+							}
+							return callback();
+						},
 						trigger: ['blur', 'change']
-					},
+					}
 				},
 				list: [],
 				isIceInfo: {},
 				headline: '添加冰排',
 				type: 1,
+				printLoading: false,
 			}
 		},
 		onShow() {
@@ -130,6 +195,7 @@
 						params.status = '1'
 					}
 					params.codeList.push(this.recipientsModel.code)
+					this.printLoading = true
 					if (this.recipientsModel.id) {
 						params.id = this.recipientsModel.id
 						params.code = this.recipientsModel.code
@@ -139,7 +205,12 @@
 								uni.navigateBack({
 									delta: 1
 								});
+							} else {
+								uni.$u.toast(res.msg)
 							}
+							this.printLoading = false
+						}).catch(() => {
+							this.printLoading = false
 						})
 					} else {
 						this.$api.post('/api/ice-raft', params).then(res => {
@@ -147,7 +218,12 @@
 								uni.navigateBack({
 									delta: 1
 								});
+							} else {
+								uni.$u.toast(res.msg)
 							}
+							this.printLoading = false
+						}).catch(() => {
+							this.printLoading = false
 						})
 					}
 				} else {

pages/order/addWaybill.vue

@@ -5,7 +5,8 @@
 		<view class="space_between card_Address">
 			<view class="title_waybill">收件人:</view>
 			<view class="card_flex_il" @click="addressBook('consignee')">
-				<u-icon name="order" size="22"></u-icon>
+				<!-- <u-icon name="order" size="22"></u-icon> -->
+				<span class="iconfont icon-dizhibu icon_bottom"></span>
 				<view class="title_sou">收件人簿</view>
 			</view>
 		</view>
@@ -14,7 +15,7 @@
 			:addloading="addloading" @selector="selector" @getSweep="getSweep"></x-form>
 		<view class="safeBottom" style="width: 100%;height: 150rpx;"></view>
 		<view class="btn_print" @click="printWaybill">
-			<u-button type="primary" :text="headline"></u-button>
+			<u-button type="primary" :loading="printLoading" :text="headline"></u-button>
 		</view>
 		<u-popup :show="courierShow" mode="bottom" closeable :round="10" :closeOnClickOverlay="false" @close="close">
 			<view class="card_courier">
@@ -139,6 +140,7 @@
 				textEmpty: '暂无配送员',
 				selectiveType: '',
 				addloading: false,
+				printLoading: false,
 			}
 		},
 		onUnload() {
@@ -216,6 +218,7 @@
 						}
 						delete params.drugBarCode
 						uni.showLoading();
+						this.printLoading = true
 						if (this.type == 1) {
 							// 添加运单
 							this.$api.post('/api/waybill', params).then(res => {
@@ -227,8 +230,10 @@
 									uni.$u.toast(res.msg)
 								}
 								uni.hideLoading();
+								this.printLoading = false
 							}).catch(() => {
 								uni.hideLoading();
+								this.printLoading = false
 							})
 						} else {
 							// 修改运单
@@ -242,8 +247,10 @@
 									uni.$u.toast('修改失败')
 								}
 								uni.hideLoading();
+								this.printLoading = false
 							}).catch(() => {
 								uni.hideLoading();
+								this.printLoading = false
 							})
 						}
 					} else {
@@ -435,6 +442,11 @@
 		font-size: 32rpx;
 	}
 
+	.icon_bottom {
+		font-size: 36rpx;
+		margin-right: 10rpx;
+	}
+
 	.card_Address:before {
 		content: " ";
 		position: absolute;

pages/order/freezer.vue

@@ -166,7 +166,7 @@
 			// 判断冰排是否选择
 			getRecord() {
 				this.list.forEach(item => {
-					let index = this.selectedList.findIndex((event) => event === item.id);
+					let index = this.selectedList.findIndex((event) => event === item.iceRaftRecord.id);
 					if (index !== -1) {
 						item.whetherFlag = true
 					} else {
@@ -177,12 +177,12 @@
 			},
 			// 选择冰排
 			choiceIce(event) {
-				let index = this.selectedList.findIndex((item) => item === event.id);
+				let index = this.selectedList.findIndex((item) => item === event.iceRaftRecord.id);
 				// 如果有就替换，没有就添加
 				if (index !== -1) {
 					this.selectedList.splice(index, 1);
 				} else {
-					this.selectedList.push(event.id);
+					this.selectedList.push(event.iceRaftRecord.id);
 				}
 				if (this.isIceInfo.isIceReleaseCold) {
 					this.getRecord()
@@ -196,7 +196,7 @@
 				}
 				this.list.forEach(item => {
 					if (item.whetherFlag) {
-						this.selectedList.push(item.id)
+						this.selectedList.push(item.iceRaftRecord.id)
 					}
 				})
 				this.getRecord()
@@ -210,7 +210,7 @@
 				}
 				this.list.forEach(item => {
 					if (item.whetherFlag) {
-						this.selectedList.push(item.id)
+						this.selectedList.push(item.iceRaftRecord.id)
 					}
 				})
 				this.getRecord()

pages/order/iceCold.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 冷冻柜管理、 -->
 	<view>
-		<u-navbar autoBack placeholder></u-navbar>
+		<u-navbar title="冷冻柜管理" autoBack placeholder></u-navbar>
 		<u-sticky :customNavHeight="navbarHeight()">
 			<view class="search_card">
 				<u-search :showAction="false" v-model="keyword" @change="searchChange"

pages/order/iceRaft.vue

@@ -1,7 +1,7 @@
 <template>
 	<!-- 冰排管理、 -->
 	<view>
-		<u-navbar autoBack placeholder @rightClick="rightClick">
+		<u-navbar title="冰排管理" autoBack placeholder @rightClick="rightClick">
 			<view class="u-nav-slot" slot="right">
 				<u-icon name="plus-circle" size="20"></u-icon>
 				<span>添加</span>
@@ -20,7 +20,7 @@
 						<span class="iconfont imagebwx icon-bingpaiguanli"></span>
 						<view>
 							<view class="title_ice">{{item.code}}</view>
-							<view class="title_ice">{{item.label}}</view>
+							<view class="title_ice_laber">{{item.label}}</view>
 						</view>
 					</view>
 					<view class="card_Cooling_release" style="display: flex;flex-direction: column;">
@@ -36,7 +36,8 @@
 					</view>
 				</view>
 				<view class="right_up_down">
-					<view :style="{color:geticeColor(item.status)}">{{geticeState(item.status)}}</view>
+					<view class="state_title_ice" :style="{color:geticeColor(item.status)}">{{geticeState(item.status)}}
+					</view>
 					<view class="card_btn_emit center_in" @click="selectIncubator(item)">
 						编辑<u-icon name="edit-pen" size="26"></u-icon>
 					</view>
@@ -215,6 +216,7 @@
 	}
 
 	.right_up_down {
+		flex: none;
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
@@ -237,12 +239,17 @@
 	}
 
 	.title_ice {
-		font-size: 32rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+	}
+
+	.title_ice_laber {
+		font-size: 28rpx;
 	}
 
 	.title_ice1 {
 		margin-right: 30rpx;
-		font-size: 30rpx;
+		font-size: 28rpx;
 	}
 
 	.space_between {
@@ -263,6 +270,7 @@
 	}
 
 	.card_btn_emit {
+		flex: none;
 		margin-top: 4rpx;
 		display: flex;
 		justify-content: flex-end;
@@ -270,4 +278,8 @@
 		font-size: 30rpx;
 		border-radius: 40rpx;
 	}
+
+	.state_title_ice {
+		font-size: 28rpx;
+	}
 </style>

pages/order/waybill.js

@@ -109,7 +109,7 @@ export const iceRaftRulesil = () => {
 		label: '冰排备注',
 		placeholder: '请输入冰排备注',
 		type: 'input',
-		required: true,
+		required: false,
 	}, {
 		field: 'status',
 		label: '状态',
@@ -144,13 +144,27 @@ export const iceRaftRulesil = () => {
 		label: '释冷温度',
 		placeholder: '请输入释冷温度',
 		type: 'input',
-		required: true,
+		required: false,
+		unit: '℃',
+	}, {
+		field: 'coolingRequirement',
+		label: '释冷要求',
+		placeholder: '请输入释冷要求',
+		type: 'input',
+		required: false,
+		unit: '小时',
 	}, {
 		field: 'iceColdAddress',
 		label: '释冷地点',
 		placeholder: '请输入释冷地点',
 		type: 'input',
-		required: true,
+		required: false,
+	}, {
+		field: 'sort',
+		label: '排序',
+		placeholder: '请输入排序编号',
+		type: 'input',
+		required: false,
 	}]
 }
 export const printList = () => {