Merge branch 'dev' of http://git.echepei.com/caojunjie/Smart_platform_ui into dev

src/api/landTransportation/index.js

@@ -128,6 +128,14 @@ export function arrival(data) {
         params:data
     })
 }
+//确认提箱箱信息
+export function borrow(data) {
+    return request({
+        url: '/api/blade-land/order-item/borrow',
+        method: 'get',
+        params:data
+    })
+}
 //获取车队司机信息
 export function fleetList() {
     return request({

src/views/landTransportation/driver/index.vue

@@ -105,7 +105,7 @@
               size="small"
               type="text"
               @click="cancelDesignate(row, index)"
-              v-if="row.status===5"
+              v-if="row.status===6"
           >取消受理
           </el-button>
           <el-button
@@ -125,6 +125,13 @@
           <el-button
               size="small"
               type="text"
+              @click="suitcase(row, index)"
+              v-if="row.status === 6"
+          >提箱
+          </el-button>
+          <el-button
+              size="small"
+              type="text"
               @click="annexOpen(row, index)"
           >附 件
           </el-button>
@@ -164,7 +171,7 @@ import {
   acceptanceCollection,
   acceptanceDispatchCollection,
   confirmCompletion,
-  fleetList, motorcadeDriver, fleetDriverSave, getAttachment, saveAttached, arrival
+  fleetList, motorcadeDriver, fleetDriverSave, getAttachment, saveAttached, arrival,borrow
 } from "@/api/landTransportation";
 
 export default {
@@ -344,6 +351,14 @@ export default {
           index: 12,
           prop: 'acceptTime'
         },{
+          label: '提箱时间',
+          type: "borrowTime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          width: 200,
+          index: 12,
+          prop: 'acceptTime'
+        },{
           label: '完工日期',
           prop: 'finishedTime',
           overHidden: true,
@@ -354,7 +369,7 @@ export default {
           valueFormat: "yyyy-MM-dd HH:mm:ss",
           index:13,
           width: 140,
-          search: true,
+          // search: true,
         },{
           label: '箱型',
           width: 100,
@@ -403,7 +418,7 @@ export default {
         },{
           label: '尺码',
           width: 100,
-          search: true,
+          // search: true,
           index:19,
           overHidden: true,
           cell: true,
@@ -685,6 +700,23 @@ export default {
         });
       }
     },
+    suitcase(row){
+      this.$confirm('是否确定提箱', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        borrow({id: row.id}).then(res => {
+          this.$message.success('操作成功');
+          this.onLoad(this.page)
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消'
+        });
+      });
+    },
     confirmArrival(row) {
       this.$confirm('是否确定到厂', '提示', {
         confirmButtonText: '确定',

src/views/landTransportation/motorcadeDriver/index.vue

@@ -489,7 +489,6 @@ export default {
             valueFormat: "yyyy-MM-dd HH:mm:ss",
             index:13,
             width: 140,
-            search: true,
           }, {
             label: '箱型',
             width: 100,
@@ -555,7 +554,7 @@ export default {
           {
             label: '尺码',
             width: 100,
-            search: true,
+            // search: true,
             index:19,
             overHidden: true,
             cell: true,

src/views/landTransportation/reportAnalysis/index.vue

@@ -197,6 +197,10 @@ export default {
             name: 'fiveFeeD',
             type: 'sum',
             decimals: 2
+          }, {
+            name: 'profit',
+            type: 'sum',
+            decimals: 2
           }],
         column: [{
           label: '订单号',