diff --git a/src/style/search.scss b/src/style/search.scss
index 8509eea..570e6a9 100644
--- a/src/style/search.scss
+++ b/src/style/search.scss
@@ -2,13 +2,13 @@
 	border-radius: 8px;
 	width: 560px;
 	.el-input-group__append{
-		background: var(--el-color-primary);
+		background: var(--el-color-white);
 		padding: 0;
 		box-shadow: none;
-		border-radius: 0 7px 7px 0;
-		border-top: 2px solid var(--el-color-primary);
-		border-bottom: 2px solid var(--el-color-primary);
-		border-right: 2px solid var(--el-color-primary);
+		border-radius:0 8px 8px 0;
+		//border-top: 2px solid var(--el-color-primary);
+		//border-bottom: 2px solid var(--el-color-primary);
+		//border-right: 2px solid var(--el-color-primary);
 	}
 	.el-input-group__prepend{
 		background: var(--el-color-white);
@@ -16,15 +16,15 @@
 		box-shadow: none;
 		border-radius: 8px 0 0 8px;
 		border: 0;
-		border-top: 2px solid #c4c7ce;
-		border-bottom: 2px solid #c4c7ce;
-		border-left: 2px solid #c4c7ce;
+		//border-top: 2px solid #c4c7ce;
+		//border-bottom: 2px solid #c4c7ce;
+		//border-left: 2px solid #c4c7ce;
 	}
 
 	.el-input__wrapper{
 		box-shadow: none;
-		border-top: 2px solid #c4c7ce;
-		border-bottom: 2px solid #c4c7ce;
+		//border-top: 2px solid #c4c7ce;
+		//border-bottom: 2px solid #c4c7ce;
 	}
 	.searchDrop{
 		height: 100%;
@@ -43,11 +43,12 @@
 	}
 	.searchBtn{
 		color: var(--el-color-white);
+		background: var(--el-color-primary);
 		width: 86px;
 		display: flex;
 		align-items: center;
 		justify-content: center;
-		border-radius: 0 7px 7px 0;
+		border-radius: 8px;
 		cursor: pointer;
 		.name{
 			margin-right: 5px;
diff --git a/src/views/login/userRegister.vue b/src/views/login/userRegister.vue
index d553a65..32e76e7 100644
--- a/src/views/login/userRegister.vue
+++ b/src/views/login/userRegister.vue
@@ -1,26 +1,30 @@
 <template>
 	<common-page title="注册">
-		<el-steps :active="stepActive" simple finish-status="success" process-status="finish">
-			<el-step title="填写信息" />
-			<el-step title="创建账户" />
-			<el-step title="注册完成" />
-		</el-steps>
-		<el-form v-if="stepActive==0" ref="stepForm_0" :model="form" :rules="rules" label-position="top">
-			<el-form-item label="公司名称" prop="company_name">
-				<el-input v-model="form.company_name" placeholder="请输入公司名称"></el-input>
-			</el-form-item>
+		<el-alert type="info" class="registerAlert" :closable="false">注册账户</el-alert>
+<!--		<el-steps :active="stepActive" simple finish-status="success" process-status="finish">-->
+<!--			<el-step title="填写信息" />-->
+<!--			<el-step title="创建账户" />-->
+<!--			<el-step title="注册完成" />-->
+<!--		</el-steps>-->
+<!--		<el-form v-if="stepActive==0" ref="stepForm_0" :model="form" :rules="rules" label-position="top">-->
+<!--			<el-form-item label="公司名称" prop="company_name">-->
+<!--				<el-input v-model="form.company_name" placeholder="请输入公司名称"></el-input>-->
+<!--			</el-form-item>-->
+<!--			<el-form-item label="客户名称" prop="customer">-->
+<!--				<el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>-->
+<!--			</el-form-item>-->
+<!--		</el-form>-->
+		<el-form ref="stepForm_1" :model="form" :rules="rules" label-position="top">
 			<el-form-item label="客户名称" prop="customer">
 				<el-input v-model="form.customer" placeholder="请输入客户名称"></el-input>
 			</el-form-item>
-		</el-form>
-		<el-form v-if="stepActive==1" ref="stepForm_1" :model="form" :rules="rules" label-position="top">
 			<el-form-item label="电子邮箱" prop="email">
 				<el-input v-model="form.email" placeholder="请输入邮箱地址"></el-input>
 			</el-form-item>
 			<el-form-item label="登录账号" prop="login_name">
 				<el-input v-model="form.login_name" placeholder="请输入账号"></el-input>
 			</el-form-item>
-			<el-form-item label="用户名" prop="name">
+			<el-form-item label="昵称" prop="name">
 				<el-input v-model="form.name" placeholder="请输入用户名"></el-input>
 			</el-form-item>
 			<el-form-item label="手机号" prop="mobile">
@@ -46,8 +50,8 @@
 		</div>
 		<el-form style="text-align: center;">
 			<div class="btnBox">
-				<el-button class="btn" v-if="stepActive>0 && stepActive<2" @click="pre" style="width: 100%;">上一步</el-button>
-				<el-button class="btn" v-if="stepActive<2" type="primary" @click="next" style="width: 100%;">下一步</el-button>
+<!--				<el-button class="btn" v-if="stepActive>0 && stepActive<2" @click="pre" style="width: 100%;">上一步</el-button>-->
+				<el-button class="btn" v-if="stepActive<2" type="primary" @click="next" style="width: 100%;">提交注册</el-button>
 				<el-button class="btn" v-if="stepActive==2" type="primary" @click="goLogin" style="width: 100%;">完成</el-button>
 			</div>
 		</el-form>
@@ -68,7 +72,7 @@
 				disabled:false,
 				time:60,
 
-				stepActive: 0,
+				stepActive: 1,
 				form: {
 					email: "",
 					mobile:"",
@@ -86,7 +90,7 @@
 						{ required: true, message: '请输入登录账号'}
 					],
 					name:[
-						{ required: true, message: '请输入用户名'}
+						{ required: false, message: '请输入用户名'}
 					],
 					mobile: [
 						{ required: true, message: '请输入手机号'}
@@ -199,4 +203,13 @@
 			transform: rotate(-45deg) translateY(-3px);
 		}
 	}
+	.registerAlert{
+		::v-deep .el-alert__content{
+			width: 100%;
+			.el-alert__description{
+				color: var(--el-color-primary);
+				text-align: center;
+			}
+		}
+	}
 </style>
diff --git a/src/views/order/order-logs.vue b/src/views/order/order-logs.vue
index 7ee2738..8652728 100644
--- a/src/views/order/order-logs.vue
+++ b/src/views/order/order-logs.vue
@@ -24,7 +24,7 @@ export default {
 			},
 			params:{
 				bill_id: Number(this.$route.query.id),
-				bill_type:1,   // 1维保单  2维修单
+				bill_type:this.$route.query.type,   // 1维保单  2维修单
 			}
 		}
 	},
