解决冲突

src/api/V2/transport/index.js

@@ -1,6 +1,5 @@
 // 司机列表
 export const API_GET_TRAN_DRIVERINFO = '/driverViewInfo/selectDriverInfoPage'
-<<<<<<< HEAD
 export const API_GET_TRAN_LIST = '/tranTaskInfo/selectTranTaskInfoPage'
 export const API_POST_TRAN_ADD = '/tranTaskInfo/api/addTranTask'
 // 司机管理添加
@@ -9,8 +8,5 @@ export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
 export const API_GET_DRIVERINFO_GETDRIVER = '/driverViewInfo/getDriver'
 // 司机管理-删除
 export const API_POST_DELETE_DRIVER = '/driverViewInfo/api/deleteDriver'
-=======
-export const API_POST_TRAN_DRIVERINFOADD = '/driverViewInfo/api/addInfo'
-export const API_GET_TRAN_LIST = '/tranTaskInfo/selectTranTaskInfoPage'
-export const API_POST_TRAN_ADD = '/tranTaskInfo/api/addTranTask'
->>>>>>> 568ded05ead3eb758d5cd501a354bff0809a5331
+//运输任务查看
+export const API_POST_TRAN_LOOK = '/tranTaskInfo/getTranTask'

src/api/V2/warehouse/index.js

@@ -1,3 +1,4 @@
+
 export const API_GET_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/selectWarehouseViewinfo'
 export const API_POST_ADD_WAREHOUSE_BASEINFO = '/warehouseBaseInfo/api/addWarehouse'
 //仓库列表查看

src/model/transport/index.js

@@ -6,11 +6,10 @@ import {
     API_POST_TRAN_DRIVERINFOADD,
     API_GET_TRAN_LIST,
     API_POST_TRAN_ADD,
-<<<<<<< HEAD
+    API_POST_TRAN_LOOK,
     API_GET_DRIVERINFO_GETDRIVER,
     API_POST_DELETE_DRIVER
-=======
->>>>>>> 568ded05ead3eb758d5cd501a354bff0809a5331
+
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -19,11 +18,10 @@ export const addDriver = appRx.post(API_POST_TRAN_DRIVERINFOADD, errorCatcher, e
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
 //运输任务添加
-export const addtrantask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 
-<<<<<<< HEAD
+export const addTranTask = appRx.post(API_POST_TRAN_ADD,errorCatcher, errorHandle, filter) 
 // 司机管理-查看
 export const lookDriver = appRx.get(API_GET_DRIVERINFO_GETDRIVER, errorCatcher, errorHandle, filter)
 // 司机管理-删除
 export const delDriver = appRx.post(API_POST_DELETE_DRIVER, errorCatcher, errorHandle, filter)
-=======
->>>>>>> 568ded05ead3eb758d5cd501a354bff0809a5331
+//运输任务查看
+export const lookTranTask = appRx.get(API_POST_TRAN_LOOK,errorCatcher, errorHandle, filter) 

src/views/tranManagement/tranManagementLook.vue

@@ -226,7 +226,7 @@
   </div>
 </template>
 <script>
-import { pullDown, addstorageputList } from '@/model/warehouse/index'
+import { lookTranTask ,gain } from '@/model/transport/index'
 import Pagination from '@/components/Pagination'
 import WsUpload from '@/components/WsUpload'
 // import { dayjs, fmoney, EventBus } from 'base-core-lib'