zhongtianhaoyuan 3 jaren geleden
bovenliggende
commit
3101770133

+ 6 - 4
src/views/driverManagement/identityExamine.vue

@@ -4,8 +4,8 @@
     <div class="center_css">
       <div class="top_css">
         <el-row>
-          <el-col :span="14">
-            <el-button type="primary">添加</el-button>
+          <el-col :span="14" style="height: 45px;">
+          <!-- <el-button type="primary">添加</el-button> -->
           </el-col>
           <el-col :span="10">
             <div class="screen">
@@ -73,10 +73,11 @@
         <el-table-column prop="paymentDate" label="附件">
           <template slot-scope="scope" style="text-align: center;">
             <span class="btn_css btn_css1" @click="fujianLook(scope.row)">查看</span>
-            <el-tooltip placement="top">
+            <el-tooltip placement="top"
+              v-if="scope.row.overdueFlag == 1 || scope.row.driverOverdueFlag == 1 || scope.row.drivingOverdueFlag == 1 || scope.row.trailerOverdueFlag == 1 ||scope.row.qualificationOverdueFlag == 1 || scope.row.operationOverdueFlag == 1 ||scope.row.trailerOperationOverdueFlag == 1">
               <div slot="content"><span v-if="scope.row.overdueFlag == 1">身份证已过有效期</span> <span
                   v-if="scope.row.driverOverdueFlag == 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.qualificationOverdueFlag == 1"><br />从业资格证已过有效期</span><span
                   v-if="scope.row.operationOverdueFlag == 1"><br />道路运输证已过有效期</span><span
@@ -562,6 +563,7 @@
     }
 
     .screen {
+      // float: right;
       display: flex;
 
       .search {

+ 2 - 2
src/views/enterpriseManagement/enterpriseAudit.vue

@@ -51,9 +51,9 @@
 				<el-table-column prop="status" label="状态"></el-table-column>
 				<el-table-column label="操作" min-width="200">
 					<template slot-scope="scope">
-						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">通过</el-link>
+						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">通过</el-link>
 						<el-divider direction="vertical"></el-divider>
-						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.authenticationStatus != '审核中'">驳回</el-link>
+						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false" :disabled="scope.row.status != '审核中'">驳回</el-link>
 						<el-divider direction="vertical"></el-divider>
 						<el-link  target="_blank" @click="seeInfo(scope.row)" type="primary" :underline="false">查看</el-link>
 						<!-- <span class="btn_css" @click="seeInfo(scope.row)"></span> -->

+ 1 - 0
src/views/platformManagement/specifiedRecordsLook.vue

@@ -173,6 +173,7 @@
 		background: #FFFFFF;
 		margin: 20px auto;
 		padding-top: 20px;
+    overflow-y: scroll;
 	}
 
 	.formData {

+ 1 - 1
vue.config.js

@@ -55,7 +55,7 @@ module.exports = {
     },
     proxy: {
       '/pb': {
-        target: 'http://192.168.1.114:8091/',
+        target: 'http://192.168.1.114:8099/',
         changeOrigin: true, //开启代理:在本地会创建一个虚拟服务端,然后发送请求的数据,并同时接收请求的数据,这样服务端和服务端进行数据的交互就不会有跨域问题
         pathRewrite: { '^/pb': '/' }, //这里重写路径
         secure: false,