最新版本541200007

doum

3 天以前 05ee96b3f690ad0ce4f47ad161e14f5f0d862707

最新版本541200007

 admin/src/components/business/OperaJkSketchLineListWindow.vue

@@ -14,6 +14,13 @@
          <div style="flex: 1">客户数：{{model.orderNum ||'-'}}</div>
          <div style="flex: 1">送货量(条)：{{model.totalNum ||'-'}}</div>
      </div>
      <div style="display: flex;margin-top: 20px" class="orange">
        <div style="flex: 1" >线路原始总路程：
          <span  v-if="(model.originDistance ||0) > 0 ||  (model.status||0) != 0" class="red" style="font-weight: bold"> {{((model.originDistance ||0)/1000).toFixed(2)}}</span>
          <span  v-if="(model.originDistance ||0) == 0 && (model.status||0) == 0"  class="blue" style="font-weight: bold;cursor: pointer" @click="initDistance"> 点击获取 </span> 公里，
          <span v-if="model.status ==2">优化后总路程:<span class="green" style="font-weight: bold"> {{((model.distance ||0)/1000).toFixed(2)}} </span> 公里</span>
        </div>
      </div>
    </div>
    <div style="display: block">
      <div  style="display: block;font-size: 16px;font-weight: 600;margin-bottom: 10px;">线路明细</div>
@@ -25,9 +32,10 @@
          <el-table-column prop="totalNum" label="送货量(条)" min-width="130px"></el-table-column>
          <el-table-column prop="carCode" label="车牌号" min-width="100px"></el-table-column>
          <el-table-column prop="memberName" label="送货司机" min-width="100px"></el-table-column>
          <el-table-column prop="distance" label="总路程(公里)" min-width="100px">
          <el-table-column prop="distance" label="当前路程(公里)" min-width="100px">
            <template slot-scope="{row}">
              {{((row.distance ||0)/1000).toFixed(2)}}
              <span  v-if="row.distance "> {{((row.distance ||0)/1000).toFixed(2)}}</span>
              <span  v-else> - </span>
            </template>
          </el-table-column>
          <el-table-column
@@ -54,6 +62,7 @@
import BaseOpera from '@/components/base/BaseOpera'
import GlobalWindow from '@/components/common/GlobalWindow'
import OperaJkSketchCustomerWindow from '@/components/business/OperaJkSketchCustomerWindow'
import { initOriginDistance } from '@/api/business/jkSketch'
export default {
  name: 'OperaJkSketchLineWindow',
  extends: BaseOpera,
@@ -86,6 +95,17 @@
        this.dataList = res
      })
    },
    initDistance () {
      var that = this
      initOriginDistance({
        id: this.model.id
      }).then(res => {
        if(res){
          that.model.originDistance = res.originDistance
          that.model.distance = res.distance
        }
      })
    },
    viewCustomer(row){

    }

 admin/src/views/business/jkCustomer.vue

@@ -29,6 +29,12 @@
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="交通规划状态" prop="distanceStatus">
        <el-select v-model="searchForm.distanceStatus" clearable filterable placeholder="请选择交通规划状态"  @change="search">
          <el-option  :value="0" label="未完成"></el-option>
          <el-option  :value="1" label="已完成"></el-option>
        </el-select>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
        <el-button type="primary" :loading="isWorking.export" v-permissions="['business:jkcustomer:exportExcel']" @click="exportExcel">导出</el-button>
@@ -60,6 +66,12 @@
        <el-table-column prop="lineName" label="送货线路" min-width="200px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="categoryName" label="所属主线路" min-width="100px"></el-table-column>
        <el-table-column prop="sortno" label="序号" min-width="100px"></el-table-column>
        <el-table-column prop="distanceStatus" label="交通规划状态" min-width="100px" align="center">
          <template slot-scope="{row}">
            <span v-if="row.distanceStatus === 1" class="green">已完成</span>
            <span v-else class="blue">未完成</span>
          </template>
        </el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="140px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:jkcustomer:update', 'business:jkcustomer:delete'])"
@@ -106,6 +118,7 @@
        categoryId: '',
        name: '',
        code: '',
        distanceStatus: '',
        location: '',
        lineWeeks: '',
        lineId: '',