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

src/views/vehicle/bookInfoViewer.vue

@@ -26,13 +26,13 @@
           <th style="font-size: 30px">五</th>
           <th style="font-size: 30px">六</th>
         </tr>
-        <tr v-for=" row in getEevryDayThisMonth " class="el-date-table__row">
+        <!-- <tr v-for=" row in getEevryDayThisMonth " class="el-date-table__row">
           <td v-for=" col in row " :class="col.class" :style="col.style">
             {{col.day}}
             <span v-if=" col.isBooked === true "
                   :style="{position: 'relative', fontSize: 10+'px', color: 'rgba(15, 159, 214, 0.6)', float: 'right'}">订</span>
           </td>
-        </tr>
+        </tr> -->
         </tbody>
       </table> -->
       <div slot="footer" class="dialog-footer">

src/views/vehicle/vehicleInfo/index.vue

@@ -737,7 +737,7 @@
 						<el-form-item label="行驶证" prop="drivingLicensePath" :style="{display:'block'}">
 							<el-upload
 								class="avatar-uploader"
-								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
 								:show-file-list="false"
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccess"
@@ -763,7 +763,7 @@
 
 							<el-upload
 								class="avatar-uploader"
-								:action="BASE_API + '/vehicle/vehicleInfo/upload/drivingLicense'"
+								:action="BASE_API + '/api/universal/file/app/unauth/admin/upload'"
 								:show-file-list="false"
 								:headers="getHeaderWithToken"
 								:on-success="handleAvatarSuccessF"
@@ -798,8 +798,8 @@
 				</el-row>
 			</el-form>
 			<div slot="footer" class="dialog-footer">
-				<el-button @click="cancel('form')">取 消</el-button>
-				<el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确 定</el-button>
+				<el-button @click="cancel('form')">取消</el-button>
+				<el-button v-if="dialogStatus=='create'" type="primary" @click="create('form')">确定</el-button>
 				<el-button
 					type="primary"
 					@click="update('form')"
@@ -1182,7 +1182,8 @@ export default {
 								}
 							})
 						},
-						trigger: 'blur'
+						trigger: 'blur',
+						required: true
 					}
 				],
 				engineNum: [
@@ -2448,11 +2449,19 @@ export default {
 			this.dialogForm4LicenceVisible = true
 		},
 		getDrivingLicenseUrl(drivingLicensePath) {
-			return (
-				process.env.BASE_API +
-				'/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' +
-				encodeURI(drivingLicensePath)
-			)
+			console.log(drivingLicensePath);
+			
+			if (drivingLicensePath.indexOf('https') > -1) {
+				return drivingLicensePath
+			}else{
+				return (
+					process.env.BASE_API +
+					'/vehicle/vehicleInfo/download/drivingLicense?realFileRelPath=' +
+					encodeURI(drivingLicensePath)
+				)
+			}
+			
+			
 		},
 		handleAvatarSuccess(res, file) {
 			this.form.drivingLicensePath = res.data
@@ -2869,6 +2878,7 @@ export default {
 		},
 		create(formName) {
 			const set = this.$refs
+			debugger
 			set[formName].validate(valid => {
 				if (valid) {
 					let formTemp = this.fillDateRange2Object(
@@ -2901,6 +2911,7 @@ export default {
 						}
 					})
 				} else {
+					this.$message('必填项不能为空')
 					return false
 				}
 			})