diff --git a/src/views/order/orderList/index.vue b/src/views/order/orderList/index.vue
index 9e1e721..02603d7 100644
--- a/src/views/order/orderList/index.vue
+++ b/src/views/order/orderList/index.vue
@@ -13,7 +13,6 @@
 				</scImport>
 				<el-button type="primary" v-auth="'maintenanceOrderSubmit'" plain :size="size" :disabled="selection.length!=1" @click="save_maintenance">提交维保</el-button>
 				<el-button type="success" v-auth="'maintenanceOrderApproval'" :size="size" icon="sc-icon-OrderReview" :disabled="selection.length==0" @click="batch_review">批量审核</el-button>
-<!--				<el-button type="primary" v-auth="'maintenanceOrderSend'" plain :size="size" :disabled="selection.length==0" @click="issued_maintenance">下发维保</el-button>-->
 				<el-button type="danger" v-auth="'maintenanceOrderDelete'" plain :size="size" icon="el-icon-Delete" :disabled="selection.length==0" @click="batch_del"></el-button>
 			</div>
 			<div class="right-panel">
@@ -65,9 +64,6 @@
 									<div v-auth="'maintenanceOrderDetail'">
 										<el-dropdown-item @click="table_show(scope.row)" icon="sc-icon-See">工单详情</el-dropdown-item>
 									</div>
