diff --git a/src/components/Hamburger/index.vue b/src/components/Hamburger/index.vue
index 991e996..ee7bbdb 100644
--- a/src/components/Hamburger/index.vue
+++ b/src/components/Hamburger/index.vue
@@ -74,7 +74,7 @@ const menuList = ref([
     label: '基础数据管理',icon:'data', children: [
       {label: '育种基地管理',href:'/basicData/breedingBase'},
       {label: '数据采集设备管理',href:'/basicData/dataGather'},
-      {label: '作物品种管理'},
+      {label: '作物品种管理',href:'/basicData/cropVariety'},
     ]
   },
   {
diff --git a/src/components/cropSelection/index.vue b/src/components/cropSelection/index.vue
new file mode 100644
index 0000000..2aced6f
--- /dev/null
+++ b/src/components/cropSelection/index.vue
@@ -0,0 +1,62 @@
+<!--作物列表-->
+<script setup>
+import useSettingsStore from "@/store/modules/settings.js";
+
+const cropList = ref([
+  {cropId: 1, cropName: '甘蔗'},
+])
+const route = useRoute();
+onMounted(()=>{
+  if (route.query.cropId){
+    cropList.value.forEach(item => {
+      if (item.cropId === Number(route.query.cropId)){
+        clickCrop(item)
+      }
+    })
+  }
+})
+const currentCrop = defineModel({type:Object,default:()=>({})})
+const maxHeight = ref(window.innerHeight - 130);
+const settingsStore = useSettingsStore()
+// 主题颜色
+const theme = computed(() => settingsStore.theme);
+let emit = defineEmits(['clickCrop']);
+const clickCrop = (item) => {
+  currentCrop.value = item
+  emit('clickCrop', item)
+}
+</script>
+
+<template>
+  <div class="Crop-box" :style="{height:maxHeight+'px'}">
+    <title-divider title="作物列表"></title-divider>
+    <div class="Crop-list">
+      <div class="Crop-item" v-for="item in cropList" @click="clickCrop(item)">
+        <i-local-two theme="filled" size="22" :fill="currentCrop.cropId !== item.cropId ? '#6c6c6c' : theme"/>
+        <div class="Crop-name" :class="{'Crop-active':currentCrop.cropId === item.cropId}">{{item.cropName}}</div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.Crop-box{
+  border-right: 1px solid #dddddd;
+  overflow: auto;
+  width: 100%;
+}
+.Crop-list{
+  .Crop-item{
+    margin: 10px 20px;
+    //鼠标悬浮变成点击
+    cursor: pointer;
+    display: flex;
+    .Crop-name{
+      margin-left: 10px;
+    }
+  }
+}
+.Crop-active{
+  color: v-bind(theme);
+}
+</style>
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index e500236..a867074 100644
--- a/src/main.js
+++ b/src/main.js
@@ -40,6 +40,7 @@ import Editor from "@/components/Editor"
 import LeftDrawer from "@/components/LeftDrawer"
 import titleDivider from "@/components/titleDivider"
 import baseSelection from "@/components/baseSelection"
+import cropSelection from "@/components/cropSelection"
 // 文件上传组件
 import FileUpload from "@/components/FileUpload"
 // 图片上传组件
@@ -88,6 +89,7 @@ app.component('Editor', Editor)
 app.component('LeftDrawer', LeftDrawer)
 app.component('titleDivider', titleDivider)
 app.component('baseSelection', baseSelection)
+app.component('cropSelection', cropSelection)
 app.use(VueAMap)
 app.use(router)
 app.use(store)
diff --git a/src/router/index.js b/src/router/index.js
index fa531d2..2ef7323 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -196,6 +196,20 @@ export const constantRoutes = [
       }
     ]
   },
