更新

src/layout/components/Sidebar/SidebarItem.vue

@@ -10,6 +10,10 @@
 
     <el-submenu v-else ref="subMenu" :index="resolvePath(item.path)" popper-append-to-body>
       <template slot="title">
+       <!-- <el-badge :value="10" class="item">
+          <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
+          {{item.meta.title}}
+        </el-badge> -->
         <item v-if="item.meta" :icon="item.meta && item.meta.icon" :title="item.meta.title" />
       </template>
       <sidebar-item

src/layout/components/Sidebar/index.vue

@@ -2,16 +2,9 @@
   <div :class="{'has-logo':showLogo}">
     <logo v-if="showLogo" :collapse="isCollapse" />
     <el-scrollbar wrap-class="scrollbar-wrapper">
-      <el-menu
-        :default-active="activeMenu"
-        :collapse="isCollapse"
-        :background-color="variables.menuBg"
-        :text-color="variables.menuText"
-        :unique-opened="true"
-        :active-text-color="variables.menuActiveText"
-        :collapse-transition="false"
-        mode="vertical"
-      >
+      <el-menu :default-active="activeMenu" :collapse="isCollapse" :background-color="variables.menuBg"
+        :text-color="variables.menuText" :unique-opened="true" :active-text-color="variables.menuActiveText"
+        :collapse-transition="false" mode="vertical">
         <sidebar-item v-for="route in routes" :key="route.path" :item="route" :base-path="route.path" />
       </el-menu>
     </el-scrollbar>
@@ -19,38 +12,122 @@
 </template>
 
 <script>
-import { mapGetters } from 'vuex'
-import Logo from './Logo'
-import SidebarItem from './SidebarItem'
-import variables from '@/styles/variables.scss'
+  import {
+    mapGetters
+  } from 'vuex'
+  import Logo from './Logo'
+  import SidebarItem from './SidebarItem'
+  import variables from '@/styles/variables.scss'
 
