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

src/views/landTransportation/bulkCargo/detailPage.vue

@@ -40,7 +40,7 @@
           <el-button
               type="warning"
               size="small"
-              v-if="goodsForm.status > 0 && !(roleName.indexOf('总调度') !== -1) && !(goodsForm.status > 3 && !(roleName.indexOf('车队') !== -1))"
+              v-if="goodsForm.status > 0 && goodsForm.status !== 5 && !(roleName.indexOf('总调度') !== -1) && !(goodsForm.status > 3 && !(roleName.indexOf('车队') !== -1)) || (goodsForm.status !== 5 && roleName.indexOf('admin') !== -1)"
               :disabled="
             !(roleName.indexOf('业务员') !== -1||roleName.indexOf('分管调度') !== -1||roleName.indexOf('经理') !== -1||roleName.indexOf('部门经理') !== -1||roleName.indexOf('总经理') !== -1) && !(roleName.indexOf('admin') !== -1)"
               @click="confirmChange"
@@ -56,7 +56,7 @@
           <el-button
               type="success"
               v-if="goodsForm.status === 0 && typeTwo === false"
-              v-show="roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
+              v-show="roleName.indexOf('admin') !== -1 || roleName.indexOf('业务员') !== -1 || (roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1)"
               size="small"
               :loading="type"
               @click="submit(true)"
@@ -830,10 +830,10 @@
       </avue-crud>
     </basic-container>
     </span>
-    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1">
+    <trade-card title="杂费明细" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('客户') !== -1 || roleName.indexOf('admin') !== -1">
       <el-tabs v-model="activeIndex" @tab-click="handleSelect">
         <el-tab-pane label="应收" name="1"></el-tab-pane>
-        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1"></el-tab-pane>
+        <el-tab-pane label="应付" name="2" v-if="roleName.indexOf('平台') !== -1 || roleName.indexOf('admin') !== -1"></el-tab-pane>
       </el-tabs>
       <avue-crud
           v-if="activeIndex === '1'"
@@ -870,7 +870,7 @@
           <el-button
               type="text"
               size="small"
-              v-if="roleName.indexOf('平台') !== -1"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
               :disabled="goodsForm.status === 5"
               :icon="row.$cellEdit?'el-icon-circle-plus-outline':'el-icon-edit'"
               @click="rowCell(row,index)"
@@ -879,7 +879,7 @@
           <el-button type="text"
                      icon="el-icon-delete"
                      size="small"
-                     v-if="roleName.indexOf('平台') !== -1"
+                     v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
                      :disabled="goodsForm.status === 5"
                      @click="$refs.collection.rowDel(row,index)"
           >删除
@@ -896,7 +896,7 @@
           <el-button
               type="primary"
               icon="el-icon-plus"
-              v-if="roleName.indexOf('平台') !== -1"
+              v-if="(roleName.indexOf('平台') !== -1 && roleName.indexOf('分管调度') !== -1) || roleName.indexOf('admin') !== -1 || (roleName.indexOf('客户') !== -1 && roleName.indexOf('业务员') !== -1)"
               :disabled="goodsForm.status === 5"
               @click="addRowCollection"
               size="small">录入明细
@@ -1044,7 +1044,7 @@ export default {
             this.goodsOptionFormTwo.disabled = true
           }else if (this.goodsForm.status === 1){
             this.goodsOptionFormTwo.disabled = false
-            if (this.roleName.indexOf('平台') !== -1){
+            if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1){
               this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
@@ -1053,7 +1053,7 @@ export default {
             }
           }else if (this.goodsForm.status === 2){
             this.goodsOptionFormTwo.disabled = false
-            if (this.roleName.indexOf('车队') !== -1){
+            if (this.roleName.indexOf('车队') !== -1 || this.roleName.indexOf('admin') !== -1){
               this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = true
               this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
               this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
@@ -1074,6 +1074,16 @@ export default {
             this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = true
           }
         }
+        if (this.typeTwo){
+          if (this.roleName.indexOf('admin') !== -1 || (this.roleName.indexOf('平台') !== -1 && this.roleName.indexOf('分管调度') !== -1)){
+            this.goodsOptionFormTwo.disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "fleetId").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "plateNo").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "driverId").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "driverTel").disabled = false
+            this.findObject(this.goodsOptionFormTwo.column, "freightPay").disabled = false
+          }
+        }
       }
     }
   },
