提交代码

build/utils.js

@@ -16,9 +16,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src') // node_modules应用
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow','ADMINISTRATORS']
 
-
-let devModules = ['all']
-//let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint']
+//let devModules = ['all']
+let devModules = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint','RMS']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -72,8 +72,8 @@ let proxyTable = {
   },
   // 所有数据的请求域名地址
   '/api/v1': {
-    target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //target: 'http://172.16.33.166:80',
+    target: 'http://localhost:8080',
     // target: 'http://192.168.1.104:8080',
     ws: true,
     pathRewrite: {

src/components/main.vue

@@ -325,6 +325,7 @@
               >
             </el-breadcrumb>
           </div>
+          <!--通知信息-->
           <div
             class="sl-header-li-websocket"
             @mouseenter="updatecss"
@@ -338,7 +339,7 @@
               :hidden="badgeshow"
             >
               <el-button type="text" size="small" @click="goMyTaskPage"
-                >通知信息</el-button
+                > <i class="el-icon-message-solid" style="width:30px;height: 30px;"></i></el-button
               >
             </el-badge>
             <div
@@ -967,7 +968,9 @@ export default {
     }
     console.log(this.$route, 'this.route')
     console.log('获取到的orgCode+++++++++++++' + this.orgcodezs)
-    this.getinformation()
+    let timer=setTimeout(()=>{
+      this.getinformation()
+    },2000)
   },
   destroyed() {
     // 销毁浏览器返回监听
@@ -2642,7 +2645,13 @@ export default {
       })
     },
     updatecss() {
-      this.socketshow = true
+      if(this.badgeshow==false){
+        console.log("进入了弹出框的判断1")
+        this.socketshow = false
+      }else{
+        console.log("进入了弹出框的判断2")
+        this.socketshow=true
+      }
       //let height = document.body.clientHeight - 125
       /*this.$nextTick(() => {
         $('.Web_Notice')[0].style.height = height + 'px;'
@@ -2654,10 +2663,10 @@ export default {
     getinformation() {
       console.log('获取到的userId----------------' + this.userId)
       this.axios
-        .post('/api/v1/ams/getNotice', { userId: this.userId })
+        .post('/api/v1/ams/getNoticeAll', { userId: this.userId })
         .then(res => {
           this.noticedata = res.data.data
-          this.taskAllNum = res.data.data[0].taskAllNum
+          this.taskAllNum = res.data.data.length
           console.log(this.noticedata)
           console.log(this.taskAllNum)
           if (this.taskAllNum != null) {

src/views/sale/components/transportFreight/saleTruckSettlement/bmsTruckDetailsOrderNew.vue

@@ -227,7 +227,6 @@
                 width="250px"
                 sortable
                 column-key="actualAddress"
-                :filters="filteraddressPlace"
               >
               </el-table-column>
               <el-table-column
@@ -445,7 +444,6 @@
                 width="250px"
                 sortable
                 column-key="actualAddress"
-                :filters="filteraddressPlace"
               >
               </el-table-column>
               <el-table-column
@@ -1114,6 +1112,8 @@ export default {
       let map = {
         orderList: this.makeSurePriceOrderList
       }
+      console.log("确认执行价的顺序")
+      console.log()
       this.axios
         .post('/api/v1/bms/updateDetailsStatus', map)
         .then(res => {