发布会奖品设置,延期租车

src/api/vehicle/vehicleInfo/index.js

@@ -131,3 +131,11 @@ export function exportExcel(query) {
     responseType: 'blob'
   });
 }
+
+export function postponeApi(param) {
+  return fetch({
+    url: 'api/order/baseOrder/bg/delay-rent-order',
+    method: 'post',
+    data: param
+  });
+}

src/views/conference/award/awardSet.vue

@@ -55,16 +55,18 @@
 				<li v-for="(item,index) in table" :key="index">
 					<!-- 序号 -->
 					<p>宫格{{item.serialNumber}}</p>
+
 					<!-- 奖品类型 -->
 					<p>
-						<el-select v-model="item.prizeGoodsType" clearable placeholder="请选择">
+						<el-select v-model="item.prizeGoodsType" clearable 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>
+
 					<!-- 奖品名称 -->
 					<p>
-						<el-input v-model="item.name" placeholder v-if="item.prizeGoodsType != 2"></el-input>
-						<el-select v-model="item.goodsId" clearable placeholder="请选择" v-else>
+						<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-option v-for="item in couponData" :key="item.id" :label="item.title" :value="item.id"></el-option>
 						</el-select>
 					</p>
@@ -76,21 +78,21 @@
 							:show-file-list="false"
 							:on-success="(response, file, fileList,id)=> handleSuccess(response, file, fileList,index)"
 						>
-							<img v-if="item.iconPath" :src="item.iconPath" style="width:50px;height:30px" />
+							<img v-if="item.iconPath" :src="item.iconPath" style="width:50px;height:30px" ref="prizeImg"/>
 							<i v-else class="el-icon-plus avatar-uploader-icon"></i>
 						</el-upload>
 					</p>
 					<!-- 奖品数量 -->
 					<p>
-						<el-input v-model="item.totalStock" placeholder></el-input>
+						<el-input v-model="item.totalStock" placeholder ref="prizeNumber"></el-input>
 					</p>
 					<!-- 中奖概率 -->
 					<p>
-						<el-input v-model="item.probability" placeholder></el-input>
+						<el-input v-model="item.probability" placeholder ref="prizeTheory"></el-input>
 					</p>
 					<!-- 最大中奖数 -->
 					<p>
-						<el-input v-model="item.dayMaxUse" placeholder></el-input>
+						<el-input v-model="item.dayMaxUse" placeholder ref="prizeNumberMax"></el-input>
 					</p>
 				</li>
 			</ul>
@@ -99,15 +101,6 @@
 			</p>
 		</el-dialog>
 
-		<!-- <el-upload
-			class="avatar-uploader"
-			:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
-			:show-file-list="false"
-			:on-success="demo"
-		>
-			<img v-if="demoImg" :src="demoImg" style="width:50px;height:30px" />
-			<i v-else class="el-icon-plus avatar-uploader-icon"></i>
-		</el-upload> -->
 	</div>
 </template>
 <script>
