Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/views/business/categoryJkLine.vue

@@ -13,7 +13,7 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:category:create','business:category:delete']">
        <li><el-button type="primary" @click="$refs.OperaCategoryFileWindow.open('新建主线路')" icon="el-icon-plus" v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="primary" @click="$refs.OperaCategoryJkLineWindow.open('新建主线路')" icon="el-icon-plus" v-permissions="['business:category:create']">新建</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:category:delete']">批量删除</el-button></li>
      </ul>
      <el-table
@@ -25,16 +25,25 @@
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="name" show-overflow-tooltip label="主线路" min-width="120px"></el-table-column>
        <el-table-column prop="lineNum" show-overflow-tooltip label="线路数" min-width="120px"></el-table-column>
        <el-table-column prop="customerNum" show-overflow-tooltip label="客户交通规划（已完成/全部）" align="center" min-width="200px">
          <template slot-scope="{row}">
            <span class="green"> {{row.customerDoneNum || 0}}/</span>
            <span  > {{row.customerNum || 0}}</span>
            <span v-if="row.status == 2 " class="red" style="margin-left: 10px; ">(规划中)</span>
          </template>
        </el-table-column>
        <el-table-column prop="sortnum" label="排序码"  min-width="70px"></el-table-column>
        <el-table-column prop="editDate" label="操作时间" width="160px"></el-table-column>
        <el-table-column
            v-if="containPermissions(['business:category:update', 'business:category:delete' ])"
            label="操作"
            min-width="140"
            min-width="180"
            fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryFileWindow.open('编辑主线路',row)" v-permissions="['business:category:update']">编辑</el-button>
            <el-button type="text" icon="el-icon-edit" @click="$refs.OperaCategoryJkLineWindow.open('编辑主线路',row)" v-permissions="['business:category:update']">编辑</el-button>
            <el-button  type="text"  icon="el-icon-edit" @click="distanceDo(row)"  v-if="row.status !=2 && row.customerDoneNum < row.customerNum " v-permissions="['business:category:update']">交通规划</el-button>
            <el-button  type="text"  icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:category:delete']">删除</el-button>
          </template>
        </el-table-column>
@@ -47,7 +56,7 @@
      </pagination>
    </template>
    <!-- 新建/修改 -->
    <OperaCategoryFileWindow ref="OperaCategoryFileWindow" @success="handlePageChange"/>
    <OperaCategoryJkLineWindow ref="OperaCategoryJkLineWindow" @success="handlePageChange"/>
  </TableLayout>
</template>

@@ -55,11 +64,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategoryFileWindow from '@/components/business/OperaCategoryFileWindow'
import OperaCategoryJkLineWindow from '@/components/business/OperaCategoryJkLineWindow'
import { distanceCustomer } from '@/api/business/jkSketch'
export default {
  name: 'areaSet',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCategoryFileWindow },
  components: { TableLayout, Pagination, OperaCategoryJkLineWindow },
  data () {
    return {
      // 搜索
@@ -79,6 +89,22 @@
    this.search()
  },
  methods: {
    distanceDo (row) {
      var that = this
      this.$confirm('确定进行该主线路下客户距离计算吗?', '提示', {
        confirmButtonText: '确定',
        cancelButtonText: '取消',
        type: 'warning'
      }).then(() => {
        distanceCustomer({ categoryId: row.id })
          .then(res => {
            this.$tip.apiSuccess('交通规划任务正在后台执行，可能需要一段时间，请等待任务完成后查看结果')
            that.search()
          })
      }).catch(() => {
        this.$tip.apiSuccess('操作失败')
      })
    }
  }
}
</script>