diff --git a/components/orderCard/OrderCard.vue b/components/orderCard/OrderCard.vue
index e8cb42e..299e572 100644
--- a/components/orderCard/OrderCard.vue
+++ b/components/orderCard/OrderCard.vue
@@ -51,14 +51,73 @@
 						<view @click.stop="gettel" class="orderCardBtnGroupItem">联系司机</view>
 					</template>
 					<template v-if="orderData.orderStatus == 3 && orderData.isWeiXiu!=='1'">
-						<view @click.stop="toRepair(orderData.id)" class="orderCardBtnGroupItem">转维修</view>
+						<view @click.stop="showRepair" class="orderCardBtnGroupItem">转维修</view>
 					</template>
 				</view>
 			</view>
 		</view>
 		<u-picker :show="show" :columns="columns" @confirm="confirms" @cancel="cancels" keyName="realName"></u-picker>
 		<u-modal :show="showDelete" title="是否确认删除" :showCancelButton="true" @confirm="deleteOk"
-			@cancel="deleteCancel"></u-modal>
+			@cancel="deleteCancel"></u-modal>
+		<u-modal :show="toRepairShow" title="转维修" :showCancelButton="true" @confirm="toRepair" @cancel="()=>{toRepairShow=false}">
+			  <u-form
+			  				labelPosition="left"
+			  				:model="formData"
+			  				ref="uForm"
+			  		>
+					<u-form-item label="姓名" borderBottom>
+						<u--input
+								placeholder="请输入车主姓名"
+								v-model="formData.name"
+								border="none"
+						></u--input>
+					</u-form-item>
+					<u-form-item label="联系电话" borderBottom>
+						<u--input
+								placeholder="请输入车主联系电话"
+								v-model="formData.phone"
+								border="none"
+						></u--input>
+					</u-form-item>
+					
+					<u-form-item
+							label="品牌"
+							borderBottom
+							@click="pinpaiShow = true;"
+							ref="item1"
+					>
+						<u-input v-model="formData.brandName" disabled disabledColor="#ffffff" placeholder="请选择车辆品牌" border="none"></u-input>
+						<u-icon
+								slot="right"
+								name="arrow-right"
+						></u-icon>
+					</u-form-item>
+					
+					<u-form-item label="型号" borderBottom>
+						<u--input
+								placeholder="请输入车辆型号"
+								v-model="formData.brandAndModel[1]"
+								border="none"
+						></u--input>
+					</u-form-item>
+					
+					<u-form-item
+							label="服务顾问"
+							borderBottom
+							@click="fuwuShow = true;"
+							ref="item1"
+					>
+						<u-input v-model="formData.adviserName" disabled disabledColor="#ffffff" placeholder="请选择服务顾问" border="none"></u-input>
+						<u-icon
+								slot="right"
+								name="arrow-right"
+						></u-icon>
+					</u-form-item>
+					
+			</u-form>
+		</u-modal>
+		<u-picker :show="pinpaiShow" :columns="[brandList]" :keyName="'brandName'" @confirm="onPinpaiConfirm" @cancel="()=>{pinpaiShow=false}"></u-picker>
+		<u-picker :show="fuwuShow" :columns="[staffList]" :keyName="'name'" @confirm="onFuwuConfirm" @cancel="()=>{fuwuShow=false}"></u-picker>
 	</view>
 </template>
 
@@ -76,7 +135,9 @@
 			status: {
 				type: [String, Number],
 				default: ''
-			}
+			},
+			brandList: [],
+			staffList: []
 		},
 		computed: {
 			statusStr() {
@@ -101,8 +162,17 @@
 				columns: [],
 				id: '',
 				show: false,
-				showDelete: false,
+				showDelete: false,
+				toRepairShow: false,
+				pinpaiShow: false,
+				fuwuShow: false,
+				formData:{
+					brandAndModel:[]
+				}
 			}
+		},
+		onLoad(){
+
 		},
 		methods: {
       hasRole,
@@ -129,10 +199,31 @@
             return ''
         }
       },
-	  toRepair(id){
-			let data ={
-				id: id
-			}
+	  onPinpaiConfirm(e){
+		  console.log(e)
+		  this.formData.brandName = e.value[0].brandName
+		  this.formData.brandAndModel[0] = e.value[0].id
+		  this.pinpaiShow = false
+	  },
+	  onFuwuConfirm(e){
+		  this.formData.adviserName = e.value[0].name
+		  this.formData.adviserId = e.value[0].id
+		  this.formData.userId = e.value[0].userId
+		  this.fuwuShow = false
+	  },
+	  showRepair(){
+		  if(this.orderData.connectionName){
+			  this.formData.name = this.orderData.connectionName
+		  }
+		  if(this.orderData.connectionPhone){
+			  this.formData.phone = this.orderData.connectionPhone
+		  }
+		  this.toRepairShow = true
+	  },
+	  toRepair(){
+		 let data = JSON.parse(JSON.stringify(this.formData))
+		 data.id = this.orderData.id
+		 console.log(data,'data');
 			request({
 				url: '/app/rescueInfo/toRepair',
 				method: 'post',
@@ -142,6 +233,7 @@
 					uni.showToast({
 						title: '操作成功'
 					})
+					this.toRepairShow = false
 					this.$emit('refresh')
 				}
 			})
diff --git a/pages/rescue/historylist.vue b/pages/rescue/historylist.vue
index 9272a1a..bbd9cda 100644
--- a/pages/rescue/historylist.vue
+++ b/pages/rescue/historylist.vue
@@ -26,7 +26,7 @@
 				<image src="../../static/quesheng.png" mode=""></image>
 			</view>
 
-			<order-card-vue @refresh="getlist" :status="gindex" v-for="(item,index) in orderList" :key="index" :orderData="item"></order-card-vue>
+			<order-card-vue @refresh="getlist" :status="gindex" v-for="(item,index) in orderList" :key="index" :orderData="item" :brandList="brandList" :staffList="staffList"></order-card-vue>
 			<!-- <view class="boxt" v-for="(item,index) in orderList" :key="index" @click="godetail(item.id)">
 				<view class="boxt-left">
 					<view class="left-lan">
@@ -82,7 +82,9 @@
 			return {
 				// 搜索内容
 				searchText: '',
-				gindex: 1,
+				gindex: 1,
+				brandList: [],
+				staffList:[],
 				orderList: [
 					// {
 					// 	rescueTypeStr: '扣车',
@@ -132,7 +134,9 @@
 		},
 		onLoad(option) {
 			this.gindex = option.id
-			this.getlist()
+			this.getlist()
+			this.getBrandList()
+			this.getStaffList()
 		},
 		onReachBottom() {
 			console.log('执行了');
@@ -148,7 +152,39 @@
 				this.getlist()
 			}
 		},
-		methods: {
+		methods: {
+			getBrandList(){
+				let data = {
+					pageSize: 1000,
+					pageNum: 1,
+				}
+				request({
+					url: '/base/carBrand/page',
+					method: 'get',
+					params: data
+				}).then((res) => {
+					console.log('list', res);
+					if (res.code == 200) {
+						this.brandList = res.data.records
+					}
+				})
+			},
+			getStaffList(){
+				let data = {
+					pageSize: 1000,
+					pageNum: 1,
+				}
+				request({
+					url: '/company/staff/list',
+					method: 'get',
+					params: data
+				}).then((res) => {
+					console.log('list', res);
+					if (res.code == 200) {
+						this.staffList = res.data
+					}
+				})
+			},
 			godetail(id) {
 				uni.navigateTo({
 					url: '/pages/details/details?id=' + id