-export default {
-  components: { SidebarItem, Logo },
-  computed: {
-    ...mapGetters([
-      'sidebar'
-    ]),
-    routes() {
-      return this.$router.options.routes
+  export default {
+    components: {
+      SidebarItem,
+      Logo
     },
-    activeMenu() {
-      const route = this.$route
-      const { meta, path } = route
-      // if set path, the sidebar will highlight the path you set
-      if (meta.activeMenu) {
-        return meta.activeMenu
+    computed: {
+      ...mapGetters([
+        'sidebar'
+      ]),
+      routes() {
+        console.log("----------------------", this.$router.options.routes)
+        // this.socketInfo()
+        return this.$router.options.routes
+      },
+      socketInfo() {
+        // var staffId = JSON.parse(localStorage.getItem('winseaview-userInfo')).content.staffId
+        var staffId = "84f62127b7384dcdbaeaddfe460329fc"
+
+        // getAdminId().toPromise().then(response => {console.log(11111)})
+        this.loading = false
+        // WebSocket
+        // this.$store.dispatch('setAdminId', response.data.data)
+        if ('WebSocket' in window) {
+          if (process.env.NODE_ENV === 'production') {
+            this.websocket = new WebSocket('wss://www.zthymaoyi.com/wss/websocket/' + staffId)
+          } else {
+            //  this.websocket = new WebSocket('ws://192.168.1.115:8090/commonUser/api/onOpen?adminId=84f62127b7384dcdbaeaddfe460329fc' )
+            // this.websocket = new WebSocket('ws://192.168.1.119:9100/websocket/' + staffId)
+            this.websocket = new WebSocket('ws://192.168.1.114:8090/websocket/' + staffId)
+          }
+          console.log("knjhdfkhedfkh",process.env.NODE_ENV)
+          this.initWebSocket()
+        } else {
+          alert('当前浏览器不支持websocket')
+        }
+      },
+      initWebSocket() {
+        console.log("有该方法·",this.websocket)
+        // 连接错误
+        this.websocket.onerror = this.setErrorMessage
+        // 连接成功
+        this.websocket.onopen = this.setOnopenMessage
+
+        // 收到消息的回调
+        this.websocket.onmessage = this.setOnmessageMessage
+
+        // 连接关闭的回调
+        this.websocket.onclose = this.setOncloseMessage
+
+        // 监听窗口关闭事件，当窗口关闭时，主动去关闭websocket连接，防止连接还没断开就关闭窗口，server端会抛异常。
+        window.onbeforeunload = this.onbeforeunload
+      },
+      setErrorMessage() {
+        console.log('WebSocket连接发生错误   状态码：' + this.websocket.readyState)
+      },
+      setOnopenMessage() {
+        // console.log(this.websocket)
+        console.log('WebSocket连接成功    状态码：' + this.websocket.readyState)
+      },
+      setOnmessageMessage(event) {
+        // console.log(3333)
+        // 根据服务器推送的消息做自己的业务处理
+        console.log('服务端返回：' + event.data)
+        // var msg = event.data.split('$')
+        // var that = this
+
+        // this.$notify.warning({
+        //   title: '新消息提醒',
+        //   message: msg[0],
+        //   duration: 0,
+        //   onClick() {
+        //     that.$router.push({
+        //       path: msg[1]
+        //     }) // 你要跳转的路由 还可以传参 当然也可以通过其他方式跳转
+        //   }
+        // })
+        // var currentPage = that.$router.history.current.path
+        // that.$router.push({
+        //   path: '/'
+        // })
+        // that.$router.push({
+        //   path: currentPage
+        // })
+      },
+      setOncloseMessage() {
+        // console.log(this.websocket)
+        console.log('WebSocket连接关闭    状态码：' + this.websocket.readyState)
+      },
+      activeMenu() {
+        const route = this.$route
+        const {
+          meta,
+          path
+        } = route
+        // if set path, the sidebar will highlight the path you set
+        if (meta.activeMenu) {
+          return meta.activeMenu
+        }
+        return path
+      },
+      showLogo() {
+        return this.$store.state.settings.sidebarLogo
+      },
+      variables() {
+        return variables
+      },
+      isCollapse() {
+        return !this.sidebar.opened
       }
-      return path
-    },
-    showLogo() {
-      return this.$store.state.settings.sidebarLogo
-    },
-    variables() {
-      return variables
-    },
-    isCollapse() {
-      return !this.sidebar.opened
     }
   }
-}
 </script>

src/views/cargoOwnerManagement/empowerExamine.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">

src/views/cargoOwnerManagement/merchantVerification.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">

src/views/cargoOwnerManagement/taskAudit.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">

src/views/driverManagement/vehicleExamine.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">

src/views/enterpriseManagement/enterpriseAudit.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">

src/views/orderManagement/orderAudit.vue

@@ -62,6 +62,10 @@
         <el-table-column prop="cargoOwner" label="货主"></el-table-column>
         <el-table-column prop="driverName" label="司机"></el-table-column>
         <el-table-column prop="freight" label="运费(元)">
+          <template slot-scope="scope">
+             <!-- //用货主订单key值来判断（装车前不显示）3未装车 -->
+            {{scope.row.cargoOwnerStatusKey > 3 ? scope.row.freight : ""}}
+          </template>
         </el-table-column>
         <el-table-column prop="amountMoney" label="已付(元)"></el-table-column>
         <el-table-column prop="amountMon" label="超期费(元)">
@@ -84,15 +88,19 @@
           <span @click="account" class="btn_css">查看</span>
         </el-table-column>
         <el-table-column prop="updateDate" label="更新时间" min-width="160"></el-table-column>
-        <el-table-column prop="orderStatus" label="状态" min-width="92"></el-table-column>
+        <el-table-column prop="cargoOwnerStatus" label="状态" min-width="92"></el-table-column>
         <el-table-column label="操作" min-width="350">
           <template slot-scope="scope">
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">确认
+              <!-- 9待平台确认装车 19待平台确认卸车 -->
+              <!-- 待平台确认装车和待平台确认卸车时显示 -->
             </el-link>
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
               :disabled="scope.row.orderStatusKey != 9 && scope.row.orderStatusKey != 19">驳回
+              <!-- 9待平台确认装车 19待平台确认卸车 -->
+              <!-- 待平台确认装车和待平台确认卸车时显示 -->
             </el-link>
             <el-divider direction="vertical"></el-divider>
             <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false">查看</el-link>
@@ -103,16 +111,21 @@
                 <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 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
                   <el-link target="_blank" @click="see(scope.row)" type="primary" :underline="false"
                     :disabled="scope.row.cargoOwnerStatusKey != 29">完结</el-link>
+                  <!-- 完结：支付完尾款后从未进行过完结操作前显示的操作。 -->
                 </el-dropdown-item>
                 <el-dropdown-item>
-                  <el-link target="_blank" type="primary" :underline="false">预付</el-link>
+                  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-dropdown-item>
                 <el-dropdown-item>
-                  <el-link target="_blank" type="primary" :underline="false">尾款</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-menu>
             </el-dropdown>
@@ -201,7 +214,7 @@
           <div class="right_title">装车时间</div>
           <div class="right_item">{{costData.carrierInfo.loadingDate}}</div>
           <div class="right_title">装车照片</div>
-          <div style="display: flex;">
+          <div style="display: flex;" v-if="costData.carrierInfo.loadingImg">
             <div v-for="(item,index) in costData.carrierInfo.loadingImg.split(',')">
               <img :src="item" class="img_css">
             </div>