Merge branch 'base-modify'

# Conflicts:
#	src/views/vehicle/vehicleInfo/index.vue

src/views/vehicle/vehicleInfo/index.vue

@@ -681,8 +681,8 @@
 				<el-row>
 					<el-col :span="12">
 						<el-form-item label="交强险单号" prop="strongInsuranceNo">
-							<el-input v-model.number="form.strongInsuranceNo" placeholder="请输入交强险单号"></el-input>
 							<el-input v-model.text="form.strongInsuranceNo" @input="handleInput" placeholder="请输入交强险单号"></el-input>
+
 						</el-form-item>
 					</el-col>
 					<el-col :span="12">
@@ -1095,7 +1095,6 @@ export default {
 				strongInsuranceCompany: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
-				strongInsuranceCompany: undefined
 				strongInsuranceCompany: undefined,
 				insurancePDF:undefined
 			},
@@ -2808,6 +2807,7 @@ export default {
 				this.$utils.objectEach(response.data, (item, key) => {
 					this.form[key] = item
 				})
+				that.pdfList = []
 				selectArry.map(function(iitem) {
 					if (that.form['subordinateBranch'] == iitem.id) {
 						that.form.subordinateBranchName = iitem.name
@@ -2817,10 +2817,11 @@ export default {
 						that.form.parkBranchCompanyName = iitem.name
 						that.form.parkBranchCompanyId = iitem.id
 					}
+
 					if (that.form.insurancePDF) {
-						that.pdfList = []
 						that.pdfList = JSON.parse(that.form.insurancePDF)
 					}
+
 				})
 				selectVehicleModelArry.map(function(value) {
 					if (that.form['modelId'] == value.id) {