diff --git a/ebike-maintenance/pages/warehouse/component/enterdetails.vue b/ebike-maintenance/pages/warehouse/component/enterdetails.vue
index e3f368e..a874103 100644
--- a/ebike-maintenance/pages/warehouse/component/enterdetails.vue
+++ b/ebike-maintenance/pages/warehouse/component/enterdetails.vue
@@ -12,7 +12,7 @@
 					<selectComponentType v-model="baseFormData.componentType" placeholder="请选择部件" :disabled="readOnly"
 						@change="changeType"></selectComponentType>
 				</uni-forms-item>
-				<uni-section  :title="listData.title" type="line">
+				<uni-section :title="listData.title" type="line">
 					<template v-slot:right>
 						<uni-icons type="scan" size="20" @click="onScanClick" v-if="!readOnly"></uni-icons>
 					</template>
@@ -29,7 +29,7 @@
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</uni-section>
-				<!-- <uni-section v-if="baseFormData.componentType == '262711452730000'" title="电池列表" type="line">
+				<uni-section v-if="baseFormData.componentType == '262711452730000'" title="电池列表" type="line">
 					<template v-slot:right>
 						<uni-icons type="scan" size="20" @click="onBatteryScanClick" v-if="!readOnly"></uni-icons>
 					</template>
@@ -52,8 +52,7 @@
 					</template>
 					<uni-swipe-action>
 						<uni-swipe-action-item v-for="(item,index) in listEcuData" :key="index"
-							:right-options="listHelmetOptions"
-							:disabled="readOnly">
+							:right-options="listHelmetOptions" :disabled="readOnly">
 							<div class="content-box">
 								<label>{{item.helmetCode}}</label>
 								<div v-show="readOnly" @click="delData(index)">
@@ -70,7 +69,8 @@
 					</template>
 					<uni-swipe-action>
 						<uni-swipe-action-item v-for="(item,index) in listEcuData" :key="index"
-							:right-options="listEcuOptions" @click="onEcuListClick($event, index, item)" :disabled="readOnly">
+							:right-options="listEcuOptions" @click="onEcuListClick($event, index, item)"
+							:disabled="readOnly">
 							<div class="content-box">
 								<label>sn：{{item.sn}}</label>
 								<div v-show="readOnly" @click="delData(index)">
@@ -80,7 +80,7 @@
 							</div>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
-				</uni-section> -->
+				</uni-section>
 				<uni-forms-item label="入库数量" required name="enterQuantity"
 					:rules="[{ required: true, errorMessage: '请输入入库数量' }]">
 					<uni-number-box :background="(readOnly||disabledNum)?'#d8d9d0':'#ffffff'"
@@ -156,16 +156,16 @@
 	const listBatteryData = ref([]);
 	const listHelmetData = ref([]);
 	const listEcuData = ref([]);
-	
-	const helType="262711452730001";
-	const batType="262711452730000";
-	const ecuType="262711452730008";
-	
-	const listData=ref({
-		code:"",
-		title:"",
-		data:[{
-			num:""
+
+	const helType = "262711452730001";
+	const batType = "262711452730000";
+	const ecuType = "262711452730008";
+
+	const listData = ref({
+		code: "",
+		title: "",
+		data: [{
+			num: ""
 		}]
 	});
 
@@ -246,7 +246,7 @@
 		})
 	};
 
-	
+
 
 	function getBatteryList(componentEnterRecordId, pageNo = 1, pageSize = 100) {
 		// 组装参数
@@ -414,7 +414,7 @@
 			backgroundColor: '#007aff'
 		}
 	}]);
-	
+
 	const listEcuOptions = reactive([{
 		text: '删除',
 		style: {
@@ -443,7 +443,7 @@
 			}
 		}
 	}
-	
+
 	const onEcuListClick = (e, index, item) => {
 		if (e.position == 'right') {
 			if (e.index == 0) {
@@ -454,26 +454,11 @@
 			}
 		}
 	}
-
-<<<<<<< HEAD
 	const onBatteryScanClick = (e) => {
 		uni.navigateTo({
 			url: `/pages/common/batchscancode?type=inBattery`, //
 		});
 	}
-=======
-	// const onBatteryScanClick = (e) => {
-	// 	uni.navigateTo({
-	// 		url: `/pages/common/batchscancode?type=inBattery`, //
-	// 	});
-	// }
->>>>>>> ab947837558b2a749e63502a218648f66f83454d
-
-	// const onHelmetScanClick = (e) => {
-	// 	uni.navigateTo({
-	// 		url: `/pages/common/batchscancode?type=inHelmet`, //
-	// 	});
-	// }
 
 	function onScanClick(e) {
 		uni.navigateTo({