Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/newTask/listPage.vue

@@ -59,6 +59,7 @@
           infinite-scroll-distance="30">
         <li v-for="(i, index) in listShow"
             :key="index"
+            v-if='i.businessType!="BUY"&&i.businessType!="SALE"'
             class="list-item"
             @click="goPath(i)">
           <!-- 图标 -->

src/views/workNotification/utils/index.js

@@ -23,6 +23,8 @@ export function code2Url (type, code, state) {
       return payment(code, state)
     case 'TRADE':
       return warehouseReceiptRegulation(code, state)
+      case 'ROLE':
+      return stock(code, state)
     default:
       return ''
   }
@@ -150,7 +152,13 @@ export function checkMateriel (code, state) {
   }
   return url
 }
-
+export function stock (code, state) {
+  if (code === 'TRADE-WAREHOUSE-REPORT') {
+    // 现货入库统计
+    return 'stockPurchaseReceiptReportList'
+  }
+  return undefined
+}
 export function checkSparepart (code, state) {
   // 备件
   let url = ''
@@ -818,12 +826,14 @@ export function payment (code, state) {
   return undefined
 }
 export function warehouseReceiptRegulation (code, state) {
-  if (code === 'TRADE-WAREHOUSE-REPORT') {
+  if (code === 'STOCK-PROCUREMENT-RECEIPT-REPORT') {
     // 付款管理
     return 'stockWarehouseReceiptRegulation'
   }
   return undefined
 }
+
+
 // 调度
 export function checkDispatch (code, state) {
   let url = ''