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

src/api/landTransportation/index.js

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

src/router/views/index.js

@@ -1153,6 +1153,20 @@ export default [{
       },
       component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/dispatchingCars/index')
     }]
+  },//陆运台账
+  {
+    path: '/landTransportation/reportAnalysis/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/landTransportation/reportAnalysis/index',
+      name: '陆运台账',
+      meta: {
+        i18n: '/landTransportation/reportAnalysis/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/reportAnalysis/index')
+    }]
   },
   //运维-价格管理
   {

src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -91,25 +91,60 @@
         <template slot-scope="scope" slot="station">
           <port-info
               v-model="goodsForm.station"
-              :disabled="goodsForm.status === 2"
+              :disabled="goodsForm.status >= 1"
           />
         </template>
         <template slot-scope="scope" slot="agentId">
           <crop-select
-              :disabled="goodsForm.status === 2"
+              :disabled="goodsForm.status >= 1"
               v-model="goodsForm.agentId"
           ></crop-select>
         </template>
         <template slot-scope="scope" slot="polId">
           <port-info
               v-model="goodsForm.polId"
-              :disabled="goodsForm.status === 2"
+              :disabled="goodsForm.status >= 1"
           />
         </template>
         <template slot-scope="scope" slot="podId">
           <port-info
+              v-model="goodsForm.podId"
+              :disabled="goodsForm.status >= 1"
+          />
+        </template>
+      </avue-form>
+    </basic-container>
+    <containerTitle title="其他信息"></containerTitle>
+    <basic-container :showBtn="true" ref="other">
+      <avue-form :option="goodsOptionFormTwo" v-model="goodsForm">
+        <template slot-scope="scope" slot="corpId">
+          <crop-select
+              v-model="goodsForm.corpId"
+              disabled
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="station">
+          <port-info
+              v-model="goodsForm.station"
+              :disabled="goodsForm.status >= 1"
+          />
+        </template>
+        <template slot-scope="scope" slot="agentId">
+          <crop-select
+              :disabled="goodsForm.status >= 1"
+              v-model="goodsForm.agentId"
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="polId">
+          <port-info
               v-model="goodsForm.polId"
-              :disabled="goodsForm.status === 2"
+              :disabled="goodsForm.status >= 1"
+          />
+        </template>
+        <template slot-scope="scope" slot="podId">
+          <port-info
+              v-model="goodsForm.podId"
+              :disabled="goodsForm.status >= 1"
           />
         </template>
       </avue-form>
@@ -600,7 +635,6 @@ export default {
           }, {
             label: '件数',
             width: 100,
-            search: true,
             overHidden: true,
             controls: false,
             cell: true,
@@ -610,7 +644,6 @@ export default {
           }, {
             label: '包装',
             width: 100,
-            search: true,
             overHidden: true,
             cell: true,
             prop: 'packing',
@@ -623,7 +656,6 @@ export default {
           }, {
             label: '尺码',
             width: 100,
-            search: true,
             overHidden: true,
             cell: true,
             prop: 'size',
@@ -762,11 +794,26 @@ export default {
           formslot: true,
           prop: 'corpId'
         }, {
+          label: '提单号',
+          prop: 'billNo'
+        }, {
+          label: '到厂时间',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          prop: 'arrivalTime'
+        }]
+      },
+      goodsOptionFormTwo: {
+        menuBtn: false,
+        disabled: true,
+        span: 8,
+        column: [{
           label: '所属公司',
           formslot: true,
           prop: 'belongCompany',
           rules: [{
-            required: true,
+            required: false,
             message: " ",
             trigger: "blur"
           }],
@@ -775,18 +822,9 @@ export default {
           prop: 'orderNo',
           disabled: true
         }, {
-          label: '提单号',
-          prop: 'billNo'
-        }, {
           label: '场站',
           prop: 'station'
         }, {
-          label: '到厂时间',
-          type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          prop: 'arrivalTime'
-        }, {
           label: '船名航次',
           prop: 'factory'
         }, {
@@ -1073,6 +1111,7 @@ export default {
         })
       })
     }
+    this.$refs.other.show = false
   },
   methods: {
     //自定义列保存

src/views/landTransportation/dispatchingCars/index.vue

@@ -246,6 +246,14 @@ export default {
       }
     }
   },
+  activated() {
+    if (this.$route.query.orderId){
+      this.rowCell({id:this.$route.query.orderId},0)
+    }
+    if (this.$route.query.params){
+      this.rowCell({id:this.$route.query.params},0)
+    }
+  },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(86), this.optionList);
     let i = 0;

