|  | @@ -2,20 +2,24 @@
 | 
	
		
			
				|  |  |    <div class="home-container">
 | 
	
		
			
				|  |  |      <el-card class="home-container__card">
 | 
	
		
			
				|  |  |        <div>
 | 
	
		
			
				|  |  | -        <div class="title">
 | 
	
		
			
				|  |  | -          <span>
 | 
	
		
			
				|  |  | -            今日业务详情(集装箱)
 | 
	
		
			
				|  |  | -          </span>
 | 
	
		
			
				|  |  | -          <span>
 | 
	
		
			
				|  |  | -            <i
 | 
	
		
			
				|  |  | -                class="el-icon-refresh-right"
 | 
	
		
			
				|  |  | -                style="cursor: pointer;font-size:20px"
 | 
	
		
			
				|  |  | -                @click="refresh"
 | 
	
		
			
				|  |  | -            ></i>
 | 
	
		
			
				|  |  | -          </span>
 | 
	
		
			
				|  |  | -        </div>
 | 
	
		
			
				|  |  | +<!--        <div class="title">-->
 | 
	
		
			
				|  |  | +<!--          <span>-->
 | 
	
		
			
				|  |  | +<!--            今日业务详情(集装箱)-->
 | 
	
		
			
				|  |  | +<!--          </span>-->
 | 
	
		
			
				|  |  | +<!--          <span>-->
 | 
	
		
			
				|  |  | +<!--            <i-->
 | 
	
		
			
				|  |  | +<!--                class="el-icon-refresh-right"-->
 | 
	
		
			
				|  |  | +<!--                style="cursor: pointer;font-size:20px"-->
 | 
	
		
			
				|  |  | +<!--                @click="refresh"-->
 | 
	
		
			
				|  |  | +<!--            ></i>-->
 | 
	
		
			
				|  |  | +<!--          </span>-->
 | 
	
		
			
				|  |  | +<!--        </div>-->
 | 
	
		
			
				|  |  |          <div class="content" v-loading="loading">
 | 
	
		
			
				|  |  | -          <avue-crud :data="tableData" :option="option" :key="key" ref="crud" @resetColumn="resetColumn" @saveColumn="saveColumn">
 | 
	
		
			
				|  |  | +          <avue-crud :data="tableData" :option="option" :key="key" ref="crud" @refresh-change="refresh" @resetColumn="resetColumn"
 | 
	
		
			
				|  |  | +                     @saveColumn="saveColumn">
 | 
	
		
			
				|  |  | +            <template slot="menuLeft">
 | 
	
		
			
				|  |  | +              <span>今日业务详情(集装箱)</span>
 | 
	
		
			
				|  |  | +            </template>
 | 
	
		
			
				|  |  |              <template slot="billNo" slot-scope="{row}">
 | 
	
		
			
				|  |  |                  <span class="el-button--text" style="cursor: pointer"
 | 
	
		
			
				|  |  |                        @click="openTrack(row,0)">{{ row.billNo }}</span>
 | 
	
	
		
			
				|  | @@ -27,7 +31,7 @@
 | 
	
		
			
				|  |  |              <template slot="addressDetail" slot-scope="{ row,index}">
 | 
	
		
			
				|  |  |                <el-tooltip class="item" effect="dark" placement="top">
 | 
	
		
			
				|  |  |                  <div v-html="ToBreak(row.addressDetail)" slot="content"></div>
 | 
	
		
			
				|  |  | -                <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{row.addressDetail}}</div>
 | 
	
		
			
				|  |  | +                <div style="overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ row.addressDetail }}</div>
 | 
	
		
			
				|  |  |                </el-tooltip>
 | 
	
		
			
				|  |  |              </template>
 | 
	
		
			
				|  |  |              <template slot="status" slot-scope="{row}">
 | 
	
	
		
			
				|  | @@ -71,8 +75,9 @@
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  <script>
 | 
	
		
			
				|  |  |  import {active} from "@/api/wel";
 | 
	
		
			
				|  |  | -import {gaude,location} from "@/api/gaude";
 | 
	
		
			
				|  |  | +import {gaude, location} from "@/api/gaude";
 | 
	
		
			
				|  |  |  import data from "@/views/util/data";
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |  export default {
 | 
	
		
			
				|  |  |    name: "basicContainer",
 | 
	
		
			
				|  |  |    props: {
 | 
	
	
		
			
				|  | @@ -87,84 +92,84 @@ export default {
 | 
	
		
			
				|  |  |        map: null,
 | 
	
		
			
				|  |  |        marker: null,
 | 
	
		
			
				|  |  |        lineArr: [],
 | 
	
		
			
				|  |  | -      key:0,
 | 
	
		
			
				|  |  | -      option:{},
 | 
	
		
			
				|  |  | -      optionList:{
 | 
	
		
			
				|  |  | -        stripe:true,
 | 
	
		
			
				|  |  | -        index:true,
 | 
	
		
			
				|  |  | -        menu:false,
 | 
	
		
			
				|  |  | -        refreshBtn:false,
 | 
	
		
			
				|  |  | -        addBtn:false,
 | 
	
		
			
				|  |  | -        height:390,
 | 
	
		
			
				|  |  | -        align:'center',
 | 
	
		
			
				|  |  | -        column:[
 | 
	
		
			
				|  |  | +      key: 0,
 | 
	
		
			
				|  |  | +      option: {},
 | 
	
		
			
				|  |  | +      optionList: {
 | 
	
		
			
				|  |  | +        stripe: true,
 | 
	
		
			
				|  |  | +        index: true,
 | 
	
		
			
				|  |  | +        menu: false,
 | 
	
		
			
				|  |  | +        refreshBtn: true,
 | 
	
		
			
				|  |  | +        addBtn: false,
 | 
	
		
			
				|  |  | +        height: 390,
 | 
	
		
			
				|  |  | +        align: 'center',
 | 
	
		
			
				|  |  | +        column: [
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'货运日期',
 | 
	
		
			
				|  |  | -            prop:'arrivalTime',
 | 
	
		
			
				|  |  | +            label: '货运日期',
 | 
	
		
			
				|  |  | +            prop: 'arrivalTime',
 | 
	
		
			
				|  |  |              type: "date",
 | 
	
		
			
				|  |  |              format: "yyyy-MM-dd HH:mm",
 | 
	
		
			
				|  |  | -            index:1,
 | 
	
		
			
				|  |  | -            width:150,
 | 
	
		
			
				|  |  | +            index: 1,
 | 
	
		
			
				|  |  | +            width: 150,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'业务员',
 | 
	
		
			
				|  |  | -            prop:'salesmanName',
 | 
	
		
			
				|  |  | -            index:2,
 | 
	
		
			
				|  |  | -            width:60,
 | 
	
		
			
				|  |  | +            label: '业务员',
 | 
	
		
			
				|  |  | +            prop: 'salesmanName',
 | 
	
		
			
				|  |  | +            index: 2,
 | 
	
		
			
				|  |  | +            width: 60,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'货运地点',
 | 
	
		
			
				|  |  | -            prop:'addressDetail',
 | 
	
		
			
				|  |  | -            index:3,
 | 
	
		
			
				|  |  | -            width:100
 | 
	
		
			
				|  |  | +            label: '货运地点',
 | 
	
		
			
				|  |  | +            prop: 'addressDetail',
 | 
	
		
			
				|  |  | +            index: 3,
 | 
	
		
			
				|  |  | +            width: 100
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'票据号',
 | 
	
		
			
				|  |  | -            prop:'receiptNo',
 | 
	
		
			
				|  |  | -            index:4,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '票据号',
 | 
	
		
			
				|  |  | +            prop: 'receiptNo',
 | 
	
		
			
				|  |  | +            index: 4,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'提单号',
 | 
	
		
			
				|  |  | -            prop:'billNo',
 | 
	
		
			
				|  |  | -            index:5,
 | 
	
		
			
				|  |  | -            width:130,
 | 
	
		
			
				|  |  | +            label: '提单号',
 | 
	
		
			
				|  |  | +            prop: 'billNo',
 | 
	
		
			
				|  |  | +            index: 5,
 | 
	
		
			
				|  |  | +            width: 130,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'场站',
 | 
	
		
			
				|  |  | -            prop:'station',
 | 
	
		
			
				|  |  | -            index:6,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '场站',
 | 
	
		
			
				|  |  | +            prop: 'station',
 | 
	
		
			
				|  |  | +            index: 6,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'箱型箱量',
 | 
	
		
			
				|  |  | -            prop:'ctnDetail',
 | 
	
		
			
				|  |  | -            index:7,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '箱型箱量',
 | 
	
		
			
				|  |  | +            prop: 'ctnDetail',
 | 
	
		
			
				|  |  | +            index: 7,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'车队',
 | 
	
		
			
				|  |  | -            prop:'fleetShortName',
 | 
	
		
			
				|  |  | -            index:8,
 | 
	
		
			
				|  |  | -            width:190,
 | 
	
		
			
				|  |  | +            label: '车队',
 | 
	
		
			
				|  |  | +            prop: 'fleetShortName',
 | 
	
		
			
				|  |  | +            index: 8,
 | 
	
		
			
				|  |  | +            width: 190,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'车号',
 | 
	
		
			
				|  |  | -            prop:'plateNo',
 | 
	
		
			
				|  |  | -            index:9,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '车号',
 | 
	
		
			
				|  |  | +            prop: 'plateNo',
 | 
	
		
			
				|  |  | +            index: 9,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'状态',
 | 
	
		
			
				|  |  | -            prop:'status',
 | 
	
		
			
				|  |  | +            label: '状态',
 | 
	
		
			
				|  |  | +            prop: 'status',
 | 
	
		
			
				|  |  |              type: 'select',
 | 
	
		
			
				|  |  |              dicUrl: "/api/blade-system/dict-biz/dictionary?code=land_order_status",
 | 
	
		
			
				|  |  |              props: {
 | 
	
	
		
			
				|  | @@ -172,36 +177,36 @@ export default {
 | 
	
		
			
				|  |  |                value: "dictKey"
 | 
	
		
			
				|  |  |              },
 | 
	
		
			
				|  |  |              dataType: "string",
 | 
	
		
			
				|  |  | -            index:10,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            index: 10,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'运费',
 | 
	
		
			
				|  |  | -            prop:'landAmountD',
 | 
	
		
			
				|  |  | -            index:11,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '运费',
 | 
	
		
			
				|  |  | +            prop: 'landAmountD',
 | 
	
		
			
				|  |  | +            index: 11,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'应收杂费',
 | 
	
		
			
				|  |  | -            prop:'extraAmountD',
 | 
	
		
			
				|  |  | -            index:13,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '应收杂费',
 | 
	
		
			
				|  |  | +            prop: 'extraAmountD',
 | 
	
		
			
				|  |  | +            index: 13,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'客户名称',
 | 
	
		
			
				|  |  | -            prop:'corpShortName',
 | 
	
		
			
				|  |  | -            index:14,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '客户名称',
 | 
	
		
			
				|  |  | +            prop: 'corpShortName',
 | 
	
		
			
				|  |  | +            index: 14,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'备注',
 | 
	
		
			
				|  |  | -            prop:'remarks',
 | 
	
		
			
				|  |  | -            index:15,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '备注',
 | 
	
		
			
				|  |  | +            prop: 'remarks',
 | 
	
		
			
				|  |  | +            index: 15,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true,
 | 
	
		
			
				|  |  |            },
 | 
	
		
			
				|  |  |          ]
 | 
	
	
		
			
				|  | @@ -212,16 +217,16 @@ export default {
 | 
	
		
			
				|  |  |      this.option = await this.getColumnData(this.getColumnName(140), this.optionList);
 | 
	
		
			
				|  |  |      this.key++
 | 
	
		
			
				|  |  |      this.init();
 | 
	
		
			
				|  |  | -    for (let item of this.option.column){
 | 
	
		
			
				|  |  | +    for (let item of this.option.column) {
 | 
	
		
			
				|  |  |        if (item.prop === 'extraAmountC') return
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  | -    if (this.roleName.indexOf('平台') !== -1){
 | 
	
		
			
				|  |  | +    if (this.roleName.indexOf('平台') !== -1) {
 | 
	
		
			
				|  |  |        this.option.column.push(
 | 
	
		
			
				|  |  |            {
 | 
	
		
			
				|  |  | -            label:'应付杂费',
 | 
	
		
			
				|  |  | -            prop:'extraAmountC',
 | 
	
		
			
				|  |  | -            index:12,
 | 
	
		
			
				|  |  | -            width:100,
 | 
	
		
			
				|  |  | +            label: '应付杂费',
 | 
	
		
			
				|  |  | +            prop: 'extraAmountC',
 | 
	
		
			
				|  |  | +            index: 12,
 | 
	
		
			
				|  |  | +            width: 100,
 | 
	
		
			
				|  |  |              overHidden: true
 | 
	
		
			
				|  |  |            }
 | 
	
		
			
				|  |  |        )
 | 
	
	
		
			
				|  | @@ -253,17 +258,17 @@ export default {
 | 
	
		
			
				|  |  |          this.$message.success("重置成功");
 | 
	
		
			
				|  |  |          //关闭窗口
 | 
	
		
			
				|  |  |          this.$refs.crud.$refs.dialogColumn.columnBox = false;
 | 
	
		
			
				|  |  | -        for (let item of this.option.column){
 | 
	
		
			
				|  |  | +        for (let item of this.option.column) {
 | 
	
		
			
				|  |  |            if (item.prop === 'extraAmountC') return false
 | 
	
		
			
				|  |  |          }
 | 
	
		
			
				|  |  | -        if (this.roleName.indexOf('平台') !== -1){
 | 
	
		
			
				|  |  | +        if (this.roleName.indexOf('平台') !== -1) {
 | 
	
		
			
				|  |  |            console.log(this.option.column)
 | 
	
		
			
				|  |  |            this.option.column.push(
 | 
	
		
			
				|  |  |                {
 | 
	
		
			
				|  |  | -                label:'应付杂费',
 | 
	
		
			
				|  |  | -                prop:'extraAmountC',
 | 
	
		
			
				|  |  | -                index:12,
 | 
	
		
			
				|  |  | -                width:100,
 | 
	
		
			
				|  |  | +                label: '应付杂费',
 | 
	
		
			
				|  |  | +                prop: 'extraAmountC',
 | 
	
		
			
				|  |  | +                index: 12,
 | 
	
		
			
				|  |  | +                width: 100,
 | 
	
		
			
				|  |  |                  overHidden: true
 | 
	
		
			
				|  |  |                }
 | 
	
		
			
				|  |  |            )
 | 
	
	
		
			
				|  | @@ -271,20 +276,20 @@ export default {
 | 
	
		
			
				|  |  |          this.key++
 | 
	
		
			
				|  |  |        }
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    openTrack(row,index){
 | 
	
		
			
				|  |  | -      if (index == 0){
 | 
	
		
			
				|  |  | +    openTrack(row, index) {
 | 
	
		
			
				|  |  | +      if (index == 0) {
 | 
	
		
			
				|  |  |          this.$router.push({
 | 
	
		
			
				|  |  |            path: '/landTransportation/placeAnOrder/index',
 | 
	
		
			
				|  |  | -          query: {id:row.orderId},
 | 
	
		
			
				|  |  | +          query: {id: row.orderId},
 | 
	
		
			
				|  |  |          });
 | 
	
		
			
				|  |  | -      }else {
 | 
	
		
			
				|  |  | -        gaude({itemId: row.id,plateNo:row.plateNo,tenantId:'234557'}).then(res => {
 | 
	
		
			
				|  |  | +      } else {
 | 
	
		
			
				|  |  | +        gaude({itemId: row.id, plateNo: row.plateNo, tenantId: '234557'}).then(res => {
 | 
	
		
			
				|  |  |            this.lineArr = res.data.data
 | 
	
		
			
				|  |  |            this.dialogVisible = true
 | 
	
		
			
				|  |  | -          let this_=this
 | 
	
		
			
				|  |  | -          setTimeout(function(){
 | 
	
		
			
				|  |  | +          let this_ = this
 | 
	
		
			
				|  |  | +          setTimeout(function () {
 | 
	
		
			
				|  |  |              this_.initMap();
 | 
	
		
			
				|  |  | -          },100)
 | 
	
		
			
				|  |  | +          }, 100)
 | 
	
		
			
				|  |  |          })
 | 
	
		
			
				|  |  |          // location({itemId: row.id,plateNo:'陕YH0008'}).then(res => {
 | 
	
		
			
				|  |  |          //   // console.log(res.data.data)
 | 
	
	
		
			
				|  | @@ -295,17 +300,17 @@ export default {
 | 
	
		
			
				|  |  |      initMap() {
 | 
	
		
			
				|  |  |        this.map = new AMap.Map("container", {
 | 
	
		
			
				|  |  |          resizeEnable: true,
 | 
	
		
			
				|  |  | -        center: this.lineArr.length >0 ?this.lineArr[this.lineArr.length - 1]:[120.382891,36.066460],
 | 
	
		
			
				|  |  | +        center: this.lineArr.length > 0 ? this.lineArr[this.lineArr.length - 1] : [120.382891, 36.066460],
 | 
	
		
			
				|  |  |          zoom: 17
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        let icon = new AMap.Icon({
 | 
	
		
			
				|  |  |          size: new AMap.Size(52, 26), // 图标尺寸
 | 
	
		
			
				|  |  | -        image: 'https://webapi.amap.com/images/car.png',
 | 
	
		
			
				|  |  | +        image: 'https://trade.tubaosoft.com/file/bladex/000000/1123598821738675201/che.png',
 | 
	
		
			
				|  |  |          imageSize: new AMap.Size(52, 26), // 根据所设置的大小拉伸或压缩图片
 | 
	
		
			
				|  |  |        });
 | 
	
		
			
				|  |  |        this.marker = new AMap.Marker({
 | 
	
		
			
				|  |  |          map: this.map,
 | 
	
		
			
				|  |  | -        position: this.lineArr.length >0 ?this.lineArr[this.lineArr.length - 1]:[120.382891,36.066460],
 | 
	
		
			
				|  |  | +        position: this.lineArr.length > 0 ? this.lineArr[this.lineArr.length - 1] : [120.382891, 36.066460],
 | 
	
		
			
				|  |  |          // icon: "https://webapi.amap.com/images/car.png",
 | 
	
		
			
				|  |  |          icon: icon,
 | 
	
		
			
				|  |  |          markerMeta: new AMap.Size(28, 28),
 | 
	
	
		
			
				|  | @@ -354,18 +359,18 @@ export default {
 | 
	
		
			
				|  |  |      init() {
 | 
	
		
			
				|  |  |        this.getsalesTrend();
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    query(data){
 | 
	
		
			
				|  |  | +    query(data) {
 | 
	
		
			
				|  |  |        this.getsalesTrend(data)
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    getsalesTrend(data={status:0,mold:0}) {
 | 
	
		
			
				|  |  | +    getsalesTrend(data = {status: 0, mold: 0}) {
 | 
	
		
			
				|  |  |        this.loading = true;
 | 
	
		
			
				|  |  |        active(data).then(res => {
 | 
	
		
			
				|  |  |          this.tableData = res.data.data
 | 
	
		
			
				|  |  |          this.loading = false;
 | 
	
		
			
				|  |  |        })
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  | -    ToBreak (val) {
 | 
	
		
			
				|  |  | -      if (val)return val.replace(/\n/g, '<br/>')
 | 
	
		
			
				|  |  | +    ToBreak(val) {
 | 
	
		
			
				|  |  | +      if (val) return val.replace(/\n/g, '<br/>')
 | 
	
		
			
				|  |  |      },
 | 
	
		
			
				|  |  |      refresh() {
 | 
	
		
			
				|  |  |        this.init()
 |