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

src/api/vehicleType.js

@@ -191,10 +191,13 @@ export function dayList(day) {
 }
 
 // 日历价格设置
-export function add_edit(params) {
+export function add_edit(params, date) {
   return fetch({
-    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit',
+    url: '/vehicle/admin/vehicle_model/calendar_price/add_edit/' + date,
     method: 'post',
+    headers: {
+      'Content-Type': 'application/json;charset=UTF-8'
+    },
     data: params
   });
 }

src/views/purseManage/commissionRecord.vue

@@ -36,7 +36,7 @@
 				</el-table-column>
 				<el-table-column align="center" label="来源">
 					<template scope="scope">
-						<span>{{scope.row.sourceName}}</span>
+						<span>{{scope.row.sourceName == '' ? scope.row.phone : scope.row.sourceName}}</span>
 					</template>
 				</el-table-column>
 				<el-table-column align="center" label="订单金额">

src/views/vehicle/vehicleInfo/index.vue

@@ -9,17 +9,12 @@
 				label-width="100px"
 			>
 				<el-row>
-					<el-col :span="5">
 					<el-form-item label="车牌">
 						<el-input v-model="listQuery.numberPlate" placeholder="请输入车牌"></el-input>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车辆编码">
 						<el-input type="number" v-model.number="listQuery.code" placeholder="请输入车辆编码"></el-input>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车辆状态">
 						<el-select class="filter-item" v-model="listQuery.status" placeholder="请选择车辆状态">
 							<el-option :key="undefined" label="全部" :value="undefined"></el-option>
@@ -31,8 +26,6 @@
 							></el-option>
 						</el-select>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="分公司" prop="subordinateBranch">
 						<el-autocomplete
 							class="inline-input"
@@ -42,10 +35,6 @@
 							@select="handleSelect"
 						></el-autocomplete>
 					</el-form-item>
-					</el-col>
-				</el-row>
-				<el-row>
-					<el-col :span="5">
 					<el-form-item label="区域" prop="zoneId">
 						<el-select
 							class="filter-item"
@@ -56,8 +45,6 @@
 							<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
 						</el-select>
 					</el-form-item>
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="省份" prop="addrProvince">
 						<el-autocomplete
 							class="inline-input"
@@ -73,8 +60,6 @@
 					<!--:value="item.id"></el-option>-->
 					<!--</el-select>-->
 					<!--</el-form-item>-->
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="城市" prop="addrCity">
 						<el-autocomplete
 							class="inline-input"
@@ -90,8 +75,6 @@
 					<!--:value="item.id"></el-option>-->
 					<!--</el-select>-->
 					<!--</el-form-item>-->
-					</el-col>
-					<el-col :span="5">
 					<el-form-item label="车型" prop="modelId">
 						<el-autocomplete
 							class="inline-input"
@@ -101,7 +84,6 @@
 							@select="handleVehicleModelSelect"
 						></el-autocomplete>
 					</el-form-item>
-					</el-col>
 				</el-row>
 				<el-button
 					class="filter-item"
@@ -544,12 +526,10 @@
 								v-model="form.annualVerificationDate"
 								type="date"
 								placeholder="选择日期"
-								style="width:100%">
-							</el-date-picker>
+								style="width:100%"
+							></el-date-picker>
 						</el-form-item>
 					</el-col>
-
-
 				</el-row>
 
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
@@ -749,7 +729,6 @@
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
-
 							<el-upload
 								class="avatar-uploader"
 								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
@@ -765,7 +744,15 @@
 									class="avatar"
 									:style="{display:'block'}"
 								/>
-								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证正面</span></i>
+								<i
+									v-else
+									class="el-icon-plus avatar-uploader-icon"
+									:style="{lineHeight:'350px'}"
+									style="position: relative;"
+								>
+									<br />
+									<span class="driving-title">行驶证正面</span>
+								</i>
 							</el-upload>
 
 							<el-upload
@@ -783,8 +770,15 @@
 									class="avatar"
 									:style="{display:'block'}"
 								/>
-								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证副本</span></i>
-								
+								<i
+									v-else
+									class="el-icon-plus avatar-uploader-icon"
+									:style="{lineHeight:'350px'}"
+									style="position: relative;"
+								>
+									<br />
+									<span class="driving-title">行驶证副本</span>
+								</i>
 							</el-upload>
 						</el-form-item>
 					</el-col>
@@ -1059,7 +1053,7 @@ export default {
 			showLoadingBody: false,
 			allVehicleList: [], //全部车型
 			form: {
-				insuranceEndDate:null,//商业险日期
+				insuranceEndDate: null, //商业险日期
 				vehicleModelName: '', //车型
 				subordinateBranchName: '', //所属分公司
 				subordinateBranch: undefined,
@@ -2621,7 +2615,8 @@ export default {
 				VEHICLE_CONSTANT_VEHICLE_BRAND,
 				code
 			)
-				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code).val
+				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_BRAND, code)
+						.val
 				: '品牌不存在'
 		},
 		getAllBranch: () => {
@@ -2635,7 +2630,8 @@ export default {
 				return '未知'
 			}
 			return getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
-				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code).val
+				? getConstantByTypeAndCode(VEHICLE_CONSTANT_VEHICLE_USE, code)
+						.val
 				: '用途未知'
 		},
 		getAllUseType: () => {
@@ -2672,7 +2668,6 @@ export default {
 				this.listQuery.belongToName = undefined
 			}
 
-			
 			page(listQueryTemp).then(response => {
 				if (response.code == 1) {
 					let totalCountRs = undefined
@@ -2688,7 +2683,7 @@ export default {
 					// 	})
 					// }
 					this.listLoading = false
-					console.log(response.data.data);
+					console.log(response.data.data)
 
 					this.list = response.data.data
 					this.total = response.data.totalCount
@@ -3057,12 +3052,12 @@ export default {
 				mileageLastUpdate: undefined,
 				//          receiveTime: undefined,
 				drivingLicensePath: undefined,
-				drivingLicenseDuplicatePath:undefined,
+				drivingLicenseDuplicatePath: undefined,
 				remark: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
 				strongInsuranceCompany: undefined,
-				insuranceEndDate:null
+				insuranceEndDate: null
 			}
 		},
 		resetTemp4Apply() {
@@ -3098,7 +3093,7 @@ export default {
 }
 </script>
 <style>
-.driving-title{
+.driving-title {
 	position: absolute;
 	top: 34px;
 	left: 140px;

src/views/vehicleType/priceList.vue

@@ -366,12 +366,18 @@ export default {
 					}
 				})
 			}
-
 			if (params == '') {
-				this.$message.error('请设置不同车型不同价格4')
-				return false
+				add_edit('',this.activeTime).then(data => {
+					if (data.status == 200) {
+						this.$message.success('设置成功')
+						this.chooseData = []
+						this.getList()
+					} else {
+						this.$message.error(data.message)
+					}
+				})
 			} else {
-				add_edit(params).then(data => {
+				add_edit(params,this.activeTime).then(data => {
 					if (data.status == 200) {
 						this.$message.success('设置成功')
 						this.chooseData = []
@@ -398,8 +404,8 @@ export default {
 						data.data.forEach(element => {
 							element.multiple = element.multiple || ''
 							element.price = element.price || ''
-							element.level = element.level||''
-							element.freeDays = element.freeDays||''
+							element.level = element.level || ''
+							element.freeDays = element.freeDays || ''
 						})
 						this.dayListData = data.data
 						this.setMultiplePop = true