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

Conflicts:
	config/dev.env.js
	src/views/summit/model/reviewPopup.vue
	src/views/summit/model/summitPopup.vue
	src/views/vehicle/bookRecord/index.vue
	src/views/vehicle/vehicleInfo/index.vue

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
+<<<<<<< HEAD
   BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+=======
+  BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

config/sit.env.js

 module.exports = {
     NODE_ENV: '"sit"',
-    BASE_API: '"https://xxtest.upyuns.com"',
+    BASE_API: '"https://dev.dfangche.com"',
     APP_ORIGIN: '"https://wallstreetcn.com"'
 };

src/api/admin/userManagement/index.js

@@ -99,15 +99,32 @@ export function postions(obj) {
   });
 }
 
+// 身份列表
+export function jobs(obj) {
+  return fetch({
+    url: '/api/admin/postion/admin/jobs',
+    method: 'get',
+    data: obj
+  });
+}
+
 // 添加员工
 export function addEditor(obj) {
   return fetch({
-    url: '/api/admin/postion/admin/add',
+    url: '/api/admin/postion/admin/addUserPostion',
     method: 'post',
     data: obj
   });
 }
 
+// 编辑员工
+export function editorUpd(obj) {
+  return fetch({
+    url: '/api/admin/postion/admin/updUserPostion',
+    method: 'post',
+    data: obj
+  });
+}
 //删除员工
 export function deleteStaffs(id) {
   return fetch({

src/api/base_info/constant/index.js

@@ -80,7 +80,6 @@ function loadFromServer(type) {
     });
   }
 
-  console.log(rs);
   return rs;
 }
 

src/api/base_info/region/index.js

@@ -80,7 +80,6 @@ export function getSonRegionByCodes(code) {
   if (!actualCode) {
     actualCode = rsCode.REGION_CODE_CHAINA;
   }
-
   let sonRegions = store.getters.sonRegions(actualCode);
   if (!sonRegions) {
     let datas = loadSonsFromServer(actualCode);

src/api/vehicle/vehicleInfo/index.js

@@ -98,3 +98,19 @@ export function checkCode(code, id) {
     method: 'get'
   });
 }
+
+//检查车架号是否存在
+export function checkVin(vin, id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/exist_vin/' + vin + '?id=' + id,
+    method: 'get'
+  });
+}
+
+//检查车辆发动机号是否存在
+export function checkEngineNum(engineNum, id) {
+  return fetch({
+    url: '/vehicle/vehicleInfo/exist_engineNum/' + engineNum + '?id=' + id,
+    method: 'get'
+  });
+}
\ No newline at end of file

src/views/summit/model/reviewPopup.vue

