前端gjy

src/api/V2/taskspost/index.js

@@ -18,3 +18,5 @@ export const API_POST_TRAN_DEL = '/tranTaskInfo/api/deleteTranTask'
 export const API_GET_TRAN_EXAMINE = '/tranTaskInfo/getTranTask'
 // 运输任务-编辑
 export const API_GET_TRAN_EDIT = '/tranTaskInfo/api/editTranTask'
+// 出入库任务-新增（编辑）
+export const API_POST_OUT_PUT = '/warehouseInOutInfo/insertOrUpdateInOutTask'

src/model/tasksport/index.js

@@ -10,7 +10,8 @@ import {
     API_GET_WAREHOUSE_NO,
     API_POST_TRAN_DEL,
     API_GET_TRAN_EXAMINE,
-    API_GET_TRAN_EDIT
+    API_GET_TRAN_EDIT,
+    API_POST_OUT_PUT
 } from '@/api/V2/taskspost'
 //运输任务列表
 export const gain = appRx.get(API_GET_TRAN_LIST, errorCatcher, errorHandle, filter)
@@ -30,3 +31,5 @@ export const deltran = appRx.post(API_POST_TRAN_DEL, errorCatcher, errorHandle,
 export const examinetran = appRx.get(API_GET_TRAN_EXAMINE, errorCatcher, errorHandle, filter)
 //运输任务-编辑
 export const edittran = appRx.post(API_GET_TRAN_EDIT, errorCatcher, errorHandle, filter)
+//出入库任务-编辑
+export const addoreditoutput = appRx.post(API_POST_OUT_PUT, errorCatcher, errorHandle, filter)

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

@@ -111,7 +111,8 @@ const tranManagementRouter = {
         title: 'inOutWarehouseTaskEdit',
         shortcutEntrance: 'tranManagement',
         module: 'tranManagement.tranManagementDriver.inOutWarehouseTaskEdit',
-      }
+      },
+      hidden: true
     },
     //出入库任务添加
     {
@@ -127,7 +128,7 @@ const tranManagementRouter = {
         keepAlive: true
       },
       hidden: true
-    },  
+    },
 
   ],
 

src/views/tranManagement/tranManagementVehicle.vue

@@ -125,6 +125,7 @@
             />
           </template>
         </el-table-column>
+        <el-table-column prop="receivingDate" label="接单时间"> </el-table-column>
         <el-table-column prop="seller" label="操作" width="300">
           <template slot-scope="scope">
             <ws-button class="completed" @click="nocomplete(scope.row)">

src/views/tranManagement/tranManagementVehicleDispatching.vue

@@ -189,7 +189,7 @@
                 <el-select
                   :disabled="item.disabled"
                   v-model="item.driverPhone"
-                  placeholder="请选择司机"
+                  placeholder="请选择司机电话"
                   class="typeselect"
                   @change="
                     (val) => {
@@ -494,7 +494,7 @@ export default {
       for (var i = 0; i < this.carList.length; i++) {
         if (this.carList[i].driverPhone == val) {
           this.deptBudgetList.tranCarInfoList[index].driver =
-            this.carList[i].driver
+            this.carList[i].driverName
           arrange({ id: this.carList[i].id })
             .toPromise()
             .then((response) => {
@@ -547,6 +547,8 @@ export default {
 </script>
 <style lang="scss" scoped>
 /deep/.basicInformation {
+  height:87vh;
+  overflow: scroll;
   .ws-info-table {
     border: none;
   }