zhongtianhaoyuan 2 år sedan
förälder
incheckning
ef06767f10

+ 10 - 7
src/views/administrationManagement/dailyReport.vue

@@ -28,7 +28,7 @@
                 待上报
               </div>
               <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-                已驳回
+                未通过
               </div>
               <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 已通过
@@ -60,14 +60,14 @@
         <el-table-column prop="amountMoney" label="金额(元)" />
         <el-table-column prop="paymentType" label="类型" />
         <el-table-column prop="reportedStatus" label="状态">
-           <template slot-scope="scope1">
-            <span>{{scope1.row.reportedStatus}}</span>
-              <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top" v-if="scope1.row.reportedStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+           <template scope="scope">
+            {{scope.row.reportedStatus}}
+            <el-tooltip class="item" effect="dark" :content="scope.row.reportedFailureReason" placement="top" v-if="scope.row.reportedStatus == '未通过'">
+              <i class="el-icon-warning-outline red_text"></i>
+            </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="paymentDate" label="付款时间" min-width="100"/>
+        <el-table-column prop="paymentDate" label="付款时间" min-width="156"/>
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
@@ -631,4 +631,7 @@ export default {
 ::v-deep .el-drawer.rtl {
   overflow: auto;
 }
+.red_text{
+    color: red;
+  }
 </style>

+ 7 - 7
src/views/administrationManagement/driverInformationReporting.vue

@@ -28,7 +28,7 @@
                 待上报
               </div>
               <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-                已驳回
+                未通过
               </div>
               <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 已通过
@@ -70,7 +70,7 @@
             <span :class="scope.row.overdueFlag == 1?'red_text':''">{{scope.row.cardValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="updateDate" label="上报时间">
+        <el-table-column prop="updateDate" label="上报时间" min-width="156">
           <template slot-scope="scope">
             <span v-if="scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{scope.row.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
           </template>
@@ -98,11 +98,11 @@
           </template>
         </el-table-column>
         <el-table-column prop="reportedStatus" label="状态" min-width="100">
-          <template slot-scope="scope">
-            <span>{{scope.row.reportedStatus}}</span>
-              <el-tooltip class="item" effect="dark" content="提示文字" placement="top" v-if="scope.row.reportedStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+          <template scope="scope">
+            {{scope.row.reportedStatus}}
+            <el-tooltip class="item" effect="dark" :content="scope.row.reportedFailureReason" placement="top" v-if="scope.row.reportedStatus == '未通过'">
+              <i class="el-icon-warning-outline red_text"></i>
+            </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="200">

+ 10 - 3
src/views/administrationManagement/vehicleInformationReporting.vue

@@ -28,7 +28,7 @@
                 待上报
               </div>
               <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-                已驳回
+                未通过
               </div>
               <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 已通过
@@ -72,7 +72,7 @@
             <span :class="scope.row.operationOverdueFlag == 1?'red_text':''">{{scope.row.operationCertificateValidityDate}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="updateDate" label="上报时间">
+        <el-table-column prop="updateDate" label="上报时间" min-width="156">
           <template slot-scope="scope">
             <span v-if="scope.row.escalationStatus&&scope.row.escalationStatus != '未认证' && scope.row.escalationStatus != '待上报'">{{scope.row.updateDate}}</span><!-- 未认证和待上报不显示时间 -->
           </template>
@@ -103,7 +103,14 @@
             </el-tooltip>
           </template>
         </el-table-column>
-        <el-table-column prop="reportedStatus" label="状态" min-width="100"></el-table-column>
+        <el-table-column prop="reportedStatus" label="状态" min-width="100">
+          <template scope="scope">
+            {{scope.row.reportedStatus}}
+            <el-tooltip class="item" effect="dark" :content="scope.row.reportedFailureReason" placement="top" v-if="scope.row.reportedStatus == '未通过'">
+              <i class="el-icon-warning-outline red_text" ></i>
+            </el-tooltip>
+          </template>
+        </el-table-column>
         <el-table-column label="操作" min-width="200">
           <template slot-scope="scope">
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"

+ 11 - 8
src/views/administrationManagement/waybillReporting.vue

@@ -28,7 +28,7 @@
                 待上报
               </div>
               <div :class="search == 2 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(2)">
-                已驳回
+                未通过
               </div>
               <div :class="search == 3 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(3)">
                 已通过
@@ -58,13 +58,13 @@
         <el-table-column prop="cargoOwnerPhone" label="发运人账号" />
         <el-table-column prop="driverName" label="承运人" />
         <el-table-column prop="driverPhone" label="承运人账号" />
-        <el-table-column prop="orderEndDate" label="订单完结时间" />
+        <el-table-column prop="orderEndDate" label="订单完结时间" min-width="156"/>
         <el-table-column prop="reportedStatus" label="状态">
-          <template slot-scope="scope1">
-            <span>{{scope1.row.reportedStatus}}</span>
-              <el-tooltip class="item" effect="dark" :content="scope1.row.escalationFailureReason" placement="top" v-if="scope1.row.reportedStatus == '未通过'">
-                 <img src="../../../public/img/wenhao.png" alt="" class="ask_css" />
-              </el-tooltip>
+           <template scope="scope">
+            {{scope.row.reportedStatus}}
+            <el-tooltip class="item" effect="dark" :content="scope.row.reportedFailureReason" placement="top" v-if="scope.row.reportedStatus == '未通过'">
+              <i class="el-icon-warning-outline red_text"></i>
+            </el-tooltip>
           </template>
         </el-table-column>
         <el-table-column label="操作" min-width="200">
@@ -72,7 +72,7 @@
             <el-link target="_blank" @click="look(scope.row)" type="primary" :underline="false">查看</el-link>
             <el-divider direction="vertical" />
             <el-link target="_blank" type="primary" :underline="false" @click="submission(scope.row)"
-              :disabled="scope.row.reportedStatusKey != '1' && scope.row.reportedStatus != '3'">
+              :disabled="scope.row.reportedStatus != '未上报' && scope.row.reportedStatus != '未通过'">
               上报</el-link>
           </template>
         </el-table-column>
@@ -636,4 +636,7 @@ export default {
 ::v-deep .el-drawer.rtl {
   overflow: auto;
 }
+.red_text{
+    color: red;
+  }
 </style>