车辆信息管理

src/views/order/rentVehicleInfo/index.vue

@@ -585,6 +585,7 @@ import { mapGetters } from 'vuex'
 import rsCode from '../../../utils/rsCode'
 import { getSysRegionByIds } from 'api/vehicle/vehicleInfo/'
 import { getAllZone } from 'api/base_info/constant/'
+import { getAll,getAllCompany } from 'api/base_info/branch_company'
 import ElRow from 'element-ui/packages/row/src/row'
 import ElCol from 'element-ui/packages/col/src/col'
 import ElButton from '../../../../node_modules/element-ui/packages/button/src/button.vue'
@@ -819,6 +820,10 @@ export default {
 			}
 		}
 		this.getList()
+		// this.getAllFn()
+		getAllCompany(codeAndBranchCompany => {
+			this.allBranchCompany = codeAndBranchCompany;
+		});
 		this.btn_del = this.elements['branchCompany/stockApply:btn_delete']
 		this.order_btn_order_violcation_save = this.elements[
 			'order:btn_order_violcation_save'
@@ -1313,10 +1318,12 @@ export default {
 		getProvinceRegions(item) {
 			this.listQuery.zoneId = item
 			this.baranchQuery.zoneId = item
-			this.listQuery.startCompanyId = undefined
-			getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
-				this.allBranchCompany = response.data
-			})
+
+
+			// this.listQuery.startCompanyId = undefined
+			// getAllBranchCompanyByZoneId(this.baranchQuery).then(response => {
+			// 	this.allBranchCompany = response.data
+			// })
 		},
 		getAllBranchCompanyChange(item) {
 			this.listQuery.startCompanyId = item

src/views/userManagement/userList/index.vue

@@ -142,9 +142,9 @@
       <!--      </el-table-column>-->
       <el-table-column align="center" label="操作" width="400" fixed="right">
         <template scope="scope">
-           <!-- <el-button size="small" class="el-button el-button--text el-button--small" v-show="!scope.row.nameOfSuperior || !scope.row.superiorMobileNumber" @click="setHigher(scope.row)">
+           <el-button size="small" class="el-button el-button--text el-button--small" v-show="!scope.row.nameOfSuperior || !scope.row.superiorMobileNumber" @click="setHigher(scope.row)">
             设置上级
-          </el-button> -->
+          </el-button>
           <el-button size="small" class="el-button el-button--text el-button--small" @click="viewDetails(scope.row)">
             查看详情
           </el-button>

src/views/vehicle/vehicleInfo/index.vue

@@ -510,14 +510,14 @@
 
 					<el-col :span="12">
 						<!--<el-form-item label="车型">
-              <el-select v-model="form.modelId" filterable placeholder="请选择">
-                <el-option
-                  v-for="item in allVehicleList"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id">
-                </el-option>
-              </el-select>
+							<el-select v-model="form.modelId" filterable placeholder="请选择">
+								<el-option
+								v-for="item in allVehicleList"
+								:key="item.id"
+								:label="item.name"
+								:value="item.id">
+								</el-option>
+							</el-select>
 						</el-form-item>-->
 						<el-form-item label="车型" prop="vehicleModelName">
 							<el-autocomplete
@@ -538,6 +538,18 @@
 							<el-input v-model="form.manufacturer" placeholder="请输入生产商"></el-input>
 						</el-form-item>
 					</el-col>
+					<el-col :span="12">
+						<el-form-item label="年审日期" prop="manufacturer">
+							 <el-date-picker
+								v-model="form.annualVerificationDate"
+								type="date"
+								placeholder="选择日期"
+								style="width:100%">
+							</el-date-picker>
+						</el-form-item>
+					</el-col>
+
+
 				</el-row>
 
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">用途、位置及里程</p>
@@ -733,16 +745,11 @@
 					<!--</el-col>-->
 				</el-row>
 				<p style="border-bottom:1px solid #bfcbd9;padding-bottom:10px">其他</p>
-				<el-row>
-					<el-col :span="24">
-						<el-form-item label="备注" prop="remark">
-							<el-input type="textarea" :rows="5" v-model="form.remark" placeholder="请输入备注信息"></el-input>
-						</el-form-item>
-					</el-col>
-				</el-row>
+				
 				<el-row>
 					<el-col :span="24">
 						<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
+
 							<el-upload
 								class="avatar-uploader"
 								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
@@ -750,7 +757,7 @@
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccess"
 								:before-upload="beforeAvatarUpload"
-								:style="{display:'block'}"
+								:style="{display:'inline-block'}"
 							>
 								<img
 									v-if="$utils.isString(form.drivingLicensePath) && !$utils.isEmpty(form.drivingLicensePath)"
@@ -758,11 +765,37 @@
 									class="avatar"
 									:style="{display:'block'}"
 								/>
-								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}"></i>
+								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证正面</span></i>
+							</el-upload>
+
+							<el-upload
+								class="avatar-uploader"
+								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:show-file-list="false"
+								:headers="getHeaderWithToken"
+								:on-success="handleAvatarSuccessF"
+								:before-upload="beforeAvatarUpload"
+								:style="{display:'inline-block'}"
+							>
+								<img
+									v-if="$utils.isString(form.drivingLicenseDuplicatePath) && !$utils.isEmpty(form.drivingLicenseDuplicatePath)"
+									:src="getDrivingLicenseUrl(form.drivingLicenseDuplicatePath)"
+									class="avatar"
+									:style="{display:'block'}"
+								/>
+								<i v-else class="el-icon-plus avatar-uploader-icon" :style="{lineHeight:'350px'}" style="position: relative;"><br/><span class="driving-title">行驶证副本</span></i>
+								
 							</el-upload>
 						</el-form-item>
 					</el-col>
 				</el-row>
+				<el-row>
+					<el-col :span="24">
+						<el-form-item label="备注" prop="remark">
+							<el-input type="textarea" :rows="5" v-model="form.remark" placeholder="请输入备注信息"></el-input>
+						</el-form-item>
+					</el-col>
+				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
 				<el-button @click="cancel('form')">取 消</el-button>
@@ -2404,6 +2437,10 @@ export default {
 			this.form.drivingLicensePath = res.data
 			this.showLoadingBody = false
 		},
+		handleAvatarSuccessF(res, file) {
+			this.form.drivingLicenseDuplicatePath = res.data
+			this.showLoadingBody = false
+		},
 		beforeAvatarUpload(file) {
 			const isJPG =
 				file.type === 'image/jpeg' || file.type === 'image/gif'
@@ -2415,7 +2452,7 @@ export default {
 			if (!isLt2M) {
 				this.$message.error('上传图片大小不能超过 10MB!')
 			}
-			this.showLoadingBody = true
+			// this.showLoadingBody = true
 			return isJPG && isLt2M
 		},
 		accItemSelected(selected) {
@@ -3020,6 +3057,7 @@ export default {
 				mileageLastUpdate: undefined,
 				//          receiveTime: undefined,
 				drivingLicensePath: undefined,
+				drivingLicenseDuplicatePath:undefined,
 				remark: undefined,
 				strongInsuranceEndDate: undefined,
 				strongInsuranceNo: undefined,
@@ -3059,3 +3097,11 @@ export default {
 	}
 }
 </script>
+<style>
+.driving-title{
+	position: absolute;
+    top: 34px;
+    left: 140px;
+    font-size: 14px;
+}
+</style>
\ No newline at end of file