@@ -234,6 +227,17 @@ export default {
 		this.getTitleFn()
 	},
 	methods: {
+		//优惠券
+		discount(val){
+			this.table[val].name = ''
+			this.table[val].goodsId = ''
+			// if (!this.table[val].goodsId ||) {
+			// 	this.table[val].goodsId = ''
+			// 	console.log(this.table);
+			// }
+			
+		},
+		//图片上传
 		handleSuccess(res, file,list,id) {
 			this.table[id].iconPath = res.data
 		},
@@ -338,6 +342,11 @@ export default {
 			infoPrize().then(data => {
 				if (val == 1) {
 					if (data.data.onlinePrize != '')
+						data.data.onlinePrize.forEach(element => {
+							if (!element.goodsId) {
+								element.goodsId = ''
+							}
+						});
 						this.table = data.data.onlinePrize
 				} else {
 					if (data.data.localePrize != '')
@@ -347,35 +356,63 @@ export default {
 		},
 		//保存
 		save() {
-			let params = []
+			var flig = true;
 			this.table.forEach(element => {
-				let defaults = {
-					serialNumber: element.serialNumber,
-					name: element.name,
-					iconPath: element.iconPath,
-					dayMaxUse: element.dayMaxUse,
-					totalStock: element.totalStock,
-					probability: element.probability,
-					type: this.or,
-					prizeGoodsType: element.prizeGoodsType,
-					goodsId: element.goodsId,
-					id: element.id
+				if(element.prizeGoodsType == 1 || element.prizeGoodsType === ''){
+					if (element.name === '' || element.iconPath === '' || element.totalStock === '' || element.probability === '' || element.dayMaxUse === '') {
+						flig = false
+						return false
+					}
 				}
-				params.push(defaults)
-			})
-			savePrize(params).then(data => {
-				if (data.status == 200) {
-					this.$message.success('设置成功')
-					this.dialogVisible = false
-				} else {
-					this.$message.error(data.message)
+				if(element.prizeGoodsType == 2 || element.prizeGoodsType === ''){
+					if (element.goodsId === '' || element.iconPath === '' || element.totalStock === '' || element.probability === '' || element.dayMaxUse === '') {
+						flig = false
+						return false
+					}
 				}
-			})
+				if(element.prizeGoodsType == 0 || element.prizeGoodsType === ''){
+					if (element.name === '' || element.iconPath === '' || element.probability === '') {
+						flig = false
+						return false
+					}
+				}
+				if(!flig){
+					return true
+				}
+			});
+			if(flig){
+				let params = []
+				this.table.forEach(element => {
+					let defaults = {
+						serialNumber: element.serialNumber,
+						name: element.name,
+						iconPath: element.iconPath,
+						dayMaxUse: element.dayMaxUse,
+						totalStock: element.totalStock,
+						probability: element.probability,
+						type: this.or,
+						prizeGoodsType: element.prizeGoodsType,
+						goodsId: element.goodsId,
+						id: element.id
+					}
+					params.push(defaults)
+				})
+				savePrize(params).then(data => {
+					if (data.status == 200) {
+						this.$message.success('设置成功')
+						this.dialogVisible = false
+					} else {
+						this.$message.error(data.message)
+					}
+				})
+			}else{
+				this.$message('必填项不能为空')
+			}
 		},
+		
 		//优惠券列表
 		getTitleFn() {
 			getTitle().then(data => {
-				console.log(data)
 				if (data.status == 200) {
 					this.couponData = data.data
 				} else {
@@ -386,7 +423,7 @@ export default {
 	}
 }
 </script>
-<style>
+<style scoped>
 .el-dialog--small {
 	width: 60% !important;
 }

src/views/order/modal/rentOrderDetailModal.vue

@@ -123,7 +123,9 @@
 					<td>
 						<el-button size="small" type="text" v-if="orderDetailInfo.status==4" @click="resetCar">重新配车</el-button>
 					</td>
-					<td></td>
+					<td>
+						<el-button size="small" type="text" v-if="orderDetailInfo.status==5" @click="postponePop = true">延期还车</el-button>
+					</td>
 					<td></td>
 					<td>
 						<el-button
@@ -202,6 +204,17 @@
 				<el-button style="margin-top:20px" type="primary" @click="confirm('returnForm')">确定</el-button>
 			</el-form>
 		</el-dialog>
+
+		<!-- 延期还车 -->
+		<div class="modal_modal" v-show="postponePop"></div>
+		<el-dialog title="延期还车" :visible.sync="postponePop" :append-to-body="true" :modal="false" @close="closePostpone">
+			 <el-date-picker
+				v-model="delayEndTime"
+				type="datetime"
+				placeholder="选择日期时间">
+			</el-date-picker>
+			<el-button style="margin-top:20px" type="primary" @click="postponeBtn">确定</el-button>
+		</el-dialog>
 	</el-dialog>
 </template>
 
@@ -211,7 +224,7 @@ import ElInput from '../../../../node_modules/element-ui/packages/input/src/inpu
 import ElCol from 'element-ui/packages/col/src/col'
 import ElFormItem from '../../../../node_modules/element-ui/packages/form/src/form-item.vue'
 import ElForm from '../../../../node_modules/element-ui/packages/form/src/form.vue'
-import { editObj } from 'api/vehicle/vehicleInfo'
+import { editObj,postponeApi} from 'api/vehicle/vehicleInfo'
 import { getAll, updateEndCompany } from 'api/base_info/branch_company'
 import {getYMD} from 'src/utils/dateUtils'
 export default {
@@ -225,6 +238,8 @@ export default {
 	},
 	data() {
 		return {
+			delayEndTime:null,//延期还车时间
+			postponePop:false,
 			returnForm: {
 				endCompanyId: ''
 			},
@@ -271,7 +286,32 @@ export default {
 		this.getAllFn()
 	},
 	methods: {
-
+		//延期还车弹窗关闭
+		closePostpone(){
+			this.delayEndTime = null
+		},
+		//延期还车
+		postponeBtn(){
+			if (!this.delayEndTime) {
+				this.$message.error("延期时间不能为空")
+					return false
+				}else{
+					let time = new Date(this.delayEndTime).getTime()
+					let params = {
+						no:this.orderDetailInfo.no,
+						delayEndTime:time,
+						needDamageSafe:1
+					}
+					postponeApi(params).then(data=>{
+						if (data.status == 200) {
+							this.postponePop = false
+							this.$message.success('操作成功')
+						}else{
+							this.$message.error(data.message)
+						}
+					})
+			}
+		},
 		orderInfo(val) {
 		  if (this.orderDetailInfo.costDetail.children) {
         let info = this.orderDetailInfo.costDetail.children.filter(item=>item.key == val)