From 05c71a1d1beb5627b2f6e3c216a60f97ca5535aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B4=BE=E8=82=83?= <15833576927@163.com>
Date: Wed, 22 May 2024 16:07:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E5=9C=B0=E7=AE=A1=E7=90=86=E5=AF=B9?=
 =?UTF-8?q?=E6=8E=A5=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/basicData/breedingBaseApi.js          |  50 ++++++++
 src/components/baseSelection/index.vue        |  34 +++---
 .../breedingBase/breedingBaseForm.vue         |  70 +++++++-----
 src/views/basicData/breedingBase/index.vue    | 108 +++++++++---------
 4 files changed, 165 insertions(+), 97 deletions(-)
 create mode 100644 src/api/basicData/breedingBaseApi.js

diff --git a/src/api/basicData/breedingBaseApi.js b/src/api/basicData/breedingBaseApi.js
new file mode 100644
index 0000000..5b3e47b
--- /dev/null
+++ b/src/api/basicData/breedingBaseApi.js
@@ -0,0 +1,50 @@
+import request from '@/utils/request'
+
+// 查询基地列表分页
+export function selBreedingBasePage(query) {
+  return request({
+    url: '/baseNurseryInfo/queryByPage',
+    method: 'get',
+    params: query
+  })
+}
+// 查询所有基地
+export function selAllBreedingBase(query) {
+  return request({
+    url: '/baseNurseryInfo/selectByPage',
+    method: 'post',
+    params: query
+  })
+}
+// 通过id查询基地
+export function breedingQueryById(query) {
+  return request({
+    url: '/baseNurseryInfo/queryById',
+    method: 'get',
+    params: query
+  })
+}
+// 新增基地
+export function addBreedingBase(data) {
+  return request({
+    url: '/baseNurseryInfo/add',
+    method: 'post',
+    data: data
+  })
+}
+// 修改基地信息
+export function editBreedingBase(data) {
+  return request({
+    url: '/baseNurseryInfo/edit',
+    method: 'put',
+    data: data
+  })
+}
+// 通过id删除基地
+export function breedingBaseDeleteById(params) {
+  return request({
+    url: '/baseNurseryInfo/queryByPage',
+    method: 'get',
+    params: params
+  })
+}
diff --git a/src/components/baseSelection/index.vue b/src/components/baseSelection/index.vue
index a447664..1ef77e7 100644
--- a/src/components/baseSelection/index.vue
+++ b/src/components/baseSelection/index.vue
@@ -1,19 +1,13 @@
 <script setup>
 import useSettingsStore from "@/store/modules/settings.js";
-
-const baseList = ref([
-  {baseId: 1, baseName: '广西农投基地'},
-  {baseId: 2, baseName: '广西农垦基地'},
-  {baseId: 4, baseName: '基地3'},
-  {baseId: 3, baseName: '基地4'},
-  {baseId: 5, baseName: '种植资源圃1'},
-  {baseId: 6, baseName: '种植资源圃2'},
-])
+import {selAllBreedingBase} from "@/api/basicData/breedingBaseApi.js";
+const loading = ref(false)
+const baseList = ref([])
 const route = useRoute();
 onMounted(()=>{
-  if (route.query.baseId){
+  if (route.query.id){
     baseList.value.forEach(item => {
-      if (item.baseId === Number(route.query.baseId)){
+      if (item.id === Number(route.query.id)){
         clickBase(item)
       }
     })
@@ -29,15 +23,27 @@ const clickBase = (item) => {
   currentBase.value = item
   emit('clickBase', item)
 }
+const selBaseList = () => {
+  loading.value = true
+  selAllBreedingBase({}).then(res =>{
+    console.log(res);
+    baseList.value = res.data
+  }).finally(()=>{
+    loading.value = false
+  })
+}
+onMounted(()=>{
+  selBaseList()
+})
 </script>
 
 <template>
-  <div class="base-box" :style="{height:maxHeight+'px'}">
+  <div class="base-box" :style="{height:maxHeight+'px'}"  v-loading="loading">
     <title-divider title="育种基地/资源圃"></title-divider>
     <div class="base-list">
       <div class="base-item" v-for="item in baseList" @click="clickBase(item)">
-        <i-local-two theme="filled" size="22" :fill="currentBase.baseId !== item.baseId ? '#6c6c6c' : theme"/>
-        <div class="base-name" :class="{'base-active':currentBase.baseId === item.baseId}">{{item.baseName}}</div>
+        <i-local-two theme="filled" size="22" :fill="currentBase.id !== item.id ? '#6c6c6c' : theme"/>
+        <div class="base-name" :class="{'base-active':currentBase.id === item.id}">{{item.baseName}}</div>
       </div>
     </div>
   </div>
diff --git a/src/views/basicData/breedingBase/breedingBaseForm.vue b/src/views/basicData/breedingBase/breedingBaseForm.vue
index 10c2717..ac5c24d 100644
--- a/src/views/basicData/breedingBase/breedingBaseForm.vue
+++ b/src/views/basicData/breedingBase/breedingBaseForm.vue
@@ -1,15 +1,17 @@
 <script setup>
-
 import LeftDrawer from "@/components/LeftDrawer/index.vue";
 import {deepClone} from "@/utils/index.js";
-import useSettingsStore from "@/store/modules/settings.js";
-import {pcTextArr} from "element-china-area-data";
-
+import {codeToText, provinceAndCityData} from "element-china-area-data";
+import {addBreedingBase, breedingQueryById, editBreedingBase} from "@/api/basicData/breedingBaseApi.js";
 let {proxy} = getCurrentInstance();
 const props = defineProps({})
-const settingsStore = useSettingsStore()
 const selectOptions = reactive({
-  pcTextArr:pcTextArr,
+  provincesOptions:provinceAndCityData.map((item) => {
+    return {
+      value:Number(item.value),
+      label: item.label
+    }
+  }),
   baseTypeOptions:[
     { label: '智能育种基地', value: 1},
     { label: '种质资源圃', value: 2}
@@ -19,6 +21,7 @@ let emit = defineEmits(['beforeSubmit', 'submitSuccess']);
 const loading = ref(false)
 // 显示表单抽屉
 const showDrawer = ref(false)
+const selLoading = ref(false)
 // 页面状态 1添加 2修改 3查看
 const formStatus = ref(1)
 // 表单数据
@@ -35,23 +38,35 @@ const toAdd = (params = {}) => {
 }
 const toUpdate = (row) => {
   formStatus.value = 2
+  geyById(row)
+}
+const geyById = (row) => {
   showDrawer.value = true
+  selLoading.value = true
+  breedingQueryById({id:row.id}).then(res =>{
+    resetForm(res.data)
+  }).finally(()=>{
+    selLoading.value = false
+  })
 }
 const toView = (row) => {
   formStatus.value = 3
-  showDrawer.value = true
+  geyById(row)
 }
 const formRef = ref(null)
-const saveMassif = () => {
+const saveBreedingBase = () => {
   formRef.value.validate(valid => {
   if (valid){
     emit('beforeSubmit', formData.value)
     loading.value = true
-    setTimeout(() => {
-      loading.value = false
+    let api = formData.value.id ? editBreedingBase : addBreedingBase
+    api(formData.value).then(res =>{
+      proxy.$modal.msgSuccess(formData.value.id ?'修改成功':"保存成功");
       emit('submitSuccess', formData.value)
       showDrawer.value = false
-    }, 2000)
+    }).finally(()=>{
+      loading.value = false
+    })
   }
 })
 }
@@ -88,6 +103,9 @@ const rules = ref({
     { validator: validateLatitude, trigger: 'change' }
   ]
 })
+const changeArea = (value) =>{
+  formData.value.administrativeDivisionName = codeToText[value.toString()]
+}
 </script>
 
 <template>
@@ -99,7 +117,7 @@ const rules = ref({
         <div v-if="formStatus === 3">地块基地/资源圃</div>
       </div>
       <div class="form">
-        <el-form :model="formData" :rules="rules" ref="formRef">
+        <el-form :model="formData" :rules="rules" ref="formRef" v-loading="selLoading">
           <el-row :gutter="20">
             <el-col :span="24">
               <el-form-item label="基地/资源圃名称" prop="baseName">
@@ -116,23 +134,23 @@ const rules = ref({
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="所属省份" prop="areaCode">
-                <el-select v-model="formData.areaCode" filterable clearable v-if="formStatus!==3">
-                  <el-option v-for="item in selectOptions.pcTextArr" :label="item.label" :value="item.value"></el-option>
+              <el-form-item label="所属省份" prop="administrativeDivisionId">
+                <el-select v-model="formData.administrativeDivisionId" filterable clearable v-if="formStatus!==3" @change="changeArea">
+                  <el-option v-for="item in selectOptions.provincesOptions" :label="item.label" :value="item.value"></el-option>
                 </el-select>
-                <div v-else>{{formData.areaCode}}</div>
+                <div v-else>{{formData.administrativeDivisionName}}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="地理位置" prop="location">
-                <el-input placeholder="请输入地理位置" v-if="formStatus!==3" v-model="formData.location"></el-input>
-                <div v-else>{{formData.location}}</div>
+              <el-form-item label="地理位置" prop="position">
+                <el-input placeholder="请输入地理位置" v-if="formStatus!==3" v-model="formData.position"></el-input>
+                <div v-else>{{formData.position}}</div>
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="占地面积(亩)" prop="baseType">
-                <el-input placeholder="请输入占地面积(亩)" v-if="formStatus!==3" v-model="formData.baseName"></el-input>
-                <div v-else>{{formData.location}}</div>
+              <el-form-item label="占地面积(亩)" prop="area">
+                <el-input-number precision="2" :controls="false" placeholder="请输入占地面积(亩)" v-if="formStatus!==3" v-model="formData.area"></el-input-number>
+                <div v-else>{{formData.area}}</div>
 
               </el-form-item>
             </el-col>
@@ -149,16 +167,16 @@ const rules = ref({
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="备注" prop="name">
-                <el-input type="textarea" rows="5" placeholder="请输入备注" v-if="formStatus!==3"></el-input>
-                <div v-else>{{formData.location}}</div>
+              <el-form-item label="备注" prop="intro">
+                <el-input type="textarea" rows="5" placeholder="请输入备注" v-if="formStatus!==3" v-model="formData.intro"></el-input>
+                <div v-else>{{formData.intro}}</div>
               </el-form-item>
             </el-col>
           </el-row>
         </el-form>
       </div>
       <template #footer>
-        <el-button v-if="formStatus!==3" type="primary" :loading="loading" @click="saveMassif">保存</el-button>
+        <el-button v-if="formStatus!==3" type="primary" :loading="loading" @click="saveBreedingBase">保存</el-button>
         <el-button @click="showDrawer = false">取消</el-button>
       </template>
     </left-drawer>
diff --git a/src/views/basicData/breedingBase/index.vue b/src/views/basicData/breedingBase/index.vue
index 293f102..44ad5da 100644
--- a/src/views/basicData/breedingBase/index.vue
+++ b/src/views/basicData/breedingBase/index.vue
@@ -9,7 +9,7 @@
             <el-col :span="6">
               <el-form-item label="基地名称">
                 <el-input
-                    v-model="queryParams.userName"
+                    v-model="queryParams.baseName"
                     placeholder="请输入基地名称"
                     clearable
                     @keyup.enter="handleQuery"
@@ -25,8 +25,8 @@
             </el-col>
             <el-col :span="6">
               <el-form-item label="所属省份">
-                <el-select v-model="queryParams.areaCode" filterable clearable>
-                  <el-option v-for="item in data.pcTextArr" :label="item.label" :value="item.value"></el-option>
+                <el-select v-model="queryParams.administrativeDivisionId" filterable clearable>
+                  <el-option v-for="item in data.provincesOptions" :label="item.label" :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -46,14 +46,19 @@
 
         <el-table v-loading="loading" :data="tableList" @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" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="基地坐标(经度)" align="center" key="phonenumber" prop="phonenumber" v-if="columns[5].visible" width="120" />
-          <el-table-column label="基地坐标(纬度)" align="center" key="status" v-if="columns[6].visible"></el-table-column>
-          <el-table-column label="创建人" align="center" prop="createTime" v-if="columns[7].visible" width="160"></el-table-column>
+          <el-table-column label="基地/资源圃名称" align="center" key="baseName" prop="baseName" v-if="columns[0].visible" />
+          <el-table-column label="基地类型" align="center" key="baseType" prop="baseType" v-if="columns[1].visible" :show-overflow-tooltip="true" >
+            <template #default="scope">
+              <el-tag v-if="scope.row.baseType === 1" type="success">智能育种基地</el-tag>
+              <el-tag v-else-if="scope.row.baseType === 2" type="success">种质资源圃</el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column label="所属省份" align="center" key="administrativeDivisionName" prop="administrativeDivisionName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="地理位置" align="center" key="position" prop="dept.position" v-if="columns[3].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="战地面积(亩)" align="center" key="area" prop="area" v-if="columns[4].visible" width="120" />
+          <el-table-column label="基地坐标(经度)" align="center" key="longitude" prop="longitude" v-if="columns[5].visible" width="120" />
+          <el-table-column label="基地坐标(纬度)" align="center" key="latitude" prop="latitude" v-if="columns[6].visible"></el-table-column>
+          <el-table-column label="创建人" align="center" prop="createUserName" v-if="columns[7].visible" width="160"></el-table-column>
           <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[8].visible" width="160">
             <template #default="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
@@ -62,13 +67,13 @@
           <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-button link type="primary" @click="handleView(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 content="修改" placement="top">
+                <el-button link type="primary" @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="Delete" @click="delBreedingBase(scope.row)" v-hasPermi="['system:user:remove']"></el-button>
+              <el-tooltip content="删除" placement="top">
+                <el-button link type="primary" @click="delBreedingBase(scope.row)">删除</el-button>
               </el-tooltip>
             </template>
           </el-table-column>
@@ -91,31 +96,26 @@
 
       </el-col>
     </el-row>
-    <breeding-base-form ref="breedingBaseFormRef" />
+    <breeding-base-form ref="breedingBaseFormRef" @submit-success="submitSuccess"/>
   </div>
 </template>
 
 <script setup name="User">
-import { changeUserStatus, listUser, resetUserPwd, delUser, getUser, updateUser, addUser, deptTreeSelect } from "@/api/system/user";
-import {pcTextArr} from "element-china-area-data";
+import {pcTextArr, provinceAndCityData} from "element-china-area-data";
 import BreedingBaseForm from "@/views/basicData/breedingBase/breedingBaseForm.vue";
-import {ElMessageBox} from "element-plus";
+import {ElMessage, ElMessageBox} from "element-plus";
+import {breedingBaseDeleteById, selBreedingBasePage} from "@/api/basicData/breedingBaseApi.js";
 // 表单绑定
 const breedingBaseFormRef = ref(null)
 const router = useRouter();
 const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
-const currentBase = ref({})
 const tableList = ref([]);
-const open = ref(false);
 const loading = ref(false);
 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 },
@@ -136,12 +136,16 @@ const data = reactive({
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    userName: undefined,
-    plantingSeason: 2023,
-    status: undefined,
-    deptId: undefined
+    baseName: undefined,
+    baseType: undefined,
+    administrativeDivisionId: undefined
   },
-  pcTextArr:pcTextArr,
+  provincesOptions:provinceAndCityData.map((item) => {
+    return {
+      value:Number(item.value),
+      label: item.label
+    }
+  }),
   baseTypeOptions:[
     { label: '智能育种基地', value: 1},
     { label: '种质资源圃', value: 2}
@@ -158,22 +162,26 @@ const delBreedingBase = (item) => {
         customClass: 'message-box'
       }
   ).then(() => {
-    ElMessage.success(`${item.label || '地块'}删除成功`)
+    breedingBaseDeleteById(item.id).then(res => {
+      ElMessage.success(`${item.baseName}删除成功`)
+      getList()
+    })
   })
 }
 // 提交成功回调
 const submitSuccess = (value) =>{
-
+  getList()
 }
 const { queryParams, form,} = toRefs(data);
 
-/** 查询用户列表 */
+/** 查询列表 */
 function getList() {
   loading.value = true;
-  listUser(proxy.addDateRange(queryParams.value, dateRange.value)).then(res => {
-    loading.value = false;
+  selBreedingBasePage(queryParams.value).then(res => {
     tableList.value = res.rows;
     total.value = res.total;
+  }).finally(()=>{
+    loading.value = false;
   });
 };
 /** 搜索按钮操作 */
@@ -183,22 +191,9 @@ function handleQuery() {
 };
 /** 重置按钮操作 */
 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 handleExport() {
   proxy.download("system/user/export", {
@@ -207,24 +202,23 @@ function handleExport() {
 };
 /** 选择条数  */
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.userId);
+  ids.value = selection.map(item => item.id);
   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 = "";
-  });
+  breedingBaseFormRef.value.toUpdate(row)
 };
+const handleView = (row) => {
+  breedingBaseFormRef.value.toView(row)
+}
 const toAdd = () => {
   breedingBaseFormRef.value.toAdd()
 }
+onMounted(()=>{
+  getList()
+})
 </script>
 <style scoped lang="scss">
 .base-title{