更新

src/api/parkReportManagement.js

@@ -39,3 +39,12 @@ export function carReport(data) {
      data: data,
   })
 }
+  //查看单条数据
+  export function carGetInfo(data) {
+    return request({
+      url: '/driverCarInfo/getDriverCarInfo',
+      method: 'get',
+      params: data,
+    })
+  }
+

src/views/operationLog/logManagement.vue

@@ -189,7 +189,7 @@
           let fileName = headers["content-disposition"];
           fileName = fileName.split('=')[1]
           //download是a标签的一个属性，可以自定义文件名称
-          a.download = fileName;
+          a.download = "日志记录.xlsx";
           let binaryData = [];
           binaryData.push(blob);
           // a.href = URL.createObjectURL(blob);

src/views/parkReportManagement/driverInformationReporting.vue

@@ -276,7 +276,7 @@
           this.$message.error("请勾选要上报的条目")
           return
         }
-          this.$confirm("确定上报信息？", "提示", {
+          this.$confirm("确定上报司机信息？", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning",
@@ -286,7 +286,7 @@
              if (response.code == 200) {
               this.$notify({
                 title: "成功",
-                message: "上报成功！",
+                message: "司机信息上报成功！",
                 type: "success",
               });
               this.musterList = []
@@ -408,13 +408,11 @@
         this.getList();
       },
       selectInit(row) {
-        // if (row.escalationStatus != '未上报'|| row.escalationStatus != '未通过') {  
-        //   return false;
-        // }else{
-        //   return true;
-        // }
+        if (row.escalationStatus != '未上报'&& row.escalationStatus != '未通过') {  
+          return false;
+        }else{
           return true;
-        
+        }
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`);

src/views/parkReportManagement/vehicleInformationReporting.vue

@@ -55,25 +55,27 @@
           </template>
         </el-table-column>
         <el-table-column prop="driverName" label="司机姓名"></el-table-column>
-        <el-table-column prop="driverPhone" label="账号"></el-table-column>
-        <el-table-column prop="driverLicenseValidityStartDate" label="驾驶证有效期">
+        <el-table-column prop="accountNumber" label="账号"></el-table-column>
+        <el-table-column prop="carNumber" label="牵引车车牌号"></el-table-column>
+        <el-table-column prop="guaCarNumber" label="挂车车牌号"></el-table-column>
+        <el-table-column prop="drivingLicenseValidityDate" label="行驶证有效期">
           <template slot-scope="scope">
-            <span :class="scope.row.driverOverdueFlag == 1?'red_text':''">{{scope.row.driverLicenseValidityStartDate}}</span>
+            <span :class="scope.row.drivingOverdueFlag == 1?'red_text':''">{{scope.row.drivingLicenseValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="qualificationCertificateValidityDate" label="从业资格证有效期">
+        <el-table-column prop="trailerLicenseValidityDate" label="挂车行驶证有效期">
            <template slot-scope="scope">
-            <span :class="scope.row.qualificationOverdueFlag == 1?'red_text':''">{{scope.row.qualificationCertificateValidityDate}}</span>
+            <span :class="scope.row.trailerOverdueFlag == 1?'red_text':''">{{scope.row.trailerLicenseValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="cardValidityDate" label="身份证有效期">
-             <template slot-scope="scope">
-            <span :class="scope.row.overdueFlag == 1?'red_text':''">{{scope.row.cardValidityDate}}</span>
+        <el-table-column prop="operationCertificateValidityDate" label="道路运输证有效期">
+          <template slot-scope="scope">
+            <span :class="scope.row.operationOverdueFlag == 1?'red_text':''">{{scope.row.operationCertificateValidityDate}}</span>
           </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="上报时间">
           <template slot-scope="scope">
-            <span v-if="scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{scope.row.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
+            <span v-if="scope.row.escalationStatus&&scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{scope.row.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
           </template>
         </el-table-column>
         <el-table-column prop="paymentDate" label="附件">
@@ -89,10 +91,14 @@
                 scope.row.trailerOperationOverdueFlag == 1
               ">
               <div slot="content">
-                <span v-if="scope.row.overdueFlag == 1">身份证已过有效期<br /></span>
-                <span v-if="scope.row.driverOverdueFlag == 1">驾驶证已过有效期<br /></span><span
-                  v-if="scope.row.qualificationOverdueFlag == 1">从业资格证已过有效期<br /></span>
-              </div>
+                  <!-- <span v-if="scope.row.overdueFlag == 1">身份证已过有效期<br /></span> -->
+                  <!-- <span v-if="scope.row.driverOverdueFlag == 1">驾驶证已过有效期<br /></span> -->
+                  <span v-if="scope.row.drivingOverdueFlag == 1">行驶证已过有效期<br /></span>
+                  <span v-if="scope.row.trailerOverdueFlag == 1">挂车行驶证已过有效期<br /></span>
+                  <span v-if="scope.row.operationOverdueFlag == 1">运营证已过有效期<br /></span>
+                  <span v-if="scope.row.operationOverdueFlag == 1">道路运输证已过有效期<br /></span>
+                  <span v-if="scope.row.trailerOperationOverdueFlag == 1">挂车道路运输证已过有效期<br /></span>
+                </div>
               <span style="margin-top: 10px"></span>
               <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
             </el-tooltip>
@@ -129,19 +135,19 @@
       :before-close="fujianClose">
       <div class="file">
         <div class="fujian_css">
-          <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
+          <!-- <div class="fujian_item" :class="count == 1 ? 'file_btn' : ''" @click="btnChange(1)">
             身份证
-          </div>
-          <div class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
+          </div> -->
+          <!-- <div class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
             驾驶证
-          </div>
-          <!-- <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
-            行驶证
           </div> -->
-          <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
-            从业资格证
+          <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
+            行驶证
           </div>
-          <!-- <div class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
+          <!-- <div class="fujian_item" :class="count == 4 ? 'file_btn' : ''" @click="btnChange(4)">
+            从业资格证
+          </div> -->
+          <div class="fujian_item" :class="count == 5 ? 'file_btn' : ''" @click="btnChange(5)">
             挂车行驶证
           </div>
           <div class="fujian_item" :class="count == 6 ? 'file_btn' : ''" @click="btnChange(6)">
@@ -149,7 +155,7 @@
           </div>
           <div class="fujian_item" :class="count == 7 ? 'file_btn' : ''" @click="btnChange(7)">
             挂车运营证
-          </div> -->
+          </div>
         </div>
         <div class="file_tips">
           <span v-if="count == 1">有效期：{{file.cardValidityDate}} </span><span v-if="count == 2">
@@ -170,35 +176,45 @@
     <el-drawer title="司机信息" :visible.sync="rightSee" style="overflow-y: auto !important">
       <div class="right_css">
         <div class="title_name">基本信息</div>
-        <div class="right_item">姓名：{{costData.driverName}}</div>
-        <div class="right_title">性别</div>
-        <div class="right_item">{{costData.driverSex}} </div>
-         <div class="right_title">手机号码</div>
-        <div class="right_item">{{costData.driverPhone}} </div>
-         <div class="right_title">身份证照片(人像面)</div>
-        <img :src="costData.cardAddressUrl" alt="" class="img_css" @click="enlarge(costData.cardAddressUrl)">
-        <div class="right_title">身份证照片(国徽面)</div>
-         <img :src="costData.cardBackAddressUrl" alt="" class="img_css"  @click="enlarge(costData.cardBackAddressUrl)">
-        <div class="right_title">身份证号：</div>
-        <div class="right_item">{{costData.numberCard}}</div>
-        <div class="right_title">身份证有效期</div>
-        <div class="right_item">{{costData.cardValidityDate}} </div>
-         <div class="right_title">驾驶证照片(正页)</div>
-        <img :src="costData.driverLicenseHomePage" alt="" class="img_css" @click="enlarge(costData.driverLicenseHomePage)">
-        <div class="right_title">驾驶证照片(副页)</div>
-        <img :src="costData.driverLicenseBackPage" alt="" class="img_css" @click="enlarge(costData.driverLicenseBackPage)">
-        <div class="right_title">准驾车型</div>
-        <div class="right_item">{{costData.quasiDrivingVehicle}}</div>
-        <div class="right_title">驾驶证发证机关</div>
-        <div class="right_item">{{costData.lssuingAuthority}}</div>
-        <div class="right_title">驾驶证有效期</div>
-        <div class="right_item">{{costData.driverLicenseValidityDate}}</div>
-        <div class="right_title">道路运输从业资格证照片</div>
-        <img :src="costData.qualificationCertificate" alt="" class="img_css" @click="enlarge(costData.qualificationCertificate)">
-        <div class="right_title">从业资格证有效期</div>
-        <div class="right_item">{{costData.qualificationCertificateValidityDate}} </div>
-        <div class="right_title">从业资格证号</div>
-        <div class="right_item">{{costData.qualificationCertificateNumber}} </div>
+        <div class="right_item">车辆号{{costData.carNumber}}</div>
+        <div class="right_title">所有人</div>
+        <div class="right_item">{{costData.owner}} </div>
+         <div class="right_title">使用性质</div>
+        <div class="right_item">{{costData.useNature}} </div>
+         <!-- <div class="right_title">车辆识别代号</div>
+        <div class="right_item">{{costData.useNature}} </div> -->
+        <div class="right_title">发证机关</div>
+          <div class="right_item">{{costData.lssuingAuthority}} </div>
+        <div class="right_title">车长(毫米)</div>
+        <div class="right_item">{{costData.carLong}}</div>
+        <div class="right_title">车宽(毫米)</div>
+        <div class="right_item">{{costData.carWidth}} </div>
+         <div class="right_title">车高(毫米)</div>
+        <div class="right_item">{{costData.carHeight}} </div>
+        <div class="right_title">注册日期</div>
+      <div class="right_item">{{costData.trailerLicenseRegistrationDate}} </div>
+        <div class="right_title">发证日期</div>
+        <div class="right_item">{{costData.drivingLicenseIssueDate}}</div>
+        <div class="right_title">车辆能源类型</div>
+        <div class="right_item">{{costData.energyType}}</div>
+        <div class="right_title">核定载质量</div>
+        <div class="right_item">{{costData.carApprovedWeight}}</div>
+        <div class="right_title">总质量</div>
+        <div class="right_item">{{costData.servicingWeight}}</div>
+        <div class="right_title">道路运输证号</div>
+        <div class="right_item">{{costData.operationCertificateNumber}} </div>
+        <div class="right_title">行驶证有效期</div>
+        <div class="right_item">{{costData.drivingLicenseValidityDate}} </div>
+        <div class="right_title">行驶证照片（正页）</div>
+         <img :src="costData.drivingLicenseHomePage" alt="" class="img_css" @click="enlarge(costData.drivingLicenseHomePage)">
+        <div class="right_title">行驶证照片（副页）</div>
+         <img :src="costData.drivingLicenseBackPage" alt="" class="img_css" @click="enlarge(costData.drivingLicenseBackPage)">
+        <div class="right_title">道路运输证照片</div>
+         <img :src="costData.operationCertificate" alt="" class="img_css" @click="enlarge(costData.operationCertificate)">
+        <div class="right_title">挂车道路运输证照片</div>
+         <img :src="costData.trailerOperationCertificate" alt="" class="img_css" @click="enlarge(costData.trailerOperationCertificate)">
+        <div class="right_title">人车合影照片</div>
+         <img :src="costData.addressUrl" alt="" class="img_css" @click="enlarge(costData.addressUrl)">
       </div>
     </el-drawer>
     <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
@@ -208,7 +224,7 @@
   import {
     carGetList,
     carReport,
-    getInfo
+    carGetInfo
   } from "@/api/parkReportManagement";
   export default {
     components: {
@@ -281,12 +297,12 @@
           cancelButtonText: "取消",
           type: "warning",
         }).then(() => {
-          carReport({hyDriverInfoList:this.musterList})
+          carReport({hyDriverCarInfoList:this.musterList})
           .then((response) => {
              if (response.code == 200) {
               this.$notify({
                 title: "成功",
-                message: "上报成功！",
+                message: "车辆上报成功！",
                 type: "success",
               });
               this.musterList = []
@@ -305,8 +321,8 @@
       see(row) { 
         this.loading = true
         this.rightSee = true
-        getInfo({
-            commonId: row.commonId
+        carGetInfo({
+            id: row.id
           }).then(response => {
             this.costData = response.data
             this.listLoading = false
@@ -408,13 +424,11 @@
         this.getList();
       },
       selectInit(row) {
-        // if (row.escalationStatus != '未上报'|| row.escalationStatus != '未通过') {  
-        //   return false;
-        // }else{
-        //   return true;
-        // }
+        if (row.escalationStatus != '未上报' && row.escalationStatus != '未通过') {  
+          return false;
+        }else{
           return true;
-        
+        }
       },
       handleSizeChange(val) {
         console.log(`每页 ${val} 条`);
@@ -548,7 +562,7 @@
   //附件
   .file {
     .fujian_css {
-      width: 270px;
+      width: 330px;
       display: flex;
       margin: 0 auto;
       text-align: center;