+  {
+    path: '/basicData',
+    component: Layout,
+    hidden: true,
+    redirect: 'noredirect',
+    children: [
+      {
+        path: 'cropVariety',
+        component: () => import('@/views/basicData/cropVariety/index.vue'),
+        name: 'cropVariety',
+        meta: { title: '作物品种管理' }
+      }
+    ]
+  },
 ]
 
 // 动态路由，基于用户权限动态去加载
diff --git a/src/views/basicData/cropVariety/index.vue b/src/views/basicData/cropVariety/index.vue
new file mode 100644
index 0000000..2e9ca11
--- /dev/null
+++ b/src/views/basicData/cropVariety/index.vue
@@ -0,0 +1,246 @@
+<!--作物品种管理-->
+<template>
+  <div class="app-container">
+    <el-row :gutter="20">
+      <!--育种基地/资源圃选择-->
+      <el-col :span="4" :xs="24">
+        <crop-selection v-model="currentCrop"></crop-selection>
+      </el-col>
+      <!--用户数据-->
+      <el-col :span="20" :xs="24">
+        <el-row class="crop-title">
+          <el-col :span="6" class="current-crop-name">当前作物：{{currentCrop.cropName || '请选择作物'}}</el-col>
+        </el-row>
+        <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+          <el-row :gutter="10">
+            <el-col :span="6">
+              <el-form-item label="品种名称">
+                <el-input
+                    v-model="queryParams.userName"
+                    placeholder="请输入品种名称"
+                    clearable
+                    @keyup.enter="handleQuery"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="6" :offset="12">
+              <el-form-item>
+                <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+                <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <el-row :gutter="10" class="mb8">
+          <el-button type="primary" icon="Download" @click="exportExcel">导出Excel</el-button>
+          <el-button type="primary" icon="Plus" @click="toAdd" :disabled="!currentCrop.cropId">新增品种</el-button>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+        </el-row>
+
+        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+          <el-table-column type="selection" width="50" align="center" />
+          <el-table-column label="品种名称" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
+          <el-table-column label="所属作物" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="副本品种" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="母本品种" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="创建人" align="center" prop="createTime" v-if="columns[4].visible" width="160"></el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[5].visible" width="160">
+            <template #default="scope">
+              <span>{{ parseTime(scope.row.createTime) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width">
+            <template #default="scope">
+              <el-tooltip content="详情" placement="top">
+                <el-button link type="primary" icon="View" @click="handleUpdate(scope.row)"></el-button>
+              </el-tooltip>
+              <el-tooltip content="修改" placement="top" v-if="scope.row.userId !== 1">
+                <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:user:edit']"></el-button>
+              </el-tooltip>
+              <el-tooltip content="删除" placement="top" v-if="scope.row.userId !== 1">
+                <el-button link type="primary" icon="Delete" @click="delMassif(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+              </el-tooltip>
+            </template>
+          </el-table-column>
+          <template #empty>
+            <el-result
+                title="暂无数据">
+              <template #icon>
+                <i-database-fail theme="outline" size="38" fill="#9b9b9b"/>
+              </template>
+            </el-result>
+          </template>
+        </el-table>
+        <pagination
+            v-show="total > 0"
+            :total="total"
+            v-model:page="queryParams.pageNum"
+            v-model:limit="queryParams.pageSize"
+            @pagination="getList"
+        />
+      </el-col>
+    </el-row>
+    <left-drawer v-model="showForm">
+      <div class="title">
+        <div v-if="formStatus === 1">新增品种</div>
+        <div v-if="formStatus === 2">编辑品种</div>
+        <div v-if="formStatus === 3">品种详情</div>
+      </div>
+      <div class="form" style="margin-top: 30px;padding: 0 30px">
+        <el-form :model="formData" :rules="rules" ref="formRef">
+          <el-row :gutter="20">
+              <el-form-item label="品种名称" prop="baseName">
+                <el-input placeholder="请输入品种名称" v-if="formStatus!==3" v-model="formData.baseName"></el-input>
+                <div v-else>{{formData.baseName}}</div>
+              </el-form-item>
+              <el-form-item label="所属作物" prop="baseName">
+                <el-input placeholder="请输入所属作物" v-if="formStatus!==3" v-model="formData.baseName"></el-input>
+                <div v-else>{{formData.baseName}}</div>
+              </el-form-item>
+              <el-form-item label="父本品种" prop="baseName">
+                <el-input placeholder="请输入父本品种" v-if="formStatus!==3" v-model="formData.baseName"></el-input>
+                <div v-else>{{formData.baseName}}</div>
+              </el-form-item>
+              <el-form-item label="母本品种" prop="baseName">
+                <el-input placeholder="请输入母本品种" v-if="formStatus!==3" v-model="formData.baseName"></el-input>
+                <div v-else>{{formData.baseName}}</div>
+              </el-form-item>
+          </el-row>
+        </el-form>
+      </div>
+      <template #footer>
+        <el-button v-if="formStatus!==3" type="primary" :loading="loading" @click="saveMassif">保存</el-button>
+        <el-button @click="showDrawer = false">取消</el-button>
+      </template>
+    </left-drawer>
+  </div>
+</template>
+
+<script setup name="User">
+import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
+import {ElMessage, ElMessageBox} from "element-plus";
+const massifFormRef = ref(null)
+const router = useRouter();
+const { proxy } = getCurrentInstance();
+const currentCrop = ref({})
+const formData = ref({})
+const userList = ref([]);
+const open = ref(false);
+const loading = ref(false);
+const showForm = ref(false);
+const formStatus = ref(1);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const dateRange = ref([]);
+// 列显隐信息
+const columns = ref([
+  { key: 0, label: `品种名称`, visible: true },
+  { key: 1, label: `所属作物`, visible: true },
+  { key: 2, label: `父本品种`, visible: true },
+  { key: 3, label: `母本品种`, visible: true },
+  { key: 7, label: `创建人`, visible: true },
+  { key: 7, label: `创建人`, visible: true },
+  { key: 8, label: `创建时间`, visible: true },
+]);
+// 打开添加弹窗
+const toAdd = () => {
+  formData.value = {}
+  showForm.value = true
+}
+// 删除地块
+const delMassif = (item) => {
+  ElMessageBox.confirm(
+      '品种删除后，将无法被找回，是否确认删除当前品种？',
+      '删除地块',
+      {
+        confirmButtonText: '确认删除',
+        cancelButtonText: '不，我再想想',
+        customClass: 'message-box'
+      }
+  ).then(() => {
+    ElMessage.success(`${item.label || '地块'}删除成功`)
+  })
+}
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userName: undefined,
+    plantingSeason: 2023,
+    status: undefined,
+    deptId: undefined
+  },
+});
+// 提交成功回调
+const submitSuccess = (value) =>{
+
+}
+const { queryParams, form, rules ,} = toRefs(data);
+
+/** 查询用户列表 */
+function getList() {
+  loading.value = true;
+  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
+    loading.value = false;
+    userList.value = res.rows;
+    total.value = res.total;
+  });
+};
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+};
+/** 重置按钮操作 */
+function resetQuery() {
+  dateRange.value = [];
+  proxy.resetForm("queryRef");
+  queryParams.value.deptId = undefined;
+  proxy.$refs.deptTreeRef.setCurrentKey(null);
+  handleQuery();
+};
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const userIds = row.userId || ids.value;
+  proxy.$modal.confirm('是否确认删除用户编号为"' + userIds + '"的数据项？').then(function () {
+    return delUser(userIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+};
+/** 选择条数  */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.userId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+};
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const userId = row.userId || ids.value;
+  getUser(userId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改用户";
+    form.password = "";
+  });
+};
+</script>
+<style scoped lang="scss">
+.crop-title{
+  margin: 10px 0;
+  .handoff-model{
+    padding-right: 20px;
+    text-align: right;
+  }
+}
+.el-form-item{
+  width: 100%;
+}
+</style>