@@ -1568,9 +1578,16 @@ export default {
           format: 'yyyy-MM-dd HH:mm',
           valueFormat: 'yyyy-MM-dd HH:mm:ss',
         }, {
-          label: '车体积',
+          label: '车型',
           span: 6,
-          prop: 'fleetVolum'
+          prop: 'fleetVolum',
+          type: 'select',
+          dicUrl: "/api/blade-system/dict-biz/dictionary?code=vehicle_type",
+          props: {
+            label: "dictValue",
+            value: "dictKey"
+          },
+          dataType: "string",
         }, {
           label: '合同号',
           span: 6,
@@ -2108,7 +2125,7 @@ export default {
     this.key++
     if (this.id) {
       if (this.id.slice(0, 4) === 'copy') {
-        detailDelegationList({id: this.id.slice(4, this.id.length), kind: '1'}).then(res => {
+        detailDelegationList({id: this.id.slice(4, this.id.length)}).then(res => {
           this.goodsForm = res.data.data
           this.tableData = res.data.data.loadingAddressList || []
           this.tableDataTwo = res.data.data.unloadedAddressList || []
@@ -2150,7 +2167,7 @@ export default {
         } else {
           this.returnButton = false
         }
-        detailDelegationList({id: this.id.slice(2, this.id.length), kind: '1'}).then(res => {
+        detailDelegationList({id: this.id.slice(2, this.id.length)}).then(res => {
           this.goodsForm = res.data.data
           this.tableData = res.data.data.loadingAddressList || []
           this.tableDataTwo = res.data.data.unloadedAddressList || []
@@ -2183,7 +2200,7 @@ export default {
           }
         })
       } else {
-        detailDelegationList({id: this.id, kind: '1'}).then(res => {
+        detailDelegationList({id: this.id}).then(res => {
           this.goodsForm = res.data.data
           if (this.roleName.indexOf('经理') !== -1 || this.roleName.indexOf('部门经理') !== -1 || this.roleName.indexOf('总经理') !== -1 || this.roleName.indexOf('总调度') !== -1) {
             this.goodsForm.status = 5
@@ -2427,7 +2444,7 @@ export default {
       } else {
         ids = this.id
       }
-      detailDelegationList({id: ids, kind: '1'}).then(res => {
+      detailDelegationList({id: ids}).then(res => {
         this.goodsForm = res.data.data
         this.tableData = res.data.data.loadingAddressList
         this.tableDataTwo = res.data.data.unloadedAddressList
@@ -2563,7 +2580,6 @@ export default {
       this.type = true
       saveSaveList({
         ...this.goodsForm,
-        kind: '1',
         loadingAddressList: this.tableData,
         unloadedAddressList: this.tableDataTwo,
         fileList: this.orderFilesList,
@@ -2583,11 +2599,11 @@ export default {
     confirmChange() {
       // validChange({id:this.id}).then(res => {
       //   if (res.data.data){
-      this.goodsForm.status = 0
       this.goodsOptionFormC.disabled = false
       this.goodsOptionForm.disabled = false
       this.goodsOptionFormTwo.disabled = false
       this.typeTwo = true
+      this.goodsForm.status = 0
       // }else {
       //   this.$message.error('不允许变更')
       // }
@@ -2630,7 +2646,6 @@ export default {
               delete form.orderItemList
               saveSaveList({
                 ...form,
-                kind: '1',
                 loadingAddressList: this.tableData,
                 unloadedAddressList: this.tableDataTwo,
                 fileList: this.orderFilesList,
@@ -2669,7 +2684,6 @@ export default {
       this.type = true
       saveSaveList({
         ...this.goodsForm,
-        kind: '1',
         loadingAddressList: this.tableData,
         unloadedAddressList: this.tableDataTwo,
         fileList: this.orderFilesList,
@@ -2724,7 +2738,6 @@ export default {
                 this.type = true
                 saveSaveList({
                   ...this.goodsForm,
-                  kind: '1',
                   loadingAddressList: this.tableData,
                   unloadedAddressList: this.tableDataTwo,
                   fileList: this.orderFilesList,

src/views/landTransportation/bulkCargo/index.vue

@@ -417,7 +417,7 @@ export default {
           }, {
             label: '业务员',
             index: 2,
-            width: 76,
+            width: 70,
             prop: 'salesmanName',
             searchProp: 'salesman',
             search: true,
@@ -443,18 +443,19 @@ export default {
             },
             overHidden: true,
             index: 3,
-            width: 94
+            width: 80
           },{
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
             index: 4,
-            width: 100,
+            width: 70,
           }, {
             label: '派车单号',
-            width: 140,
+            width: 80,
             index: 5,
             prop: 'dispatchNumber',
+            overHidden: true,
             search: true,
           }, {
             label: '装货地址',
@@ -470,7 +471,7 @@ export default {
             search: true,
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             index: 8,
             overHidden: true,
             prop: 'fleetName',
@@ -485,19 +486,14 @@ export default {
             filterable: true,
             search: true,
           }, {
-            label: '车体积',
-            width: 100,
+            label: '车型',
+            width: 90,
             index: 9,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 10,
-            prop: 'volumeSum'
           }, {
             label: '运费',
             index: 11,
-            width: 86,
+            width: 100,
             prop: 'freightCollect'
           }, {
             label: '状态',
@@ -512,20 +508,26 @@ export default {
             type: 'select',
             overHidden: true,
             search: true,
-            width: 140
+            width: 90
+          },{
+            label: '备注',
+            index: 13,
+            overHidden: true,
+            width: 130,
+            prop: 'remarks',
           }, {
             label: '公司名称',
             prop: 'corpName',
             overHidden: true,
-            index: 13,
-            width: 112,
+            index: 14,
+            width: 120,
             search: true,
           }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
-            index: 14,
-            width: 80,
+            index: 15,
+            width: 60,
           }, {
             label: '制单日期',
             overHidden: true,
@@ -535,7 +537,7 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 15,
+            index: 16,
             width: 135,
             search: true,
           }]
@@ -583,7 +585,7 @@ export default {
           }, {
             label: '业务员',
             index: 2,
-            width: 76,
+            width: 70,
             prop: 'salesmanName',
             searchProp: 'salesman',
             search: true,
@@ -600,10 +602,10 @@ export default {
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
-            width: 100,
+            width: 70,
           }, {
             label: '派车单号',
-            width: 140,
+            width: 80,
             index: 4,
             prop: 'dispatchNumber',
             search: true,
@@ -621,7 +623,7 @@ export default {
             search: true,
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             index: 7,
             overHidden: true,
             prop: 'fleetName',
@@ -638,23 +640,18 @@ export default {
             search: true,
           }, {
             label: '车号',
-            width: 100,
+            width: 90,
             index: 8,
             prop: 'plateNo'
           },{
-            label: '车体积',
-            width: 100,
+            label: '车型',
+            width: 90,
             index: 9,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 10,
-            prop: 'volumeSum'
           }, {
             label: '应收运费',
             index: 11,
-            width: 86,
+            width: 100,
             prop: 'freightCollect'
           }, {
             label: '状态',
@@ -669,26 +666,32 @@ export default {
             type: 'select',
             overHidden: true,
             search: true,
-            width: 140
+            width: 90
           },{
             label: '应付运费',
             prop: 'freightPay',
             overHidden: true,
             width: 100,
             index: 13,
+          },{
+            label: '备注',
+            index: 14,
+            overHidden: true,
+            width: 130,
+            prop: 'remarks',
           }, {
             label: '公司名称',
             prop: 'corpName',
             overHidden: true,
-            index: 14,
-            width: 112,
+            index: 15,
+            width: 120,
             search: true,
           }, {
             label: '制单人',
             prop: 'createUserName',
             overHidden: true,
-            index: 15,
-            width: 80,
+            index: 16,
+            width: 60,
           }, {
             label: '制单日期',
             overHidden: true,
@@ -698,7 +701,7 @@ export default {
             defaultTime: ['00:00:00', '23:59:59'],
             format: "yyyy-MM-dd HH:mm",
             valueFormat: "yyyy-MM-dd HH:mm:ss",
-            index: 16,
+            index: 17,
             width: 135,
             search: true,
           }]
@@ -756,16 +759,16 @@ export default {
             },
             overHidden: true,
             index: 2,
-            width: 94
+            width: 80
           },{
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
-            width: 100,
+            width: 70,
           }, {
             label: '派车单号',
-            width: 140,
+            width: 80,
             index: 4,
             prop: 'dispatchNumber',
             search: true,
@@ -783,7 +786,7 @@ export default {
             search: true,
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             index: 7,
             overHidden: true,
             prop: 'fleetName',
@@ -799,7 +802,7 @@ export default {
             search: true,
           }, {
             label: '车号',
-            width: 100,
+            width: 90,
             index: 8,
             prop: 'plateNo',
             type: "select",
@@ -813,7 +816,7 @@ export default {
             search: true,
           }, {
             label: '司机',
-            width: 100,
+            width: 70,
             index: 9,
             prop: 'driverName',
             searchProp: 'driverId',
@@ -827,19 +830,14 @@ export default {
             search: true,
           }, {
             label: '电话',
-            width: 160,
+            width: 120,
             index: 10,
-            prop: 'tel'
+            prop: 'driverTel'
           }, {
-            label: '车体积',
-            width: 100,
+            label: '车型',
+            width: 90,
             index: 11,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 12,
-            prop: 'volumeSum'
           },
           // {
           //   label: '状态',
@@ -866,7 +864,7 @@ export default {
             label: '备注',
             index: 14,
             overHidden: true,
-            width: 140,
+            width: 130,
             prop: 'remarks',
           }]
       },
@@ -923,16 +921,16 @@ export default {
             },
             overHidden: true,
             index: 2,
-            width: 94
+            width: 80
           },{
             label: '运输调度',
             prop: 'dispatcherName',
             overHidden: true,
             index: 3,
-            width: 100,
+            width: 70,
           }, {
             label: '派车单号',
-            width: 140,
+            width: 80,
             index: 4,
             prop: 'dispatchNumber',
             search: true,
@@ -950,7 +948,7 @@ export default {
             search: true,
           }, {
             label: '车队',
-            width: 100,
+            width: 90,
             index: 7,
             overHidden: true,
             prop: 'fleetName',
@@ -967,7 +965,7 @@ export default {
             search: true,
           }, {
             label: '车号',
-            width: 100,
+            width: 90,
             index: 8,
             prop: 'plateNo',
             type: "select",
@@ -981,7 +979,7 @@ export default {
             search: true,
           }, {
             label: '司机',
-            width: 100,
+            width: 70,
             index: 9,
             prop: 'driverName',
             searchProp: 'driverId',
@@ -995,19 +993,14 @@ export default {
             search: true,
           }, {
             label: '电话',
-            width: 160,
+            width: 120,
             index: 10,
             prop: 'tel'
           }, {
-            label: '车体积',
-            width: 100,
+            label: '车型',
+            width: 90,
             index: 11,
             prop: 'fleetVolum'
-          },{
-            label: '货物体积',
-            width: 100,
-            index: 12,
-            prop: 'volumeSum'
           },
           // {
           //   label: '状态',
@@ -1028,7 +1021,7 @@ export default {
             label: '备注',
             index: 14,
             overHidden: true,
-            width: 140,
+            width: 130,
             prop: 'remarks',
           }]
       },

src/views/landTransportation/reportAnalysis/index.vue

@@ -1093,7 +1093,7 @@ export default {
     },
     //行跳转
     celJump(row, index) {
-      if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('平台') !== -1) {
+      if (this.roleName.indexOf('平台') !== -1 || this.roleName.indexOf('admin') !== -1) {
         this.$router.push({
           path: '/landTransportation/dispatchingCars/index',
           query: {orderId: row.orderId},

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

@@ -25,12 +25,16 @@
                 <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.unloadingPlace }}</div>
               </el-tooltip>
             </template>
+            <template slot="plateNo" slot-scope="{row}">
+                <span class="el-button--text" style="cursor: pointer"
+                      @click="openTrack(row,1)">{{ row.plateNo }}</span>
+            </template>
             <template slot="dispatchNumber" slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"
                       @click="openTrackTwo(row,0)">{{ row.dispatchNumber }}</span>
             </template>
             <template slot="menuLeft">
-              <span>今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
+              <span @click="getsalesTrend({status: 0, mold:mold})">今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
             </template>
           </avue-crud>
           <!--集装箱-->
@@ -38,7 +42,7 @@
                      @resetColumn="resetColumn"
                      @saveColumn="saveColumn">
             <template slot="menuLeft">
-              <span>今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
+              <span @click="getsalesTrend({status: 0, mold: mold})">今日业务详情{{ mold == 1 ? '（集装箱）' : mold == 2 ? '（散货）' : mold == 3 ? '（特种）' : '' }}</span>
             </template>
             <template slot="billNo" slot-scope="{row}">
                 <span class="el-button--text" style="cursor: pointer"
@@ -215,52 +219,52 @@ export default {
           label: '业务员',
           prop: 'salesmanName',
           index: 2,
-          width: 60,
+          width: 70,
           overHidden: true,
         }, {
           label: '物流运输',
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 3,
-          width: 100
+          width: 80
         }, {
           label: '派车单号',
-          width: 140,
+          width: 90,
           index: 4,
           overHidden: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
-          width: 140,
+          width: 90,
           index: 5,
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
-          width: 132,
+          width: 130,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
-          width: 132,
+          width: 130,
         }, {
-          label: '车体积',
-          width: 100,
+          label: '车型',
+          width: 80,
           index: 8,
           prop: 'fleetVolum'
         }, {
           label: '车队',
           prop: 'fleetShortName',
           index: 9,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '车号',
           prop: 'plateNo',
           index: 10,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '状态',
@@ -274,7 +278,7 @@ export default {
           dataType: "string",
           type: 'select',
           overHidden: true,
-          width: 140
+          width: 90
         }, {
           label: '应收运费',
           prop: 'freightCollect',
@@ -291,7 +295,7 @@ export default {
           label: '备注',
           prop: 'remarks',
           index: 14,
-          width: 100,
+          width: 130,
           overHidden: true,
         }]
       },
@@ -316,52 +320,52 @@ export default {
           label: '业务员',
           prop: 'salesmanName',
           index: 2,
-          width: 60,
+          width: 70,
           overHidden: true,
         },{
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 3,
-          width: 100,
+          width: 80,
         }, {
           label: '派车单号',
-          width: 140,
+          width: 90,
           index: 4,
           overHidden: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
-          width: 140,
+          width: 90,
           index: 5,
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
-          width: 132,
+          width: 130,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
-          width: 132,
+          width: 130,
         }, {
-          label: '车体积',
-          width: 100,
+          label: '车型',
+          width: 80,
           index: 8,
           prop: 'fleetVolum'
         }, {
           label: '车队',
           prop: 'fleetShortName',
           index: 9,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '车号',
           prop: 'plateNo',
           index: 10,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '状态',
@@ -375,7 +379,7 @@ export default {
           dataType: "string",
           type: 'select',
           overHidden: true,
-          width: 140
+          width: 90
         }, {
           label: '应收运费',
           prop: 'freightCollect',
@@ -404,7 +408,7 @@ export default {
           label: '备注',
           prop: 'remarks',
           index: 16,
-          width: 100,
+          width: 130,
           overHidden: true,
         }]
       },
@@ -430,51 +434,51 @@ export default {
           prop: 'dispatchDeptName',
           overHidden: true,
           index: 2,
-          width: 100
+          width: 80
         },{
           label: '运输调度',
           prop: 'dispatcherName',
           overHidden: true,
           index: 3,
-          width: 100,
+          width: 70,
         }, {
           label: '派车单号',
-          width: 140,
+          width: 90,
           index: 4,
           overHidden: true,
           prop: 'dispatchNumber'
         }, {
           label: '合同号',
-          width: 140,
+          width: 90,
           index: 5,
           overHidden: true,
           prop: 'contractNo'
         }, {
-          label: '装货地址',
+          label: '装货地点',
           prop: 'addressDetail',
           index: 6,
-          width: 132,
+          width: 130,
         }, {
-          label: '卸货地址',
+          label: '卸货地点',
           prop: 'unloadingPlace',
           index: 7,
-          width: 132,
+          width: 130,
         }, {
-          label: '车体积',
-          width: 100,
+          label: '车型',
+          width: 80,
           index: 8,
           prop: 'fleetVolum'
         }, {
           label: '车队',
           prop: 'fleetShortName',
           index: 9,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '车号',
           prop: 'plateNo',
           index: 10,
-          width: 100,
+          width: 90,
           overHidden: true,
         }, {
           label: '状态',
@@ -488,7 +492,7 @@ export default {
           dataType: "string",
           type: 'select',
           overHidden: true,
-          width: 140
+          width: 90
         }, {
           label: '应付运费',
           prop: 'freightPay',
@@ -505,7 +509,7 @@ export default {
           label: '备注',
           prop: 'remarks',
           index: 14,
-          width: 100,
+          width: 130,
           overHidden: true,
         }]
       },