Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU/icore-pass

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 = ['index', 'statisticalReport', 'queue', 'sale','TMS','QMS','appoint','RMS']
 // let devModules = ['index', 'ADMINISTRATORS']
 
 if (pathSrc.indexOf('node_modules') > -1) {

config/index.js

@@ -73,7 +73,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   '/api/v1': {
     target: 'http://172.16.33.166:80',
-    // target: 'http://localhost:8080',
+    //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
@@ -968,6 +969,9 @@ export default {
     console.log(this.$route, 'this.route')
     console.log('获取到的orgCode+++++++++++++' + this.orgcodezs)
     this.getinformation()
+    let timer=setInterval(()=>{
+      this.getinformation()
+    },1000*60)
   },
   destroyed() {
     // 销毁浏览器返回监听
@@ -1174,6 +1178,7 @@ export default {
             this.taskAllNum = res.data.data
           }
         })
+      this.getinformation()
     },
     // 判断是否为公司其他平台模块且处于开发模式
     isDev(url) {
@@ -2642,7 +2647,15 @@ export default {
       })
     },
     updatecss() {
-      this.socketshow = true
+      console.log("taskAllNum")
+      console.log(this.taskAllNum)
+      if(!this.taskAllNum){
+        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;'
@@ -2652,12 +2665,23 @@ export default {
       this.socketshow = false
     },
     getinformation() {
+      this.taskAllNum=0
+      this.noticedata=[]
       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
+          console.log("进入了获取数据的方法")
+          res.data.data.forEach((e)=>{
+            console.log("进入了数据的遍历")
+            if(e.status==0&&e.insertusername!='销售审核'){
+              console.log("进入了数据的插入")
+              this.taskAllNum++;
+              this.noticedata.push(e)
+            }
+          })
+          //this.taskAllNum = res.data.data.length
+          console.log("获取到的数据")
           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
@@ -930,6 +928,7 @@ export default {
         startPointName: '',
         endPointName: ''
       },
+      someOnePriceValue:"",
       saleSteelKey: false,
       tableRowIndex: '',
       isRowClick: 0,
@@ -1106,6 +1105,8 @@ export default {
       this.makeSurePriceOrderList = []
       console.log(this.$refs.tableRef.selection, 'selection')
       this.makeSurePriceOrderList = this.$refs.tableRef.selection.map(e => {
+        //运价判断
+        this.someOnePriceValue=e.priceValue
         return e.orderId
       })
       console.log(this.makeSurePriceOrderList)
@@ -1114,6 +1115,17 @@ export default {
       let map = {
         orderList: this.makeSurePriceOrderList
       }
+      if(this.priceValue==null){
+        this.$message({
+              type: 'error',
+              message: '没有单价',
+              duration: 2000,
+              offset: '250'
+            })
+        return
+      }
+      console.log("确认执行价的顺序")
+      console.log(this.makeSurePriceOrderList)
       this.axios
         .post('/api/v1/bms/updateDetailsStatus', map)
         .then(res => {