Merge remote-tracking branch 'origin/master'

k94314517

2024-07-11 a52f8c508d08014d1a153cfc02e12b5fc185a3a4

 admin/src/views/business/categorySeg.vue

@@ -2,38 +2,16 @@
  <TableLayout :permissions="['business:categoryseg: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="remark">
        <el-input v-model="searchForm.remark" placeholder="请输入备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="品类编码" prop="unitCode">
        <el-input v-model="searchForm.unitCode" placeholder="请输入品类编码" @keypress.enter.native="search"></el-input>
        <el-select v-model="searchForm.unitCode" @change="search" clearable placeholder="所属品牌">
          <el-option v-for="(item) in unitList " :key="item.code" :label="item.name" :value="item.code"></el-option>
        </el-select>
      </el-form-item>
      <el-form-item label="战区编码" prop="segId">
        <el-input v-model="searchForm.segId" placeholder="请输入战区编码" @keypress.enter.native="search"></el-input>
      <el-form-item label="F码" prop="orgId">
        <el-input v-model="searchForm.orgId" placeholder="请输入F码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="省区编码" prop="segId2">
        <el-input v-model="searchForm.segId2" placeholder="请输入省区编码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="市区编码" prop="segId3">
        <el-input v-model="searchForm.segId3" placeholder="请输入市区编码" @keypress.enter.native="search"></el-input>
      <el-form-item label="S码" prop="scode">
        <el-input v-model="searchForm.scode" placeholder="请输入S码" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="战区名称" prop="segName">
        <el-input v-model="searchForm.segName" placeholder="请输入战区名称" @keypress.enter.native="search"></el-input>
@@ -43,15 +21,6 @@
      </el-form-item>
      <el-form-item label="市区名称" prop="segName3">
        <el-input v-model="searchForm.segName3" placeholder="请输入市区名称" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="最近同步时间" prop="syncDate">
        <el-date-picker v-model="searchForm.syncDate" value-format="yyyy-MM-dd" placeholder="请输入最近同步时间" @change="search"/>
      </el-form-item>
      <el-form-item label="最近同步备注" prop="syncInfo">
        <el-input v-model="searchForm.syncInfo" placeholder="请输入最近同步备注" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="收货地址" prop="shipToAddress">
        <el-input v-model="searchForm.shipToAddress" placeholder="请输入收货地址" @keypress.enter.native="search"></el-input>
      </el-form-item>
      <el-form-item label="收货人" prop="shipToPerson">
        <el-input v-model="searchForm.shipToPerson" placeholder="请输入收货人" @keypress.enter.native="search"></el-input>
@@ -67,47 +36,33 @@
    </el-form>
    <!-- 表格和分页 -->
    <template v-slot:table-wrap>
      <ul class="toolbar" v-permissions="['business:categoryseg:create', 'business:categoryseg:delete']">
        <li><el-button type="primary" @click="$refs.operaCategorySegWindow.open('新建志邦营销区域品类信息表')" icon="el-icon-plus" v-permissions="['business:categoryseg:create']">新建</el-button></li>
        <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">删除</el-button></li>
      </ul>
      <el-table
        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="remark" label="备注" min-width="100px"></el-table-column>
        <el-table-column prop="unitCode" label="品类编码" min-width="100px"></el-table-column>
        <el-table-column prop="segId" label="战区编码" min-width="100px"></el-table-column>
        <el-table-column prop="segId2" label="省区编码" min-width="100px"></el-table-column>
        <el-table-column prop="segId3" label="市区编码" min-width="100px"></el-table-column>
        <el-table-column prop="segName" label="战区名称" min-width="100px"></el-table-column>
        <el-table-column prop="segName2" label="省区名称" min-width="100px"></el-table-column>
        <el-table-column prop="segName3" label="市区名称" min-width="100px"></el-table-column>
        <el-table-column prop="syncDate" label="最近同步时间" min-width="100px"></el-table-column>
        <el-table-column prop="syncInfo" label="最近同步备注" min-width="100px"></el-table-column>
        <el-table-column prop="shipToAddress" label="收货地址" min-width="100px"></el-table-column>
        <el-table-column prop="shipToPerson" label="收货人" min-width="100px"></el-table-column>
        <el-table-column prop="shipToPhone" label="收货人电话" min-width="100px"></el-table-column>
        <el-table-column
          v-if="containPermissions(['business:categoryseg:update', 'business:categoryseg:delete'])"
          label="操作"
          min-width="120"
          fixed="right"
        >
          <template slot-scope="{row}">
            <el-button type="text" @click="$refs.operaCategorySegWindow.open('编辑志邦营销区域品类信息表', row)" icon="el-icon-edit" v-permissions="['business:categoryseg:update']">编辑</el-button>
            <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:categoryseg:delete']">删除</el-button>
          </template>
        <el-table-column type="selection" width="55" fixed></el-table-column>
        <el-table-column label="S码" prop="scode" fixed min-width="80px"></el-table-column>
        <el-table-column label="一体商" prop="sname" fixed min-width="180px"></el-table-column>
        <el-table-column label="F码" prop="orgId" fixed min-width="80px"></el-table-column>
        <el-table-column label="加盟商" prop="orgName" fixed  min-width="180px"></el-table-column>
        <el-table-column prop="unitCode" label="品类" min-width="150px">
          <template slot-scope="{row}"> {{row.unitCode}} / {{row.unitName}}</template>
        </el-table-column>
        <el-table-column prop="segId" label="战区" min-width="150px">
            <template slot-scope="{row}"> {{row.segId}} / {{row.segName}}</template>
        </el-table-column>
        <el-table-column prop="segId2" label="省区" min-width="150px">
          <template slot-scope="{row}"> {{row.segId2}} / {{row.segName2}}</template>
        </el-table-column>
        <el-table-column prop="segId3" label="片区" min-width="150px">
          <template slot-scope="{row}"> {{row.segId3}} / {{row.segName3}}</template>
        </el-table-column>
        <el-table-column prop="shipToPerson" label="收货人" min-width="100px"></el-table-column>
        <el-table-column prop="shipToPhone" label="收货人电话" min-width="120px"></el-table-column>
        <el-table-column prop="shipToAddress" label="收货地址" min-width="250px"></el-table-column>
        <el-table-column prop="editDate" label="更新时间" min-width="150px"></el-table-column>
      </el-table>
      <pagination
        @size-change="handleSizeChange"
@@ -126,33 +81,22 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCategorySegWindow from '@/components/business/OperaCategorySegWindow'
import { getUnitList } from '@/api/business/segments'
export default {
  name: 'CategorySeg',
  extends: BaseTable,
  components: { TableLayout, Pagination, OperaCategorySegWindow },
  data () {
    return {
      unitList:[],
      // 搜索
      searchForm: {
        id: '',
        creator: '',
        createDate: '',
        editor: '',
        editDate: '',
        isdeleted: '',
        remark: '',
        unitCode: '',
        segId: '',
        segId2: '',
        segId3: '',
        segName: '',
        segName2: '',
        segName3: '',
        syncDate: '',
        syncInfo: '',
        shipToAddress: '',
        shipToPerson: '',
        shipToPhone: ''
        scode: '',
        orgId: ''
      }
    }
  },
@@ -163,7 +107,16 @@
      'field.id': 'id',
      'field.main': 'id'
    })
    this.loadUnitList()
    this.search()
  },
  methods: {
    loadUnitList () {
      getUnitList()
        .then(data => {
          this.unitList = data
        })
    }
  }
}
</script>