前端更新

src/router/driverManagement/index.js

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

src/views/enterpriseManagement/enterpriseAudit.vue

@@ -48,7 +48,12 @@
         <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">
@@ -123,30 +128,23 @@
         <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">
-          <img :src="infoData.businessLicenseAddressUrl" class="right_img">
+          <img :src="infoData.businessLicenseAddressUrl" class="right_img" @click="enlarge(infoData.businessLicenseAddressUrl)">
         </div>
         <div class="right_title">营业期限截止日期</div>
         <div class="right_item">{{infoData.businessTermDate}}</div>
         <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" :key="index">
-          <img :src="item" class="right_img">
+        <div class="right_item"  v-for="(item , index) in infoData.imgs" :key="index">
+          <img :src="item" class="right_img" @click="enlarge(item)">
         </div>
         <div class="right_title">视频验证</div>
         <div class="right_item">
-          <!-- <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>
+           <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">
@@ -156,6 +154,8 @@
         </div>
       </div>
     </el-drawer>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
+
   </div>
 </template>
 <script>
@@ -165,9 +165,13 @@
     getBillList
   } from '@/api/enterpriseManagement'
   export default {
+     components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     data() {
       return {
-        billList: [],
+        billList:[],
         tableData: [],
         //分页
         searchkeyWord: "",
@@ -186,20 +190,29 @@
         },
         rightSee: false,
         infoData: {},
-
-
+          //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
     mounted() {
       this.getList()
     },
     methods: {
+       closeImgViewer() {
+        this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
       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
@@ -512,12 +525,9 @@
   ::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/feedbackManagement/userFeedback.vue

@@ -108,8 +108,9 @@
     </el-dialog>
     <!-- //附图 -->
      <el-dialog title="附图" :visible.sync="seePicture" width="500px" :before-close="seePictureClose">
-        <img :src="dataInfo.url" class="user_item" style="width:100%;"/>
+        <img :src="dataInfo.url" class="user_item" style="width:100%;" @click="enlarge(dataInfo.url)"/>
     </el-dialog>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -118,6 +119,10 @@
     submitResult
   } from "@/api/feedbackManagement";
   export default {
+    components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     data() {
       return {
         tableData: [],
@@ -132,7 +137,10 @@
         sendInfo: false,
         titleInfo: "",
         dataInfo:{},
-        seePicture:false
+        seePicture:false,
+        //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
 
@@ -140,10 +148,18 @@
       this.getList();
     },
     methods: {
+      closeImgViewer() {
+        this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
       seeUrl(val){
         this.seePicture = true
         this.dataInfo = val
-        
+
       },
       seePictureClose(){
         this.seePicture = false

src/views/orderManagement/orderAudit.vue

@@ -22,7 +22,8 @@
         <el-row>
           <el-col>
             <div class="search_btn">
-              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block" @click="searchBtn('')">
+              <div :class="search == '' ? 'search' : 'searchNo'" class="search_item search_block"
+                @click="searchBtn('')">
                 全部
               </div>
               <div :class="search == 1 ? 'search' : 'searchNo'" class="search_item" @click="searchBtn(1)">
@@ -70,35 +71,37 @@
         <el-table-column prop="freight" label="预计运费(元)"></el-table-column>
         <el-table-column prop="actualFreight" label="实际运费(元)"></el-table-column>
         <el-table-column prop="advanceCharge" label="预付运费(元)"></el-table-column>
-       
+
         <el-table-column prop="amountMoney" label="司机费用结算">
-           <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column>
-           <el-table-column prop="payable" label="应付(元)"></el-table-column>
+          <el-table-column prop="driverServiceCharge" label="服务费(元)"></el-table-column>
+          <el-table-column prop="payable" label="应付(元)"></el-table-column>
           <el-table-column prop="payabled" label="已付(元)">
             <template slot-scope="scope">
               <span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
             </template>
           </el-table-column>
-           <el-table-column prop="nopayable" label="未付(元)"></el-table-column>
-        </el-table-column>
-         <el-table-column prop="amountMoney" label="货主费用结算">
-           <el-table-column prop="ownerServiceCharge" label="服务费(元)"></el-table-column>
-            <el-table-column prop="overdueFee" label="超期费(元)">
-          <template slot-scope="scope">
-            <span class="btn_css" @click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
-          </template>
+          <el-table-column prop="nopayable" label="未付(元)"></el-table-column>
         </el-table-column>
-           <el-table-column prop="receivable" label="应收(元)"></el-table-column>
+        <el-table-column prop="amountMoney" label="货主费用结算">
+          <el-table-column prop="ownerServiceCharge" label="服务费(元)"></el-table-column>
+          <el-table-column prop="overdueFee" label="超期费(元)">
+            <template slot-scope="scope">
+              <span class="btn_css" @click="costLook(scope.row)">{{scope.row.freightAdvance == 0 ? "" : 0}}</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="receivable" label="应收(元)"></el-table-column>
           <el-table-column prop="receivabled" label="已收(元)">
             <template slot-scope="scope">
               <span>{{scope.row.freightAdvance == 0 ? "" : scope.row.alreadyRepaid}}</span>
             </template>
           </el-table-column>
         </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>
+          <template scope="scope">
+          <span @click="contract(scope.row)" class="btn_css">查看</span>
+         </template>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" min-width="160"></el-table-column>
         <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92"></el-table-column>
@@ -124,7 +127,7 @@
                 <el-dropdown-item>
                   <el-link target="_blank" @click="end(scope.row)" type="primary" :underline="false"
                     :disabled="scope.row.cargoOwnerStatusKey > 18">终止</el-link>
-                    <!-- cargoOwnerStatusKey=19待平台确认卸车，待货主确认卸车key = 18 -->
+                  <!-- cargoOwnerStatusKey=19待平台确认卸车，待货主确认卸车key = 18 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
@@ -133,11 +136,13 @@
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <!-- v-if="scope.row.freightAdvance == 1" -->
-                  <el-link target="_blank" type="primary" :underline="false"  :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 9">预付</el-link>
-                   <!-- 垫付类型的订单，平台确认装车后从未进行过预付操作（即预付款=0）时显示的按钮。 -->
+                  <el-link target="_blank" type="primary" :underline="false"
+                    :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 9">预付</el-link>
+                  <!-- 垫付类型的订单，平台确认装车后从未进行过预付操作（即预付款=0）时显示的按钮。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link target="_blank" type="primary" :underline="false" :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 19">尾款</el-link>
+                  <el-link target="_blank" type="primary" :underline="false"
+                    :disabled="scope.row.freightAdvance != 1 && scope.row.cargoOwnerStatusKey < 19">尾款</el-link>
                   <!-- 垫付类型的订单，平台确认卸车后从未进行过尾款操作（即尾款=0）时显示的按钮。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
@@ -232,17 +237,17 @@
           <div class="right_title">装车照片</div>
           <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">
+              <img :src="item" class="img_css" @click="enlarge(item)">
             </div>
           </div>
-           <div class="right_title" v-if="costData.hyCarrierInfo.totalFreight">合计应付运费</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_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 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">
+              <img :src="item" class="img_css" @click="enlarge(item)">
             </div>
           </div>
         </div>
@@ -253,8 +258,8 @@
           <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?costData.freightInfo.freightBalance:'未支付'}} <span
-              style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
+          <div class="right_item">{{costData.freightInfo.freightBalance?costData.freightInfo.freightBalance:'未支付'}}
+            <span style="margin-left: 100px;">{{costData.freightInfo.freightBalanceDate}}</span></div>
           <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}}元。
@@ -282,6 +287,7 @@
         </div>
       </div>
     </el-drawer>
+    <el-image-viewer v-if="imgsVisible" :on-close="closeImgViewer" :url-list="srcList" style="z-index:9999" />
   </div>
 </template>
 <script>
@@ -294,6 +300,10 @@
     batchData
   } from '@/api/orderManagement'
   export default {
+    components: {
+      "el-image-viewer": () =>
+        import("element-ui/packages/image/src/image-viewer"),
+    },
     data() {
       return {
         tableData: [],
@@ -319,13 +329,25 @@
         costData: {},
         rightSee: false,
         modification: [],
+        //图片预览
+        srcList: [],
+        imgsVisible: false,
       };
     },
     mounted() {
       this.getList()
     },
     methods: {
-      toMapPage(row){debugger
+      closeImgViewer() {
+        this.srcList = []
+        this.imgsVisible = false;
+      },
+      enlarge(url) {
+        this.imgsVisible = true;
+        this.srcList.push(url)
+      },
+      toMapPage(row) {
+        debugger
         this.$router.push({
           path: 'trajectory',
           query: {
@@ -436,8 +458,9 @@
         this.endDate = e[1]
         this.getList()
       },
-      account() {
-        this.userInfo = true;
+      contract(row) {
+        window.open(row.ownerContractUrl)
+        // this.userInfo = true;
       },
       userClose() {
         this.userInfo = false;
@@ -534,9 +557,11 @@
         background: linear-gradient(#fafbfb, #ffffff);
         display: flex;
         margin-top: 20px;
-        .search_block{
+
+        .search_block {
           margin-left: 20px;
         }
+
         .search_item {
           text-align: center;
           font-size: 14px;
@@ -736,7 +761,8 @@
       margin-top: 10px;
     }
   }
-  .pad_css{
+
+  .pad_css {
     background: #F0F4FF;
     color: #2F53EB;
     padding: 2px;