更新

src/router/driverManagement/index.js

@@ -37,6 +37,15 @@ const driverManagementRouter = {
             title: '车辆信息',
             icon: ''
         }
+    },
+    {
+        path: 'test',
+        name: 'test',
+        component: () => import('@/views/driverManagement/test'),
+        meta: {
+            title: '测试',
+            icon: ''
+        }
     }
     ]
 }

src/views/cargoOwnerManagement/empowerExamine.vue

@@ -95,7 +95,7 @@
           </template>
         </el-table-column>
         <el-table-column prop="authenticationStatus" label="身份证">
-          <template slot-scope="scope"> 
+          <template slot-scope="scope">
             <span class="btn_css" @click="IDLook(scope.row)">查看</span>
           </template>
         </el-table-column>
@@ -141,9 +141,9 @@
         <div class="name_css">{{idSee.cardValidityDate}} <span style="color: #EF4C33;margin-left: 10px"
             v-if="false">已过期</span></div>
         <div class="title_css">身份证人像面</div>
-        <img :src="idSee.cardAddressUrl" class="user_item" />
+        <img :src="idSee.cardAddressUrl" class="user_item" @click="enlarge(idSee.cardAddressUrl)" />
         <div class="title_css">身份证国徽面</div>
-        <img :src="idSee.cardBackAddressUrl" class="user_item" />
+        <img :src="idSee.cardBackAddressUrl" class="user_item" @click="enlarge(idSee.cardBackAddressUrl)" />
         <div class="form_btn">
           <el-button @click="userInfoClose">关闭</el-button>
         </div>
