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

src/views/appManagement/appVersion/index.vue

@@ -413,7 +413,7 @@
           type: 'warning'
         }).then(() => {
           removeAppVersion(row.id).then(res=>{
-            if (res.rel) {
+            if (res.status==200) {
               this.$notify.success({
                 title: '删除成功',
                 message: `success`

src/views/index/index.vue

@@ -87,7 +87,7 @@
             <div v-for="iitem in  scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
               <div v-for="ii in  iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)">
                 <span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span>
-                <span v-else style="position: absolute;color: #fff;top: -24px;right: 0;">{{ii.timeEtr}}</span>
+                <span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span>
                 <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
               </div>
             </div>

src/views/login/index.vue

@@ -16,6 +16,9 @@
       </el-button>
     </el-form-item>
   </el-form>
+  <div style="position: fixed; bottom: 50px; width: 100%; text-align: center;">
+    <a href="http://beian.miit.gov.cn" target="_blank" style="color: #eeeeee;">粤ICP备19072339号-1</a>
+  </div>
 
   <div style="position: fixed; bottom: 50px; width: 100%; text-align: center;">
     <a href="http://beian.miit.gov.cn" target="_blank" style="color: #62a8ea;">粤ICP备19072339号-1</a>

src/views/vehicle/bookRecord/index.vue

@@ -201,13 +201,14 @@
           <el-button v-if="bookRecord_btn_prove&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small"  @click="handleProve(scope.row)">通过</el-button>
           <el-button v-if="bookRecord_btn_reject&&scope.row.status==1" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleReject(scope.row)">驳回</el-button>
           <template v-if="scope.row.vehicleDepartureLogVo==undefined">
-            <el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1" size="small" class="el-button el-button--text el-button--small"  @click="handleLift(scope.row)">出车</el-button>
+            <el-button v-if="bookRecord_btn_lift&&scope.row.liftStatus==1&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  @click="handleLift(scope.row)">出车</el-button>
           </template>
           <template v-if="scope.row.vehicleDepartureLogVo!=undefined">
             <el-button v-if="bookRecord_btn_ret&&scope.row.vehicleDepartureLogVo.state==0&&scope.row.retStatus==1" size="small" class="el-button el-button--text el-button--small"  @click="handleRet(scope.row)">收车</el-button>
           </template>
-          <el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleUnbook(scope.row)">取消预定
-          </el-button>
+          <template v-if="scope.row.vehicleDepartureLogVo==undefined">
+            <el-button v-if="bookRecord_btn_unbook&&scope.row.status==2" size="small" class="el-button el-button--text el-button--small"  style="color: red;" @click="handleUnbook(scope.row)">取消预定</el-button>
+          </template>
         </template>
       </el-table-column>
     </el-table>
@@ -328,7 +329,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="提车公里数">
-              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart}}KM</span>
+              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageStart?detailItem.vehicleDepartureLogVo.mileageStart+'KM':''}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -360,7 +361,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="还车公里数">
-              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd}}KM</span>
+              <span v-if="detailItem.vehicleDepartureLogVo">{{detailItem.vehicleDepartureLogVo.mileageEnd?detailItem.vehicleDepartureLogVo.mileageEnd+'KM':''}}</span>
             </el-form-item>
           </el-col>
         </el-row>
@@ -642,11 +643,17 @@
             message: '请输入验车人',
             trigger: 'blur'
           },
-          checkManTel:{
-            required: true,
-            message: '请输入验车人联系方式',
-            trigger: 'blur'
-          },
+          checkManTel:[
+            {
+              required: true,
+              message: '请输入验车人联系方式',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '请输入正确的手机号'
+            }
+          ],
           mileage:{
             type:"number",
             required: true,
@@ -693,11 +700,17 @@
             message: '请输入收车人',
             trigger: 'blur'
           },
-          recycleManTel:{
-            required: true,
-            message: '请输入收车人联系方式',
-            trigger: 'blur'
-          },
+          recycleManTel:[
+            {
+              required: true,
+              message: '请输入收车人联系方式',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '请输入正确的手机号'
+            }
+          ],
           mileage:{
             type:"number",
             required: true,
@@ -1080,6 +1093,8 @@
               departurePicList.push(item);
             });
             t.departurePicList = departurePicList;
+          }else{
+            t.departurePicList = [];
           }
           if(row.vehicleDepartureLogVo.arrivalPic!= undefined){
             let Arr = row.vehicleDepartureLogVo.arrivalPic.split(",");
@@ -1089,7 +1104,12 @@
               arrivalPicList.push(item);
             });
             t.arrivalPicList = arrivalPicList;
