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

src/api/V2/warehouse/index.js

@@ -53,7 +53,7 @@ export const API_GET_STAFF = '/staff/query/getStaffListByCompIdAndWarehouseId'
 export const API_GET_WAREHOUSE_RECORDSS = '/warehouseInOutInfo/selectInfoTemporary'
 
 //临时出库货名下拉
-export const API_GET_GOODSNAME_XIALA = '/warehouseInOutInfo/selectTemporaryGoodsNameList '
+export const API_GET_GOODSNAME_XIALA = '/warehouseInOutInfo/selectTemporaryGoodsNameList'
 //临时仓库待完成
 export const API_GET_WAREHOUSE_LIST = '/warehouseInOutInfo/selectWarehouseInOutInfoTemporary'
 //任务列表
@@ -73,11 +73,11 @@ export const API_GET_WEIGHTEDDETAILS = '/weightedDetails/selectInventoryCostInfo
 // 库
 export const API_GET_WAREHOUSE = '/warehouseBaseInfo/selectWarehouse'
 // 出入库任务负责人
-export const API_GET_WAREHOUSERESPONSIBLE = "/warehouseBaseInfo/selectResponsible"
+export const API_GET_WAREHOUSERESPONSIBLE = '/warehouseBaseInfo/selectResponsible'
 // 出入库任务
-export const API_GET_WAREHOUSETASK = "/inOutWarehouseTask/selectWarehouseTask"
+export const API_GET_WAREHOUSETASK = '/inOutWarehouseTask/selectWarehouseTask'
 // 修改经办人
-export const API_GET_CHECKORUPDATE = "/inOutWarehouseTask/api/checkOrUpdateInOutTask"
+export const API_GET_CHECKORUPDATE = '/inOutWarehouseTask/api/checkOrUpdateInOutTask'
 
 
 

src/views/newTask/listPage.vue

@@ -390,6 +390,7 @@ export default {
           data.noticeTaskStatus,
           this.typeShow
         )
+        console.log(url)
         if (!url) {
           EventBus.$emit('error', this.$t('workNotification.noRelatedType'))
         } else {

src/views/platformaudit/component/router/route.js

@@ -8,7 +8,7 @@ const platformauditRouter = {
   alwaysShow: true, // will always show the root menu
   meta: {
     title: 'platformaudit',
-    module: 'audit.driverMerchant',
+    module: 'audit',
     icon: '-shenhe'
   },
   children: [

src/views/workNotification/utils/index.js

@@ -15,6 +15,9 @@ export function code2Url (type, code, state) {
     // 判断 销售
     case 'SALE':
       return sale(code, state)
+      // 判断 运输
+    case 'Tran':
+      return tran(code, state)
     default:
       return ''
   }
@@ -795,7 +798,13 @@ export function sale (code, state) {
   }
   return undefined
 }
-
+export function tran (code, state) {
+  if (code === 'TRAN-TASK-APPROVE') {
+    // 运输单价
+    return 'vehicleDispatching'
+  }
+  return undefined
+}
 // 调度
 export function checkDispatch (code, state) {
   let url = ''