-<!--									<div v-auth="'maintenanceOrderSend'">-->
-<!--										<el-dropdown-item  icon="sc-icon-OrderMaintenance" @click="table_send(scope.row)">下发维保</el-dropdown-item>-->
-<!--									</div>-->
 									<div v-auth="'orderLogsList'">
 										<el-dropdown-item  icon="sc-icon-OrderLog" @click="table_logs(scope.row)" divided>工单日志</el-dropdown-item>
 									</div>
@@ -122,6 +118,7 @@ export default {
 				{name:'PE确认时间',type:'date',code:'pe_confirmation_time',show:true},
 				{name:'保修到期',type:'date',code:'warranty_end_date',show:true},
 				{name:'SLA到期时间',type:'date',code:'sla_expiration',show:true},
+				{name:'客户',type:'select',code:['customer_name'],placeholder:"请选择客户",isOpen:true,show:false},
 				{name:'维修单号',type:'text',code:['repair_order_no'],placeholder:"请输入维修单号",isOpen:true,show:false},
 				{name:'维修等级',type:'select',code:'maintenance_level', data:[], placeholder:"请选择维修等级",show:false},
 				{name:'园区名称',type:'select',code:['park_name'],data:[],placeholder:"请输入园区名称",isOpen:true,show:false},
@@ -297,38 +294,14 @@ export default {
 		},
 		async save_maintenance() {
 			eventBus.$emit('tagClose','/order/submit-order',{id:this.selection.map(em => em.id)[0]});
-
-			// const params = {order_ids: this.selection.map(em => em.id)};
-			// const res = await this.$API.orders.order.maintenance.submit.post(params);
-			// if (res.code == 200) {
-			// 	this.$refs.table.refresh();
-			// 	this.$message.success("操作成功")
-			// }
-		},
-		async issued_maintenance() {
-			const params = {order_ids: this.selection.map(em => em.id)};
-			const res = await this.$API.orders.order.maintenance.send.post(params);
-			if (res.code == 200) {
-				this.$refs.table.refresh();
-				this.$message.success("操作成功")
-			}
 		},
 		// 工单设置
 		async table_submit(row){
 			eventBus.$emit('tagClose','/order/submit-order',{id:row.id});
 		},
-		async table_send(row) {
-			let params = {
-				order_ids:[row.id]
-			}
-			const res = await this.$API.orders.order.maintenance.send.post(params);
-			if (res.code == 200) {
-				this.$refs.table.refresh();
-			}
-		},
 		// 工单日志
 		table_logs(row){
-			eventBus.$emit('tagClose','/order/order-logs',{id:row.id});
+			eventBus.$emit('tagClose','/order/order-logs',{id:row.id,type:1});
 		},
 		//表格选择后回调事件
 		selectionChange(selection){
diff --git a/src/views/order/orderPlan/index.vue b/src/views/order/orderPlan/index.vue
index 5b73a84..5731083 100644
--- a/src/views/order/orderPlan/index.vue
+++ b/src/views/order/orderPlan/index.vue
@@ -85,9 +85,9 @@ export default {
 			searchShow:false,
 			searchList:[
 				{name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true},
-				{name:'故障类型',type:'select',code:'fault_type', data:[], placeholder:"请选择故障类型",show:true},
-				{name:'整机型号',type:'select',code:'repair_status', data:[], placeholder:"请选择整机型号",isOpen:true,show:true},
-				{name:'园区名称',type:'select',code:'repair_status', data:[], placeholder:"请选择园区名称",isOpen:true,show:false},
+				{name:'故障类型',type:'select',code:['fault_type'], data:[], placeholder:"请选择故障类型",show:true},
+				{name:'整机型号',type:'select',code:['device_model'], data:[], placeholder:"请选择整机型号",isOpen:true,show:true},
+				{name:'机房城市',type:'select',code:['city'], data:[], placeholder:"请选择机房城市",isOpen:true,show:false},
 				{name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false},
 				{name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true},
 			],
diff --git a/src/views/order/repairList/index.vue b/src/views/order/repairList/index.vue
index 4400f11..56a17f7 100644
--- a/src/views/order/repairList/index.vue
+++ b/src/views/order/repairList/index.vue
@@ -30,6 +30,7 @@
 								<el-dropdown-menu>
 									<el-dropdown-item  icon="sc-icon-MaintenanceSetup">执行维修</el-dropdown-item>
 									<el-dropdown-item @click="table_show(scope.row, 'see')" icon="sc-icon-See">工单详情</el-dropdown-item>
+									<el-dropdown-item  icon="sc-icon-OrderLog" @click="table_logs(scope.row)" divided>工单日志</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
 						</el-dropdown>
@@ -84,10 +85,10 @@ export default {
 			exportShow:false,
 			searchShow:false,
 			searchList:[
-				{name:'创建日期',type:'date',code:'activation_date',show:true},
+				{name:'创建日期',type:'date',code:'created_at',show:true},
 				{name:'维修单号',type:'text',code:'repair_order_no', data:[], placeholder:"请输入维修单号",show:true},
-				{name:'故障类型',type:'select',code:'fault_type', data:[], placeholder:"请选择故障类型",show:true},
-				{name:'状态',type:'select',code:'repair_status', data:[], placeholder:"请选择状态",isOpen:true,show:false},
+				{name:'故障类型',type:'select',code:['fault_type'], data:[], placeholder:"请选择故障类型",show:true},
+				{name:'状态',type:'select',code:['repair_status'], data:[], placeholder:"请选择状态",isOpen:true,show:false},
 				{name:'故障描述',type:'text',code:['fault_description'],placeholder:"请输故障描述",isOpen:true,show:false},
 				{name:'关键字',type:'text',code:['fault_description','device_sn'],keyword:true,show:true},
 			],
@@ -128,29 +129,30 @@ export default {
 				}
 			})
 		},
-		getSelectData(item){
-			let {data,params} = item;
+		async getSelectData(item) {
+			let {data, params} = item;
 			this.params = params;
-			if(data.code == "id"){
-				this.getCompanyList(data,params)
-			}else if(data.code == "active_status"){
-				this.getStatusList(data,params);
+			let searchParams = this.$TOOL.objCopy(params);
+			searchParams.field = ""
+			if (typeof data.code === 'string') {
+				searchParams.field = data.code;
+			} else {
+				searchParams.field = data.code[0];
 			}
-		},
-
-		async getCompanyList(data,params) {
-			const res = await this.$API.system.company.select.post(params);
-			if(res.data && res.data.length>0){
-				res.data.forEach(item=>{
-					item.label = item.full_name;
-				})
-			}
-			if(res.code == 200){
-				this.searchList.forEach(item=>{
-					if(item.code == data.code){
-						item.data = res.data;
+			if (data.type == 'select') {
+				const res = await this.$API.orders.order.maintenance.field.post(searchParams);
+				if (res.code == 200) {
+					if (res.data && res.data.length > 0) {
+						res.data.forEach(item => {
+							item.label = item[data.code];
+						})
 					}
-				})
+					this.searchList.forEach(item => {
+						if (item.code == data.code) {
+							item.data = res.data;
+						}
+					})
+				}
 			}
 		},
 
@@ -162,16 +164,20 @@ export default {
 			})
 		},
 		//查看
-		// table_show(row){
-		// 	eventBus.$emit('tagClose','/order/order-info',{id:row.id});
-		// },
+		table_show(row){
+			eventBus.$emit('tagClose','/order/order-info',{id:row.id});
+		},
 		//编辑
 		table_edit(row){
 			this.dialog.save = true
 			this.$nextTick(() => {
-				this.$refs.saveDialog.open('edit').setData(row)
+				this.$refs.saveDialog.open('edit').setData(row);
 			})
 		},
+		// 工单日志
+		table_logs(row){
+			eventBus.$emit('tagClose','/order/order-logs',{id:row.id,type:2});
+		},
 		// 删除
 		async table_del(row){
 			this.$confirm(`确定删除 ${row.name} 吗？`, '提示', {