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

src/views/vehicle/vehicleInfo/index.vue

@@ -40,7 +40,6 @@
 							class="filter-item"
 							v-model="listQuery.zoneId"
 							placeholder="请选择"
-							@change="getProvinceRegions()"
 						>
 							<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"></el-option>
 						</el-select>
@@ -54,12 +53,6 @@
 							@select="handleSelectProvince"
 						></el-autocomplete>
 					</el-form-item>
-					<!--<el-form-item label="省份" prop="addrProvince">-->
-					<!--<el-select class="filter-item" v-model="listQuery.addrProvince" placeholder="请选择省份（直辖市）" @change="cityRegions4Query()">-->
-					<!--<el-option v-for="item in provinceArr" :key="item.id" :label="item.name"-->
-					<!--:value="item.id"></el-option>-->
-					<!--</el-select>-->
-					<!--</el-form-item>-->
 					<el-form-item label="城市" prop="addrCity">
 						<el-autocomplete
 							class="inline-input"
@@ -69,12 +62,6 @@
 							@select="handleSelectCity"
 						></el-autocomplete>
 					</el-form-item>
-					<!--<el-form-item label="城市" prop="addrCity">-->
-					<!--<el-select class="filter-item" v-model="listQuery.addrCity" placeholder="请选择城市">-->
-					<!--<el-option v-for="item in cityArr" :key="item.id" :label="item.name"-->
-					<!--:value="item.id"></el-option>-->
-					<!--</el-select>-->
-					<!--</el-form-item>-->
 					<el-form-item label="车型" prop="modelId">
 						<el-autocomplete
 							class="inline-input"
@@ -201,12 +188,6 @@
 				v-waves
 				@click="handleFilter('download')"
 			>下载车辆信息Excel表</el-button>
-			<el-button
-				class="filter-item"
-				type="primary"
-				v-waves
-				@click="handleFilter('export')"
-			>导出分公司车辆信息</el-button>
 		</div>
 
 		<el-table :key="tableKey" :data="list" border fit highlight-current-row style="width: 100%">
@@ -1675,14 +1656,10 @@ export default {
 			}
 			t.getAllVehicleType() //获取全部车型
 		})
-		getAllCompany(codeAndBranchCompany => {
-			this.allCompanies = codeAndBranchCompany
-		})
 		getUpkeepAll().then(response => {
 			this.allUpkeepItems = response.data
 		})
-		this.getAllProvinceRegions()
-		this.getAllCities()
+		
 		this.vehicleInfo_btn_edit = this.elements['vehicleInfo:btn_edit']
 		this.vehicleInfo_btn_add = this.elements['vehicleInfo:btn_add']
 		this.vehicleInfo_btn_apply = this.elements['vehicleInfo:btn_apply']
@@ -1707,7 +1684,7 @@ export default {
 		getAllZoneList() {
 			let that = this
 			that.allZoneArr = getAllZone()
-			return getAllZone()
+			return that.allZoneArr
 		},
 
 		townRegions4Query() {
@@ -1863,43 +1840,7 @@ export default {
 		}
 	},
 	methods: {
-		/**
-		 * 根据片区获取省份数据
-		 * */
-		getProvinceRegions() {
-			let that = this
-			this.listQuery.addrCity = undefined
-			this.listQuery.addrProvince = undefined
-			if (!this.$utils.isInteger(this.listQuery.zoneId)) {
-				return that.getAllProvinceRegions()
-			}
-			this.allZoneArr.map(function(item) {
-				if (item.id == that.listQuery.zoneId) {
-					getSysRegionByIds(item.provinceIds).then(response => {
-						let listRs = undefined
-						if (!that.$utils.isEmpty(response.data)) {
-							listRs = response.data
-						}
-						that.provinceRegions = listRs
-					})
-				}
-			})
-		},
-		getAllProvinceRegions() {
-			let that = this
-			var zoneStr = ''
-			getAllZone().map(function(item) {
-				zoneStr = zoneStr + item.provinceIds + ','
-			})
-			let listRs = undefined
-			getSysRegionByIds(zoneStr).then(response => {
-				if (!that.$utils.isEmpty(response.data)) {
-					listRs = response.data
-				}
-				that.provinceRegions = listRs
-			})
-			return listRs
-		},
+		
 		cityRegions4Query() {
 			let that = this
 			if (!this.$utils.isInteger(this.listQuery.addrProvince)) {