车辆信息管理

src/views/order/modal/rentOrderDetailModal.vue

@@ -75,7 +75,7 @@
 				<el-col :span="8">
 					<el-form-item label="还车公司:">
 						<span>{{form.endCompanyName}}</span>
-						<el-button size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button>
+						<el-button v-show="form.status == 4 || form.status == 5" size="mini" type="primary" style="padding: 7px 9px;" @click="resetReturn = true">更换</el-button>
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -205,7 +205,6 @@ export default {
 	},
 	mounted() {
 		console.log(this.form)
-
 		this.dialogVisible = true
 		if (this.form.status == 2) {
 			this.form.ststusName = '取消'
@@ -246,24 +245,25 @@ export default {
 			} else {
 				this.returnForm.id = this.form.detailId
 				updateEndCompany(this.returnForm).then(data => {
-          console.log(data.status);
-          
 					if (data.status == 200) {
 						this.$notify({
 							title: '成功',
 							message: '修改还车地点成功',
 							type: 'success',
 							duration: 3000
-            })
-            this.resetReturn = false
-					}else{
-            	this.$notify({
+						})
+						this.resetReturn = false;
+						this.dialogVisible = false;
+						this.$emit('rentOrderDetailDialogEvent', true)
+						
+					} else {
+						this.$notify({
 							title: '失败',
 							message: data.message,
 							type: 'error',
-							duration:3000
+							duration: 3000
 						})
-          }
+					}
 				})
 			}
 		},

src/views/order/rentVehicleInfo/index.vue

@@ -775,7 +775,7 @@ export default {
     illegalEvent(params) {
       this.illegalVisible = false;
       if (params) {
-        console.log(params);
+        // console.log(params);
       }
     },
     /**
@@ -784,11 +784,11 @@ export default {
     detailEvent(params) {
       this.detailVisible = false;
       if (params) {
-        console.log(params);
+        // console.log(params);
       }
     },
     handleHandoverOrderVehicle(row) {
-      console.log(row);
+      // console.log(row);
       this.modalTitle = "交车记录";
       this.form = row;
       if (this.form.status == 2) {
@@ -837,7 +837,7 @@ export default {
     },
     getAllOrderVehicleCrosstown() {
       getOrderVehicleCrosstown(this.orderVehicleQuery).then(response => {
-        console.log(response);
+        // console.log(response);
         if (response.data.length <= 0) {
           alert("交还车记录不存在");
         } else {
@@ -851,7 +851,7 @@ export default {
     },
 
     handleReturnOrderVehicle(row) {
-      console.log(row);
+      // console.log(row);
       this.modalTitle = "还车记录";
       this.form = row;
       if (this.form.status == 2) {
@@ -899,7 +899,7 @@ export default {
       this.depositDetail = false;
     },
     handleRefundVehicle(row) {
-      console.log(row);
+      // console.log(row);
       var that = this;
       that.pictureList = [];
       that.dedDetail = [];
@@ -947,7 +947,7 @@ export default {
             }
 
             that.depositRefundRecord = arr;
-            console.log(that.depositRefundRecord);
+            // console.log(that.depositRefundRecord);
           }
         });
       });
@@ -1068,7 +1068,7 @@ export default {
       page(this.listQuery).then(response => {
         if (response.data.data) {
           response.data.data.map(function(el) {
-            console.log(el);
+            // console.log(el);
             if (el.status == 2) {
               el.ststusName = "取消";
             }
@@ -1106,6 +1106,7 @@ export default {
     handleCurrentChange(val) {
       this.listQuery.page = val;
       this.getList();
+      
     },
     templateModel() {
       this.costDetail = {

src/views/summit/index.vue

@@ -15,7 +15,7 @@
               @change="changeTime"
             ></el-date-picker>
           </el-form-item>
-          <el-form-item label="用户来源">
+          <el-form-item label="峰会状态">
             <el-select class="filter-item" v-model="query.status" placeholder="状态">
               <el-option
                 v-for="(val,index) in status"
@@ -173,7 +173,7 @@ export default {
       list: [],
       listLoading: true,
       status: [
-        { id: 0, name: "默认" },
+        { id: 0, name: "全部" },
         { id: 1, name: "报名中" },
         { id: 2, name: "进行中" },
         { id: 3, name: "已结束" }
@@ -274,6 +274,7 @@ export default {
     review(row) {
       this.reviewRow = row;
       this.reviewShow = true;
+      console.log(this.reviewRow);
     },
     deleteSummit() {},
     getStatusName(status) {

src/views/summit/model/reviewPopup.vue

@@ -142,13 +142,13 @@ export default {
 			return { Authorization: getToken() }
 		}
 	},
-	watch: {
-		dialogVisible(newValue, oldValue) {
-			if (!newValue) {
-				this.$emit('summitDialogEvent', this.result)
-			}
-		}
-	},
+	// watch: {
+	// 	dialogVisible(newValue, oldValue) {
+	// 		if (!newValue) {
+	// 			this.$emit('summitDialogEvent', this.result)
+	// 		}
+	// 	}
+	// },
 	mounted() {
 		this.getOrderInfo()
 	},

src/views/summit/model/summitPopup.vue

 <template>
-	<el-dialog :title="title" :visible.sync="dialogVisible" class="order-details" :close-on-click-modal='false'>
+	<el-dialog
+		:title="title"
+		:visible.sync="dialogVisible"
+		class="order-details"
+		:close-on-click-modal="false"
+	>
 		<div>
 			<!-- <el-form :model="ruleForm2" :rules="rules2" ref="ruleForm2" label-width="100px" class="demo-ruleForm"> -->
 			<el-form :model="form" ref="form" :rules="rules" label-width="120px">
 				<div>
-					<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">基础信息</p>
 					<div class="steLine">
 						<el-row>
 							<el-col :span="12">
@@ -77,11 +81,6 @@
 							<el-form-item style="display:inline-block;margin-left:-120px">
 								<el-input class="content" v-model="form.latitude" placeholder="纬度" style="width:100px"></el-input>
 							</el-form-item>
-							<!-- <el-col :span="6" class="content">
-                <el-form-item>
-                  <el-input class="content" v-model="form.latitude" placeholder="纬度"></el-input>
-                </el-form-item>
-							</el-col>-->
 						</el-row>
 						<el-row>
 							<el-col :span="8">
@@ -93,7 +92,7 @@
 								</el-form-item>
 							</el-col>
 							<el-col :span="9" v-if="form.state==='自定义'">
-								<el-radio-group v-model="form.status">
+								<el-radio-group v-model="statusRadio">
 									<el-radio class="status" :label="0">默认</el-radio>
 									<el-radio class="status" :label="1">报名中</el-radio>
 									<el-radio class="status" :label="2">进行中</el-radio>
@@ -108,42 +107,40 @@
 								</el-form-item>
 							</el-col>
 						</el-row>
+
+						<el-tabs v-model="activeNameTab">
+							<el-tab-pane label="峰会主题" name="first">
+								<UE
+									:editorId="activeName"
+									:defaultMsg="form.content"
+									:config="config"
+									ref="ue"
+									@ready="editorReadyEvent"
+								></UE>
+							</el-tab-pane>
+							<el-tab-pane label="诚邀莅临" name="second">
+								<UE
+									:editorId="activeNameShare"
+									:defaultMsg="form.actDesc "
+									:config="config"
+									ref="ue"
+									@ready="editorReadyEventShare"
+								></UE>
+							</el-tab-pane>
+							<el-tab-pane label="公司简章" name="third">
+								<UE
+									:editorId="activeNameFirm"
+									:defaultMsg="form.companyDesc"
+									:config="config"
+									ref="ue"
+									@ready="editorReadyEventFirm"
+								></UE>
+							</el-tab-pane>
+						</el-tabs>
 					</div>
 				</div>
 				<div>
-					<p style="padding:20px 0;border-bottom:1px solid #d9d9d9">报名页面</p>
 					<div>
-						<el-row>
-							<el-col>
-								<el-form-item label="峰会主题：">
-									<UE
-										:editorId="activeName"
-										:defaultMsg="form.content"
-										:config="config"
-										ref="ue"
-										@ready="editorReadyEvent"
-									></UE>
-								</el-form-item>
-								<el-form-item label="诚邀莅临：" prop="name">
-									<UE
-										:editorId="activeNameShare"
-										:defaultMsg="form.actDesc "
-										:config="config"
-										ref="ue"
-										@ready="editorReadyEventShare"
-									></UE>
-								</el-form-item>
-								<el-form-item label="公司简章：" prop="name">
-									<UE
-										:editorId="activeNameFirm"
-										:defaultMsg="form.companyDesc"
-										:config="config"
-										ref="ue"
-										@ready="editorReadyEventFirm"
-									></UE>
-								</el-form-item>
-							</el-col>
-						</el-row>
 						<el-row>
 							<el-col>
 								<el-form-item label="房车介绍:">
@@ -165,12 +162,6 @@
 								<el-form-item label="峰会流程:">
 									<el-row class="height" v-for="(item, index) in processJson" :key="index">
 										<el-col :span="6">
-											<!-- <el-date-picker
-												v-model="item.time"
-												type="datetime"
-												format="yyyy-MM-dd HH:mm:ss"
-												placeholder="请选择时间"
-											></el-date-picker>-->
 											<el-time-select
 												v-model="item.time"
 												:picker-options="{
@@ -239,6 +230,8 @@ export default {
 	},
 	data() {
 		return {
+			statusRadio: '0',
+			activeNameTab: 'first',
 			fileList2: [],
 			config: {
 				initialFrameWidth: null,
@@ -271,10 +264,11 @@ export default {
 				contentFirm: '',
 				actDesc: '', // 诚邀莅临
 				companyDesc: '', // 公司简章
-				vehicleImgs: [] // 房车介绍
+				vehicleImgs: [], // 房车介绍
+				processJson:[]
 			},
 			result: false,
-			processJson: []
+			processJson: [{ time: undefined, content: '' }]
 		}
 	},
 	mounted() {
@@ -428,9 +422,15 @@ export default {
 					duration: 2000
 				})
 			} else {
-				typeof(this.form.endTime) == 'number' ? this.form.endTime = this.form.endTime :  this.form.endTime = this.form.endTime.getTime();
-				typeof(this.form.startTime) == 'number' ? this.form.startTime = this.form.startTime :  this.form.startTime = this.form.startTime.getTime();
-				typeof(this.form.bmCloseTime) == 'number' ? this.form.bmCloseTime = this.form.bmCloseTime :  this.form.bmCloseTime = this.form.bmCloseTime.getTime();
+				typeof this.form.endTime == 'number'
+					? (this.form.endTime = this.form.endTime)
+					: (this.form.endTime = this.form.endTime.getTime())
+				typeof this.form.startTime == 'number'
+					? (this.form.startTime = this.form.startTime)
+					: (this.form.startTime = this.form.startTime.getTime())
+				typeof this.form.bmCloseTime == 'number'
+					? (this.form.bmCloseTime = this.form.bmCloseTime)
+					: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
 				let pic = []
 				if (!!this.form.vehicleImgs) {
 					this.form.vehicleImgs.forEach(element => {
@@ -478,6 +478,7 @@ export default {
 					duration: 2000
 				})
 			} else {
+				this.form.processJson = this.processJson
 				this.form.endTime = this.form.endTime.getTime()
 				this.form.startTime = this.form.startTime.getTime()
 				this.form.bmCloseTime = this.form.bmCloseTime.getTime()
@@ -488,20 +489,17 @@ export default {
 					})
 					this.form.vehicleImgs = pic.join(',')
 				}
-
-				this.form.processJson = this.processJson
-
+				this.dataProcessing()
 				add(this.form).then(res => {
 					this.responseResult(res)
 				})
-				this.dataProcessing()
 			}
 		},
 		dataProcessing() {
 			if (this.form.state === '默认') {
-				this.form.status = 0
+				this.form.status = '0'
 			}
-			this.form.processJson = JSON.stringify(this.processJson)
+			// this.form.processJson = JSON.stringify(this.processJson)
 		},
 		/**
 		 * 请求结果判断
@@ -554,7 +552,8 @@ export default {
 				contentFirm: '',
 				actDesc: '', // 诚邀莅临
 				companyDesc: '', // 公司简章
-				vehicleImgs: [] // 房车介绍
+				vehicleImgs: [], // 房车介绍
+				processJson:[]
 			}
 		}
 	}

src/views/vehicle/bookRecord/index.vue

@@ -415,6 +415,7 @@
 								type="primary"
 								style="padding: 7px 9px;"
 								@click="resetReturn = true"
+								v-show="detailItem.status == 2 || detailItem.status == 5"
 							>更换</el-button>
 						</el-form-item>
 					</el-col>
@@ -1113,8 +1114,10 @@ export default {
 							message: '修改还车地点成功',
 							type: 'success',
 							duration: 2000
-            })
-            this.resetReturn = false
+						})
+						this.resetReturn = false;
+						this.dialogDetailVisible = false;
+						this.getList();
 					} else {
 						this.$notify({
 							title: '失败',

src/views/vehicle/vehicleInfo/index.vue

@@ -345,7 +345,7 @@
 
 
     <!--     对话框相关html元素  -->
-    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-dialog :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible" @close='closePop'>
 
       <el-form :model="form" :rules="rules" ref="form" label-width="90px">
         <el-row>
@@ -894,7 +894,8 @@
                                     return callback(new Error('编码合法范围：[1 - 9999999999]'));
                                 }
                                 //检验code码
-                                checkCode(value, this.form.code).then(response => {
+                                checkCode(value, this.form.id).then(response => {
+                                  // console.log(response.data);
                                     if (response.data === true) {
                                         return callback(new Error("该车辆编码已经被占用，请重新输入"));
                                     } else {
@@ -2029,6 +2030,10 @@
                 this.dialogFormVisible = false;
                 this.dialogForm4ApplyVisible = false;
                 this.$refs[formName].resetFields();
+                // this.listQuery.code = ''
+            },
+            closePop(formName){
+               this.$refs.form.resetFields();
             },
             cancel4Apply(formName) {
                 this.dialogForm4ApplyVisible = false;