achao 2 rokov pred
rodič
commit
95dd5713e6

+ 1 - 0
.env.development

@@ -3,3 +3,4 @@ ENV = 'development'
 
 # base api
 VUE_APP_BASE_API = '/pb'
+HOST = '/pb'

+ 2 - 0
.env.production

@@ -3,5 +3,7 @@ ENV = 'production'
 
 # base api
 VUE_APP_BASE_API = 'https://api.changyuntong56.com'
+# base api
+HOST = 'https://api.changyuntong56.com'
 # VUE_APP_BASE_API = 'http://192.168.1.114:8091'
 

+ 1 - 0
.env.staging

@@ -5,4 +5,5 @@ ENV = 'staging'
 
 # base api
 VUE_APP_BASE_API = '/stage-api'
+HOST='/stage-api'
 

BIN
public/img/ic_locationmarker.jpg


BIN
public/img/zuobiao.gif


+ 5 - 0
public/index.html

@@ -8,6 +8,11 @@
     <!-- <meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests"> -->
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
     <title><%= webpackConfig.name %></title>
+    <style>
+      .amap-sug-result{
+	z-index: 99999;
+}
+    </style>
   </head>
   <body>
     <noscript>

+ 15 - 0
src/api/cargoOwnerManagement.js

@@ -105,3 +105,18 @@ export function forbidden(data) {
      data: data,
   })
 }
+export function selectCargoOwnerList(data) {
+  return request({
+    url: '/cargoOwnerInfo/selectCargoOwnerList',
+    method: 'get',
+     params: data,
+  })
+}
+export function getInfo1(data) {
+  return request({
+    url: '/commonSysParameter/getInfo',
+    method: 'get',
+     params: data,
+  })
+}
+

+ 103 - 0
src/api/driverManagement.js

@@ -128,4 +128,107 @@ export function getBillList(data) {
   })
 }
 
+// 识别身份证
+export function getPersonShibie(data) {
+  return request({
+    url: '/driverInfo/personShibie',
+    method: 'get',
+    params: data,
+  })
+}
+
+export function editdriverInfo(data) {
+  return request({
+    url: '/driverInfo/api/editInfo',
+    method: 'post',
+     data: data,
+  })
+}
+
+export function adddriverInfo(data) {
+  return request({
+    url: '/driverInfo/api/addInfo',
+    method: 'post',
+     data: data,
+  })
+}
+
+// 司机列表
+export function selectDriverList(data) {
+  return request({
+    url: '/driverInfo/selectDriverList ',
+    method: 'get',
+     params: data,
+  })
+}
+
+export function getInfo(data) {
+  return request({
+    url: '/commonSysParameter/getInfo',
+    method: 'get',
+     params: data,
+  })
+}
+
+export function addCar(data) {
+  return request({
+    url: '/driverCarInfo/api/addInfo',
+    method: 'post',
+     data: data,
+  })
+}
+
+export function editCar(data) {
+  return request({
+    url: '/driverCarInfo/api/editInfo',
+    method: 'post',
+     data: data,
+  })
+}
+
+export function personShibie(data) {
+  return request({
+    url: '/driverInfo/personShibie',
+    method: 'get',
+     params: data,
+  })
+}
+export function bankShibie(data) {
+  return request({
+    url: '/driverInfo/bankShibie',
+    method: 'get',
+     params: data,
+  })
+}
+export function driverLicenseShibie(data) {
+  return request({
+    url: '/driverInfo/api/driverLicenseShibie',
+    method: 'get',
+     params: data,
+  })
+}
+export function qualificationLicenseShibie(data) {
+  return request({
+    url: '/driverInfo/api/qualificationLicenseShibie',
+    method: 'get',
+     params: data,
+  })
+}
+
+export function driveringLicenseShibie(data) {
+  return request({
+    url: '/driverCarInfo/api/driveringLicenseShibie',
+    method: 'get',
+     params: data,
+  })
+}
+
+export function tranLicenseShibie(data) {
+  return request({
+    url: '/driverCarInfo/api/tranLicenseShibie',
+    method: 'get',
+     params: data,
+  })
+}
+
 

+ 11 - 0
src/api/storage.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+const uploadPath = process.env.VUE_APP_BASE_API + '/upload/admin'
+export { uploadPath }
+
+export function createStorage(data) {
+  return request({
+    url: uploadPath,
+    method: 'post',
+    data
+  })
+}

+ 571 - 11
src/views/cargoOwnerManagement/taskAudit.vue

@@ -4,16 +4,16 @@
 		<div class="center_css">
 			<div class="top_css">
 				<el-row>
-					<el-col :span="14" style="height: 45px;">
-						<!-- <el-button type="primary">添加</el-button> -->
-					</el-col>
+					<!-- <el-col :span="14" style="height: 45px;">
+						<el-button type="primary" @click="add">添加</el-button>
+					</el-col> -->
 					<el-col :span="10">
 						<div class="screen">
 							<el-input class='find' placeholder="可按货主姓名、账号查找" v-model="searchkeyWord" clearable
 								@change="find"></el-input>
-							<el-button class="search" @click="find"><img width="16" height="16"
-									style="margin-left: -8px" src="../../../public/img/sousuo.png" /></el-button><span
-								class="count_css">共{{ deptBudgetTotal }}条</span>
+							<el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
+									src="../../../public/img/sousuo.png" /></el-button><span class="count_css">共{{
+										deptBudgetTotal }}条</span>
 						</div>
 					</el-col>
 				</el-row>
@@ -50,12 +50,14 @@
 				<el-table-column prop="cargoOwnerPhone" label="货主账号" min-width="108"></el-table-column>
 				<el-table-column prop="amountMoney" label="发货地" min-width="150">
 					<template slot-scope="scope">
-						{{ scope.row.sendPrivate }}{{ scope.row.sendCity }}{{ scope.row.sendArea }}{{ scope.row.sendDetailedAddress }}
+						{{ scope.row.sendPrivate }}{{ scope.row.sendCity }}{{ scope.row.sendArea }}{{
+							scope.row.sendDetailedAddress }}
 					</template>
 				</el-table-column>
 				<el-table-column prop="amountMoney" label="收货地" min-width="150">
 					<template slot-scope="scope">
-						{{ scope.row.unloadPrivate }}{{ scope.row.unloadCity }}{{ scope.row.unloadArea }}{{ scope.row.unloadDetailedAddress }}
+						{{ scope.row.unloadPrivate }}{{ scope.row.unloadCity }}{{ scope.row.unloadArea }}{{
+							scope.row.unloadDetailedAddress }}
 					</template>
 				</el-table-column>
 				<el-table-column prop="createDate" label="发布日期" min-width="100"></el-table-column>
@@ -69,8 +71,7 @@
 						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false"
 							:disabled="scope.row.status != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-link target="_blank" @click="reject(scope.row)" type="primary"
-							:underline="false">查看</el-link>
+						<el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false">查看</el-link>
 					</template>
 				</el-table-column>
 			</el-table>
@@ -162,16 +163,238 @@
 				</div>
 			</div>
 		</el-drawer>
+		<el-dialog :title="rwTitle" :visible.sync="dialogTableVisible">
+			<el-form ref="form" label-width="180px">
+				<el-form-item label="货主姓名">
+					<el-select v-model="value" placeholder="请选择" filterable @change="selectName" value-key="id">
+						<el-option v-for="(item, index) in cargoOwnerList" :key="index" :label="item.name" :value="item">
+							{{ item.name }}
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="货主身份">
+					<el-select v-model="value1" placeholder="请选择" filterable @change="selectCargoOwnerSF" value-key="id">
+						<el-option v-for="(item, index) in cargoOwnerSFList" :key="index" :label="item.company"
+							:value="item">
+							{{ item.company }}
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="发货地址">
+					<span @click="selectMaap(1)">地图选择发货地址</span>
+				</el-form-item>
+				<el-form-item label="发货地址">
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">省</span><el-input
+							v-model="dataDetails.sendPrivate"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">市</span><el-input
+							v-model="dataDetails.sendCity"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">区</span><el-input
+							v-model="dataDetails.sendArea"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">详细地址</span><el-input
+							v-model="dataDetails.sendDetailedAddress"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">经度</span><el-input
+							v-model="dataDetails.sendLongitude"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">纬度</span><el-input
+							v-model="dataDetails.sendLatitude"></el-input></div>
+				</el-form-item>
+				<el-form-item label="收货地址">
+					<span @click="selectMaap(2)">地图选择收货地址</span>
+				</el-form-item>
+				<el-form-item label="收货地址">
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">省</span><el-input
+							v-model="dataDetails.unloadPrivate"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">市</span><el-input
+							v-model="dataDetails.unloadCity"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">区</span><el-input
+							v-model="dataDetails.unloadArea"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">详细地址</span><el-input
+							v-model="dataDetails.unloadDetailedAddress"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">经度</span><el-input
+							v-model="dataDetails.unsendLongitude"></el-input></div>
+					<div style="display:flex;margin-bottom:10px"><span style="width:100px">纬度</span><el-input
+							v-model="dataDetails.unsendLatitude"></el-input></div>
+				</el-form-item>
+				<el-form-item label="距离">
+					<el-input placeholder="请输入距离" v-model="dataDetails.distance"></el-input>
+				</el-form-item>
+				<el-form-item label="业务类型">
+					<el-select v-model="value2" placeholder="请选择" filterable value-key="id">
+						<el-option v-for="(item, index) in businessList" :key="index" :label="item.constValue"
+							:value="item">
+							{{ item.constValue }}
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="货物类别">
+					<el-select v-model="value3" placeholder="请选择" filterable value-key="id">
+						<el-option v-for="(item, index) in goodsList" :key="index" :label="item.constValue" :value="item">
+							{{ item.constValue }}
+						</el-option>
+					</el-select>
+				</el-form-item>
+				<el-form-item label="货名">
+					<el-input placeholder="请输入货名" v-model="dataDetails.goodsName"></el-input>
+				</el-form-item>
+				<el-form-item label="收货方">
+					<el-input placeholder="请输入收货方" v-model="dataDetails.receiver"></el-input>
+				</el-form-item>
+				<el-form-item label="收货方手机号">
+					<el-input placeholder="请输入收货方手机号" v-model="dataDetails.receiverPhone"></el-input>
+				</el-form-item>
+				<el-form-item label="收货方身份证号(选填)">
+					<el-input placeholder="请输入收货方身份证号" v-model="dataDetails.receiverIdcard"></el-input>
+				</el-form-item>
+				<el-form-item label="收货方信用代码(选填)">
+					<el-input placeholder="请输入收货方信用代码" v-model="dataDetails.receiverCreditCode"></el-input>
+				</el-form-item>
+				<el-form-item label="运费计算方式">
+					<el-radio v-model="dataDetails.billingMethod" label="0">元/吨</el-radio>
+					<el-radio v-model="dataDetails.billingMethod" label="1">元/车</el-radio>
+				</el-form-item>
+				<el-form-item label="运费单价">
+					<el-input placeholder="请输入运费单价" v-model="dataDetails.freightPrice"></el-input>
+				</el-form-item>
+				<div style="font-weight:700;margin:20px 0">以下为附加信息(选填)</div>
+				<el-form-item label="发货联系人">
+					<el-input placeholder="输入发货联系人姓名" v-model="dataDetails.sender"></el-input>
+				</el-form-item>
+				<el-form-item label="发货人手机号">
+					<el-input placeholder="输入发货联系人手机号" v-model="dataDetails.senderPhone"></el-input>
+				</el-form-item>
+				<el-form-item label="重量(吨)">
+					<el-input placeholder="输入重量" v-model="dataDetails.weight"></el-input>
+				</el-form-item>
+				<el-form-item label="预计装车日期起">
+					<el-date-picker v-model="value4" type="date" placeholder="请选择预计装车日期起" value-format="yyyy-MM-dd">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="预计装车日期止">
+					<el-date-picker v-model="value5" type="date" placeholder="请选择预计装车日期止" value-format="yyyy-MM-dd">
+					</el-date-picker>
+				</el-form-item>
+				<el-form-item label="车长要求(米)">
+					<div style="display:flex">
+						<el-input placeholder="最短不限" v-model="dataDetails.carLengthSmall"></el-input>-<el-input
+							placeholder="最长不限" v-model="dataDetails.carLength"></el-input>
+					</div>
+
+				</el-form-item>
+				<el-form-item label="载重要求(吨)">
+					<div style="display:flex">
+						<el-input placeholder="最小不限" v-model="dataDetails.loadWeightSmall"></el-input>-<el-input
+							placeholder="最大不限" v-model="dataDetails.loadWeight"></el-input>
+					</div>
+
+				</el-form-item>
+				<el-form-item label="载重要求(吨)">
+					<el-checkbox-group v-model="checkList">
+						<el-checkbox label="不限"></el-checkbox>
+						<el-checkbox label="高栏"></el-checkbox>
+						<el-checkbox label="集装箱"></el-checkbox>
+						<el-checkbox label="自卸车"></el-checkbox>
+					</el-checkbox-group>
+				</el-form-item>
+				<el-form-item label="任务描述">
+					<el-input type="textarea" :rows="2" placeholder="请输入内容" v-model="dataDetails.taskDescription">
+					</el-input>
+				</el-form-item>
+				<el-form-item label="任务有效期">
+					<el-date-picker v-model="value6" type="date" placeholder="请选择任务有效期" value-format="yyyy-MM-dd"
+						:disabled="checked">
+					</el-date-picker>
+					<el-checkbox v-model="checked" style="margin-left: 20px;" @change="changeChecked">长期</el-checkbox>
+				</el-form-item>
+				<div class="form_btn">
+					<el-button @click="dialogTableVisible = false">取消</el-button>
+					<el-button @click="release" type="primary">确定</el-button>
+				</div>
+			</el-form>
+		</el-dialog>
+		<el-dialog title="地图" :visible.sync="dialogTableVisible1" @opened="openMap">
+			<div id="mapContainer"></div>
+			<el-input type="text" id="searchValue" placeholder="请输入关键字:" v-model="address" clearable class="address-input">
+			</el-input>
+			<div class="form_btn">
+				<el-button @click="dialogTableVisible1 = false">取消</el-button>
+				<el-button @click="submitInfo" type="primary">确定地址</el-button>
+			</div>
+		</el-dialog>
 	</div>
 </template>
 <script>
