回显优化

src/views/engineeringMaintenance/basicData/detail.vue

@@ -3,7 +3,7 @@
 		<el-page-header @back="goBack" :content="title"></el-page-header>
 		<el-divider></el-divider>
 		<div slot="moreSearch" v-if="formType != 0">
-		  <el-radio-group v-model="tabIndex" size="mini" @change="">
+		  <el-radio-group v-model="tabIndex" size="small" @change="">
 		  	<el-radio-button :label="1">基础资料</el-radio-button>
 		  	<el-radio-button :label="2">修改记录</el-radio-button>
 		  </el-radio-group>
@@ -11,9 +11,7 @@
 		</div>
 		<template v-if="tabIndex == 1">
 			<el-card class="box-card">
-				<div slot="header" class="clearfix">
-					<span>项目信息</span>
-				</div>
+				<div style="margin-bottom: 20px;font-weight: bold;">项目信息</div>
 				<div class="mymain-container">
 					<el-form ref="formData" :rules="rules" :model="formData" label-width="110px" size="small" label-position="left">
 						<el-row :gutter="20" justify="start">
@@ -54,7 +52,7 @@
 							<el-col :span="12">
 								<el-form-item label="工单类型" prop="orderSmallTypeText" :required="true">
 									<el-checkbox-group v-model="formData.checkTypeList">
-									    <el-checkbox v-for="(item,index) in orderTypeList" :key="index" :label="item">{{item.orderSmallTypeText}}</el-checkbox>
+									    <el-checkbox v-for="(item,index) in orderTypeList" :disabled="formType==2" :key="index" :label="item.id">{{item.orderSmallTypeText}}</el-checkbox>
 									</el-checkbox-group>
 								</el-form-item>
 							</el-col>
@@ -96,7 +94,7 @@
 								<el-form-item label="" prop="address" :required="true">
 									<el-row :gutter="20">
 										<el-col :span="22">
-											<el-input type="text" v-model="formData.address" placeholder="详细地址"></el-input>
+											<el-input type="text" v-model="formData.address" :disabled="formType==2" placeholder="详细地址"></el-input>
 										</el-col>
 										<el-col :span="2">
 											<geographicalPosi :disabled="formType==2" :formData="this.formData" @selectPosi="selectAddress"/>
@@ -323,10 +321,10 @@
 				
 				<div class="table">
 					<el-table :data="historyList" element-loading-text="Loading" border fit highlight-current-row stripe>
-						<el-table-column prop="" align="center" label="操作类型" ></el-table-column>
-						<el-table-column prop="" align="center" label="操作内容"></el-table-column>
-						<el-table-column prop="" align="center" label="操作人"></el-table-column>
-						<el-table-column prop="" align="center" label="操作时间"></el-table-column>
+						<el-table-column prop="typeText" align="center" label="操作类型" ></el-table-column>
+						<el-table-column prop="content" align="left" label="操作内容"></el-table-column>
+						<el-table-column prop="createBy" align="center" label="操作人"></el-table-column>
+						<el-table-column prop="createTime" align="center" label="操作时间"></el-table-column>
 					</el-table>
 				</div>
 			</el-card>
@@ -378,6 +376,8 @@
 					street: '',
 					streetId: '',
 					address: '',
+					lat: '',
+					lng: '',
 					remark: ''
 				},
 				formData1: {
@@ -450,6 +450,7 @@
 						websit: {websitId: res.data.websitId,name: res.data.websitName},
 						
 					})
+					this.historyList = res.data.operatorLogList
 					this.formData.dateList = [res.data.startTime,res.data.endTime]
 					for(var item of res.data.productList){
 						item.smallList = await this.filterChildren(item.mainId)
@@ -457,25 +458,17 @@
 						item.main = {categoryId: item.mainId,name: item.mainName}
 						item.small = {categoryId: item.smallId,name: item.smallName}
 					}
-					// res.data.productList.forEach(item=>{
-					// 	item.smallList = await that.filterChildren(item.mainId)
-					// 	item.brand = {id: item.brandId,brandName: item.brandName}
-					// 	item.main = {categoryId: item.mainId,name: item.mainName}
-					// 	item.small = {categoryId: item.smallId,name: item.smallName}
-					// })
+
 					res.data.websitList.map(item=>{
 						item.websit = {websitId: item.websitId,name: item.websitName}
 					})
 					res.data.typeList.forEach(item=>{
-						this.formData.checkTypeList.push({
-							id: item.id,
-							orderSmallTypeText: item.orderSmallTypeText
-						})
+						this.formData.checkTypeList.push(item.id)
 					})
 					this.formData2.byList = res.data.byList
 					this.formData1.productList = res.data.productList
 					this.formData3.websitData = res.data.websitList
-					// this.formData.checkTypeList = res.data.typeList
+					
 					console.log(this.formData.checkTypeList,'123123123')
 				})
 			},
@@ -496,15 +489,7 @@
 						params: [{param: 'a.is_rp_project_repair',compare: '=', value: 'YES'}]
 					}
 				}).then(res => {
-					let data = []
-					res.data.records.forEach(item=>{
-						data.push({
-							id: item.id,
-							orderSmallTypeText: item.orderSmallTypeText
-						})
-					})
-					this.orderTypeList = data
-					console.log(this.orderTypeList,'工单类型')
+					this.orderTypeList = res.data.records
 				})
 			},
 			getBrandList(){
@@ -555,6 +540,8 @@
 			  })
 			},
 			selectAddress(data){
+				this.formData.lng = data.center[0]
+				this.formData.lat = data.center[1]
 				// 获取定位的省市区街道
 				var { province, city, district, township } = data.data.addressComponent
 				// 获取选中省名称id
@@ -695,13 +682,11 @@
 				})
 			},
 			save(){
-				let data = []
-				this.formData.checkTypeList.forEach(item=>{
-					data.push({
-						id: item.id,
-						orderSmallTypeText: item.orderSmallTypeText
-					})
-				})
+				let data = this.orderTypeList.filter((it) => {
+				   const index = this.formData.checkTypeList.findIndex((item) => item === it.id)
+				   return index !== -1
+				 })
+				
 				const that = this
 				let params = {
 					...this.formData,