Merge remote-tracking branch 'origin/master'

fuliqi

2024-03-18 f18ff6df94830a0147f372f031fa94ab5402ead8

 src/views/system/region/index.vue

@@ -20,12 +20,12 @@
        />
      </el-form-item>
      <el-form-item label="区县" prop="county">
        <el-select v-model="queryParams.parentId" placeholder="请选择区县">
        <el-select v-model="queryParams.parentId" clearable @change="handleQuery" placeholder="请选择区县">
          <el-option v-for="item in countyList" :label="item.value" :value="item.id" :key="item.id"/>
        </el-select>
      </el-form-item>
      <el-form-item label="地方级别" prop="county">
        <el-select v-model="queryParams.regionLevel" clearable placeholder="请选择区县">
        <el-select v-model="queryParams.regionLevel" clearable @change="handleQuery" placeholder="请选择区县">
          <el-option label="市" value="city" />
          <el-option label="区县" value="county" />
          <el-option label="街道" value="street" />
@@ -45,7 +45,6 @@
          icon="el-icon-plus"
          size="mini"
          @click="handleAdd"
          v-hasPermi="['system:region:add']"
        >新增</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -56,7 +55,6 @@
          size="mini"
          :disabled="single"
          @click="handleUpdate"
          v-hasPermi="['system:region:edit']"
        >修改</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -67,7 +65,6 @@
          size="mini"
          :disabled="multiple"
          @click="handleDelete"
          v-hasPermi="['system:region:remove']"
        >删除</el-button>
      </el-col>
      <el-col :span="1.5">
@@ -77,13 +74,18 @@
          icon="el-icon-download"
          size="mini"
          @click="handleExport"
          v-hasPermi="['system:region:export']"
        >导出</el-button>
      </el-col>
      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
    </el-row>

    <el-table v-loading="loading" :data="regionList" @selection-change="handleSelectionChange">
    <el-table v-loading="loading"
              :data="regionList"
              row-key="id"
              border
              default-expand-all
              :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
              @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="区域全称" align="center" prop="fullName" />
      <el-table-column label="区域简称" align="center" prop="simpleName" />
@@ -101,14 +103,12 @@
            type="text"
            icon="el-icon-edit"
            @click="handleUpdate(scope.row)"
            v-hasPermi="['system:region:edit']"
          >修改</el-button>
          <el-button
            size="mini"
            type="text"
            icon="el-icon-delete"
            @click="handleDelete(scope.row)"
            v-hasPermi="['system:region:remove']"
          >删除</el-button>
        </template>
      </el-table-column>