提交代码

build/utils.js

@@ -16,8 +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','RMS']
+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

@@ -968,9 +968,10 @@ export default {
     }
     console.log(this.$route, 'this.route')
     console.log('获取到的orgCode+++++++++++++' + this.orgcodezs)
-    let timer=setTimeout(()=>{
+    this.getinformation()
+    let timer=setInterval(()=>{
       this.getinformation()
-    },2000)
+    },1000*60)
   },
   destroyed() {
     // 销毁浏览器返回监听
@@ -1177,6 +1178,7 @@ export default {
             this.taskAllNum = res.data.data
           }
         })
+      this.getinformation()
     },
     // 判断是否为公司其他平台模块且处于开发模式
     isDev(url) {
@@ -2645,7 +2647,9 @@ export default {
       })
     },
     updatecss() {
-      if(this.badgeshow==false){
+      console.log("taskAllNum")
+      console.log(this.taskAllNum)
+      if(!this.taskAllNum){
         console.log("进入了弹出框的判断1")
         this.socketshow = false
       }else{
@@ -2661,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/getNoticeAll', { userId: this.userId })
         .then(res => {
-          this.noticedata = res.data.data
-          this.taskAllNum = res.data.data.length
+          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

@@ -928,6 +928,7 @@ export default {
         startPointName: '',
         endPointName: ''
       },
+      someOnePriceValue:"",
       saleSteelKey: false,
       tableRowIndex: '',
       isRowClick: 0,
@@ -1104,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)
@@ -1112,8 +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()
+      console.log(this.makeSurePriceOrderList)
       this.axios
         .post('/api/v1/bms/updateDetailsStatus', map)
         .then(res => {