Merge branch 'base-modify'

src/App.vue

 <template>
 	<div id="app">
-		<router-view></router-view>
+    <keep-alive>
+      <router-view />
+    </keep-alive>
+		<!-- <router-view></router-view> -->
 	</div>
 </template>
 

src/api/admin/userManagement/index.js

@@ -195,4 +195,49 @@ export function updAddPositionChangeRecord(params) {
 //     method: 'post',
 //     data: params
 //   });
-// }
\ No newline at end of file
+// }
+
+// 股东列表
+export function stockholderList(query) {
+  return fetch({
+    url: 'api/admin/appShareholder/page',
+    method: 'post',
+    data: query
+  });
+}
+
+// 新增股东
+export function addUserPostion(query) {
+  return fetch({
+    url: 'api/admin/appShareholder/addUserPostion',
+    method: 'post',
+    data: query
+  });
+}
+
+// 批量导入股东
+export function exports(query) {
+  return fetch({
+    url: 'api/admin/appShareholder/export',
+    method: 'post',
+    data: query
+  });
+}
+
+// 编辑股东信息
+export function updUserPostionEditor(query) {
+  return fetch({
+    url: 'api/admin/appShareholder/updUserPostion',
+    method: 'post',
+    data: query
+  });
+}
+
+// 股东信息变更记录
+export function findShareholderChangeRecord(query) {
+  return fetch({
+    url: 'api/admin/appShareholder/findShareholderChangeRecord',
+    method: 'get',
+    params: query
+  });
+}
\ No newline at end of file

src/router/index.js

@@ -582,13 +582,13 @@ export const asyncRouterMap = [{
       component: _import('appManagement/selectedActivities/index'),
       name: '首页精选活动',
       authority: 'selectedActivities'
+    },
+    {
+      path: 'pushManagement',
+      component: _import('appManagement/pushManagement/index'),
+      name: '消息推送',
+      authority: 'pushManagement'
     }
-	// {
- //      path: 'pushManagement',
- //      component: _import('appManagement/pushManagement/index'),
- //      name: '消息推送',
- //      authority: 'pushManagement'
- //    }
   ]
 },
 {
@@ -801,6 +801,12 @@ export const asyncRouterMap = [{
       component: _import('interior/employeesInput'),
       name: '员工录入',
       authority: 'employeesInput'
+    },
+    {
+      path: 'shareholder',
+      component: _import('interior/shareholder'),
+      name: '股东列表',
+      authority: 'shareholder'
     }
   ]
 }

src/views/appManagement/pushManagement/index.vue

