Merge branch 'master' of http://git.zthymaoyi.com/gdc/yiliangyiyun-pc

src/views/newTask/listPage.vue

@@ -32,21 +32,21 @@
     <!-- end table切换 -->
 
     <!-- 分类 -->
-    <ul class="taskType"
+    <!-- <ul class="taskType"
         ref="taskTypeShow">
       <li v-for="(item, index) in taskTypeList"
           :key="index"
           @click="clickSearch(item, index)"
           :class="{ active: categoryIndex == index }">
-        <p>
+        <p> -->
           <!-- 类型名称 -->
-          {{ getLanguage !== 'en' ? $t(item.businessTypeName) : $t(item.businessTypeNameEn)}}
+          <!-- {{ getLanguage !== 'en' ? $t(item.businessTypeName) : $t(item.businessTypeNameEn)}} -->
           <!-- 类型个数 -->
-          <span>( {{ item.amount }} )</span>
+          <!-- <span>( {{ item.amount }} )</span>
         </p>
       </li>
       <div class="clear-both"></div>
-    </ul>
+    </ul> -->
     <!-- end 分类 -->
 
     <!-- 内容部分 -->
@@ -57,9 +57,9 @@
           v-infinite-scroll="noticeListFun"
           infinite-scroll-disabled="scrollDisabled"
           infinite-scroll-distance="30">
+          <!-- v-if='i.businessType!="BUY"&&i.businessType!="SALE"&&i.businessType!="DAICHU"' -->
         <li v-for="(i, index) in listShow"
             :key="index"
-            v-if='i.businessType!="BUY"&&i.businessType!="SALE"&&i.businessType!="DAICHU"'
             class="list-item"
             @click="goPath(i)">
           <!-- 图标 -->

src/views/profitable/oilcost.vue