+import AMapLoader from '@amap/amap-jsapi-loader';
+import image from '../../../public/img/zuobiao.gif'
 import {
 	getListLook,
-	toTaskExamine
+	toTaskExamine,
+	selectCargoOwnerList,
+	getInfo1,
+	add,
+	edit
 } from '@/api/cargoOwnerManagement'
 export default {
 	data() {
 		return {
+			cargoOwnerSFList: [],
+			checked: false,
+			checkList: ['不限'],
+			radio: "0",
+			goodsList: [],
+			businessList: [],
+			cargoOwnerList: [],
+			mapType: '',
+			address: '',
+			autoOptions: {
+				input: "tipinput"
+			},
+			map: null,
+			value: '',
+			value1: '',
+			value2: '',
+			value3: '',
+			value4: '',
+			value5: '',
+			value6: '',
+			dataDetails: {
+				commonId: '',
+				cargoOwner: '',
+				sendPrivate: '',
+				sendCity: '',
+				sendArea: '',
+				sendDetailedAddress: '',
+				unloadPrivate: '',
+				unloadCity: '',
+				unloadArea: '',
+				unloadDetailedAddress: '',
+				distance: '',
+				goodsName: '',
+				billingMethod: '元/吨',
+				freightPrice: '',
+				freightAdvance: false,
+				sender: '',
+				senderPhone: '',
+				receiver: '',
+				receiverPhone: '',
+				weight: '',
+				loadingDateStart: '',
+				loadingDateEnd: '',
+				carLengthSmall: '',
+				carLength: '',
+				loadWeightSmall: '',
+				loadWeight: '',
+				carModel: '',
+				taskDescription: '',
+				taskValidity: '',
+				sendLongitude: '',
+				sendLatitude: '',
+				unsendLongitude: '',
+				unsendLatitude: '',
+				sendAdCode: '',
+				unsendAdCode: ''
+			},
+			rwTitle: '新增',
+			dialogTableVisible: false,
+			dialogTableVisible1: false,
 			tableData: [],
 			//分页
 			searchkeyWord: "",
@@ -188,13 +411,320 @@ export default {
 			},
 			rightSee: false,
 			taskLook: {},
+			zoomEnable: true,
+			markers: [],
+			polygons: [],
+			status: true,
+			center: '',
+			dragEnable: true,
 		};
 	},
 	mounted() {
 		this.getList()
+
 	},
 	methods: {
+		release(){
+			this.dataDetails.businessType = this.value2
+			this.dataDetails.goodsType = this.value3
+			this.dataDetails.loadingDateStart = this.value4
+			this.dataDetails.loadingDateEnd = this.value5
+			this.dataDetails.taskValidity = this.value6
+			this.dataDetails.carModel = this.checkList.toString()
+			if(rwTitle=='编辑'){
+
+			}else{
+
+			}
+		},
+		getDistance(lat1, lng1, lat2, lng2) {
+			function Rad(d) {
+				return d * Math.PI / 180.0;
+			}
+			if (!lat1 || !lng1) {
+				return '';
+			}
+			// lat1用户的纬度
+			// lng1用户的经度
+			// lat2商家的纬度
+			// lng2商家的经度
+			let radLat1 = Rad(lat1);
+			let radLat2 = Rad(lat2);
+			let a = radLat1 - radLat2;
+			let b = Rad(lng1) - Rad(lng2);
+			let s = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLat1) * Math.cos(radLat2) *
+				Math.pow(
+					Math.sin(b / 2), 2)));
+			s = s * 6378.137;
+			s = Math.round(s * 10000) / 10000;
+			s = s.toFixed(2) //保留两位小数
+			return s
+		},
+		changeChecked(e) {
+			console.log(e)
+			if (e) {
+				this.value6 = ''
+			} else {
+				this.value6 = this.dataDetails.taskValidity
+			}
+		},
+		selectCargoOwnerSF(item) {
+			debugger
+			if (item.company == '个人货主') {
+				this.dataDetails.compId = ""
+				this.dataDetails.freightAdvance = 0
+			} else {
+				this.dataDetails.compId = item.id
 
+
+			}
+
+		},
+		selectName(item) {
+			console.log(item)
+			this.cargoOwnerSFList = []
+			this.cargoOwnerSFList.push({ company: '个人货主' })
+			if (item.hyCargoOwnerCompInfoList) {
+				this.cargoOwnerSFList = this.cargoOwnerSFList.concat(item.hyCargoOwnerCompInfoList)
+			}
+			this.dataDetails.commonId = item.commonId
+			console.log(this.cargoOwnerSFList)
+			//   this.dataDetails.driverId = item.id
+			//   this.dataDetails.commonId = item.commonId
+			//   this.dataDetails.driverName = item.driverName
+		},
+		openMap() {
+			if (window.AMap && window.AMapUI) {
+			} else {
+				AMapLoader.load({
+					"key": "211dd6f989e719022aaf47ddb0659c47", // 申请好的Web端开发者Key,首次调用 load 时必填
+					"version": "2.0", // 指定要加载的 JSAPI 的版本,缺省时默认为 1.4.15
+					"plugins": ['plugin=AMap.Scale', 'AMap.ToolBar', 'AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch', 'AMap.Geolocation', 'Geolocation'],
+					"Loca": { // 是否加载 Loca, 缺省不加载
+						"version": '2.0.0' // Loca 版本,缺省 1.3.2
+					},
+				}).then((AMap) => {
+					setTimeout(() => {
+						var that = this
+						this.map = new AMap.Map('mapContainer', {
+							resizeEnable: true,
+							zoom: 10,
+							zoomEnable: this.zoomEnable,
+							dragEnable: this.dragEnable,
+						})
+						this.map.on('click', function (e) {
+							if (this.status) {
+								var marker = new AMap.Marker({
+									position: new AMap.LngLat(e.lnglat.getLng(), e.lnglat
+										.getLat()), // 经纬度对象,也可以是经纬度构成的一维数组[116.39, 39.9]
+								})
+								that.map.remove(that.markers)
+								// that.$emit('marker', e)
+								that.markers.push(marker)
+								// 将创建的点标记添加到已有的地图实例:
+								that.map.add(marker)
+							}
+						})
+						this.marker = new AMap.Marker({
+							icon: new AMap.Icon({
+								size: new AMap.Size(0, 0),
+								image: image,
+							}),
+							map: that.map,
+						})
+						AMap.plugin(
+							['AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Geocoder', 'AMap.DistrictSearch'],
+							function () {
+								var autocomplete = new AMap.AutoComplete({
+									input: 'searchValue',
+								})
+								var placeSearch = new AMap.PlaceSearch({
+									map: that.map,
+								})
+								// var districtSearch = new AMap.DistrictSearch({
+								//   subdistrict: 1,
+								//   level: 'city',
+								//   showbiz: false,
+								// });
+								autocomplete.on('select', function (e) {
+									that.marker.setMap(that.map)
+									if (e.poi.location) {
+										placeSearch.search() // 关键字查询查询
+										that.marker.setPosition(e.poi.location)
+										geocoder.getAddress(e.poi.location, function (status, result) {
+											console.log(e.poi.location, "klokolkjolk")
+											if (status === 'complete') {
+												let regex = "(?<province>[^省]+省|.+自治区)(?<city>[^自治州]+自治州|[^市]+市|[^盟]+盟|[^地区]+地区|.+区划)(?<county>[^市]+市|[^县]+县|[^旗]+旗|.+区)?(?<town>[^区]+区|.+镇)?(?<village>.*)";
+												let address = result.regeocode.formattedAddress;
+												let _result = address.match(regex);
+												if (that.mapType == 1) {
+													that.dataDetails.sendPrivate = result.regeocode.addressComponent.province
+													that.dataDetails.sendCity = result.regeocode.addressComponent.city
+													that.dataDetails.sendArea = result.regeocode.addressComponent.district
+													that.dataDetails.sendDetailedAddress = _result[5]
+													that.dataDetails.sendLatitude = e.poi.location.lat
+													that.dataDetails.sendLongitude = e.poi.location.lng
+												} else {
+													that.dataDetails.unloadPrivate = result.regeocode.addressComponent.province
+													that.dataDetails.unloadCity = result.regeocode.addressComponent.city
+													that.dataDetails.unloadArea = result.regeocode.addressComponent.district
+													that.dataDetails.unloadDetailedAddress = _result[5]
+													that.dataDetails.unsendLatitude = e.poi.location.lat
+													that.dataDetails.unsendLongitude = e.poi.location.lng
+												}
+													if (that.dataDetails.sendLatitude && that.dataDetails.sendLongitude && that.dataDetails.unsendLatitude && that.dataDetails
+				.unsendLongitude) {
+				that.dataDetails.distance = that.getDistance(that.dataDetails.unsendLatitude, that.dataDetails
+					.unsendLongitude,
+					that.dataDetails.sendLatitude, that.dataDetails.sendLongitude)
+			}
+
+											}
+											that.map.setFitView()
+										})
+									} else {
+										districtSearch.search(e.poi.name, (status, result1) => {
+											if (status == 'complete') {
+												that.marker.setPosition(result1.districtList[0].center)
+												geocoder.getAddress(result1.districtList[0].center, function (status, result) {
+													if (status === 'complete') {
+														debugger
+														var obj = {}
+
+														// that.province = result.regeocode.addressComponent.province
+														// that.city = result.regeocode.addressComponent.city
+														// that.district = result.regeocode.addressComponent.district
+														// obj.formattedAddress = result.regeocode.formattedAddress
+														// obj.areacode = result.regeocode.addressComponent.adcode
+														// that.address = result.regeocode.formattedAddress
+														// obj.lat = result1.districtList[0].center.lat
+														// obj.lng = result1.districtList[0].center.lng
+													} else {
+													}
+													that.map.setFitView()
+												})
+
+
+											}
+										})
+									}
+								})
+								// 经纬度
+								var geocoder = new AMap.Geocoder({
+									radius: 1000,
+								})
+								that.map.on('moveend', function (e) {
+									//地图变动之后需要重新赋值省市区,未完成
+									that.center = that.map.getCenter(); //获取当前地图中心位置
+									console.log(that.center)
+									that.center.lat = Number(that.center.lat.toFixed(3))
+									that.center.lng = Number(that.center.lng.toFixed(3))
+									for (var i = 0, l = that.polygons.length; i < l; i++) {
+										that.polygons[i].setMap(null)
+									}
+									that.marker.setMap(that.map)
+									that.marker.setPosition(that.center)
+									geocoder.getAddress(that.center, function (status, result) {
+										if (status === 'complete') {
+											let regex = "(?<province>[^省]+省|.+自治区)(?<city>[^自治州]+自治州|[^市]+市|[^盟]+盟|[^地区]+地区|.+区划)(?<county>[^市]+市|[^县]+县|[^旗]+旗|.+区)?(?<town>[^区]+区|.+镇)?(?<village>.*)";
+											let address = result.regeocode.formattedAddress;
+											let _result = address.match(regex);
+											if (that.mapType == 1) {
+												that.dataDetails.sendPrivate = result.regeocode.addressComponent.province
+												that.dataDetails.sendCity = result.regeocode.addressComponent.city
+												that.dataDetails.sendArea = result.regeocode.addressComponent.district
+												that.dataDetails.sendDetailedAddress = _result[5]
+												that.dataDetails.sendLatitude = that.center.lat
+												that.dataDetails.sendLongitude = that.center.lng
+											} else {
+												that.dataDetails.unloadPrivate = result.regeocode.addressComponent.province
+												that.dataDetails.unloadCity = result.regeocode.addressComponent.city
+												that.dataDetails.unloadArea = result.regeocode.addressComponent.district
+												that.dataDetails.unloadDetailedAddress = _result[5]
+												that.dataDetails.unsendLatitude = that.center.lat
+												that.dataDetails.unsendLongitude = that.center.lng
+											}
+											if (that.dataDetails.sendLatitude && that.dataDetails.sendLongitude && that.dataDetails.unsendLatitude && that.dataDetails
+				.unsendLongitude) {
+				that.dataDetails.distance = that.getDistance(that.dataDetails.unsendLatitude, that.dataDetails
+					.unsendLongitude,
+					that.dataDetails.sendLatitude, that.dataDetails.sendLongitude)
+			}
+										} else {
+										}
+									})
+								});
+								that.map.on('zoomend', function () {
+									//地图变动之后需要重新赋值省市区,未完成
+									// this.zoom = map.getZoom(); //获取当前地图级别
+									that.center = that.map.getCenter(); //获取当前地图中心位置
+									console.log(that.center)
+									that.center.lat = Number(that.center.lat.toFixed(3))
+									that.center.lng = Number(that.center.lng.toFixed(3))
+									for (var i = 0, l = that.polygons.length; i < l; i++) {
+										that.polygons[i].setMap(null)
+									}
+									that.marker.setMap(that.map)
+									that.marker.setPosition(that.center)
+									geocoder.getAddress(that.center, function (status, result) {
+										if (status === 'complete') {
+											debugger
+											var obj = {}
+											//   that.province = result.regeocode.addressComponent.province
+											//   that.city = result.regeocode.addressComponent.city
+											//   that.district = result.regeocode.addressComponent.district
+											//   obj.formattedAddress = result.regeocode.formattedAddress
+											//   obj.areacode = result.regeocode.addressComponent.adcode
+											//   that.address = result.regeocode.formattedAddress
+											//   obj.lat = that.center.lat
+											//   obj.lng = that.center.lng
+											//   that.$emit('pickedAddress', obj)
+										} else {
+											//   that.$emit('pickedAddress', '')
+										}
+									})
+								});
+								// 根据坐标点定位,获取地址的详细信息
+								if (that.position) {
+									that.marker.setMap(that.map)
+									that.marker.setPosition(that.position)
+									geocoder.getAddress(that.position, function (status, result) {
+										if (status === 'complete') {
+											debugger
+											var obj = {}
+											//   obj.formattedAddress = result.regeocode.formattedAddress
+											//   obj.areacode = result.regeocode.addressComponent.adcode
+											//   that.address = result.regeocode.formattedAddress
+											//   that.$emit('positionAddress', obj)
+											//   that.province = result.regeocode.addressComponent.province
+											//   that.city = result.regeocode.addressComponent.city
+											//   that.district = result.regeocode.addressComponent.district
+										}
+									})
+									that.map.setFitView()
+								} else {
+									return false
+								}
+							}
+						)
+					}, 500)
+					// this.loadmap()
+					// this.loadmap()
+				}).catch(e => {
+					console.log(e);
+				})
+			}
+		},
+		selectMaap(type) {
+			this.dialogTableVisible1 = true
+			this.mapType = type
+		},
+		submitInfo() {
+			this.dialogTableVisible1 = false
+		},
+		add() {
+			this.dialogTableVisible = true
+		},
 		getList() {
 
 			this.loading = true
@@ -212,6 +742,32 @@ export default {
 				.catch(() => {
 					this.loading = false
 				})
+			selectCargoOwnerList().then(response => {
+				this.cargoOwnerList = response.data
+				this.listLoading = false
+			})
+				.catch(() => {
+					this.loading = false
+				})
+			getInfo1({ constId: "BUS1" }).then(response => {
+				this.dataDetails.businessType = response.data[0].constValue
+				this.dataDetails.businessTypeKey = response.data[0].constKey
+				this.businessList = response.data
+				this.listLoading = false
+			})
+				.catch(() => {
+					this.loading = false
+				})
+			getInfo1({ constId: "CON1" }).then(response => {
+				this.dataDetails.goodsType = response.data[0].constValue
+				this.dataDetails.goodsTypeKey = response.data[0].constKey
+				this.goodsList = response.data
+				this.listLoading = false
+			})
+				.catch(() => {
+					this.loading = false
+				})
+
 		},
 		adopt(row) {
 			this.taskLook = row
@@ -499,4 +1055,8 @@ export default {
 .find::v-deep input.el-input__inner {
 	border-radius: 0;
 }
+
+#mapContainer {
+	height: 50vh;
+}
 </style>

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 671 - 272
src/views/driverManagement/identityExamine.vue


+ 1100 - 471
src/views/driverManagement/vehicleExamine.vue

@@ -5,22 +5,22 @@
       <div class="top_css">
         <el-row>
           <el-col :span="14" style="height: 45px;">
-            <!-- <el-button type="primary">添加</el-button> -->
+            <el-button type="primary" @click="addCar">添加</el-button>
           </el-col>
           <el-col :span="10">
             <div class="screen">
-              <el-input class='find' placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" @keyup.enter.native="find" clearable @change="find"></el-input>
+              <el-input class='find' placeholder="可按司机姓名、账号、车牌号查找" v-model="searchkeyWord" @keyup.enter.native="find"
+                clearable @change="find"></el-input>
               <el-button class="search" @click="find"><img width="16" height="16" style="margin-left: -8px"
-                  src="../../../public/img/sousuo.png" /></el-button><span
-                class="count_css">共{{ deptBudgetTotal }}条</span>
+                  src="../../../public/img/sousuo.png" /></el-button><span class="count_css">共{{ deptBudgetTotal
+                  }}条</span>
             </div>
           </el-col>
         </el-row>
         <el-row>
           <el-col>
             <div class="search_btn">
-              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
-                @click="searchBtn('')">
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block" @click="searchBtn('')">
                 全部
               </div>
               <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
@@ -42,37 +42,37 @@
           </el-col>
         </el-row>
       </div>
-      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="58vh" border highlight-current-row>
-        <el-table-column type="index" width="60"  label="序号" align="center">
-            <template scope="scope">
-                <span>{{scope.$index + 1}}</span>
-                <!-- <span v-else>{{scope.$index}}</span> -->
-            </template>
+      <el-table :data="tableData" style="width: 98%; margin: 0 auto; border-radius: 10px" height="58vh" border
+        highlight-current-row>
+        <el-table-column type="index" width="60" label="序号" align="center">
+          <template scope="scope">
+            <span>{{ scope.$index + 1 }}</span>
+            <!-- <span v-else>{{scope.$index}}</span> -->
+          </template>
         </el-table-column>
         <el-table-column prop="driverName" label="司机姓名" min-width="130"></el-table-column>
         <el-table-column prop="driverPhone" label="账号" min-width="110"></el-table-column>
         <el-table-column prop="numberCard" label="身份证号" min-width="165"></el-table-column>
         <el-table-column prop="carCategory" label="车型">
           <template scope="scope">
-            <span>{{scope.row.carCategory}}</span>
-            <span>{{scope.row.carType}}</span>
+            <span>{{ scope.row.carCategory }}</span>
+            <span>{{ scope.row.carType }}</span>
           </template>
-        </el-table-column> 
+        </el-table-column>
         <el-table-column prop="carNumber" label="车牌号" min-width="90"></el-table-column>
         <el-table-column prop="guaCarNumber" label="挂车车牌号" min-width="100"></el-table-column>
         <el-table-column prop="amountMoney" label="附件">
           <template scope="scope">
             <div>
               <span class="btn_css" @click="fujianLook(scope.row)">查看</span>
-              <el-tooltip placement="top" v-if="
-                scope.row.overdueFlag == 1 ||
+              <el-tooltip placement="top" v-if="scope.row.overdueFlag == 1 ||
                 scope.row.driverOverdueFlag == 1 || //驾驶证过期标志
                 scope.row.drivingOverdueFlag == 1 || //行驶证过期标志
                 scope.row.trailerOverdueFlag == 1 ||  //挂车行驶证过期标志
                 scope.row.operationOverdueFlag == 1 || //运营证过期标志
                 scope.row.operationOverdueFlag == 1 || //道路运输证过期标志
                 scope.row.trailerOperationOverdueFlag == 1 //挂车道路运输证过期标志
-              ">
+                ">
                 <div slot="content">
                   <span v-if="scope.row.overdueFlag == 1">身份证已过有效期<br /></span>
                   <span v-if="scope.row.driverOverdueFlag == 1">驾驶证已过有效期<br /></span>
@@ -99,8 +99,10 @@
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="reject(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.status != '审核中'">驳回</el-link>
-              <el-divider direction="vertical"></el-divider>
-              <el-link target="_blank" @click="lookmessage(scope.row)" type="primary" :underline="false">查看</el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="lookmessage(scope.row)" type="primary" :underline="false">查看</el-link>
+            <el-divider direction="vertical"></el-divider>
+            <el-link target="_blank" @click="edit(scope.row)" type="primary" :underline="false">编辑</el-link>
           </template>
         </el-table-column>
       </el-table>
@@ -122,7 +124,8 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal='false' title="附件" :visible.sync="fujianInfo" width="830px" :before-close="fujianClose">
+    <el-dialog :close-on-click-modal='false' title="附件" :visible.sync="fujianInfo" width="830px"
+      :before-close="fujianClose">
       <div class="file">
         <div class="fujian_css">
           <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
@@ -137,13 +140,15 @@
           <!-- <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
             从业资格证
           </div> -->
-          <div v-if='file.carCategory=="挂车"' class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
+          <div v-if='file.carCategory == "挂车"' class="fujian_item" :class="count == 5 ? 'file_btn' : ''"
+            @click="btnChange(5)">
             挂车行驶证
           </div>
           <div class="fujian_item" :class="count == 6 ? 'file_btn' : ''" @click="btnChange(6)">
             道路运输证
           </div>
-          <div v-if='file.carCategory=="挂车"' class="fujian_item" :class="count == 7 ? 'file_btn' : ''" @click="btnChange(7)">
+          <div v-if='file.carCategory == "挂车"' class="fujian_item" :class="count == 7 ? 'file_btn' : ''"
+            @click="btnChange(7)">
             挂车道路运输证
           </div>
           <div class="fujian_item" :class="count == 8 ? 'file_btn' : ''" @click="btnChange(8)">
@@ -154,10 +159,18 @@
           </div>
         </div>
         <div class="file_tips">
-          <span v-if="count == 3">有效期:{{file.drivingLicenseValidityDate}} </span><span v-if="count == 3"> 注册日期:{{file.drivingLicenseRegistrationDate}} </span> <span v-if="count == 3"> 发证日期:{{file.drivingLicenseIssueDate}} </span> <span v-if="count == 3"> 发证机关:{{file.lssuingAuthority}}</span>
-          <span v-if="count == 5">有效期:{{file.trailerLicenseValidityDate}} </span><span v-if="count == 5"> 注册日期:{{file.trailerLicenseRegistrationDate}} </span> <span v-if="count == 5"> 发证日期:{{file.trailerLicenseIssueDate}} </span> <span v-if="count == 5"> 发证机关:{{file.guaLssuingAuthority}}</span>
-          <span v-if="count == 6"> 运输证号:{{file.operationCertificateNumber}} </span><span v-if="count == 6">有效期:{{file.operationCertificateValidityDate}} </span>
-          <span v-if="count == 7"> 挂车运输证号:{{file.trailerOperationCertificateNumber}} </span><span v-if="count == 7">有效期:{{file.trailerOperationCertificateValidityDate}} </span>
+          <span v-if="count == 3">有效期:{{ file.drivingLicenseValidityDate }} </span><span v-if="count == 3">
+            注册日期:{{ file.drivingLicenseRegistrationDate }} </span> <span v-if="count == 3">
+            发证日期:{{ file.drivingLicenseIssueDate }} </span> <span v-if="count == 3"> 发证机关:{{ file.lssuingAuthority
+            }}</span>
+          <span v-if="count == 5">有效期:{{ file.trailerLicenseValidityDate }} </span><span v-if="count == 5">
+            注册日期:{{ file.trailerLicenseRegistrationDate }} </span> <span v-if="count == 5">
+            发证日期:{{ file.trailerLicenseIssueDate }} </span> <span v-if="count == 5">
+            发证机关:{{ file.guaLssuingAuthority }}</span>
+          <span v-if="count == 6"> 运输证号:{{ file.operationCertificateNumber }} </span><span v-if="count == 6">有效期:{{
+            file.operationCertificateValidityDate }} </span>
+          <span v-if="count == 7"> 挂车运输证号:{{ file.trailerOperationCertificateNumber }} </span><span
+            v-if="count == 7">有效期:{{ file.trailerOperationCertificateValidityDate }} </span>
         </div>
         <div class="file_img">
           <img :src="img[index]" class="img_css" @click="enlarge(img[index])" />
@@ -170,7 +183,8 @@
         </div>
       </div>
     </el-dialog>
-    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px" :before-close="rejectClose">
+    <el-dialog :close-on-click-modal='false' title="驳回认证" :visible.sync="rejectInfo" width="400px"
+      :before-close="rejectClose">
       <div>
         <!-- <div><span class="sign">*</span>选择驳回原因</div> -->
         <div class="form_css">
@@ -197,593 +211,1208 @@
       <div class="right_css">
         <div style='height:80vh;overflow-y:scroll;'>
           <!-- <div class="title_name">基本信息</div> -->
-          <div class="right_item">车型:{{costData.carCategory}}{{costData.carType}}</div>
+          <div class="right_item">车型:{{ costData.carCategory }}{{ costData.carType }}</div>
           <div class="right_title">道路运输证</div>
           <div class="right_item">
-            <img :src="costData.operationCertificate" class="right_img_css" @click="enlarge(costData.operationCertificate)" />
+            <img :src="costData.operationCertificate" class="right_img_css"
+              @click="enlarge(costData.operationCertificate)" />
           </div>
           <div class="right_title">道路运输证号</div>
-          <div class="right_item">{{costData.operationCertificateNumber}}</div>
+          <div class="right_item">{{ costData.operationCertificateNumber }}</div>
           <div class="right_title">道路运输证有效期</div>
-          <div class="right_item">{{costData.operationCertificateValidityDate}}</div>
+          <div class="right_item">{{ costData.operationCertificateValidityDate }}</div>
           <div class="right_title">挂车道路运输证</div>
           <div class="right_item">
-            <img :src="costData.trailerOperationCertificate" class="right_img_css" @click="enlarge(costData.trailerOperationCertificate)" />
+            <img :src="costData.trailerOperationCertificate" class="right_img_css"
+              @click="enlarge(costData.trailerOperationCertificate)" />
           </div>
           <div class="right_title">挂车道路运输证号</div>
-          <div class="right_item">{{costData.trailerOperationCertificateNumber}}</div>
+          <div class="right_item">{{ costData.trailerOperationCertificateNumber }}</div>
           <div class="right_title">挂车道路运输证有效期</div>
-          <div class="right_item">{{costData.trailerOperationCertificateValidityDate}}</div>
+          <div class="right_item">{{ costData.trailerOperationCertificateValidityDate }}</div>
           <div class="right_title">行驶证主页</div>
           <div class="right_item">
-            <img :src="costData.drivingLicenseHomePage" class="right_img_css" @click="enlarge(costData.drivingLicenseHomePage)" />
+            <img :src="costData.drivingLicenseHomePage" class="right_img_css"
+              @click="enlarge(costData.drivingLicenseHomePage)" />
           </div>
           <div class="right_title">行驶证副页</div>
           <div class="right_item">
-            <img :src="costData.drivingLicenseBackPage" class="right_img_css" @click="enlarge(costData.drivingLicenseBackPage)" />
+            <img :src="costData.drivingLicenseBackPage" class="right_img_css"
+              @click="enlarge(costData.drivingLicenseBackPage)" />
           </div>
           <div class="right_title">行驶证车辆类型</div>
-          <div class="right_item">{{costData.vehicleType}}</div>
+          <div class="right_item">{{ costData.vehicleType }}</div>
           <div class="right_title">行驶证档案编号</div>
-          <div class="right_item">{{costData.drivingLicenseNumber}}</div>
+          <div class="right_item">{{ costData.drivingLicenseNumber }}</div>
           <div class="right_title">注册日期</div>
-          <div class="right_item">{{costData.drivingLicenseRegistrationDate}}</div>
+          <div class="right_item">{{ costData.drivingLicenseRegistrationDate }}</div>
           <div class="right_title">发证日期</div>
-          <div class="right_item">{{costData.drivingLicenseIssueDate}}</div>
+          <div class="right_item">{{ costData.drivingLicenseIssueDate }}</div>
           <div class="right_title">行驶证有效期</div>
-          <div class="right_item">{{costData.drivingLicenseValidityDate}}</div>
+          <div class="right_item">{{ costData.drivingLicenseValidityDate }}</div>
           <div class="right_title">使用性质</div>
-          <div class="right_item">{{costData.useNature}}</div>
+          <div class="right_item">{{ costData.useNature }}</div>
           <div class="right_title">发证机关</div>
-          <div class="right_item">{{costData.lssuingAuthority}}</div>
+          <div class="right_item">{{ costData.lssuingAuthority }}</div>
           <div class="right_title">车辆能源类型</div>
-          <div class="right_item">{{costData.energyType}}</div>
+          <div class="right_item">{{ costData.energyType }}</div>
           <div class="right_title">挂车行驶证主页</div>
           <div class="right_item">
-            <img :src="costData.trailerLicenseHomePage" class="right_img_css" @click="enlarge(costData.drivingLicenseHomePage)" />
+            <img :src="costData.trailerLicenseHomePage" class="right_img_css"
+              @click="enlarge(costData.drivingLicenseHomePage)" />
           </div>
-           <div class="right_title">挂车行驶证副页</div>
+          <div class="right_title">挂车行驶证副页</div>
           <div class="right_item">
-            <img :src="costData.trailerLicenseBackPage" class="right_img_css" @click="enlarge(costData.drivingLicenseBackPage)" />
+            <img :src="costData.trailerLicenseBackPage" class="right_img_css"
+              @click="enlarge(costData.drivingLicenseBackPage)" />
           </div>
           <div class="right_title">挂车行驶证档案编号</div>
-          <div class="right_item">{{costData.trailerLicenseNumber}}</div>
+          <div class="right_item">{{ costData.trailerLicenseNumber }}</div>
           <div class="right_title">注册日期</div>
-          <div class="right_item">{{costData.trailerLicenseRegistrationDate}}</div>
+          <div class="right_item">{{ costData.trailerLicenseRegistrationDate }}</div>
           <div class="right_title">发证日期</div>
-          <div class="right_item">{{costData.trailerLicenseIssueDate}}</div>
+          <div class="right_item">{{ costData.trailerLicenseIssueDate }}</div>
           <div class="right_title">挂车行驶证有效期</div>
-          <div class="right_item">{{costData.trailerLicenseValidityDate}}</div>
+          <div class="right_item">{{ costData.trailerLicenseValidityDate }}</div>
           <div class="right_title">使用性质</div>
-          <div class="right_item">{{costData.guaUseNature}}</div>
+          <div class="right_item">{{ costData.guaUseNature }}</div>
           <div class="right_title">发证机关</div>
-          <div class="right_item">{{costData.guaLssuingAuthority}}</div>
+          <div class="right_item">{{ costData.guaLssuingAuthority }}</div>
           <div class="right_title">车牌号</div>
-          <div class="right_item">{{costData.carNumber}}</div>
+          <div class="right_item">{{ costData.carNumber }}</div>
           <div class="right_title">车牌颜色</div>
-          <div class="right_item">{{costData.carNumberColour}}</div>
+          <div class="right_item">{{ costData.carNumberColour }}</div>
           <div class="right_title">车辆所属车主</div>
-          <div class="right_item">{{costData.owner}}</div>
+          <div class="right_item">{{ costData.owner }}</div>
           <div class="right_title">总质量(千克)</div>
-          <div class="right_item">{{costData.carTotalWeight}}</div>
+          <div class="right_item">{{ costData.carTotalWeight }}</div>
           <div class="right_title">核定载质量(千克)</div>
-          <div class="right_item">{{costData.carApprovedWeight}}</div>
+          <div class="right_item">{{ costData.carApprovedWeight }}</div>
           <div class="right_title">整备质量(千克)</div>
-          <div class="right_item">{{costData.servicingWeight}}</div>
+          <div class="right_item">{{ costData.servicingWeight }}</div>
           <div class="right_title">外廓尺寸(毫米)</div>
-          <div class="right_item">{{costData.carLong}}-{{costData.carWidth}}-{{costData.carHeight}}</div>
+          <div class="right_item">{{ costData.carLong }}-{{ costData.carWidth }}-{{ costData.carHeight }}</div>
           <div class="right_title">上传人车合影</div>
           <div class="right_item">
-            <img  v-for="item in costData.addressUrlArray" :src="item" class="right_img_css" @click="enlarge(item)" />
+            <img v-for="item in costData.addressUrlArray" :src="item" class="right_img_css" @click="enlarge(item)" />
           </div>
           <div class="right_title">挂车车牌号</div>
-          <div class="right_item">{{costData.guaCarNumber}}</div>
+          <div class="right_item">{{ costData.guaCarNumber }}</div>
           <div class="right_title">挂车车辆所属车主</div>
-          <div class="right_item">{{costData.guaOwner}}</div>
+          <div class="right_item">{{ costData.guaOwner }}</div>
           <div class="right_title">挂车核定载质量(千克)</div>
-          <div class="right_item">{{costData.guaCarApprovedWeight}}</div>
+          <div class="right_item">{{ costData.guaCarApprovedWeight }}</div>
           <div class="right_title">挂车整备质量(千克)</div>
-          <div class="right_item">{{costData.guaServicingWeight}}</div>
+          <div class="right_item">{{ costData.guaServicingWeight }}</div>
           <div class="right_title">挂车外廓尺寸(毫米)</div>
-          <div class="right_item">{{costData.guaCarLong}}-{{costData.guaCarWidth}}-{{costData.guaCarHeight}}</div>
+          <div class="right_item">{{ costData.guaCarLong }}-{{ costData.guaCarWidth }}-{{ costData.guaCarHeight }}</div>
           <div class="right_title">上传人和挂车合影</div>
           <div class="right_item">
-            <img  v-for="item in costData.guaAddressUrlArray" :src="item" class="right_img_css" @click="enlarge(item)" />
+            <img v-for="item in costData.guaAddressUrlArray" :src="item" class="right_img_css" @click="enlarge(item)" />
+          </div>
+          <div class="right_btn">
+            <el-button @click="rightSee = false">关闭</el-button>
           </div>
-        <div class="right_btn">
-          <el-button @click="rightSee = false">关闭</el-button>
-        </div>
         </div>
       </div>
     </el-drawer>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
+    <el-dialog :title="driverTitle" :visible.sync="dialogTableVisible">
+      <el-form ref="form" label-width="280px">
+        <el-form-item label="司机姓名">
+          <el-select v-model="value" placeholder="请选择" filterable @change="selectName" value-key="id">
+            <el-option v-for="(item, index) in driverList" :key="index" :label="item.driverName" :value="item">
+              {{ item.driverName }}
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="车型">
+          <el-cascader v-model="value1" :options="options" @change="handleChange"></el-cascader>
+        </el-form-item>
+        <el-form-item label="道路运输证">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 1) }">
+            <img v-if="dataDetails.operationCertificate" :src="dataDetails.operationCertificate" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="道路运输证号">
+          <el-input placeholder="请输入道路运输证号" v-model="dataDetails.operationCertificateNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="道路运输证有效期">
+          <el-date-picker v-model="value2" type="date" placeholder="请选择道路运输证有效期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="挂车道路运输证" v-if="sign == '挂车'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 2) }">
+            <img v-if="dataDetails.trailerOperationCertificate" :src="dataDetails.trailerOperationCertificate"
+              class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="挂车道路运输证号" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车道路运输证号" v-model="dataDetails.trailerOperationCertificateNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车道路运输证有效期" v-if="sign == '挂车'">
+          <el-date-picker v-model="value3" type="date" placeholder="请选择挂车道路运输证有效期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item :label="sign == '挂车' ? '牵引车行驶证主页' : '行驶证主页'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 3) }">
+            <img v-if="dataDetails.drivingLicenseHomePage" :src="dataDetails.drivingLicenseHomePage" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item :label="sign == '挂车' ? '牵引车行驶证副页' : '行驶证副页'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 4) }">
+            <img v-if="dataDetails.drivingLicenseBackPage" :src="dataDetails.drivingLicenseBackPage" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="行驶证车辆类型">
+          <el-select v-model="value12" placeholder="请选择">
+            <el-option v-for="item in tcarTypeList" :key="item.constValue" :label="item.constValue"
+              :value="item.constValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="行驶证车辆识别代号">
+          <el-input placeholder="请输入行驶证车辆识别代号" v-model="dataDetails.carCode"></el-input>
+        </el-form-item>
+        <el-form-item label="行驶证档案编号">
+          <el-input placeholder="请输入行驶证档案编号" v-model="dataDetails.drivingLicenseNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="注册日期">
+          <el-date-picker v-model="value4" type="date" placeholder="请选择注册日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="发证日期">
+          <el-date-picker v-model="value5" type="date" placeholder="请选择发证日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="行驶证有效期">
+          <el-date-picker v-model="value6" type="date" placeholder="请选择行驶证有效期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用性质">
+          <el-input placeholder="请输入使用性质" v-model="dataDetails.useNature" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="发证机关">
+          <el-input placeholder="请输入发证机关" v-model="dataDetails.lssuingAuthority"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆能源类型">
+          <el-select v-model="value7" placeholder="请选择">
+            <el-option v-for="item in carTypeList" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="挂车行驶证主页" v-if="sign == '挂车'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 5) }">
+            <img v-if="dataDetails.trailerLicenseHomePage" :src="dataDetails.trailerLicenseHomePage" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="挂车行驶证副页" v-if="sign == '挂车'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 6) }">
+            <img v-if="dataDetails.trailerLicenseBackPage" :src="dataDetails.trailerLicenseBackPage" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="挂车行驶证车辆类型" v-if="sign == '挂车'">
+          <el-select v-model="value8" placeholder="请选择">
+            <el-option v-for="item in tcarTypeList" :key="item.constValue" :label="item.constValue"
+              :value="item.constValue">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="挂车行驶证车辆识别代号" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车行驶证车辆识别代号" v-model="dataDetails.trailerCarCode"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车行驶证档案编号" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车行驶证档案编号" v-model="dataDetails.trailerLicenseNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="注册日期" v-if="sign == '挂车'">
+          <el-date-picker v-model="value9" type="date" placeholder="请选择注册日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="发证日期" v-if="sign == '挂车'">
+          <el-date-picker v-model="value10" type="date" placeholder="请选择发证日期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="挂车行驶证有效截止期" v-if="sign == '挂车'">
+          <el-date-picker v-model="value11" type="date" placeholder="请选择行驶证有效期" value-format="yyyy-MM-dd">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="使用性质" v-if="sign == '挂车'">
+          <el-input placeholder="请输入使用性质" v-model="dataDetails.guaUseNature" disabled></el-input>
+        </el-form-item>
+        <el-form-item label="发证机关" v-if="sign == '挂车'">
+          <el-input placeholder="请输入发证机关" v-model="dataDetails.guaLssuingAuthority"></el-input>
+        </el-form-item>
+        <el-form-item :label="sign == '挂车' ? '牵引车车牌号' : '车牌号'" v-if="sign == '挂车'">
+          <el-input placeholder="请输入牵引车车牌号" v-model="dataDetails.carNumber"></el-input>
+        </el-form-item>
+        <el-form-item label="车牌颜色">
+          <el-input placeholder="请输入车牌颜色" v-model="dataDetails.carNumberColour"></el-input>
+        </el-form-item>
+        <el-form-item label="车辆所属车主">
+          <el-input placeholder="请输入车主姓名" v-model="dataDetails.owner"></el-input>
+        </el-form-item>
+        <el-form-item label="总质量(千克)" v-if="sign == '非挂车'">
+          <el-input placeholder="请输入总质量" v-model="dataDetails.carTotalWeight"></el-input>
+        </el-form-item>
+        <el-form-item label="核定载质量(千克)" v-if="sign == '非挂车'">
+          <el-input placeholder="请输入核定载质量" v-model="dataDetails.carApprovedWeight"></el-input>
+        </el-form-item>
+        <el-form-item label="整备质量(千克)" v-if="sign == '挂车'">
+          <el-input placeholder="请输入整备质量" v-model="dataDetails.servicingWeight"></el-input>
+        </el-form-item>
+        <el-form-item :label="sign == '挂车' ? '牵引车外廓尺寸(毫米)' : '外廓尺寸(毫米)'">
+          <el-input placeholder="长" v-model="dataDetails.carLong"></el-input>
+          <el-input placeholder="宽" v-model="dataDetails.carWidth"></el-input>
+          <el-input placeholder="高" v-model="dataDetails.carHeight"></el-input>
+        </el-form-item>
+        <el-form-item :label="sign == '挂车' ? '上传人和牵引车合影(牵引车牌号可见)' : '上传人车合影(车头车牌号可见)'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 7) }">
+            <img v-if="dataDetails.addressUrl" :src="dataDetails.addressUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <el-form-item label="挂车车牌号" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车车牌号" v-model="dataDetails.guaCarNumber1"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车车辆所属车主" v-if="sign == '挂车'">
+          <el-input placeholder="请输入车主姓名" v-model="dataDetails.guaOwner"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车总质量(千克)" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车总质量" v-model="dataDetails.carTotalWeight"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车整备质量(千克)" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车整备质量" v-model="dataDetails.guaServicingWeight"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车核定载质量(千克)" v-if="sign == '挂车'">
+          <el-input placeholder="请输入挂车核定载质量" v-model="dataDetails.guaCarApprovedWeight"></el-input>
+        </el-form-item>
+        <el-form-item label="挂车外廓尺寸(毫米)" v-if="sign == '挂车'">
+          <el-input placeholder="长" v-model="dataDetails.guaCarLong"></el-input>
+          <el-input placeholder="宽" v-model="dataDetails.guaCarWidth"></el-input>
+          <el-input placeholder="高" v-model="dataDetails.guaCarHeight"></el-input>
+        </el-form-item>
+        <el-form-item label="上传人和挂车合影(挂车车牌号可见)" v-if="sign == '挂车'">
+          <el-upload class="avatar-uploader" :action="uploadPath" :show-file-list="false"
+            :on-success="function (res, file) { return uploadSuccessHandle(res, file, 8) }">
+            <img v-if="dataDetails.guaAddressUrl" :src="dataDetails.guaAddressUrl" class="avatar">
+            <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+          </el-upload>
+        </el-form-item>
+        <div class="form_btn">
+          <el-button @click="dialogTableVisible = false">取消</el-button>
+          <el-button @click="submitDriverCarInfo" type="primary">确定</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
   </div>
 </template>
 <script>
