Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

src/api/base_info/branch_company/index.js

@@ -155,7 +155,22 @@ export function stockSearchPage(query) {
   });
 }
 
-
+// 修改订单还车公司
+export function updateEndCompany(params) {
+  return fetch({
+    url: '/api/order/baseOrder/updateEndCompany',
+    method: 'post',
+    data: params
+  });
+}
+// 修改预定订单还车公司
+export function updateById(params) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/bookRecord/updateById',
+    method: 'post',
+    data: params
+  });
+}
 export function delObj(id) {
   return fetch({
     url: '/vehicle/branchCompany/' + id,
@@ -184,6 +199,7 @@ export function getDetail(id) {
     method: 'get'
   })
 }
+
 /**
  * 获取所有公司信息
  * @returns {null|*}

src/views/order/rentVehicleInfo/index.vue

@@ -697,7 +697,6 @@ export default {
       });
     },
     handleOrderDetail(row) {
-			debugger
       this.form = row;
       if (this.form.status == 2) {
         this.form.ststusName = "取消";

src/views/summit/model/summitPopup.vue

@@ -165,12 +165,21 @@
 								<el-form-item label="峰会流程:">
 									<el-row class="height" v-for="(item, index) in processJson" :key="index">
 										<el-col :span="6">
-											<el-date-picker
+											<!-- <el-date-picker
 												v-model="item.time"
 												type="datetime"
 												format="yyyy-MM-dd HH:mm:ss"
 												placeholder="请选择时间"
-											></el-date-picker>
+											></el-date-picker>-->
+											<el-time-select
+												v-model="item.time"
+												:picker-options="{
+													start: '06:00',
+													step: '00:15',
+													end: '23:59'
+												}"
+												placeholder="选择/输入时间"
+											></el-time-select>
 										</el-col>
 										<el-col :span="8">
 											<el-input class="content" v-model="item.content" placeholder="请输入内容"></el-input>
@@ -256,6 +265,7 @@ export default {
 				longitude: undefined,
 				latitude: undefined,
 				state: '默认',
+				status: 0,
 				rid: undefined,
 				content: '', // 峰会主题
 				contentFirm: '',
@@ -305,10 +315,10 @@ export default {
 					res.data.state = this.getState(res.data.status)
 					this.form = res.data
 					this.form.bmCloseTime = Number(res.data.bmCloseTime)
-          let introduce = this.form.vehicleImgs.split(',');
+					let introduce = this.form.vehicleImgs.split(',')
 					introduce.forEach(element => {
-            this.fileList2.push({name:'峰会介绍',url:element})
-          });
+						this.fileList2.push({ name: '峰会介绍', url: element })
+					})
 					if (res.data.processJson) {
 						this.processJson = JSON.parse(res.data.processJson)
 					}
@@ -378,7 +388,7 @@ export default {
 		},
 		addTag() {
 			const t = {
-				time: undefined,
+				time: null,
 				content: ''
 			}
 			this.processJson.push(t)
@@ -388,43 +398,98 @@ export default {
 		 *
 		 * */
 		update1() {
-			this.dataProcessing()
+			if (!this.form.title) {
+				this.$notify({
+					title: '失败',
+					message: '标题不能为空',
+					type: 'error',
+					duration: 2000
+				})
+				return false
+			} else if (!this.form.startTime) {
+				this.$notify({
+					title: '失败',
+					message: '开始时间不能为空',
+					type: 'error',
+					duration: 2000
+				})
+			} else if (!this.form.endTime) {
+				this.$notify({
+					title: '失败',
+					message: '结束时间不能为空',
+					type: 'error',
+					duration: 2000
+				})
+			} else if (!this.form.bmCloseTime) {
+				this.$notify({
+					title: '失败',
+					message: '报名截止时间不能为空',
+					type: 'error',
+					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();
+				let pic = []
+				if (!!this.form.vehicleImgs) {
+					this.form.vehicleImgs.forEach(element => {
+						pic.push(element.url)
+					})
+					this.form.vehicleImgs = pic.join(',')
+				}
+
+				this.form.processJson = this.processJson
+
 				update(this.form).then(res => {
 					this.responseResult(res)
 				})
+				this.dataProcessing()
+			}
 		},
-		create(formName) {
-			if (
-				!this.form.title ||
-				!this.form.startTime ||
-				!this.form.endTime
-			) {
+		create() {
+			if (!this.form.title) {
 				this.$notify({
 					title: '失败',
-					message: '必填项不能为空',
+					message: '标题不能为空',
 					type: 'error',
 					duration: 2000
 				})
 				return false
+			} else if (!this.form.startTime) {
+				this.$notify({
+					title: '失败',
+					message: '开始时间不能为空',
+					type: 'error',
+					duration: 2000
+				})
+			} else if (!this.form.endTime) {
+				this.$notify({
+					title: '失败',
+					message: '结束时间不能为空',
+					type: 'error',
+					duration: 2000
+				})
+			} else if (!this.form.bmCloseTime) {
+				this.$notify({
+					title: '失败',
+					message: '报名截止时间不能为空',
+					type: 'error',
+					duration: 2000
+				})
 			} else {
 				this.form.endTime = this.form.endTime.getTime()
 				this.form.startTime = this.form.startTime.getTime()
 				this.form.bmCloseTime = this.form.bmCloseTime.getTime()
 				let pic = []
+				if (!!this.form.vehicleImgs) {
 					this.form.vehicleImgs.forEach(element => {
 						pic.push(element.url)
 					})
 					this.form.vehicleImgs = pic.join(',')
-				let demo = []
-				this.processJson.forEach(element => {
-					demo.push({
-						time:
-							formatDate(element.time, 'yyyy-MM-dd hh') +
-							':00:00',
-						content: element.content
-					})
-				})
-				this.form.processJson = demo
+				}
+
+				this.form.processJson = this.processJson
 
 				add(this.form).then(res => {
 					this.responseResult(res)