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

doum

2 天以前 dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4

 admin/src/views/business/jkLine.vue

@@ -2,47 +2,20 @@
  <TableLayout :permissions="['business:jkline: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>
      <el-form-item label="创建人编码" prop="creator">
        <el-input v-model="searchForm.creator" placeholder="请输入创建人编码" @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>
      <el-form-item label="更新人编码" prop="editor">
        <el-input v-model="searchForm.editor" placeholder="请输入更新人编码" @keypress.enter.native="search"></el-input>
      </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>
      <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>
      <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-input v-model="searchForm.name" placeholder="请输入名称" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="班组编码（关联category）" prop="categoryId">
        <el-input v-model="searchForm.categoryId" placeholder="请输入班组编码（关联category）" @keypress.enter.native="search"></el-input>
      <el-form-item label="所属主线路" prop="categoryId">
        <el-select v-model="searchForm.categoryId" clearable filterable placeholder="请选择所属主线路"  @change="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="所属车辆(关联cars)" prop="carId">
        <el-input v-model="searchForm.carId" placeholder="请输入所属车辆(关联cars)" @keypress.enter.native="search"></el-input>
      <el-form-item label="运送车辆" prop="carId">
        <el-input v-model="searchForm.carCode" placeholder="请输入运送车辆" clearable @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最大客户量" prop="maxCustomer">
        <el-input v-model="searchForm.maxCustomer" placeholder="请输入最大客户量" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最大订单量" prop="maxOrder">
        <el-input v-model="searchForm.maxOrder" placeholder="请输入最大订单量" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="状态 0未绑定 1在位 2借出" prop="status">
        <el-input v-model="searchForm.status" placeholder="请输入状态 0未绑定 1在位 2借出" @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="code">
        <el-input v-model="searchForm.code" placeholder="请输入序号" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <section>
        <el-button type="primary" @click="search">搜索</el-button>
@@ -54,29 +27,26 @@
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:jkline:create', 'business:jkline:delete']">
        <li><el-button type="primary" @click="$refs.operaJkLineWindow.open('新建交控-线路信息表')" icon="el-icon-plus" v-permissions="['business:jkline:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button></li>
        <li><el-button icon="el-icon-upload"  type="primary" @click="$refs.OperaJkLineImportWindowRef.open('线路导入')"  v-permissions="['business:jkline:create']">线路导入</el-button></li>
        <li><el-button type="danger"  @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkline: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="categoryId" label="班组编码（关联category）" min-width="100px"></el-table-column>
        <el-table-column prop="carId" label="所属车辆(关联cars)" min-width="100px"></el-table-column>
        <el-table-column prop="maxCustomer" label="最大客户量" min-width="100px"></el-table-column>
        <el-table-column prop="maxOrder" label="最大订单量" min-width="100px"></el-table-column>
        <el-table-column prop="status" label="状态 0未绑定 1在位 2借出" min-width="100px"></el-table-column>
        <el-table-column prop="sortnum" label="排序码" min-width="100px"></el-table-column>
        <el-table-column prop="name" label="名称" min-width="200px" show-tooltip-when-overflow></el-table-column>
        <el-table-column prop="categoryName" label="所属主线路" min-width="140px"></el-table-column>
        <el-table-column prop="carCode" label="所属车辆" min-width="100px"></el-table-column>
        <el-table-column prop="maxCustomer" label="客户量" min-width="100px"></el-table-column>
        <el-table-column prop="maxOrder" label="订单量" min-width="100px"></el-table-column>
        <el-table-column prop="weeks" label="配送周期" min-width="140px"></el-table-column>
        <el-table-column prop="code" label="序号" min-width="100px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="150px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:jkline:update', 'business:jkline:delete'])"
          label="操作"
@@ -85,7 +55,7 @@
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaJkLineWindow.open('编辑交控-线路信息表', row)" icon="el-icon-edit" v-permissions="['business:jkline:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button>
            <el-button type="text" class="red" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:jkline:delete']">删除</el-button>
          </template>
        </el-table-column>
      </el-table>
@@ -98,6 +68,7 @@
    </template>
    <!-- 新建/修改 -->
    <OperaJkLineWindow ref="operaJkLineWindow" @success="handlePageChange"/>
    <OperaJkLineImportWindow ref="OperaJkLineImportWindowRef" @success="handlePageChange" />
  </TableLayout>
</template>

@@ -106,29 +77,22 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaJkLineWindow from '@/components/business/OperaJkLineWindow'
import OperaJkLineImportWindow from '@/components/business/OperaJkLineImportWindow'
import { fetchCateList } from '@/api/business/category'
export default {
  name: 'JkLine',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaJkLineWindow },
  components: { TableLayout, Pagination, OperaJkLineWindow,OperaJkLineImportWindow },
  data () {
    return {
      // 搜索
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        info: '',
        name: '',
        categoryId: '',
        carId: '',
        maxCustomer: '',
        maxOrder: '',
        status: '',
        sortnum: ''
      }
        carCode: '',
        code: ''
      },
      categoryList: []
    }
  },
  created () {
@@ -139,6 +103,14 @@
      'field.main': 'id'
    })
    this.search()
    this.loadCategory()
  },
  methods: {
    loadCategory () {
      fetchCateList({ type: 4 }).then(res => {
        this.categoryList = res || []
      })
    }
  }
}
</script>