-  import {
-    getCarList,
-    toCarExamine
-  } from '@/api/driverManagement'
-  export default {
-    components: {
-      "el-image-viewer": () =>
-        import("element-ui/packages/image/src/image-viewer"),
-    },
-    data() {
-      return {
-        tableData: [],
-        //分页
-        searchkeyWord: "",
-        currentPage: 1,
-        pageSize: 10,
-        deptBudgetTotal: 0,
-        deptCircularPage: {},
-        search: "",
-        addressUrl: [],
-        disabled: false,
-        carInfo: false,
-        rejectInfo: false,
-        checkList: [],
-        form: {},
-        carSee: {},
-        //附件
-        file: {},
-        rightSee:false,
-        img: [],
-        index: "0",
-        count: "1",
-        abilityName: "身份证人像面",
-        abilityName1: "身份证国徽面",
-        fujianInfo: false,
-        //图片预览
-        srcList: [],
-        costData:{},
-        imgsVisible: false,
-      };
-    },
-    mounted() {
-      this.getList()
-    },
-    methods: {
-      lookmessage(row){
-        this.costData=row
-        this.rightSee=true
+import {
+  uploadPath
+} from '@/api/officialWebsiteManagement'
+import { getToken } from '@/utils/auth'
+import {
+  getCarList,
+  toCarExamine,
+  selectDriverList,
+  getInfo,
+  addCar,
+  editCar,
+  driveringLicenseShibie,
+  tranLicenseShibie
+} from '@/api/driverManagement'
+export default {
+  components: {
+    "el-image-viewer": () =>
+      import("element-ui/packages/image/src/image-viewer"),
+  },
+  data() {
+    return {
+      tcarTypeList: [],
+      carTypeList: [{
+        value: '汽油',
+        label: '汽油'
       },
-      closeImgViewer() {
-        console.log(11111111111)
-         this.srcList = []
-        this.imgsVisible = false;
+      {
+        value: '柴油',
+        label: '柴油'
       },
-      enlarge(url) {
-        this.imgsVisible = true;
-        this.srcList.push(url)
+      {
+        value: '油电混合',
+        label: '油电混合'
       },
-      fujianLook(row) {
-        this.file = row;
-        this.index = 0;
-        this.img[0] = this.file.cardAddressUrl;
-        this.img[1] = this.file.cardBackAddressUrl;
-        this.fujianInfo = true;
+      {
+        value: '纯电动',
+        label: '纯电动'
       },
-      fujianClose() {
-        this.count = 1;
-        this.fujianInfo = false;
+      {
+        value: '插电式混合动力',
+        label: '插电式混合动力'
       },
-      btnChange(num) {
-        this.count = num;
-        if (num == 1) {
-          this.abilityName = "身份证人像面";
-          this.abilityName1 = "身份证国徽面";
-          this.img[0] = this.file.cardAddressUrl;
-          this.img[1] = this.file.cardBackAddressUrl;
-        } else if (num == 2) {
-          this.abilityName = "驾驶证主页";
-          this.abilityName1 = "驾驶证副页";
-          this.img[0] = this.file.driverLicenseHomePage;
-          this.img[1] = this.file.driverLicenseBackPage;
-        } else if (num == 3) {
-          this.abilityName = "行驶证主页";
-          this.abilityName1 = "行驶证副页";
-          this.img[0] = this.file.drivingLicenseHomePage;
-          this.img[1] = this.file.drivingLicenseBackPage;
-        } else if (num == 4) {
-          this.index = 0;
-          this.img[0] = this.file.qualificationCertificate;
-        } else if (num == 5) {
-          this.abilityName = "挂车行驶证主页";
-          this.abilityName1 = "挂车行驶证副页";
-          this.img[0] = this.file.trailerLicenseHomePage;
-          this.img[1] = this.file.trailerLicenseBackPage;
-        } else if (num == 6) {
-          this.index = 0;
-          this.img[0] = this.file.operationCertificate;
-        } else if (num == 7) {
-          this.index = 0;
-          this.img[0] = this.file.trailerOperationCertificate;
-        } else if (num == 8) {
-          this.index = 0;
-          this.img[0] = this.file.addressUrl;
-        } else if (num == 9) {
-          this.index = 0;
-          this.img[0] = this.file.guaAddressUrl;
-        }
+      {
+        value: '增程式',
+        label: '增程式'
+      }],
+      dataDetails: {
+        useNature: "营运特种车",
+        guaUseNature: '营运挂车',
+        carCategory: '挂车',
+        carType: '高栏'
       },
+      uploadPath,
+      sign: '挂车',
+      value1: ['挂车', '高栏'],
+      value2: '',
+      value3: '',
+      value4: '',
+      value5: '',
+      value6: '',
+      value7: '',
+      value8: '',
+      value9: '',
+      value10: '',
+      value11: '',
+      value12: '',
+      options: [{
+        value: '挂车',
+        label: '挂车',
+        children: [
+          {
+            value: '高栏',
+            label: '高栏',
+          },
+          {
+            value: '集装箱',
+            label: '集装箱',
+          },
+          {
+            value: '自卸车',
+            label: '自卸车',
+          }
+        ]
+      },
+      {
+        value: '非挂车',
+        label: '非挂车',
+        children: [
+          {
+            value: '重型仓栏',
+            label: '重型仓栏',
+          }
+        ]
+      }],
+      driverList: [],
+      value: '',
+      dialogTableVisible: false,
+      driverTitle: '新增',
+      tableData: [],
+      //分页
+      searchkeyWord: "",
+      currentPage: 1,
+      pageSize: 10,
+      deptBudgetTotal: 0,
+      deptCircularPage: {},
+      search: "",
+      addressUrl: [],
+      disabled: false,
+      carInfo: false,
+      rejectInfo: false,
+      checkList: [],
+      form: {},
+      carSee: {},
+      //附件
+      file: {},
+      rightSee: false,
+      img: [],
+      index: "0",
+      count: "1",
+      abilityName: "身份证人像面",
+      abilityName1: "身份证国徽面",
+      fujianInfo: false,
+      //图片预览
+      srcList: [],
+      costData: {},
+      imgsVisible: false,
+    };
+  },
+  mounted() {
+    this.getList()
+    this.getCarType()
+  },
+  methods: {
+    edit(val) {
+      console.log(val)
+      this.driverTitle = "编辑"
+      this.value = val.driverName
+      this.value1 = [val.carCategory, val.carType],
+        this.value2 = val.operationCertificateValidityDate
+      this.value3 = val.trailerOperationCertificateValidityDate
+      this.value4 = val.drivingLicenseRegistrationDate
+      this.value5 = val.drivingLicenseIssueDate
+      this.value6 = val.drivingLicenseValidityDate
+      this.value7 = val.energyType
+      this.value8 = val.trailerVehicleType
+      this.value9 = val.trailerLicenseRegistrationDate
+      this.value10 = val.trailerLicenseIssueDate
+      this.value11 = val.trailerLicenseValidityDate
+      this.value12 = val.vehicleType
+      this.dataDetails = val
+      this.dataDetails.guaCarNumber1 = this.dataDetails.guaCarNumber
+      this.dialogTableVisible = true
+
+    },
+    getCarType() {
+      getInfo({
+        constId: 'TRAILER1'
+      }).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          this.tcarTypeList.push(response.data[i])
+        }
+        console.log("this.tcarTypeList", this.tcarTypeList)
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    uploadSuccessHandle(res, file, index) {
+      console.log('图片地址', res.data.url)
+      switch (index) {
+        case 1:
+          this.dataDetails.operationCertificate = res.data.url
+          tranLicenseShibie({
+            image: res.data.url,
+          }).then((response) => {
+            if (response.code == 200) {
+              this.dataDetails.operationCertificateNumber = response.data.tranNumber.replace(/\s*/g, "")
+            }
+          })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 2:
+          this.dataDetails.trailerOperationCertificate = res.data.url
+          tranLicenseShibie({
+            image: res.data.url,
+          }).then((response) => {
+            if (response.code == 200) {
+              this.dataDetails
+                .trailerOperationCertificateNumber = response
+                  .data.tranNumber.replace(/\s*/g, "")
+            }
+          })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 3:
+          this.dataDetails.drivingLicenseHomePage = res.data.url
+          driveringLicenseShibie({
+            image: res.data.url,
+            flag: 1
+          }).then((response) => {
+            if (response.code == 200) {
+              this.dataDetails.carNumber = response.data
+                .carNum //车牌号
+              this.dataDetails.vehicleType = response.data
+                .vehicleType
+              this.dataDetails.carCode = response.data.carCode
+              this.dataDetails.owner = response.data
+                .owner //车辆所有人
+              if (response.data.lssuingAuthority) { //行驶证发证机关
+                this.dataDetails.lssuingAuthority = response
+                  .data.lssuingAuthority
+              }
+            }
+          })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 4:
+          this.dataDetails.drivingLicenseBackPage = res.data.url
+          driveringLicenseShibie({
+            image: res.data.url,
+            flag: 2
+          }).then((response) => {
+            if (response.code == 200) {
+              if (response.data.issuingAuthority) { //行驶证发证机关
+                this.dataDetails.lssuingAuthority = response
+                  .data.issuingAuthority
+              }
+              if (this.sign == "非挂车") {
+                if (response.data.servicingMass && response.data
+                  .servicingMass.indexOf("kg") != -1) {
+                  response.data.servicingMass = response.data
+                    .servicingMass.slice(0, response.data
+                      .servicingMass.length - 2)
+                }
+                this.dataDetails.carTotalWeight = response.data
+                  .servicingMass //总质量
+              }
+              if (response.data.approvedLoadMass.indexOf("kg") != -
+                1) {
+                response.data.approvedLoadMass = response.data
+                  .approvedLoadMass.slice(0, response.data
+                    .approvedLoadMass.length - 2)
+              }
+              if (response.data.approvedLoadMass && !isNaN(response.data
+                .approvedLoadMass)) {
+                this.dataDetails.carApprovedWeight = response.data
+                  .approvedLoadMass //核定载质量
+              }
 
-      getList() {
-        this.loading = true
-        let _obj = {}
-        _obj.currentPage = this.currentPage
-        _obj.pageSize = this.pageSize
-        _obj.searchKeyWord = this.searchkeyWord
-        _obj.searchType = this.search
-        getCarList(_obj).then(response => {
-          if(response.data.records.length>0){
-            for(var i=0;i<response.data.records.length;i++){
-              if(response.data.records[i].addressUrl){
-                response.data.records[i].addressUrlArray=response.data.records[i].addressUrl.split(',')
-              }else{
-                response.data.records[i].addressUrlArray=[]
+              if (response.data.size && response.data.size.indexOf(
+                "mm") != -1) {
+                response.data.size = response.data.size.slice(0, response
+                  .data.size.length - 2);
               }
-              if(response.data.records[i].guaAddressUrl){
-                response.data.records[i].guaAddressUrlArray=response.data.records[i].guaAddressUrl.split(',')
-              }else{
-                response.data.records[i].guaAddressUrlArray=[]
+
+              this.dataDetails.carLong = response.data.size
+                .split("X")[0] //车长
+              this.dataDetails.carWidth = response.data.size
+                .split("X")[1] //车宽
+              this.dataDetails.carHeight = response.data.size
+                .split("X")[2] //车高
+            }
+          })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 5:
+          this.dataDetails.trailerLicenseHomePage = res.data.url
+          driveringLicenseShibie({
+            image: res.data.url,
+            flag: 1
+          }).then((response) => {
+            if (response.code == 200) {
+              if (response.data.lssuingAuthority) { //行驶证发证机关
+                if (response.data.carNum) {
+                  this.dataDetails.guaCarNumber1 = response.data
+                    .carNum.substring(0, 6)
+                }
+                //车牌号
+                this.dataDetails.guaOwner = response.data.owner //车辆所有人
+                this.dataDetails.trailerVehicleType = response.data
+                  .vehicleType
+                this.dataDetails.trailerCarCode = response.data.carCode
               }
             }
-            
-          }
-            this.tableData = response.data.records
-            this.deptBudgetTotal = response.data.total
-            this.listLoading = false
           })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 6:
+          this.dataDetails.trailerLicenseBackPage = res.data.url
+          driveringLicenseShibie({
+            image: res.data.url,
+            flag: 2
+          }).then((response) => {
+            if (response.code == 200) {
+              this.dataDetails.trailerLicenseNumber = res
+                .data.driveringNum.replace(/\s*/g,
+                  "") //挂车行驶证档案编号
+              if (response.data.servicingMass && response.data
+                .servicingMass.indexOf("kg") != -1) {
+                response.data.servicingMass = response.data
+                  .servicingMass.slice(0, response.data
+                    .servicingMass.length - 2)
+              }
+              if (response.data.approvedLoadMass.indexOf("kg") != -
+                1) {
+                response.data.approvedLoadMass = response.data
+                  .approvedLoadMass.slice(0, response.data
+                    .approvedLoadMass.length - 2)
+              }
+              this.dataDetails.carTotalWeight = response.data
+                .totalMass.split("kg").join("") //挂车总质量
+              this.dataDetails.guaServicingWeight = response.data
+                .servicingMass //总质量
+              this.dataDetails.guaCarApprovedWeight = response.data
+                .approvedLoadMass //核定载质量
+              if (response.data.size && response.data.size.indexOf(
+                "mm") != -1) {
+                response.data.size = response.data.size.slice(0, response
+                  .data.size.length - 2);
+              }
+              this.dataDetails.guaCarLong = response.data.size
+                .split("X")[0] //车长
+              this.dataDetails.guaCarWidth = response.data.size
+                .split("X")[1] //车宽
+              this.dataDetails.guaCarHeight = response.data.size
+                .split("X")[2] //车高
+            }
+          })
+            .catch(() => {
+              this.listLoading = false;
+            });
+          break;
+        case 7:
+          this.dataDetails.addressUrl = res.data.url
+          break;
+        case 8:
+          this.dataDetails.guaAddressUrl = res.data.url
+          break;
+      }
+      this.$forceUpdate()
+    },
+    handleChange(value) {
+      if (value[0] == '挂车') {
+        this.sign = '挂车'
+        this.dataDetails.useNature = "营业特种车"
+        this.dataDetails.guaUseNature = "营运挂车"
+      } else {
+        this.sign = '非挂车'
+        this.dataDetails.useNature = "营运货车"
+      }
+      this.dataDetails.carCategory = value[0]
+      this.dataDetails.carType = value[1]
+      console.log(value);
+    },
+    selectName(item) {
+      console.log(item)
+      this.dataDetails.driverId = item.id
+      this.dataDetails.commonId = item.commonId
+      this.dataDetails.driverName = item.driverName
+    },
+    submitDriverCarInfo() {
+
+      this.dataDetails.operationCertificateValidityDate = this.value2
+      this.dataDetails.trailerOperationCertificateValidityDate = this.value3
+      this.dataDetails.drivingLicenseRegistrationDate = this.value4
+      this.dataDetails.drivingLicenseIssueDate = this.value5
+      this.dataDetails.drivingLicenseValidityDate = this.value6
+      this.dataDetails.energyType = this.value7
+      this.dataDetails.trailerVehicleType = this.value8
+      this.dataDetails.trailerLicenseRegistrationDate = this.value9
+      this.dataDetails.trailerLicenseIssueDate = this.value10
+      this.dataDetails.trailerLicenseValidityDate = this.value11
+      this.dataDetails.vehicleType = this.value12
+      if (this.dataDetails.carCategory == "挂车") {
+        if (this.dataDetails.guaCarNumber1.indexOf('挂') == -1) {
+          this.dataDetails.guaCarNumber = this.dataDetails.guaCarNumber1 + '挂'
+        }
+      }
+      if (this.driverTitle = "编辑") {
+        editCar(this.dataDetails).then(response => {
+          debugger
+          this.listLoading = false
+          this.dialogTableVisible = false
+          this.$notify({
+            title: '成功',
+            message: '编辑成功!',
+            type: 'success'
+          });
+          this.getList()
+        })
           .catch(() => {
             this.loading = false
           })
-      },
-      adopt(row) {
-        this.$confirm('确定通过' + row.carNumber + '的审核?', '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
+      } else {
+        addCar(this.dataDetails).then(response => {
+          this.listLoading = false
+          this.dialogTableVisible = false
+          this.$notify({
+            title: '成功',
+            message: '添加成功!',
+            type: 'success'
+          });
+          this.getList()
+        })
+          .catch(() => {
+            this.loading = false
           })
-          .then(() => {
-            this.listLoading = true
-            var _examine = {}
-            _examine.id = row.id,
+      }
+
+
+    },
+    addCar() {
+      this.dataDetails = {}
+      this.value1 = ['挂车', '高栏']
+      this.value2 = ''
+      this.value3 = ''
+      this.value4 = ''
+      this.value5 = ''
+      this.value6 = ''
+      this.value7 = ''
+      this.value8 = ''
+      this.value9 = ''
+      this.value10 = ''
+      this.value11 = ''
+      this.dialogTableVisible = true
+    },
+    lookmessage(row) {
+      this.costData = row
+      this.rightSee = true
+    },
+    closeImgViewer() {
+      console.log(11111111111)
+      this.srcList = []
+      this.imgsVisible = false;
+    },
+    enlarge(url) {
+      this.imgsVisible = true;
+      this.srcList.push(url)
+    },
+    fujianLook(row) {
+      this.file = row;
+      this.index = 0;
+      this.img[0] = this.file.cardAddressUrl;
+      this.img[1] = this.file.cardBackAddressUrl;
+      this.fujianInfo = true;
+    },
+    fujianClose() {
+      this.count = 1;
+      this.fujianInfo = false;
+    },
+    btnChange(num) {
+      this.count = num;
+      if (num == 1) {
+        this.abilityName = "身份证人像面";
+        this.abilityName1 = "身份证国徽面";
+        this.img[0] = this.file.cardAddressUrl;
+        this.img[1] = this.file.cardBackAddressUrl;
+      } else if (num == 2) {
+        this.abilityName = "驾驶证主页";
+        this.abilityName1 = "驾驶证副页";
+        this.img[0] = this.file.driverLicenseHomePage;
+        this.img[1] = this.file.driverLicenseBackPage;
+      } else if (num == 3) {
+        this.abilityName = "行驶证主页";
+        this.abilityName1 = "行驶证副页";
+        this.img[0] = this.file.drivingLicenseHomePage;
+        this.img[1] = this.file.drivingLicenseBackPage;
+      } else if (num == 4) {
+        this.index = 0;
+        this.img[0] = this.file.qualificationCertificate;
+      } else if (num == 5) {
+        this.abilityName = "挂车行驶证主页";
+        this.abilityName1 = "挂车行驶证副页";
+        this.img[0] = this.file.trailerLicenseHomePage;
+        this.img[1] = this.file.trailerLicenseBackPage;
+      } else if (num == 6) {
+        this.index = 0;
+        this.img[0] = this.file.operationCertificate;
+      } else if (num == 7) {
+        this.index = 0;
+        this.img[0] = this.file.trailerOperationCertificate;
+      } else if (num == 8) {
+        this.index = 0;
+        this.img[0] = this.file.addressUrl;
+      } else if (num == 9) {
+        this.index = 0;
+        this.img[0] = this.file.guaAddressUrl;
+      }
+    },
+
+    getList() {
+      this.loading = true
+      let _obj = {}
+      _obj.currentPage = this.currentPage
+      _obj.pageSize = this.pageSize
+      _obj.searchKeyWord = this.searchkeyWord
+      _obj.searchType = this.search
+      getCarList(_obj).then(response => {
+        if (response.data.records.length > 0) {
+          for (var i = 0; i < response.data.records.length; i++) {
+            if (response.data.records[i].addressUrl) {
+              response.data.records[i].addressUrlArray = response.data.records[i].addressUrl.split(',')
+            } else {
+              response.data.records[i].addressUrlArray = []
+            }
+            if (response.data.records[i].guaAddressUrl) {
+              response.data.records[i].guaAddressUrlArray = response.data.records[i].guaAddressUrl.split(',')
+            } else {
+              response.data.records[i].guaAddressUrlArray = []
+            }
+          }
+
+        }
+        this.tableData = response.data.records
+        this.deptBudgetTotal = response.data.total
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
+        })
+      selectDriverList().then(response => {
+        this.driverList = response.data
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
+        })
+
+
+    },
+    adopt(row) {
+      this.$confirm('确定通过' + row.carNumber + '的审核?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning',
+      })
+        .then(() => {
+          this.listLoading = true
+          var _examine = {}
+          _examine.id = row.id,
             _examine.flag = 1,
             _examine.carNumber = row.carNumber,
             _examine.carNumberColour = row.carNumberColour,
             toCarExamine(_examine).then(response => {
-                this.$notify({
-                  title: '成功',
-                  message: '通过成功!',
-                  type: 'success'
-                });
-                this.getList()
-                this.listLoading = false
-              })
+              this.$notify({
+                title: '成功',
+                message: '通过成功!',
+                type: 'success'
+              });
+              this.getList()
+              this.listLoading = false
+            })
               .catch(() => {
                 this.loading = false
               })
-          })
+        })
 
-      },
-      reject(row) {
-        this.form.id = row.id
-        this.form.flag = 2
-        this.rejectInfo = true
-      },
-      rejectClose() {
+    },
+    reject(row) {
+      this.form.id = row.id
+      this.form.flag = 2
+      this.rejectInfo = true
+    },
+    rejectClose() {
+      this.form = {}
+      this.rejectInfo = false
+    },
+    submit() {
+      if (!this.form.rejectReasonDescription) {
+        this.$message.error("请输入驳回原因")
+        return
+      }
+      if (this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 50) {
+        this.$message.error("驳回原因字数应在6-50之间")
+        return
+      }
+      this.listLoading = true
+      toCarExamine(this.form).then(response => {
+        this.$notify({
+          title: '成功',
+          message: '驳回成功!',
+          type: 'success'
+        });
         this.form = {}
         this.rejectInfo = false
-      },
-      submit() {
-        if (!this.form.rejectReasonDescription) {
-          this.$message.error("请输入驳回原因")
-          return
-        }
-        if (this.form.rejectReasonDescription.length < 6 || this.form.rejectReasonDescription.length > 50) {
-          this.$message.error("驳回原因字数应在6-50之间")
-          return
-        }
-        this.listLoading = true
-        toCarExamine(this.form).then(response => {
-            this.$notify({
-              title: '成功',
-              message: '驳回成功!',
-              type: 'success'
-            });
-            this.form = {}
-            this.rejectInfo = false
-            this.getList()
-            this.listLoading = false
-          })
-          .catch(() => {
-            this.loading = false
-          })
-      },
-      carLook(row) {
-        this.carSee.addressUrl = row.addressUrl
-        this.carSee.cardAddressUrl = row.cardAddressUrl
-        this.carSee.cardBackAddressUrl = row.cardBackAddressUrl
-        this.carInfo = true;
-      },
-      carClose() {
-        this.carInfo = false;
-      },
-      searchBtn(num) {
-        this.search = num;
-        this.getList();
-      },
-      find() {
-        this.currentPage = 1
-        this.getList();
-      },
-      onChange() {
-        this.$refs.upload
-          .handleSaveBill()
-          .then(async (response) => {
-            this.formData.addressUrl = response;
-          })
-          .catch((res) => {
-            EventBus.$emit("error", (JSON.parse(res) || {}).message);
-            this.$refs.upload.clearFiles();
-          });
-      },
-      handleSizeChange(val) {
-        console.log(`每页 ${val} 条`);
-        this.pageSize = val;
-        this.getList();
-      },
-      handleCurrentChange(val) {
-        this.currentPage = val;
-        console.log(`当前页: ${val}`);
-        this.getList();
-      },
+        this.getList()
+        this.listLoading = false
+      })
+        .catch(() => {
+          this.loading = false
+        })
+    },
+    carLook(row) {
+      this.carSee.addressUrl = row.addressUrl
+      this.carSee.cardAddressUrl = row.cardAddressUrl
+      this.carSee.cardBackAddressUrl = row.cardBackAddressUrl
+      this.carInfo = true;
+    },
+    carClose() {
+      this.carInfo = false;
+    },
+    searchBtn(num) {
+      this.search = num;
+      this.getList();
     },
-  };
+    find() {
+      this.currentPage = 1
+      this.getList();
+    },
+    onChange() {
+      this.$refs.upload
+        .handleSaveBill()
+        .then(async (response) => {
+          this.formData.addressUrl = response;
+        })
+        .catch((res) => {
+          EventBus.$emit("error", (JSON.parse(res) || {}).message);
+          this.$refs.upload.clearFiles();
+        });
+    },
+    handleSizeChange(val) {
+      console.log(`每页 ${val} 条`);
+      this.pageSize = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      console.log(`当前页: ${val}`);
+      this.getList();
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .center {
-    padding: 10px 20px;
-    background: #f5f6f7;
-    min-height: calc(100vh - 50px);
-
-    .top_css {
-      padding: 10px;
+.center {
+  padding: 10px 20px;
+  background: #f5f6f7;
+  min-height: calc(100vh - 50px);
 
-      .search_btn {
-        height: 80px;
-        display: flex;
-        margin-top: 20px;
-        background: linear-gradient(#fafbfb, #ffffff);
+  .top_css {
+    padding: 10px;
 
-        .search_block {
-          margin-left: 20px;
-        }
-
-        .search_item {
-          text-align: center;
-          font-size: 14px;
-          font-weight: 600;
-          line-height: 40px;
-          width: 112px;
-          height: 40px;
-          background: #f7f8f9;
-          cursor: pointer;
-          margin-top: 30px;
-        }
-
-        .searchNo {
-          color: #323233;
-        }
-
-        .search {
-          color: #2f53eb;
-          background: #ffffff;
-        }
-      }
-    }
-
-    .center_css {
-      background: #ffffff;
-      border-radius: 1px;
-      margin-top: 10px;
-      padding-bottom: 10px;
-    }
-
-    .screen {
+    .search_btn {
+      height: 80px;
       display: flex;
+      margin-top: 20px;
+      background: linear-gradient(#fafbfb, #ffffff);
 
-      .search {
-        width: 40px;
-        height: 40px;
-        background: #2f53eb;
-        border-radius: 0px 2px 2px 0px;
-        border: 1px solid #DCDFE6;
-        margin-left:-1px;
+      .search_block {
+        margin-left: 20px;
       }
 
-      .count_css {
-        width: 80px;
+      .search_item {
         text-align: center;
+        font-size: 14px;
+        font-weight: 600;
         line-height: 40px;
-        color: #666666;
+        width: 112px;
+        height: 40px;
+        background: #f7f8f9;
+        cursor: pointer;
+        margin-top: 30px;
+      }
+
+      .searchNo {
+        color: #323233;
       }
-    }
 
-    .el-button {
-      padding: 10px 20px !important;
+      .search {
+        color: #2f53eb;
+        background: #ffffff;
+      }
     }
+  }
 
-    .center_css {
+  .center_css {
+    background: #ffffff;
+    border-radius: 1px;
+    margin-top: 10px;
+    padding-bottom: 10px;
+  }
 
-      ::v-deep .el-table th,
-      ::v-deep .el-table td {
-        text-align: center;
-      }
+  .screen {
+    display: flex;
 
-      .fujian {
-        font-size: 24px;
-        color: #409eff;
-      }
+    .search {
+      width: 40px;
+      height: 40px;
+      background: #2f53eb;
+      border-radius: 0px 2px 2px 0px;
+      border: 1px solid #DCDFE6;
+      margin-left: -1px;
+    }
 
-      .warning {
-        font-size: 14px;
-        color: #ed1d1d;
-      }
+    .count_css {
+      width: 80px;
+      text-align: center;
+      line-height: 40px;
+      color: #666666;
     }
   }
 
-  .car_css {
-    margin-bottom: 20px;
+  .el-button {
+    padding: 10px 20px !important;
+  }
 
-    .title_css {
-      margin-bottom: 10px;
-      color: #999999;
-    }
+  .center_css {
 
+    ::v-deep .el-table th,
+    ::v-deep .el-table td {
+      text-align: center;
+    }
 
-    .car_item {
-      width: 370px;
-      height: 220px;
-      margin-bottom: 20px;
+    .fujian {
+      font-size: 24px;
+      color: #409eff;
     }
 
-    .form_btn {
-      text-align: right;
+    .warning {
+      font-size: 14px;
+      color: #ed1d1d;
     }
   }
+}
+
+.car_css {
+  margin-bottom: 20px;
 
-  ::v-deep .el-table--border .el-table__header th {
-    background: #f7f8f9;
+  .title_css {
+    margin-bottom: 10px;
+    color: #999999;
   }
 
-  .btn_css {
-    color: #409EFF;
-    cursor: pointer
+
+  .car_item {
+    width: 370px;
+    height: 220px;
+    margin-bottom: 20px;
   }
 
-  .sign {
-    font-size: 14px;
-    color: red;
+  .form_btn {
+    text-align: right;
   }
+}
 
-  .form_css {
-    width: 100%;
-    margin: 0 auto 20px;
+::v-deep .el-table--border .el-table__header th {
+  background: #f7f8f9;
+}
 
-    ::v-deep .el-checkbox {
-      width: 40%;
-      height: 30px;
-    }
+.btn_css {
+  color: #409EFF;
+  cursor: pointer
+}
 
-    ::v-deep .el-dialog__body {
-      padding: 10px 20px;
-    }
+.sign {
+  font-size: 14px;
+  color: red;
+}
 
-    ::v-deep .el-dialog__title {
-      font-size: 16px;
-    }
+.form_css {
+  width: 100%;
+  margin: 0 auto 20px;
 
-    ::v-deep .el-textarea__inner {
-      background: #F0F1F2;
-    }
+  ::v-deep .el-checkbox {
+    width: 40%;
+    height: 30px;
+  }
 
-    .form_btn {
-      text-align: right;
-      margin-top: 10px;
-    }
+  ::v-deep .el-dialog__body {
+    padding: 10px 20px;
   }
-  
-   .right_css {
-    // overflow-y: auto !important;
-    min-height: 1266px;
-    padding: 0 20px;
-
-    .right_title {
-      color: #9D9D9D;
-      font-size: 14px;
-      margin-bottom: 4px;
-    }
 
-    .title_name {
-      margin-bottom: 10px;
-    }
+  ::v-deep .el-dialog__title {
+    font-size: 16px;
+  }
 
-    .right_item {
-      color: #0D0D0D;
-      font-size: 14px;
-      margin-bottom: 10px;
-    }
+  ::v-deep .el-textarea__inner {
+    background: #F0F1F2;
+  }
 
-    .right_btn {
-      text-align: right;
-      margin: 10px 0;
-    }
+  .form_btn {
+    text-align: right;
+    margin-top: 10px;
+  }
+}
+
+.right_css {
+  // overflow-y: auto !important;
+  min-height: 1266px;
+  padding: 0 20px;
 
-    .right_img_css {
+  .right_title {
+    color: #9D9D9D;
+    font-size: 14px;
+    margin-bottom: 4px;
+  }
+
+  .title_name {
+    margin-bottom: 10px;
+  }
+
+  .right_item {
+    color: #0D0D0D;
+    font-size: 14px;
+    margin-bottom: 10px;
+  }
+
+  .right_btn {
+    text-align: right;
+    margin: 10px 0;
+  }
+
+  .right_img_css {
     width: 100px;
     height: 80px;
     margin-right: 5px;
   }
 
-    .right_img {
-      width: 200px;
-      height: 120px;
-      margin-top: 10px;
-    }
+  .right_img {
+    width: 200px;
+    height: 120px;
+    margin-top: 10px;
   }
-  //查看附件
-  .file {
-    .fujian_css {
-      width: 746px;
-      display: flex;
-      margin: 0 auto;
-      text-align: center;
-      line-height: 32px;
-      border: 1px solid #f0f1f2;
-      border-right: 0px;
-      border-radius: 2px 0px 0px 2px;
+}
 
-      .fujian_item {
-        cursor: pointer;
-        width: 135px;
-        height: 32px;
-        border-right: 1px solid #f0f1f2;
-      }
+//查看附件
+.file {
+  .fujian_css {
+    width: 746px;
+    display: flex;
+    margin: 0 auto;
+    text-align: center;
+    line-height: 32px;
+    border: 1px solid #f0f1f2;
+    border-right: 0px;
+    border-radius: 2px 0px 0px 2px;
 
-      .file_btn {
-        color: #2f53eb;
-        background-color: #cfdbfe;
-      }
-    }
-    .file_tips{
-        margin: 10px auto;
-       width: 70%;
-    }
-    .file_img {
-      width: 525px;
-      height: 332px;
-      margin: 20px auto;
+    .fujian_item {
+      cursor: pointer;
+      width: 135px;
+      height: 32px;
+      border-right: 1px solid #f0f1f2;
     }
 
-    .img_css {
-      width: 525px;
-      height: 332px;
+    .file_btn {
+      color: #2f53eb;
+      background-color: #cfdbfe;
     }
+  }
 
-    .btn {
-      width: 415px;
-      margin: 0 auto;
-    }
+  .file_tips {
+    margin: 10px auto;
+    width: 70%;
   }
 
-  .ask_css {
-    position: absolute;
-    margin: 2px 0 0 10px;
+  .file_img {
+    width: 525px;
+    height: 332px;
+    margin: 20px auto;
   }
-  .find::v-deep input.el-input__inner{
-    border-radius:0;
+
+  .img_css {
+    width: 525px;
+    height: 332px;
+  }
+
+  .btn {
+    width: 415px;
+    margin: 0 auto;
   }
+}
+
+.ask_css {
+  position: absolute;
+  margin: 2px 0 0 10px;
+}
+
+.find::v-deep input.el-input__inner {
+  border-radius: 0;
+}
+
+.avatar {
+  width: 50px;
+}
 </style>

+ 2 - 1
src/views/login/index.vue

@@ -336,7 +336,7 @@
         this.$refs.loginForm.validate(async (valid) => {
           if (valid) {
             this.loginForm.companyName = '黑龙江中天昊元贸易有限公司';
-            this.loading = true;
+            // this.loading = true;
             // this.$store.dispatch('user/login', this.loginForm)
             // const res = await this.$store.dispatch('user/login', this.loginForm)、
            const res = await getlogin({
@@ -344,6 +344,7 @@
               loginPassword: this.loginForm.password,
               compId: '2710b21efc1e4393930c5dc800010dc4',
             })
+            console.log(res)
             
               if (res.code == 200) {
                 const res1 = await this.$store.dispatch('user/login', this.loginForm)

Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov