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

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/views/business/jkCustomer.vue

@@ -2,53 +2,39 @@
  <TableLayout :permissions="['business:jkcustomer:query']">
    <!-- 搜索表单 -->
    <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
      <el-form-item label="主键" prop="id">
        <el-input v-model="searchForm.id" placeholder="请输入主键" @keypress.enter.native="search"></el-input>
      <el-form-item label="客户简码" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入客户简码" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="searchForm.creator" placeholder="请输入创建人编码" @keypress.enter.native="search"></el-input>
      <el-form-item label="客户名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入客户名称" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="创建时间" prop="createDate">
        <el-date-picker v-model="searchForm.createDate" value-format="yyyy-MM-dd" placeholder="请输入创建时间" @change="search"/>
      <el-form-item label="地址" prop="location">
        <el-input v-model="searchForm.location" placeholder="请输入地址"  clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="searchForm.editor" placeholder="请输入更新人编码" @keypress.enter.native="search"></el-input>
      <el-form-item label="配送周期" prop="lineWeeks">
        <el-select v-model="searchForm.lineWeeks" clearable filterable placeholder="请选择配送周期"  @change="search">
          <el-option v-for="item in weeksList" :key="item" :label="item" :value="item">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="更新时间" prop="editDate">
        <el-date-picker v-model="searchForm.editDate" value-format="yyyy-MM-dd" placeholder="请输入更新时间" @change="search"/>
      <el-form-item label="所属主线路" prop="categoryId">
        <el-select v-model="searchForm.categoryId" clearable filterable placeholder="请选择所属主线路"  @change="loadLines();search()">
          <el-option v-for="item in categoryList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="是否删除0否 1是" prop="isdeleted">
        <el-input v-model="searchForm.isdeleted" placeholder="请输入是否删除0否 1是" @keypress.enter.native="search"></el-input>
      <el-form-item label="送货线路" prop="lineId">
        <el-select v-model="searchForm.lineId" clearable filterable placeholder="请选择送货线路"  @change="search">
          <el-option v-for="item in lineList" :key="item.id" :label="item.name" :value="item.id">
          </el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="备注" prop="info">
        <el-input v-model="searchForm.info" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="名称" prop="name">
        <el-input v-model="searchForm.name" placeholder="请输入名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="编码" prop="code">
        <el-input v-model="searchForm.code" placeholder="请输入编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="所在位置" prop="lacation">
        <el-input v-model="searchForm.lacation" placeholder="请输入所在位置" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="经度" prop="longitude">
        <el-input v-model="searchForm.longitude" placeholder="请输入经度" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="维度" prop="latitude">
        <el-input v-model="searchForm.latitude" placeholder="请输入维度" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="配送周期" prop="weeks">
        <el-input v-model="searchForm.weeks" placeholder="请输入配送周期" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="送货路线编码（关联jk_line)" prop="lineId">
        <el-input v-model="searchForm.lineId" placeholder="请输入送货路线编码（关联jk_line)" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态 0正常 禁用" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态 0正常 禁用" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="排序码" prop="sortnum">
        <el-input v-model="searchForm.sortnum" placeholder="请输入排序码" @keypress.enter.native="search"></el-input>
      <el-form-item label="交通规划状态" prop="distanceStatus">
        <el-select v-model="searchForm.distanceStatus" clearable filterable placeholder="请选择交通规划状态"  @change="search">
          <el-option  :value="2" label="未定位"></el-option>
          <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>
@@ -59,32 +45,36 @@
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:jkcustomer:create', 'business:jkcustomer:delete']">
<!--
        <li><el-button type="primary" @click="$refs.operaJkCustomerWindow.open('新建交控-客户信息表')" icon="el-icon-plus" v-permissions="['business:jkcustomer:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">删除</el-button></li>
