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

src/views/landTransportation/placeAnOrder/detailPage.vue

@@ -719,6 +719,11 @@ export default {
           index: 3,
           width: 140,
         }, {
+          label: '车队',
+          width: 150,
+          index: 4,
+          prop: 'fleetShortName'
+        }, {
           label: '车号',
           width: 150,
           index: 4,

src/views/landTransportation/placeAnOrder/index.vue

@@ -162,6 +162,9 @@
         <template slot="billNo" slot-scope="{row,index}">
           <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.billNo }}</span>
         </template>
+        <template slot="fleetNameDetail" slot-scope="{row,index}">
+          <span class="el-button--text" style="cursor: pointer" @click.stop="rowCell(row,index)">{{ row.fleetNameDetail }}</span>
+        </template>
       </avue-crud>
     </basic-container>
     <detail-page v-if="!show" @backToList="backToList" :id="id" :home="home"></detail-page>
@@ -289,6 +292,11 @@ export default {
             index: 8,
             width: 140
           }, {
+            label: '车队',
+            width: 150,
+            index: 8,
+            prop: 'fleetNameDetail'
+          }, {
             label: '运费',
             index: 9,
             width: 140,