src/views/landTransportation/driver/index.vue

@@ -111,8 +111,15 @@
           <el-button
               size="small"
               type="text"
-              @click="confirmCompletion(row, index)"
+              @click="confirmArrival(row, index)"
               v-if="row.status === 3"
+          >确认到厂
+          </el-button>
+          <el-button
+              size="small"
+              type="text"
+              @click="confirmCompletion(row, index)"
+              v-if="row.status === 5"
           >确认完工
           </el-button>
           <el-button
@@ -157,7 +164,7 @@ import {
   acceptanceCollection,
   acceptanceDispatchCollection,
   confirmCompletion,
-  fleetList, motorcadeDriver, fleetDriverSave, getAttachment, saveAttached
+  fleetList, motorcadeDriver, fleetDriverSave, getAttachment, saveAttached, arrival
 } from "@/api/landTransportation";
 
 export default {
@@ -313,7 +320,6 @@ export default {
           prop: 'realArrivalTime',
           overHidden: true,
           type: "date",
-          cell: true,
           searchRange: true,
           defaultTime: ['00:00:00', '23:59:59'],
           format: "yyyy-MM-dd HH:mm:ss",
@@ -606,16 +612,33 @@ export default {
           })
         }).catch(() => {
           this.$message({
-            type: 'warning',
-            message: '请选择实际到厂时间！'
+            type: 'info',
+            message: '已取消'
           });
         });
       }else {
         this.$message({
+          type: 'warning',
+          message: '请选择实际到厂时间！'
+        });
+      }
+    },
+    confirmArrival(row) {
+      this.$confirm('是否确定到厂', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        arrival({id: row.id}).then(res => {
+          this.$message.success('操作成功');
+          this.onLoad(this.page)
+        })
+      }).catch(() => {
+        this.$message({
           type: 'info',
           message: '已取消'
         });
-      }
+      });
     },
     //打开附件
     annexOpen(row, index){

src/views/landTransportation/motorcadeDriver/index.vue

@@ -402,7 +402,7 @@ export default {
             cascader: ['vehicleId'],
             overHidden: true,
             prop: 'fleetId',
-            dicUrl: "/api/blade-client/land-vehicle/list?size=1000&current=1",
+            dicUrl: "/api/blade-client/land-vehicle/list?size=1000&current=1&corpType=CD",
             props: {
               label: "fleetName",
               value: "fleetId",

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -149,7 +149,53 @@
               :disabled="goodsForm.status === 1"
           />
         </template>
-        >
+        <template slot-scope="scope" slot="salesman">
+          <el-select v-model="goodsForm.salesman" placeholder="请选择">
+            <el-option
+                v-for="item in salesmanList"
+                :key="item.id"
+                :label="item.cname"
+                :value="item.id">
+            </el-option>
+          </el-select>
+        </template>
+        <template slot-scope="scope" slot="agentId">
+          <crop-select
+              :disabled="goodsForm.status === 1"
+              v-model="goodsForm.agentId"
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="polId">
+          <port-info
+              v-model="goodsForm.polId"
+              :disabled="goodsForm.status === 1"
+          />
+        </template>
+        <template slot-scope="scope" slot="podId">
+          <port-info
+              v-model="goodsForm.podId"
+              :disabled="goodsForm.status === 1"
+          />
+        </template>
+      </avue-form>
+    </basic-container>
+    <containerTitle title="其他信息"></containerTitle>
+    <basic-container :showBtn="true" ref="other">
+      <avue-form :option="goodsOptionFormTwo" v-model="goodsForm">
+        <template slot-scope="scope" slot="corpId">
+          <crop-select
+              :disabled="goodsForm.status === 1"
+              v-model="goodsForm.corpId"
+              @getCorpData="getCorpData"
+              :corpType="'KH'"
+          ></crop-select>
+        </template>
+        <template slot-scope="scope" slot="station">
+          <port-info
+              v-model="goodsForm.station"
+              :disabled="goodsForm.status === 1"
+          />
+        </template>
         <template slot-scope="scope" slot="salesman">
           <el-select v-model="goodsForm.salesman" placeholder="请选择">
             <el-option
@@ -751,42 +797,48 @@ export default {
             trigger: "change"
           }],
         }, {
-          label: '所属公司',
-          formslot: true,
-          prop: 'belongCompany',
+          label: '提单号',
+          prop: 'billNo',
           rules: [{
-            required: false,
+            required: true,
             message: " ",
             trigger: "blur"
           }],
         }, {
-          label: '订单号',
-          prop: 'orderNo',
-          disabled: true
-        }, {
-          label: '提单号',
-          prop: 'billNo',
+          label: '到厂时间',
+          type: "datetime",
+          format: 'yyyy-MM-dd HH:mm:ss',
+          valueFormat: 'yyyy-MM-dd HH:mm:ss',
+          prop: 'arrivalTime',
           rules: [{
             required: true,
             message: " ",
             trigger: "blur"
           }],
-        }, {
-          label: '场站',
-          prop: 'station',
+        }]
+      },
+      goodsOptionFormTwo: {
+        menuBtn: false,
+        disabled: false,
+        span: 8,
+        column: [{
+          label: '所属公司',
+          formslot: true,
+          prop: 'belongCompany',
           rules: [{
             required: false,
             message: " ",
             trigger: "blur"
           }],
         }, {
-          label: '到厂时间',
-          type: "datetime",
-          format: 'yyyy-MM-dd HH:mm:ss',
-          valueFormat: 'yyyy-MM-dd HH:mm:ss',
-          prop: 'arrivalTime',
+          label: '订单号',
+          prop: 'orderNo',
+          disabled: true
+        }, {
+          label: '场站',
+          prop: 'station',
           rules: [{
-            required: true,
+            required: false,
             message: " ",
             trigger: "blur"
           }],
@@ -936,7 +988,6 @@ export default {
         }, {
           label: '件数',
           width: 100,
-          search: true,
           index: 6,
           overHidden: true,
           controls: false,
@@ -947,7 +998,6 @@ export default {
         }, {
           label: '包装',
           width: 100,
-          search: true,
           index: 7,
           overHidden: true,
           cell: true,
@@ -961,7 +1011,6 @@ export default {
         }, {
           label: '尺码',
           width: 100,
-          search: true,
           index:8,
           overHidden: true,
           cell: true,
@@ -1187,6 +1236,7 @@ export default {
       })
       this.entrustList = [{$cellEdit: true}]
     }
+    this.$refs.other.show = false
   },
   methods: {
     //查询业务员

src/views/landTransportation/placeAnOrder/index.vue

@@ -307,6 +307,11 @@ export default {
       }
     }
   },
+  activated() {
+    if (this.$route.query.params){
+      this.rowCell({id:this.$route.query.params},0)
+    }
+  },
   async created() {
     this.option = await this.getColumnData(this.getColumnName(85), this.optionList);
     let i = 0;

src/views/landTransportation/reportAnalysis/index.vue

@@ -17,6 +17,9 @@
         <template slot-scope="{row}" slot="fleetId">
           <span>{{ row.fleetName }}</span>
         </template>
+        <template slot="billNo" slot-scope="{row,index}">
+          <span class="el-button--text" style="cursor: pointer" @click.stop="celJump(row,index)">{{row.billNo}}</span>
+        </template>
         <template slot-scope="{row}" slot="fleetIdSearch">
           <crop-select
               v-model="row.fleetId"
@@ -245,46 +248,19 @@ export default {
           overHidden: true,
           prop: 'fleetId'
         }, {
-          label: '应付陆运费',
-          overHidden: true,
-          index: 8,
-          prop: 'landAmountC'
-        },{
-          label: '场站费',
-          width: 100,
-          precision: 2,
-          cell: true,
-          index: 9,
-          controls: false,
-          type: 'number',
-          prop: 'oneFeeC'
-        }, {
-          label: '港杂费',
+          label: '利润',
           width: 100,
           precision: 2,
           cell: true,
-          index: 10,
-          controls: false,
-          type: 'number',
-          prop: 'twoFeeC'
-        }, {
-          label: '扣款',
-          width: 100,
-          precision: 2,
-          cell: true,
-          index: 11,
+          index: 8,
           controls: false,
           type: 'number',
-          prop: 'threeFeeC'
+          prop: 'profit'
         }, {
-          label: '待时费',
-          width: 100,
-          precision: 2,
-          index: 12,
-          cell: true,
-          controls: false,
-          type: 'number',
-          prop: 'fourFeeC'
+          label: '应付陆运费',
+          overHidden: true,
+          index: 9,
+          prop: 'landAmountC'
         }, {
           label: '其他',
           width: 100,
@@ -555,6 +531,13 @@ export default {
         this.$refs.crud.$refs.dialogColumn.columnBox = false;
       }
     },
+    //行跳转
+    celJump(row,index){
+      this.$router.push({
+        path: '/landTransportation/dispatchingCars/index',
+        query: {orderId:row.orderId},
+      });
+    },
     // 获得高度
     searchCriteriaSwitch(type) {
       if (type) {