@@ -170,7 +170,10 @@ export default {
 		beforeAvatarUpload(file) {
 			var index = file.name.lastIndexOf('.')
 			var ext = file.name.substr(index + 1)
+<<<<<<< HEAD
 			console.log(ext)
+=======
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			if (ext != 'zip') {
 				this.$message.error('上传压缩包只能是 zip 格式!')
 				return false
@@ -197,7 +200,11 @@ export default {
 		cre() {
 			let zipPic = []
 			this.list.forEach(element => {
+<<<<<<< HEAD
 				zipPic.push(element.url)
+=======
+				zipPic.push(element.response.data)
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			})
 			let mp4Vadio = []
 			this.vadio.forEach(element => {
@@ -219,6 +226,11 @@ export default {
 						: zipPic.join(',') + ',' + this.oldList
 					: zipPic.join(',')
 			}
+<<<<<<< HEAD
+=======
+			// console.log(params);
+			
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			save(params).then(res => {
 				this.responseResult(res)
 			})

src/views/summit/model/summitPopup.vue

@@ -105,12 +105,16 @@
 								<el-form-item label="活动id:">
 									<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
 									<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
+<<<<<<< HEAD
 										<el-option
 											v-for="(item,index) in optionsId"
 											:key="index"
 											:label="item"
 											:value="item"
 										></el-option>
+=======
+										<el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -151,20 +155,20 @@
 					<div>
 						<el-row>
 							<el-col>
+<<<<<<< HEAD
 								<el-form-item label="房车介绍:">
+=======
+								<el-form-item label="房车介绍:" style="margin-top:20px">
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 									<el-upload
-										class="upload-demo"
-										:headers="getHeaderWithToken"
 										:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
-										:on-remove="handleRemove"
+										list-type="picture-card"
 										:file-list="fileList2"
 										:on-success="handleBannerSuccess"
-										list-type="picture"
+										:on-remove="handleRemove"
+										:headers="getHeaderWithToken"
 									>
-										<div slot="tip" class="el-upload__tip">
-											<span style="color: red;">建议尺寸：1080*644px</span>
-										</div>
-										<el-button size="small" type="primary">点击上传</el-button>
+										<i class="el-icon-plus"></i>
 									</el-upload>
 								</el-form-item>
 								<el-form-item label="峰会流程:">
@@ -205,8 +209,8 @@
 				<el-row>
 					<el-col>
 						<el-button class="button" @click="cancelHandel">取 消</el-button>
-						<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确 定</el-button>
-						<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button>
+						<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确定</el-button>
+						<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确定</el-button>
 					</el-col>
 				</el-row>
 			</el-form>
@@ -287,7 +291,11 @@ export default {
 	created() {
 		activityIds().then(data => {
 			if (data.status == 200) {
+<<<<<<< HEAD
 				this.optionsId = data.data;
+=======
+				this.optionsId = data.data
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			}
 		})
 	},
@@ -306,11 +314,14 @@ export default {
 		}
 	},
 	methods: {
-		handleBannerSuccess(res, file) {
-			this.fileList2.push({ url: res.data })
-			this.form.vehicleImgs = this.fileList2
+		handleBannerSuccess(res, file, fileList) {
+			console.log(fileList);
+			this.fileList2 = fileList
+			// this.form.vehicleImgs = this.fileList2
+		},
+		handleRemove(res, file, fileList) {
+			this.fileList2 = file
 		},
-		handleRemove() {},
 		getOrderInfo() {
 			this.title = this.titleNme
 			if (this.title === '编辑峰会') {
@@ -384,7 +395,11 @@ export default {
 		},
 		getState(status) {
 			if (this.$utils.isInteger(status)) {
+<<<<<<< HEAD
 				console.log(status);
+=======
+				console.log(status)
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 				if (status == 0) {
 					return '默认'
 				} else {
@@ -450,10 +465,24 @@ export default {
 					? (this.form.bmCloseTime = this.form.bmCloseTime)
 					: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
 				let pic = []
+<<<<<<< HEAD
 				if (!!this.form.vehicleImgs) {
 					this.form.vehicleImgs.forEach(element => {
 						pic.push(element.url)
 					})
+=======
+				if (this.fileList2 != '') {
+					console.log(this.fileList2);
+					this.fileList2.forEach(element => {
+						if (!!element.response) {
+							pic.push(element.response.data)
+						}else{
+							pic.push(element.url);
+						}
+					});
+					console.log(pic);
+					
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 					this.form.vehicleImgs = pic.join(',')
 				}
 
@@ -501,12 +530,27 @@ export default {
 				this.form.startTime = this.form.startTime.getTime()
 				this.form.bmCloseTime = this.form.bmCloseTime.getTime()
 				let pic = []
+<<<<<<< HEAD
 				if (!!this.form.vehicleImgs) {
 					this.form.vehicleImgs.forEach(element => {
 						pic.push(element.url)
 					})
 					this.form.vehicleImgs = pic.join(',')
 				}
+=======
+				if (this.fileList2 != '') {
+					this.fileList2.forEach(element => {
+						pic.push(element.response.data);
+					});
+					this.form.vehicleImgs = pic.join(',')
+				}
+				// if (!!this.form.vehicleImgs) {
+				// 	this.form.vehicleImgs.forEach(element => {
+				// 		pic.push(element.url)
+				// 	})
+				// 	this.form.vehicleImgs = pic.join(',')
+				// }
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 				this.dataProcessing()
 				add(this.form).then(res => {
 					this.responseResult(res)
@@ -516,7 +560,11 @@ export default {
 		dataProcessing() {
 			if (this.form.state === '默认') {
 				this.form.status = '0'
+<<<<<<< HEAD
 			}else{
+=======
+			} else {
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 				this.form.status = this.statusRadio
 			}
 			this.form.processJson = JSON.stringify(this.processJson)

src/views/vehicle/bookRecord/index.vue

@@ -104,11 +104,24 @@
 					<span v-if="scope.row.bookType==10">其他</span>
 				</template>
 			</el-table-column>
+<<<<<<< HEAD
 			<el-table-column align="center" label="预定时间" width="220">
 				<template scope="scope">
 					<span>{{scope.row.bookStartDate}} 至 {{scope.row.bookEndDate}}</span>
 				</template>
 			</el-table-column>
+=======
+			<el-table-column align="center" label="预定取/还时间" width="200">
+				<template scope="scope">
+					<span>{{scope.row.bookStartDate}}</span> <br/><span>{{scope.row.bookEndDate}}</span>
+				</template>
+			</el-table-column>
+			 <el-table-column align="center" label="实际取/还时间" width="200">
+			  <template scope="scope">
+			    <span>{{scope.row.actualStartDate}}</span> <br/><span>{{scope.row.actualEndDate}}</span>
+			  </template>
+			</el-table-column>
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 			<!-- <el-table-column align="center" label="预定时间" width="220">
         <template scope="scope">
         <span
@@ -177,11 +190,7 @@
           <span>{{scope.row.reviewerNameReturn}}</span>
         </template>
       </el-table-column>
-      <el-table-column align="center" label="还车时间" width="120">
-        <template scope="scope">
-          <span>{{scope.row.actualEndDate}}</span>
-        </template>
-      </el-table-column>
+     
 
       <el-table-column align="center" label="随车物品" width="120">
         <template scope="scope">
@@ -301,7 +310,11 @@
 					</el-col>
 					<el-col :span="12">
 						<el-form-item label="车辆编号">
+<<<<<<< HEAD
 							<span>{{detailItem.vehicleId}}</span>
+=======
+							<span>{{detailItem.code}}</span>
+>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
 						</el-form-item>
 					</el-col>
 					<!-- <el-col :span="7">

src/views/vehicle/vehicleDepartureLog/index.vue

@@ -4,29 +4,41 @@
       <el-form>
         <el-row>
           <el-col :span="5">
-            <el-form-item>
-              <el-date-picker
-                v-model="listQuery.time"
-                type="date"
-                :editable="false"
-                format="yyyy-MM-dd"
-                prop="time"
-                placeholder="请选择日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="5">
-              <el-form-item>
+              <el-form-item label="车辆编码" prop="code">
                 <el-input type="number" style="width: 200px;" v-model.number="listQuery.code"
                           placeholder="请输入车辆编码"></el-input>
               </el-form-item>
             </el-col>
               <el-col :span="5">
-                <el-form-item>
+                <el-form-item label="车牌号" prop="code">
               <el-input @keyup.enter.native="handleFilter" style="width: 200px;" class="filter-item" placeholder="车牌号"
                         v-model="listQuery.numberPlate"></el-input>
             </el-form-item>
           </el-col>
+					<el-col :span="5">
+					  <el-form-item label="出车日期" prop="startTime">
+					    <el-date-picker
+					      v-model="listQuery.startTime"
+					      type="date"
+					      :editable="false"
+					      format="yyyy-MM-dd"
+					      prop="startTime"
+					      placeholder="请选择出车日期">
+					    </el-date-picker>
+					  </el-form-item>
+					</el-col>
+					<el-col :span="5">
+					  <el-form-item label="还车日期" prop="endTime">
+					    <el-date-picker
+					      v-model="listQuery.endTime"
+					      type="date"
+					      :editable="false"
+					      format="yyyy-MM-dd"
+					      prop="endTime"
+					      placeholder="请选择还车日期">
+					    </el-date-picker>
+					  </el-form-item>
+					</el-col>
         </el-row>
         <el-row>
           <el-col :span="5">
@@ -79,8 +91,8 @@
         label="编号"
         width="65">
       </el-table-column>
-      <!--<el-table-column align="center" label="编号" width="65">-->
-      <!--<template scope="scope">-->
+<!--      <el-table-column align="center" label="编号" width="65">
+ -->      <!--<template scope="scope">-->
       <!--<span>{{scope.row.id}}</span>-->
       <!--</template>-->
       <!--</el-table-column>-->
@@ -214,10 +226,10 @@
     import {
         toEast8Date,
         deepCopyDate,
-        newEast8Date
+        newEast8Date,
+				getYMD_date
     } from 'utils/dateUtils';
-
-    export default {
+				export default {
         name: 'vehicleDepartureLog',
         data() {
             return {
@@ -262,7 +274,8 @@
                 listQuery: {
                     page: 1,
                     limit: 20,
-                    time: "",
+                    startTime: undefined,
+                    endTime:undefined,
                     numberPlate: undefined,
                     departureId:undefined,
                 },
@@ -329,9 +342,12 @@
                 if (!this.listQuery.numberPlate) {
                     this.statisticVisiable = false;
                 }
-                if (this.listQuery.time) {
-                    this.listQuery.time = this.dateToString(this.listQuery.time);
-                }
+               if (this.listQuery.startTime) {
+               	this.listQuery.startTime = getYMD_date(new Date(this.listQuery.startTime));
+               }
+               if(this.listQuery.endTime) {
+               	this.listQuery.endTime = getYMD_date(new Date(this.listQuery.endTime));
+               }
                 if (!this.state1) {
                     this.listQuery.departureId = undefined;
                 }