@@ -241,6 +241,9 @@
       }
     },
     activated() {
+      if(this.$route.query.id){//有id证从任务页面进来的  将筛选状态变成待审核
+      this.searchType = 1
+    }
       this.getList()
     },
     methods: {

src/views/universalityAudit/audit.vue

@@ -241,6 +241,9 @@ export default {
       .then(response => {
         this.xialaList = response
       })
+      if(this.$route.query.id){//有id证从任务页面进来的  将筛选状态变成待审核
+      this.searchType = 1
+    }
     this.getList()
   },
   methods: {

src/views/workNotification/utils/index.js

@@ -13,14 +13,38 @@ export function code2Url (type, code, state,status,message,businessId) {
       return checkpurchase(code, state)
     // 判断 统计报表
     case 'REPORT':
-      return checkPurchase(code, state)
+      return checkReport(code, state)
     // 判断 销售
     case 'SALE':
       return sale(code, state)
       // 判断 代储
     case 'DAICHU':
       return daichu(code, state)
-      // 判断 运输
+  // 判断 代收
+    case 'DAISHOU':
+      return daishou(code, state)
+  // 判断 收购
+    case 'SHOU':
+      return acquisitionContract(code, state)
+  // 判断 采购
+  case 'BUY':
+    return buyContract(code, state)
+// 判断 通用审核
+  case 'GENERAL':
+    return generalAudit(code, state)
+// 判断 运价
+    case 'YUNJIA':
+      return tranAudit(code, state,message)
+// 判断 加油
+case 'JIAYOU':
+  return fuelAudit(code, state,message)
+// 判断 请假
+case 'QINGJIA':
+  return qingJaAudit(code, state,message)
+// 判断 buka
+case 'BUKA':
+  return buKaAudit(code, state,message)
+  // 判断 运输
     case 'Tran':
       return tran(code, state)
         // 判断 付款
@@ -89,6 +113,71 @@ export function daichu(code, state,message){
   }
    return url
 }
+export function daishou(code, state,message){
+  let url = ''
+  switch (code) {
+      // 代收合同
+      case 'DAISHOU-CONTRACT-APPROVE':
+        url = 'collectionContract'
+        break
+
+  }
+   return url
+}
+export function generalAudit(code, state,message){
+  debugger
+  let url = ''
+  switch (code) {
+      // 通用审核
+      case 'GENERAL-AUDIT-APPROVE':
+        url = 'audit'
+        break
+  }
+   return url
+}
+export function acquisitionContract(code, state,message){
+  let url = ''
+  switch (code) {
+      // 收购合同
+      case 'SHOU-CONTRACT-APPROVE':
+        url = 'acquisitionContract'
+        break
+
+  }
+   return url
+}
+export function buyContract(code, state,message){
+  let url = ''
+  switch (code) {
+      // 采购合同
+      case 'BUY-CONTRACT-APPROVE':
+        url = 'buyContract'
+        break
+
+  }
+   return url
+}
+export function tranAudit(code, state,message){
+  let url = ''
+  switch (code) {
+      // 运价
+      case 'YUNJIA-TRAN-APPROVE':
+        if(message.indexOf('汽运')!=-1){
+          url = 'vehicleDispatching'
+          break
+        }
+        if(message.indexOf('火运')!=-1){
+          url = 'fireDispatching'
+          break
+        }
+        if(message.indexOf('船运')!=-1){
+          url = 'shippingDispatching'
+          break
+        }
+
+  }
+   return url
+}
 export function warehousing(code, state){
   let url = ''
   switch (code) {
@@ -98,6 +187,13 @@ export function warehousing(code, state){
       url = 'warehousingOrder'
       break
   }
+  switch (code) {
+    
+    // 销售转移
+    case 'WAREHOUSING-XSZY-APPROVE':
+      url = 'warehouseManagementList'
+      break
+  }
   return url
 }
 export function warehousetask(code, state){
@@ -130,6 +226,39 @@ export function profitable(code, state){
   }
   return url
 }
+export function fuelAudit(code, state){
+  let url = ''
+  switch (code) {
+    
+    //加油申请
+    case 'JIAYOU-SHENHE-APPROVE':
+      url = 'oilcost'
+      break
+  }
+  return url
+}
+export function qingJaAudit(code, state){
+  let url = ''
+  switch (code) {
+    
+    //请假申请
+    case 'QINGJIA-APPROVE':
+      url = 'leaveList'
+      break
+  }
+  return url
+}
+export function buKaAudit(code, state){
+  let url = ''
+  switch (code) {
+    
+    //补卡申请
+    case 'BUKA-APPROVE':
+      url = 'leaveList'
+      break
+  }
+  return url
+}
 export function checkNavigation (code, state) {
   // 航海
   let url = ''
@@ -748,8 +877,23 @@ export function checkoutput (code, state) {
   }
   return url
 }
-
-export function checkpurchase (code, state) {
+export function checkpurchase (code, state,message) {
+  let url = ''
+  switch (code) {
+    //仓库设置
+      case 'PROCUREMENT-PRICE-APPROVE':
+        url = 'acquisitionManagement'
+      break
+      //采购订单
+      case 'PROCUREMENT-ORDER-APPROVE':
+      url = 'purchaseOrderList'
+      break
+    default:
+      url = undefined
+  }
+  return url
+}
+export function checkReport (code, state) {
   let url = ''
   switch (code) {
     case 'PROCUREMENT-CLOSE-REPORT':
@@ -758,19 +902,20 @@ export function checkpurchase (code, state) {
       case 'PROCUREMENT-RECEIPT-REPORT':
       url = 'purchaseReceiptStatisticsList'
       break
-      case 'PROCUREMENT-ORDER-APPROVE':
-      url = 'purchaseOrderList'
-      break
-      case 'PROCUREMENT-PRICE-APPROVE':
-        url = 'acquisitionManagement'
+      // case 'PROCUREMENT-ORDER-APPROVE':
+      // url = 'purchaseOrderList'
+      // break
+      // case 'PROCUREMENT-PRICE-APPROVE':
+      //   url = 'acquisitionManagement'
+      // break
+      case 'STOCK-PROCUREMENT-RECEIPT-REPORT':
+      url = 'stockPurchaseReceiptReportList'
       break
     default:
       url = undefined
   }
   return url
 }
-
-
 export function sale (code, state) {
   if (code === 'SALE-CLOSE-REPORT') {
     // 销售平仓统计
@@ -784,6 +929,10 @@ export function sale (code, state) {
     // 销售订单
     return 'salesOrderList'
   }
+  if (code === 'SALE-CONTRACT-APPROVE') {
+    // 销售合同
+    return 'salesContract'
+  }
   return undefined
 }
 export function tran (code, state) {