@@ -189,6 +189,7 @@
         </div>
       </div>
     </el-dialog>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -200,6 +201,10 @@
     editInfo
   } from '@/api/cargoOwnerManagement'
   export default {
+    components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     data() {
       return {
         billList: [],
@@ -218,18 +223,28 @@
         form: {},
         Info: {},
         sendInfo: false,
-        idSee: {}
-
+        idSee: {},
+        //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
     mounted() {
       this.getList()
     },
     methods: {
-		IDLook(val){//查看身份证
-		this.idSee = val
-		this.userInfo = true
-		},
+      closeImgViewer() {
+         this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
+      IDLook(val) { //查看身份证
+        this.idSee = val
+        this.userInfo = true
+      },
       editRatio(val) {
         this.$confirm("确定修改该货主的垫付比例？", '提示', {
             confirmButtonText: '确定',

src/views/driverManagement/identityExamine.vue

@@ -169,7 +169,7 @@
       <!-- <span v-if="carSee.length == 0">暂无车辆</span> -->
       <span class="tips">注：车辆信息不在本页面审核，仅供查看</span>
       <div class="car_css" v-for="(item, index) in carSee" :key="index">
-        <img :src="item.addressUrl" class="car_item" />
+        <img :src="item.addressUrl" class="car_item" @click="enlarge(item.addressUrl)" />
         <div class="status_css" v-if="item.status == '审核中'" style="color: #2f53eb; background: #cfdbfe">
           {{ item.status }}
         </div>
@@ -190,7 +190,7 @@
         <div class="name_css">{{ item.payeeName }}</div>
         <div class="id_css">{{ item.bankCard }}</div>
         <div class="pay_name">{{ item.bankDepositBranch }}</div>
-        <img :src="item.payeeAddressUrl" class="user_item" />
+        <img :src="item.payeeAddressUrl" class="user_item" @click="enlarge(item.payeeAddressUrl)" />
         <div class="border_css"></div>
       </div>
       <div v-if="paySee.length == 0">暂无账户信息</div>
@@ -237,7 +237,7 @@
           </div> -->
         </div>
         <div class="file_img">
-          <img :src="img[index]" class="img_css" />
+          <img :src="img[index]" class="img_css" @click="enlarge(img[index])"/>
         </div>
         <div class="btn">
           <el-button style="margin-right: 120px" @click="index = 0"
@@ -288,6 +288,7 @@
         </div>
       </div>
     </el-dialog>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -296,7 +297,7 @@
     toExamine,
     postNews,
     billSee,
-    editInfo
+    editInfo,
   } from "@/api/driverManagement";
   export default {
     data() {
@@ -333,47 +334,62 @@
         billInfo: [], //账单
         billShow: false,
         // iconShow: true,
+        //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
 
     mounted() {
       this.getList();
     },
+    components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     methods: {
-      editNumber(item) {
+      closeImgViewer() {
+         this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
+            editNumber(item) {
         //   // item.iconShow = false
         //   this.$set(item,"iconShow",false)
         for (let i = 0; i < this.tableData.length; i++) {
           if (this.tableData[i].id == item.id) {
             this.tableData[i].iconShow = false;
-            this.$set(this.tableData[i], "iconShow", false)
+            this.$set(this.tableData[i], "iconShow", false);
             this.$forceUpdate();
             this.$forceupdate();
           }
         }
       },
       editRatio(val) {
-        this.$confirm("确定修改该司机的垫付比例？", '提示', {
-            confirmButtonText: '确定',
-            cancelButtonText: '取消',
-            type: 'warning',
-          })
-          .then(() => {
-            this.listLoading = true;
-            editInfo(val)
-              .then((response) => {
-                if (response.code == 200) {
-                  this.$notify({
-                    title: "成功",
-                    message: "修改成功！",
-                    type: "success",
-                  });
-                  this.getList()
-                }
-              }).catch(() => {
-                this.listLoading = false;
-              });
-          })
+        this.$confirm("确定修改该司机的垫付比例？", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        }).then(() => {
+          this.listLoading = true;
+          editInfo(val)
+            .then((response) => {
+              if (response.code == 200) {
+                this.$notify({
+                  title: "成功",
+                  message: "修改成功！",
+                  type: "success",
+                });
+                this.getList();
+              }
+            })
+            .catch(() => {
+              this.listLoading = false;
+            });
+        });
       },
       billLook(val) {
         this.listLoading = true;
@@ -945,4 +961,10 @@
   ::v-deep .input_css .el-input__inner {
     height: 30px;
   }
+
+  // .tupian{
+  //   width: 100%;
+  //   height: 100%;
+  //   position: absolute;
+  // }
 </style>

src/views/driverManagement/vehicleExamine.vue

@@ -33,11 +33,11 @@
                 已驳回
               </div>
               <div :class="search == 4 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(4)">
-								已删除
-							</div>
-							<div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
-								已注销
-							</div>
+                已删除
+              </div>
+              <div :class="search == 5 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(5)">
+                已注销
+              </div>
             </div>
           </el-col>
         </el-row>
@@ -56,9 +56,9 @@
         <el-table-column prop="guaCarNumber" label="挂车车牌号"></el-table-column>
         <el-table-column prop="amountMoney" label="附件" min-width="133">
           <template scope="scope">
-			<div>
-				 <span class="btn_css" @click="fujianLook(scope.row)">查看</span>
-			<el-tooltip placement="top" v-if="
+            <div>
+              <span class="btn_css" @click="fujianLook(scope.row)">查看</span>
+              <el-tooltip placement="top" v-if="
                 scope.row.overdueFlag == 1 ||
                 scope.row.driverOverdueFlag == 1 || //驾驶证过期标志
                 scope.row.drivingOverdueFlag == 1 || //行驶证过期标志
@@ -67,20 +67,20 @@
                 scope.row.operationOverdueFlag == 1 || //道路运输证过期标志
                 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.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>
-			</div>
-           
+                <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.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>
+            </div>
+
           </template>
         </el-table-column>
         <el-table-column prop="energyType" label="能源类型"></el-table-column>
@@ -117,10 +117,10 @@
     <el-dialog title="附件" :visible.sync="fujianInfo" width="830px" :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 class="fujian_item" :class="count == 2 ? 'file_btn' : ''" @click="btnChange(2)">
             驾驶证
           </div> -->
           <div class="fujian_item" :class="count == 3 ? 'file_btn' : ''" @click="btnChange(3)">
@@ -138,12 +138,12 @@
           <div class="fujian_item" :class="count == 7 ? 'file_btn' : ''" @click="btnChange(7)">
             挂车道路运输证
           </div>
-		  <div class="fujian_item" :class="count == 8 ? 'file_btn' : ''" @click="btnChange(8)">
-           人车合影
+          <div class="fujian_item" :class="count == 8 ? 'file_btn' : ''" @click="btnChange(8)">
+            人车合影
           </div>
         </div>
         <div class="file_img">
-          <img :src="img[index]" class="img_css" />
+          <img :src="img[index]" class="img_css" @click="enlarge(img[index])" />
         </div>
         <div class="btn">
           <el-button style="margin-right: 120px" @click="index = 0"
@@ -176,6 +176,7 @@
         </div>
       </div>
     </el-dialog>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -184,6 +185,10 @@
     toCarExamine
   } from '@/api/driverManagement'
   export default {
+    components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     data() {
       return {
         tableData: [],
@@ -209,13 +214,23 @@
         abilityName: "身份证人像面",
         abilityName1: "身份证国徽面",
         fujianInfo: false,
-
+        //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
     mounted() {
       this.getList()
     },
     methods: {
+      closeImgViewer() {
+         this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
       fujianLook(row) {
         this.file = row;
         this.index = 0;
@@ -258,7 +273,7 @@
         } else if (num == 7) {
           this.index = 0;
           this.img[0] = this.file.trailerOperationCertificate;
-        }else if (num == 8) {
+        } else if (num == 8) {
           this.index = 0;
           this.img[0] = this.file.addressUrl;
         }
@@ -556,7 +571,7 @@
         background-color: #cfdbfe;
       }
     }
-	
+
 
     .file_img {
       width: 525px;
@@ -574,8 +589,9 @@
       margin: 0 auto;
     }
   }
+
   .ask_css {
-      position: absolute;
-      margin: 2px 0 0 10px;
-    }
+    position: absolute;
+    margin: 2px 0 0 10px;
+  }
 </style>

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -48,12 +48,7 @@
         <el-table-column prop="frozenAmount" label="冻结金额（元）" min-width="133"></el-table-column>
         <el-table-column label="账单">
           <template slot-scope="scope">
-            <el-popover
-              placement="right"
-              width="400"
-              trigger="click"
-              @show="getBillList(scope.row.id)"
-              >
+            <el-popover placement="right" width="400" trigger="click" @show="getBillList(scope.row.id)">
               <div class="bill-content">
                 <div class="bill-item" v-for="item in billList" :Key="item.id">
                   <div class="row1">
@@ -128,7 +123,7 @@
         <div class="right_item">{{infoData.legalPersonName}}</div>
         <div class="right_title">联系方式</div>
         <div class="right_item">{{infoData.accountNumber}}</div>
-<!--        <div class="right_title">注册实缴金额（万元）</div>
+        <!--        <div class="right_title">注册实缴金额（万元）</div>
         <div class="right_item">{{infoData.registeredPaidAmount}}</div> -->
         <div class="right_title">上传营业执照</div>
         <div class="right_item">
@@ -139,13 +134,19 @@
         <div class="right_title">统一社会信用代码</div>
         <div class="right_item">{{infoData.unifiedSocialCreditCode}}</div>
         <div class="right_title">{{infoData.landOwnership == 0 ? "房产证":"租赁合同"}}</div>
-        <div class="right_item" v-if="infoData.imgs.length > 0" v-for="(item , index) in infoData.imgs">
+        <div class="right_item" v-if="infoData.imgs.length > 0" v-for="(item , index) in infoData.imgs" :key="index">
           <img :src="item" class="right_img">
         </div>
-
         <div class="right_title">视频验证</div>
         <div class="right_item">
-          <img src="../../../public/img/yonghu.jpg" class="right_img">
+          <!-- <img src="../../../public/img/yonghu.jpg" class="right_img"> -->
+          <!-- <video :src="infoData.videoAddressUrl" class="right_img">
+             <source src="movie.mp4" type="video/mp4">
+             <source src="movie.ogg" type="video/ogg">
+          </video> -->
+          <video ref="video" id="video" src="infoData.videoAddressUrl" autoplay="false" controls="true"
+            class="right_img">
+          </video>
         </div>
         <div class="right_item">{{infoData.advanceFreightService == 1 ? "申请开通平台垫付运费业务" : "未申请开通平台垫付运费业务"}}</div>
         <div class="right_btn">
@@ -166,7 +167,7 @@
   export default {
     data() {
       return {
-        billList:[],
+        billList: [],
         tableData: [],
         //分页
         searchkeyWord: "",
@@ -196,9 +197,9 @@
       getBillList(id) {
         console.log('查看账单')
         let _obj = {
-          companyId:id,
-          pageSize:999,
-          currentPage:1
+          companyId: id,
+          pageSize: 999,
+          currentPage: 1
         }
         getBillList(_obj).then(response => {
             this.billList = response.data.records
@@ -511,9 +512,12 @@
   ::v-deep .el-drawer {
     overflow: auto;
   }
-  .bill-content{
-    .bill-item{
-      .row1,.row2{
+
+  .bill-content {
+    .bill-item {
+
+      .row1,
+      .row2 {
         display: flex;
         justify-content: space-between;
       }

src/views/orderManagement/orderAudit.vue

@@ -56,7 +56,7 @@
         </el-table-column>
         <el-table-column prop="orderNo" label="订单编号" min-width="182">
           <template scope="scope">
-            <div>{{scope.row.orderNo}} <span class="pad_css" v-if="scope.row.freightAdvance == 1">垫</span></div>
+            <div>{{scope.row.orderNo}} <span class="pad_css" v-if="scope.row.freightAdvance == '垫付'">垫</span></div>
           </template>
         </el-table-column>
         <el-table-column prop="cargoOwner" label="货主"></el-table-column>
@@ -96,11 +96,7 @@
           </el-table-column>
         </el-table-column>
         
-        <el-table-column prop="invoicing" label="发票">
-          <template slot-scope="scope">
-            <span>{{scope.row.invoicing == 0 ? "未开":"已开"}}</span>
-          </template>
-        </el-table-column>
+        <el-table-column prop="invoicing" label="发票"></el-table-column>
         <el-table-column prop="driverContractUrl" label="合同">
           <span @click="account" class="btn_css">查看</span>
         </el-table-column>
@@ -220,41 +216,51 @@
         <div class="right_item">约{{costData.distance ? costData.distance : 0}}km</div>
         <div class="right_title">运费</div>
         <div class="right_item">{{costData.freight}}</div>
-        <el-divider></el-divider>
-        <div v-if="costData.carrierInfo">
+        <el-divider v-if="costData.hyCarrierInfo"></el-divider>
+        <div v-if="costData.hyCarrierInfo">
           <div class="title_name">承运信息</div>
           <div class="right_title">承运合同编号</div>
-          <div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+          <div class="right_item">{{costData.hyCarrierInfo.orderNo}}</div>
           <div class="right_title">委托合同编号</div>
-          <div class="right_item">{{costData.carrierInfo.orderNo}}</div>
+          <div class="right_item">{{costData.hyCarrierInfo.orderNo}}</div>
           <div class="right_title">车牌号</div>
-          <div class="right_item">{{costData.carrierInfo.carNo}}</div>
+          <div class="right_item">{{costData.hyCarrierInfo.carNo}}</div>
           <div class="right_title">预计运费</div>
-          <div class="right_item">{{costData.carrierInfo.estimatedFreight}}</div>
+          <div class="right_item">{{costData.hyCarrierInfo.estimatedFreight}}</div>
           <div class="right_title">装车时间</div>
-          <div class="right_item">{{costData.carrierInfo.loadingDate}}</div>
+          <div class="right_item">{{costData.hyCarrierInfo.loadingDate}}</div>
           <div class="right_title">装车照片</div>
-          <div style="display: flex;" v-if="costData.carrierInfo.loadingImg">
-            <div v-for="(item,index) in costData.carrierInfo.loadingImg.split(',')" :key="index">
+          <div style="display: flex;" v-if="costData.hyCarrierInfo.loadingImg">
+            <div v-for="(item,index) in costData.hyCarrierInfo.loadingImg.split(',')" :key="index">
+              <img :src="item" class="img_css">
+            </div>
+          </div>
+           <div class="right_title" v-if="costData.hyCarrierInfo.totalFreight">合计应付运费</div>
+          <div class="right_item">{{costData.hyCarrierInfo.totalFreight}}</div>
+           <div class="right_title" v-if="costData.hyCarrierInfo.unloadingDate">卸车时间</div>
+          <div class="right_item">{{costData.hyCarrierInfo.unloadingDate}}</div>
+           <div class="right_title" v-if="costData.hyCarrierInfo.unloadingImg">卸车照片</div>
+          <div style="display: flex;" v-if="costData.hyCarrierInfo.unloadingImg">
+            <div v-for="(item,index) in costData.hyCarrierInfo.unloadingImg.split(',')" :key="index">
               <img :src="item" class="img_css">
             </div>
           </div>
         </div>
-        <el-divider></el-divider>
+        <el-divider v-if="costData.freightInfo"></el-divider>
         <div v-if="costData.freightInfo">
           <div class="title_name">运费信息（单位：元）</div>
           <div class="right_title">预付运费</div>
           <div class="right_item">{{costData.freightInfo.prepaidFreight}} <span
               style="margin-left: 100px;">{{costData.freightInfo.prepaidFreightDate}}</span></div>
           <div class="right_title">运费尾款</div>
-          <div class="right_item">{{costData.freightInfo.freightBalance}} <span
+          <div class="right_item">{{costData.freightInfo.freightBalance?costData.freightInfo.freightBalance:'未支付'}} <span
               style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
-          <div class="right_title">明细</div>
-          <div class="right_item">
-            预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元，扣款{{costData.freightInfo.deduction ? costData.freightInfo.deduction : 0}}元，服务费{{costData.freightInfo.serviceCharge ? costData.freightInfo.serviceCharge:0}}元，尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元，合计收款{{costData.freightInfo.totalRepayable ? costData.freightInfo.totalRepayable:0}}元。
+          <div class="right_title" v-if="costData.freightInfo.freightBalance">明细</div>
+          <div class="right_item" v-if="costData.freightInfo.freightBalance">
+            预付{{costData.freightInfo.prepaidFreight ? costData.freightInfo.prepaidFreight : 0}}元，服务费{{costData.freightInfo.driverServiceCharge ? costData.freightInfo.driverServiceCharge:0}}元，尾款{{costData.freightInfo.freightBalance ? costData.freightInfo.freightBalance:0}}元，合计收款{{costData.freightInfo.totalCollection ? costData.freightInfo.totalCollection:0}}元。
           </div>
         </div>
-        <el-divider></el-divider>
+        <el-divider v-if="costData.repaymentInfo"></el-divider>
         <div v-if="costData.repaymentInfo">
           <div class="title_name">还款信息</div>
           <div class="right_title">运费</div>