+          }else{
+            t.arrivalPicList = [];
           }
+        }else{
+          t.departurePicList = [];
+          t.arrivalPicList = [];
         }
         this.dialogDetailVisible = true;
       },
@@ -1156,6 +1176,15 @@
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
+            if(Number(this.departureForm.mileage)>999999){
+              this.$notify({
+                title: '警告',
+                message: '公里数不能大于999999',
+                type: 'warning',
+                duration: 2000
+              });
+              return false;
+            }
             var arr = [];
             this.departurePicList.map(function(item){
               arr.push(item.url);
@@ -1408,6 +1437,15 @@
         const set = this.$refs;
         set[formName].validate(valid => {
           if (valid) {
+            if(Number(this.arrivalForm.mileage)>999999){
+              this.$notify({
+                title: '警告',
+                message: '公里数不能大于999999',
+                type: 'warning',
+                duration: 2000
+              });
+              return false;
+            }
             var arr = [];
             this.arrivalPicList.map(function(item){
               arr.push(item.url);
@@ -1528,5 +1566,5 @@
       height: 110px;
       display: block;
     }
-    .el-card__body,.el-card{padding: 0px;width: 110px;height: 110px;text-align: center;}
+    .el-card__body,.el-card{padding: 0px !important;width: 150px;text-align: center;}
 </style>

src/views/vehicle/vehicleSchedulManage/index.vue

@@ -136,7 +136,7 @@
             <div v-for="iitem in  scope.row.temp" :key="iitem.day" v-if="iitem.time == item.time">
               <div v-for="ii in  iitem.children" :key="ii.time" :data-ii="ii.time" :data-endhour="ii.endhour" class="ii-day" :class="ii.bg" @click="toShowDialog(scope.row, iitem, ii)">
                 <span v-if="ii.timeEtr == '00'" style="position: absolute;color: #fff;left: -20px;bottom: 0">{{ii.timeEtr}}</span>
-                <span v-else style="position: absolute;color: #fff;top: -24px;right: 0;">{{ii.timeEtr}}</span>
+                <span v-else style="position: relative;color: #fff;top: -24px;right: -20px;">{{ii.timeEtr}}</span>
                 <span style="position: absolute;color: #fff;z-index: 11;left: 0;">{{ii.timeStr}}</span>
               </div>
             </div>

src/views/vehicle/vehicleSchedulManage/vehiclePlanModal.vue

@@ -33,6 +33,8 @@
           v-model="form.times"
           type="datetimerange"
           :picker-options="pickerOptions0"
+          format="yyyy-MM-dd HH:00:00" 
+          value-format="yyyy-MM-dd HH:00:00"
           placeholder="选择时间范围">
         </el-date-picker>
       </el-form-item>
@@ -259,7 +261,7 @@
        * */
       handelOk(formName){
         const set = this.$refs;
-        console.log(this.form.times);
+        // console.log(formatDate(this.form.times[0], "yyyy-MM-dd hh:mm:ss"));
         set[formName].validate(valid => {
           if (valid) {
             if(this.form.bookType==6){
@@ -275,8 +277,8 @@
             }
             let params = {
               vehicleId:this.currentItem.item.id,
-              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh")+":00:00",//预定开始时间
-              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh")+":00:00",//预定结束时间
+              bookStartDate: formatDate(this.form.times[0], "yyyy-MM-dd hh") + ":00:00",//预定开始时间
+              bookEndDate: formatDate(this.form.times[1], "yyyy-MM-dd hh") + ":00:00",//预定结束时间
               retCompany: this.form.arrivalBranchCompanyId,//还车分公司
               bookType: this.form.bookType,//预定车辆用途类型
               vehicleUsername: this.form.vehicleUsername,//使用人姓名

src/views/vehicleType/vehicleTypeLabel.vue

@@ -12,7 +12,7 @@
       <el-table-column type="expand">
         <template scope="scope">
           <el-form label-position="left" inline class="demo-table-expand">
-            <el-form-item label="二级分类名称">
+            <el-form-item label="二级分类名称" style="margin-right: 100px;">
               <span  v-for="item,index in scope.row.children" style="margin-right: 30px;"
                      :key="item.id">{{index+1}}、{{item.name}}</span>
             </el-form-item>