@@ -399,6 +399,8 @@
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
+            console.log(this.form);
+            
             editObj(this.form).then(response => {
               if (response.status === 200) {
                 this.bannerDialogVisible = false;

src/views/financial/branchCompany.vue

@@ -53,13 +53,21 @@
 				<el-table-column prop="companyName" label="公司" align="center"></el-table-column>
 				<el-table-column prop="memberAmount" label="会员费" align="center"></el-table-column>
 				<el-table-column prop="rentVehilceAmount" label="租车费" align="center"></el-table-column>
-				<el-table-column prop="depositAmount" label="押金" align="center"></el-table-column>
+				
 				<el-table-column prop="noDeductibleAmount" label="不计免赔费" align="center"></el-table-column>
 				<el-table-column prop="travelAmount" label="旅游费" align="center"></el-table-column>
 				<el-table-column prop="rentDays" label="租借天数" align="center"></el-table-column>
 				<!-- <el-table-column prop="extralAmount" label="其他费用" align="center"></el-table-column> -->
 				<el-table-column prop="departureNum" label="出车服务次数" align="center"></el-table-column>
 				<el-table-column prop="arrivalNum" label="收车服务次数" align="center"></el-table-column>
+				<el-table-column prop="lossSpecifiedAmount" label="定损金额" align="center"></el-table-column>
+				<el-table-column prop="lateFeeAmount" label="违约金额" align="center"></el-table-column>
+				<el-table-column label="押金" align="center">
+					<template scope="scope">
+						<span>{{ Math.round((scope.row.depositAmount+scope.row.depositRefundAmount)*100)/100}}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="depositRefundAmount" label="已退押金" align="center"></el-table-column>
 			</el-table>
 
 			<el-pagination

src/views/interior/employeesInput.vue

@@ -5,12 +5,12 @@
 				<el-row>
 					<el-col :span="4">
 						<el-form-item label="姓名">
-							<el-input v-model.number="listQuery.name" placeholder="请输入姓名"></el-input>
+							<el-input v-model="listQuery.name" placeholder="请输入姓名"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="4">
 						<el-form-item label="手机号">
-							<el-input v-model.number="listQuery.phone" placeholder="请输入手机号"></el-input>
+							<el-input v-model="listQuery.phone" placeholder="请输入手机号"></el-input>
 						</el-form-item>
 					</el-col>
 
@@ -103,10 +103,10 @@
 			<el-dialog :title="staffTitle" :visible.sync="bulkUploadMember" class="member" @close="closeAdd">
 				<el-form :model="staffTitleFrom" ref="userMembership" :rules="rules" label-width="100px">
 					<el-form-item label="员工姓名">
-						<el-input v-model.number="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
+						<el-input v-model="staffTitleFrom.name" placeholder="请输入姓名"></el-input>
 					</el-form-item>
 					<el-form-item label="手机号">
-						<el-input v-model.number="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
+						<el-input v-model="staffTitleFrom.phone" placeholder="请输入手机号"></el-input>
 					</el-form-item>
 					<el-form-item label="入职日期" v-show="staffTitle == '新增员工'">
 						<el-date-picker
@@ -246,7 +246,8 @@
 					<span v-else-if="item.jobRemark == 4">(人事调动)  {{item.oldCompanyName}} => {{item.newCompanyName}}</span>
 					<span v-else-if="item.jobRemark == 2">(职位变更)   {{item.oldJobName}} => {{item.newJobName}}</span>
 					<span v-else-if="item.jobRemark == 3">(身份变更)  {{item.oldPositionName}} => {{item.newPositionName}}</span>
-					<span v-if="item.jobRemark == 5">离职</span>
+					<span v-else-if="item.jobRemark == 5">离职</span>
+					<span v-else-if="item.jobRemark == 6">复职</span>
 					<!-- <span v-else></span> -->
 				</p>
 			</el-dialog>
@@ -258,12 +259,12 @@
 				<div v-if="isShow == 4">
 					<el-form :model="amendCompany" ref="amendCompany" label-width="80px">
 						<el-form-item label="修改原因" style="width:80%">
-							<el-radio-group v-model="amendCompany.changeStatus" prop="changeStatus">
-								<el-radio-button label="3">人事调动</el-radio-button>
-								<el-radio-button label="2">信息修改</el-radio-button>
+							<el-radio-group v-model="amendStatus" prop="changeStatus">
+								<el-radio-button label="0">人事调动</el-radio-button>
+								<el-radio-button label="1">信息修改</el-radio-button>
 							</el-radio-group>
 						</el-form-item>
-						<el-form-item label="调动日期" v-show="amendCompany.changeStatus == 3" prop="relTime">
+						<el-form-item label="调动日期" v-show="amendStatus == 0" prop="relTime">
 							<el-date-picker v-model="amendCompany.relTime" type="datetime" placeholder="选择日期时间"></el-date-picker>
 						</el-form-item>
 						<el-form-item label="分公司" prop="companyId">
@@ -403,12 +404,11 @@ export default {
 			position:{
 				relTime: null, //修改时间
 				jobId:null,//职位
-
 			},
 			loading:true,
+			amendStatus:0,//0人事调动  1信息修改
 			//修改分公司
 			amendCompany: {
-				changeStatus: 3,
 				companyId: null, //公司id
 				relTime: null //修改时间
 			},
@@ -486,7 +486,6 @@ export default {
 				this.amendContent = '修改所属公司'
 				this.isShow = val
 				this.amendCompany= {
-					changeStatus: 3,
 					companyId: null, //公司id
 					relTime: null //修改时间
 				}
@@ -517,7 +516,7 @@ export default {
 			if (!this.amendCompany.companyId) {
 				this.$message('分公司不能为空')
 				return false
-			} else if (this.amendCompany.changeStatus == 3) {
+			} else if (this.amendStatus == 0) {
 				if (!this.amendCompany.relTime) {
 					this.$message('调动日期不能为空')
 					return false
@@ -527,24 +526,21 @@ export default {
 					this.amendCompany.companyName = name[0].name
 					this.amendCompany.jobId = this.staffTitleFrom.jobId
 					this.amendCompany.positionId = this.staffTitleFrom.positionId
+					this.amendCompany.changeStatus = 4
 					this.amendCompany.isQuit  = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
 					this.setApi(this.amendCompany)
 				}
 			} else {
+				//信息修改
 				let params = {};
 				let name = this.companyList.filter(item => item.id == this.amendCompany.companyId)
-				console.log(name)
 				params.companyName = name[0].name
 				params.companyId = name[0].id
 				params.positionId = this.staffTitleFrom.positionId
-				// params.isQuit  = this.staffTitleFrom.isQuit == '在职' ? 0 : 1
-				// params.changeStatus = 2
-				// params.jobId = this.staffTitleFrom.jobId
 				params.name = this.staffTitleFrom.name
 				params.phone = this.staffTitleFrom.phone
 				params.id = this.staffTitleFrom.id
-				console.log(params)
-				// this.setApi(this.amendCompany)
+				params.userId = this.staffTitleFrom.userId
 				editorUpd(params).then(data=>{
 					if (data.status == 200) {
 						this.$message.success('编辑成功')
@@ -561,6 +557,7 @@ export default {
 			params.phone = this.staffTitleFrom.phone
 			params.id = this.staffTitleFrom.id
 			params.name = this.staffTitleFrom.name
+			params.userId = this.staffTitleFrom.userId
 			updUserChange(params).then(data => {
 				if (data.status == 200) {
 					this.$message.success('编辑成功')
@@ -574,7 +571,7 @@ export default {
 		},
 		//身份修改
 		amendIdentityBtn() {
-			this.amendIdentity.changeStatus = 2
+			this.amendIdentity.changeStatus = 3
 			if (!this.amendIdentity.positionId || !this.amendIdentity.relTime ) {
 				this.$message('身份和变更日期不能为空')
 				return false
@@ -604,17 +601,22 @@ export default {
 				this.isJobForm.jobId = this.staffTitleFrom.jobId
 				if(val == '离职时间'){
 					this.setApi(this.isJobForm)
-				}else{
+				}else{//复职
+					// this.isJobForm.isQuit  = 2
+					// this.isJobForm.changeStatus = 6
+					// this.setApi(this.isJobForm)
 					let params = {}
 					params.phone = this.staffTitleFrom.phone
+					params.relTime =  formatDate(new Date(this.isJobForm.relTime), 'yyyy-MM-dd hh:mm:ss')
 					params.id = this.staffTitleFrom.id
 					params.companyName = this.staffTitleFrom.companyName
 					params.positionId = this.staffTitleFrom.positionId
 					params.companyId = this.staffTitleFrom.companyId
 					params.isQuit  = 0
-					params.changeStatus = 2
+					params.changeStatus = 6
 					params.jobId = this.staffTitleFrom.jobId
 					params.name = this.staffTitleFrom.name
+					params.userId = this.staffTitleFrom.userId
 					updAddPositionChangeRecord(params).then(data=>{
 						if (data.status == 200) {
 							this.$message.success('编辑成功')
@@ -851,6 +853,7 @@ export default {
 				companyName: row.companyName,
 				relTime: row.relTime,
 				id:row.id,
+				userId:row.userId,
 				jobId:row.jobId ==0 ? null : row.jobId,
 				isQuit: row.isQuit == 1 ? '离职' : '在职'
 			}
@@ -859,11 +862,10 @@ export default {
 		infoStaff(row) {
 			this.infoPop = true
 			this.staffInfo.info = row
-			findPositionChangeRecord({ phone: row.phone }).then(data => {
+			findPositionChangeRecord({ id: row.id }).then(data => {
 				if(data.status == 200){
 					this.staffInfo.record = data.data
 				}
-				
 			})
 		},
 		//确定

src/views/order/memberOrderInfo/index.vue

@@ -253,7 +253,9 @@
 				<el-row>
 				<el-col :span="6">
 					<el-form-item label="注册终端:">
-					<span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
+					 <span v-if="userDetails.channel == 1">安卓</span>
+					<span v-else-if="userDetails.channel == 2">小程序</span>
+					<span v-else-if="userDetails.channel == 3">ios</span>
 					</el-form-item>
 				</el-col>
 				<el-col :span="8">

src/views/statistics/orderStatistics.vue

@@ -53,7 +53,7 @@
 						<el-checkbox-group v-model="listQuery.statisticalSigns">
 							<span v-for="(item,index) in checkArr" :key="index" class="checkStyle">
 								<el-checkbox :label="item.id">{{item.name}}</el-checkbox>
-								<p v-show="item.id== 'ac_oavgq' || item.id== 'bc_rvavgq' || item.id== 'cd_tavgq'"></p>
+								<p v-show="item.id== 'ad_oavga' || item.id== 'ce_tavga' || item.id== 'bd_rvavga'"></p>
 							</span>
 						</el-checkbox-group>
 					</div>
@@ -63,7 +63,6 @@
 				</el-row>
 			</el-form>
 
-			<!-- <p v-for="(item,index) in chartArr" :key="index">{{item.row}}</p> -->
 			<div v-for="(item,index) in chartArr" :key="index">
 				<p style="text-align:center">{{checkArr.filter(val => val.id == item.title)[0].name}}</p>
 				<ve-line
@@ -111,19 +110,23 @@ export default {
 				{ name: '订单总额 ', id: 'aa_ota' },
 				{ name: '订单量 ', id: 'ab_otq' },
 				{ name: '订单平均量 ', id: 'ac_oavgq' },
+				{ name: '订单平均金额 ', id: 'ad_oavga' },
 				{ name: '租车订单总额 ', id: 'ba_rvta' },
 				{ name: '租车订单量', id: 'bb_rvtq' },
 				{ name: '租车订单平均量 ', id: 'bc_rvavgq' },
+				{ name: '租车平均金额 ', id: 'bd_rvavga' },
 				{ name: '旅游订单总额', id: 'ca_tta' },
 				{ name: '旅游订单量 ', id: 'cb_ttq' },
 				{ name: '旅游订单平均量 ', id: 'cd_tavgq' },
+				{ name: '旅游平均金额 ', id: 'ce_tavga' },
 				{ name: '会员订单总额 ', id: 'da_mta' },
 				{ name: '普通会员订单总额 ', id: 'db_cmta' },
 				{ name: '普通会员订单量 ', id: 'dc_cmtq' },
 				{ name: '黄金会员订单总额 ', id: 'dd_gmta' },
 				{ name: '黄金会员订单量 ', id: 'de_mgtq' },
 				{ name: '钻石会员订单总额 ', id: 'df_dmta' },
-				{ name: '钻石会员订单量 ', id: 'dg_dmtq' }
+				{ name: '钻石会员订单量 ', id: 'dg_dmtq' },
+				{ name: '会员平均金额 ', id: 'dh_mavga' },
 			],
 			//快捷筛选
 			listQuery: {

src/views/userManagement/userList/index.vue

@@ -92,7 +92,9 @@
       </el-table-column>
       <el-table-column width="110" align="center" label="注册终端">
         <template scope="scope">
-          <span>{{scope.row.channel}}</span>
+          <span v-if="scope.row.channel == 1">安卓</span>
+          <span v-else-if="scope.row.channel == 2">小程序</span>
+          <span v-else-if="scope.row.channel == 3">ios</span>
         </template>
       </el-table-column>
       <el-table-column width="90" align="center" label="来源">
@@ -148,9 +150,9 @@
           <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
             查看详情
           </el-button>
-          <el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
+          <!-- <el-button size="small" class="el-button el-button--text el-button--small" v-if="admin_btn_user_postion_put"
                      @click="peopleSetting(scope.row)">身份设置
-          </el-button>
+          </el-button> -->
           <el-button class="el-button el-button--text el-button--small" v-if="scope.row.status!=1&&userList_btn_edit"
                      size="small" @click=" setMember(scope.row)">设置会员信息
           </el-button>
@@ -226,7 +228,9 @@
             <el-row>
               <el-col :span="6">
                 <el-form-item label="注册终端:">
-                  <span>{{userDetails.channel == 1 ? 'app' : '小程序'}}</span>
+                  <span v-if="userDetails.channel == 1">安卓</span>
+                  <span v-else-if="userDetails.channel == 2">小程序</span>
+                  <span v-else-if="userDetails.channel == 3">ios</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -1127,7 +1131,7 @@
         listKey.lastTime = listKey.lastTime ? timestamp2Date(listKey.lastTime) : '';
         listKey.createTime = listKey.createTime ? timestamp2Date(listKey.createTime * 1000) : '';
         listKey.buyCount = listKey.buyCount ? listKey.buyCount : 0;
-        listKey.channel = this.terminal[listKey.channel];
+        // listKey.channel = this.terminal[listKey.channel];
         listKey.source = this.source[listKey.source];
         listKey.validTime = listKey.validTime ? ((listKey.validTime == 0) ? '永久' : listKey.validTime) : '无';
         listKey.visible2 = false

src/views/vehicle/vehicleInfo/index.vue

@@ -681,7 +681,7 @@
 				<el-row>
 					<el-col :span="12">
 						<el-form-item label="交强险单号" prop="strongInsuranceNo">
-							<el-input v-model.number="form.strongInsuranceNo" placeholder="请输入交强险单号"></el-input>
+							<el-input v-model="form.strongInsuranceNo" placeholder="请输入交强险单号"></el-input>
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">