前端孟祥旭

src/api/V2/transport/index.js

@@ -26,3 +26,9 @@ export const API_GET_PRAAMETER = '/commonSysParameter/getInfo'
 export const API_POST_TRAN_LOOK = '/tranTaskInfo/getTranTask'
 // 汽运调度列表
 export const API_GET_AUTOMOBILE_TRAN_LIST = '/tranProcessInfo/selectTranProcessInfo'
+//船运调度列表
+export const API_GET_SHIPPING_TRAN_LIST = '/tranProcessInfo/selectTranProcessInfo'
+//船运调度详情
+export const API_GET_SHIPPING_TRST_LOOK = '/tranProcessInfo/getTranProcess'
+//船次安排
+export const API_POST_SHIPPING_TRAN_ARR = '/tranCarInfo/api/insertTranCar'

src/lang/zh.js

@@ -519,6 +519,10 @@
     tranManagementVehicleDispatching: '汽车调度',
     tranManagementVehicleLook: '查看派车详情',
     tranManagementTransporTationFire: '火运调度',
+    tranManagementShipping:'船运调度',
+    tranManagementShippingArrangemen:'船次安排',
+    tranManagementShippingLook:'船运调度详情',
+
 
     // 采购模块
     procurement: '采购管理',
@@ -4736,6 +4740,12 @@
   tranManagementTransporTationFire: {
     tranManagementTransporTationFire: '火运调度'
   },
+  tranManagementShipping:{
+    tranManagementShipping:'船运调度',
+    tranManagementShippingArrangemen:'船次安排',
+    tranManagementShippingLook:'船运调度详情'
+
+  },
   // 任务管理
   tranManagement: '任务管理',
   // 年度培训

src/model/transport/index.js

@@ -16,7 +16,11 @@ import {
     API_POST_EDIT_DRIVER,
     API_GET_PRAAMETER,
     API_POST_TRAN_LOOK,
-    API_GET_AUTOMOBILE_TRAN_LIST
+    API_GET_AUTOMOBILE_TRAN_LIST,
+    API_GET_SHIPPING_TRAN_LIST,
+    API_GET_SHIPPING_TRST_LOOK,
+    API_POST_SHIPPING_TRAN_ARR,
+    API_GET_STAFF
 } from '@/api/V2/transport'
 // 司机列表
 export const selectDriver = appRx.get(API_GET_TRAN_DRIVERINFO, errorCatcher, errorHandle, filter)
@@ -47,4 +51,10 @@ export const packList = appRx.get(API_GET_PRAAMETER, errorCatcher, errorHandle,
 //运输任务查看
 export const lookTranTask = appRx.get(API_POST_TRAN_LOOK, errorCatcher, errorHandle, filter)
 //汽运调度列表
-export const automobileList = appRx.get(API_GET_AUTOMOBILE_TRAN_LIST, errorCatcher, errorHandle, filter)
+export const automobileList = appRx.get(API_GET_AUTOMOBILE_TRAN_LIST, errorCatcher, errorHandle, filter)
+//船运调度列表
+export const shippingList = appRx.get(API_GET_SHIPPING_TRAN_LIST,errorCatcher , errorHandle ,filter)
+//船运调度详情
+export const shippingLook = appRx.get(API_GET_SHIPPING_TRST_LOOK, errorCatcher, errorHandle , filter)
+//船次安排
+export const shippingArrangemen = appRx.post(API_POST_SHIPPING_TRAN_ARR,errorCatcher, errorHandle , filter )

src/views/tranManagement/component/routers/route.js

@@ -12,6 +12,7 @@ const tranManagementRouter = {
     icon: 'cg'
   },
   children: [
+    
     //火运调度
     {
       path: 'tranManagementTransporTationFire',
@@ -27,6 +28,38 @@ const tranManagementRouter = {
       },
 
 
+    },
+    //船次安排
+    {
+      path: 'tranManagementShippingArrangemen',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingArrangemen'),
+      name: 'tranManagementShippingArrangemen',
+      meta: {
+        title: 'tranManagementShippingArrangemen',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementShippingArrangemen',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+
+    },
+    //船运调度详情
+    {
+      path: 'tranManagementShippingLook',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShippingLook'),
+      name: 'tranManagementShippingLook',
+      meta: {
+        title: 'tranManagementShippingLook',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementShippingLook',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+
     },
     //添加司机
     {
@@ -73,6 +106,36 @@ const tranManagementRouter = {
       },
 
     },
+    //船运调度
+    {
+      path: 'tranManagementShipping',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementShipping'),
+      name: 'tranManagementShipping',
+      meta: {
+        title: 'tranManagementShipping',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementShipping',
+        permissicon: [],
+        keepAlive: true
+      },
+     
+    },
+    //编辑司机
+    {
+      path: 'tranManagementDriverEdit',
+      component: () =>
+        import(/* webpackChunkName: "applDetail" */ '@/views/tranManagement/tranManagementDriverEdit'),
+      name: 'tranManagementDriverEdit',
+      meta: {
+        title: 'tranManagementDriverEdit',
+        shortcutEntrance: 'tranManagement',
+        module: 'tranManagement.tranManagementDriver.tranManagementDriverEdit',
+        permissicon: [],
+        keepAlive: true
+      },
+      hidden: true
+    },
     //司机查看
     {
       path: 'tranManagementDriverLook',

src/views/tranManagement/tranManagementVehicle.vue

@@ -7,26 +7,20 @@
           class="but"
           type="primary"
           @click="handleAdd()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+          
         >
           执行中</ws-button
         >
         <ws-button
           class="but"
           @click="handleLook()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+          
           >已完成</ws-button
         >
         <ws-button
           class="but"
           @click="handleEdit()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+          
           >全部任务</ws-button
         >
       </template>
@@ -58,9 +52,7 @@
           class="find"
           type="primary"
           @click="find()"
-          v-hasPermission="
-            `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-          "
+          
           ><img
             width="16"
             height="16"
@@ -203,18 +195,14 @@
             <ws-button
               class="completed"
               @click="nocomplete(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
+              
             >
               查看（{{ scope.row.number }}）
             </ws-button>
             <ws-button
               class="putstorage"
               @click="warehousing(scope.row)"
-              v-hasPermission="
-                `${$permission('PERMISSIONS.PURSPAPPLINFO_CREATEINSTORE')}`
-              "
+              
             >
               派车
             </ws-button>

vue.config.js

@@ -144,11 +144,7 @@ module.exports = {
         // target: 'http://standard-dev.winsea.com/', //目标地址
         // target: 'http://localhost:8090/',
         // target: 'http://192.168.1.121:8090/',
-<<<<<<< HEAD
         target: 'http://192.168.1.119:8090/',
-=======
-        target: 'http://192.168.1.115:8090/',
->>>>>>> 70caf9b691bf8b68635fd42469710b8d8afb4f8a
         // target: 'http://192.168.1.119:8090/',
         // target: 'http://192.168.24.5:8098',//目标地址
         // target: 'http://product-server.winsea.com/',