派车司机

src/api/landTransportation/index.js

@@ -222,6 +222,13 @@ export function telephone(key) {
         method: 'get'
     })
 }
+export function driversiji(data) {
+    return request({
+        url: '/api/blade-client/land-driver/driver-list',
+        method: 'get',
+        params:data
+    })
+}
 //获取附件
 export function getAttachment(data) {
     return request({

src/views/SpecialTrade/motorcadeDriver/index.vue

@@ -106,6 +106,17 @@
           <span class="el-button--text" style="cursor: pointer"
                 @click="openTrack(row)">{{ row.plateNo }}</span>
         </template>
+          <template slot-scope="{ row }" slot="driverId">
+              <el-select v-if="row.$cellEdit" v-model="row.driverId" placeholder="请选择">
+                  <el-option
+                      v-for="item in driverIddata"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                  </el-option>
+              </el-select>
+              <span v-else>{{row.driverName}}</span>
+          </template>
         <template slot-scope="{row,index}" slot="menu">
           <el-button
               type="text"
@@ -212,12 +223,12 @@
 
 <script>
 import {
-  sendACarCollection,
-  sendACarDispatchCollection,
-  driverQueryCollection,
-  fleetList,
-  motorcadeDriver,
-  fleetDriverSave, telephone, getAttachment, saveAttached, recordingDetails, changeVehicle, fleetListTwo
+    sendACarCollection,
+    sendACarDispatchCollection,
+    driverQueryCollection,
+    fleetList,
+    motorcadeDriver,
+    fleetDriverSave, telephone, getAttachment, saveAttached, recordingDetails, changeVehicle, fleetListTwo, driversiji
 } from "@/api/landTransportation";
 import {location} from "@/api/gaude";
 import {businessStatisticsFrequency} from "@/api/wel";
@@ -227,6 +238,7 @@ export default {
   name: "index",
   data() {
     return {
+        driverIddata:[],
       key: 0,
       query:{},
       screen:{},
@@ -507,18 +519,18 @@ export default {
             width: 77,
             search: true,
             overHidden: true,
-            cell: true,
+            // cell: true,
             filterable: true,
             index: 9,
             prop: 'driverId',
-            type: "select",
-            // dicUrl: `/api/blade-client/land-driver/driver-list?plateNo={{key}}&fleetId=${ `{{fleetId}}` ? `{{fleetId}}` : '' }`,
-            dicUrl: '/api/blade-client/land-driver/driver-list?plateNo={{key}}',
-            props: {
-              label: "name",
-              value: "id",
-              // res: "res.data"
-            }
+            // type: "select",
+            // // dicUrl: `/api/blade-client/land-driver/driver-list?plateNo={{key}}&fleetId=${ `{{fleetId}}` ? `{{fleetId}}` : '' }`,
+            // dicUrl: '/api/blade-client/land-driver/driver-list?plateNo={{key}}&fleetId=',
+            // props: {
+            //   label: "name",
+            //   value: "id",
+            //   // res: "res.data"
+            // }
           }, {
             label: '电话',
             overHidden: true,
@@ -923,12 +935,21 @@ export default {
     },
     //箱信息保存
     rowSaveT(row, index, done, loading) {
+        driversiji({
+            fleetId:row.fleetId
+        }).then(res=>{
+            console.log(res.data.data,944)
+            this.driverIddata = res.data.data
+        })
+
       if (row.$cellEdit) {
         fleetDriverSave(row).then(res => {
           this.$message.success("保存成功");
         })
       }
       this.$refs.crud.rowCell(row, index)
+
+        // this.driverIddata
     },
     //切换订单状态
     handleClick(tab) {

src/views/SpecialTrade/reportAnalysis/index.vue

@@ -429,7 +429,7 @@ export default {
             width: 70,
             search: true,
           }, {
-            label: '车型车量',
+            label: '车型车数',
             width: 80,
             index: 8,
             overHidden: true,
@@ -480,7 +480,7 @@ export default {
         }
       }
     }
-    if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
+    if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('大件调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
       this.goodsOptionCrud.menu = false;
       // this.goodsOptionCrud.column.forEach((item,index)=>{
       //   if (item.prop === 'corpShortName'){
@@ -934,7 +934,7 @@ export default {
           }
         }
       }
-      if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
+      if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('大件调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
         this.goodsOptionCrud.menu = false;
         // this.goodsOptionCrud.column.forEach((item,index)=>{
         //   if (item.prop === 'corpShortName'){

src/views/landTransportation/reportAnalysis/index.vue

@@ -473,7 +473,7 @@ export default {
         }
       }
     }
-    if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
+    if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('大件调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
       this.goodsOptionCrud.menu = false;
       // this.goodsOptionCrud.column.forEach((item,index)=>{
       //   if (item.prop === 'corpShortName'){
@@ -927,7 +927,7 @@ export default {
           }
         }
       }
-      if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
+      if (this.roleName.indexOf('总调度') !== -1 || this.roleName.indexOf('分管调度') !== -1 || this.roleName.indexOf('大件调度') !== -1 || this.roleName.indexOf('车队') !== -1) {
         this.goodsOptionCrud.menu = false;
         // this.goodsOptionCrud.column.forEach((item,index)=>{
         //   if (item.prop === 'corpShortName'){

src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -866,6 +866,11 @@ export default {
               }
           )
         }
+
+          if (this.mold == 3) {
+              this.findObject(this.option.column, "billNo").label = "业务号"
+              this.findObject(this.option.column, "ctnDetail").label = "车型车数"
+          }
       }
     },
     //自定义列保存