-->
        <li><el-button icon="el-icon-upload"  type="primary" @click="$refs.OperaJkCustomerImportWindowRef.open('客户导入')"  v-permissions="['business:jkcustomer:create']">客户导入</el-button></li>
        <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">删除</el-button></li>
      </ul>
      <el-table
          :height="tableHeightNew"
        v-loading="isWorking.search"
        :data="tableData.list"
        stripe
        @selection-change="handleSelectionChange"
      >
        <el-table-column type="selection" width="55"></el-table-column>
        <el-table-column prop="id" label="主键" min-width="100px"></el-table-column>
        <el-table-column prop="creator" label="创建人编码" min-width="100px"></el-table-column>
        <el-table-column prop="createDate" label="创建时间" min-width="100px"></el-table-column>
        <el-table-column prop="editor" label="更新人编码" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="100px"></el-table-column>
        <el-table-column prop="isdeleted" label="是否删除0否 1是" min-width="100px"></el-table-column>
        <el-table-column prop="info" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="编码" min-width="100px"></el-table-column>
        <el-table-column prop="lacation" label="所在位置" min-width="100px"></el-table-column>
        <el-table-column prop="longitude" label="经度" min-width="100px"></el-table-column>
        <el-table-column prop="latitude" label="维度" min-width="100px"></el-table-column>
        <el-table-column prop="weeks" label="配送周期" min-width="100px"></el-table-column>
        <el-table-column prop="lineId" label="送货路线编码（关联jk_line)" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态 0正常 禁用" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="code" label="客户简码" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="客户名称" min-width="100px"></el-table-column>
        <el-table-column prop="location" label="地址" min-width="200px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="locationInfo" label="经纬度" min-width="150px">  </el-table-column>
        <el-table-column prop="lineWeeks" label="配送周期" min-width="100px"></el-table-column>
        <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 === 2" class="red">未定位</span>
            <span v-else-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'])"
          label="操作"
@@ -92,8 +82,8 @@
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkCustomerWindow.open('编辑交控-客户信息表', row)" icon="el-icon-edit" v-permissions="['business:jkcustomer:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">删除</el-button>
            <el-button type="text" @click="$refs.operaJkCustomerWindow.open('编辑客户信息', row)" icon="el-icon-edit" v-permissions="['business:jkcustomer:update']">编辑</el-button>
            <el-button type="text" style="color: red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkcustomer:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -106,6 +96,7 @@
    </template>
    <!-- 新建/修改 -->
    <OperaJkCustomerWindow ref="operaJkCustomerWindow" @success="handlePageChange"/>
    <OperaJkCustomerImportWindow ref="OperaJkCustomerImportWindowRef" @success="handlePageChange" />
  </TableLayout>
</template>

@@ -114,31 +105,31 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkCustomerWindow from '@/components/business/OperaJkCustomerWindow'
import OperaJkCustomerImportWindow from '@/components/business/OperaJkCustomerImportWindow'
import { fetchCateList } from '@/api/business/category'
import { allList } from '@/api/business/jkLine'
export default {
  name: 'JkCustomer',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaJkCustomerWindow },
  components: { TableLayout, Pagination, OperaJkCustomerWindow, OperaJkCustomerImportWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        categoryId: '',
        name: '',
        code: '',
        lacation: '',
        longitude: '',
        latitude: '',
        weeks: '',
        distanceStatus: '',
        location: '',
        lineWeeks: '',
        lineId: '',
        status: '',
        sortnum: ''
      }
      },
      categoryList: [],
      lineList: [],
      weeksList: ['周一', '周二', '周三', '周四', '周五', '周六', '周日']
    }
  },
  created () {
@@ -149,6 +140,25 @@
      'field.main': 'id'
    })
    this.search()
    this.loadCategory()
    this.loadLines()
  },
  methods: {
    loadCategory () {
      fetchCateList({
        type: 4
      }).then(res => {
        this.categoryList = res
      })
    },
    loadLines () {
      this.searchForm.lineId =''
      allList({
        categoryId: this.searchForm.categoryId
      }).then(res => {
        this.lineList = res
      })
    }
  }
}
</script>