奖品设置表单验证

src/views/conference/award/awardSet.vue

@@ -58,7 +58,7 @@
 
 					<!-- 奖品类型 -->
 					<p>
-						<el-select v-model="item.prizeGoodsType" clearable placeholder="请选择" @visible-change="discount(index)">
+						<el-select v-model="item.prizeGoodsType" placeholder="请选择" @visible-change="discount(index)">
 							<el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
 						</el-select>
 					</p>
@@ -66,7 +66,7 @@
 					<!-- 奖品名称 -->
 					<p>
 						<el-input v-model="item.name" placeholder v-if="item.prizeGoodsType != 2" ref="prizeName"></el-input>
-						<el-select v-model="item.goodsId" clearable placeholder="请选择" v-else ref="prizeTicket">
+						<el-select v-model="item.goodsId" placeholder="请选择" v-else ref="prizeTicket">
 							<el-option v-for="item in couponData" :key="item.id" :label="item.title" :value="item.id"></el-option>
 						</el-select>
 					</p>
@@ -341,15 +341,34 @@ export default {
 			this.dialogVisible = true
 			infoPrize().then(data => {
 				if (val == 1) {
-					if (data.data.onlinePrize != '')
+					if (data.data.onlinePrize != ''){
 						data.data.onlinePrize.forEach(element => {
 							if (!element.goodsId) {
 								element.goodsId = ''
 							}
+							if (!element.totalStock) {
+								element.totalStock = ''
+							}
+							if (!element.dayMaxUse) {
+								element.dayMaxUse = ''
+							}
 						});
+					}
 					this.table = data.data.onlinePrize
 				} else {
-					if (data.data.localePrize != '')
+					if (data.data.localePrize != ''){
+						data.data.localePrize.forEach(element => {
+							if (!element.goodsId) {
+								element.goodsId = ''
+							}
+							if (!element.totalStock) {
+								element.totalStock = ''
+							}
+							if (!element.dayMaxUse) {
+								element.dayMaxUse = ''
+							}
+						});
+					}	
 					this.table = data.data.localePrize
 				}
 			})
@@ -380,6 +399,8 @@ export default {
 					return true
 				}
 			});
+			// console.log(flig);
+			
 			if(flig){
 				let params = []
 				this.table.forEach(element => {
@@ -405,6 +426,8 @@ export default {
 						this.$message.error(data.message)
 					}
 				})
+				// console.log(params);
+				
 			}else{
 				this.$message('必填项不能为空')
 			}

src/views/order/modal/rentOrderDetailModal.vue

@@ -124,7 +124,7 @@
 						<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
 					</td>
 					<td>
-						<el-button size="small" type="text" v-if="orderDetailInfo.status==5" @click="postponePop = true">延期还车</el-button>
+						<el-button size="small" type="text" v-if="orderDetailInfo.status==5 || orderDetailInfo.status==4" @click="postponePop = true">延期还车</el-button>
 					</td>
 					<td></td>
 					<td>

src/views/vehicleType/mockSun.vue

@@ -239,8 +239,12 @@ export default {
 							delete this.ruleForm.id
 							this.successApi()
 						} else {
-							this.ruleForm.startDate = this.ruleForm.date[0]
-							this.ruleForm.endDate = this.ruleForm.date[1]
+							this.ruleForm.startDate = this.format(
+								this.ruleForm.date[0]
+							)
+							this.ruleForm.endDate = this.format(
+								this.ruleForm.date[1]
+							)
 							!this.activeId
 								? ''
 								: (this.ruleForm.id = this.activeId)