From b3558d0997d71375a2b18a28cdfb6969db1fff4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com>
Date: Wed, 12 Mar 2025 11:35:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=9C=9F=E5=A3=A4=E7=B1=BB=E5=9E=8B?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/apis/baseInfo.js | 15 ++++++-
.../src/router/modules/inputSupplies/index.js | 42 +++++++++++++++++--
.../component/soilClassification/index.vue | 4 +-
.../soilClassification/useSoilTypeHook.js | 31 +++++++++++---
.../material/farmMachinery/index.vue | 22 ++++++++++
.../material/fertilizer/index.vue | 22 ++++++++++
.../{basicInfo => material}/index.vue | 0
.../material/pesticide/index.vue | 21 ++++++++++
.../material/ratPoison/index.vue | 22 ++++++++++
.../material/seed/index.vue | 21 ++++++++++
10 files changed, 188 insertions(+), 12 deletions(-)
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/farmMachinery/index.vue
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/fertilizer/index.vue
rename sub-government-affairs-service/src/views/inputSuppliesManage/{basicInfo => material}/index.vue (100%)
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/ratPoison/index.vue
create mode 100644 sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
diff --git a/sub-government-affairs-service/src/apis/baseInfo.js b/sub-government-affairs-service/src/apis/baseInfo.js
index 2e2500e..032eb6d 100644
--- a/sub-government-affairs-service/src/apis/baseInfo.js
+++ b/sub-government-affairs-service/src/apis/baseInfo.js
@@ -82,7 +82,7 @@ export function savePlanStage(data) {
});
}
-/* ------ ------ */
+/* ------ 土壤类型 ------ */
/* 获取土壤类型列表 */
export function getSoilType(params) {
@@ -106,4 +106,17 @@ export function updateSoilType(data) {
data,
});
}
+/* 删除土壤类型 */
+export function delSoilType(id) {
+ return request(`/land-resource/baseInfo/soilTypeDelete/${id}`, {
+ method: 'GET',
+ });
+}
+/* 导出土壤类型 */
+export function exportSoilType() {
+ return request('/land-resource/baseInfo/soilTypeExport', {
+ method: 'GET',
+ responseType: 'blob',
+ });
+}
// #endregion
diff --git a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
index 112dc62..c7411c5 100644
--- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
+++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js
@@ -1,11 +1,12 @@
import Layout from '@/layouts/index.vue';
+import Views from '@/layouts/Views.vue';
const inputSuppliesRoutes = [
{
path: '/sub-government-affairs-service/inputSuppliesManage',
name: 'inputSuppliesManage',
component: Layout,
- redirect: '/sub-government-affairs-service/basicInfo',
+ redirect: '/sub-government-affairs-service/material',
meta: { title: '投入品监管平台', icon: 'Document' },
children: [
// {
@@ -15,10 +16,43 @@ const inputSuppliesRoutes = [
// meta: { title: '投入品资源一张图', icon: 'Document' },
// },
{
- path: '/sub-government-affairs-service/basicInfo',
- name: 'basicInfo',
- component: () => import('@/views/inputSuppliesManage/basicInfo/index.vue'),
+ path: '/sub-government-affairs-service/material',
+ name: 'material',
+ component: Views,
+ redirect: '/sub-government-affairs-service/material/pesticide',
meta: { title: '物资管理', icon: 'Document' },
+ children: [
+ {
+ path: '/sub-government-affairs-service/material/pesticide',
+ name: 'input-supplies-pesticide',
+ component: () => import('@/views/inputSuppliesManage/material/pesticide/index.vue'),
+ meta: { title: '农药管理', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/material/fertilizer',
+ name: 'input-supplies-fertilizer',
+ component: () => import('@/views/inputSuppliesManage/material/fertilizer/index.vue'),
+ meta: { title: '肥料管理', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/material/ratPoison',
+ name: 'input-supplies-ratPoison',
+ component: () => import('@/views/inputSuppliesManage/material/ratPoison/index.vue'),
+ meta: { title: '兽药管理', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/material/farmMachinery',
+ name: 'input-supplies-farmMachinery',
+ component: () => import('@/views/inputSuppliesManage/material/farmMachinery/index.vue'),
+ meta: { title: '农机管理', icon: 'Document' },
+ },
+ {
+ path: '/sub-government-affairs-service/material/seed',
+ name: 'input-supplies-seed',
+ component: () => import('@/views/inputSuppliesManage/material/seed/index.vue'),
+ meta: { title: '种源管理', icon: 'Document' },
+ },
+ ],
},
// {
// path: '/sub-government-affairs-service/productionDealer',
diff --git a/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue b/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue
index 412f19a..303ac84 100644
--- a/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue
+++ b/sub-government-affairs-service/src/views/dict/component/soilClassification/index.vue
@@ -15,7 +15,9 @@
@row-update="handleUpdate"
>
- 导出
+
+ 导出
+
diff --git a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js
index a662b03..04b4167 100644
--- a/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js
+++ b/sub-government-affairs-service/src/views/dict/component/soilClassification/useSoilTypeHook.js
@@ -1,6 +1,6 @@
import { ref, onMounted, nextTick } from 'vue';
import { CRUD_OPTIONS } from '@/config';
-import { getSoilType, saveSoilType, updateSoilType } from '@/apis/baseInfo';
+import { getSoilType, saveSoilType, updateSoilType, delSoilType, exportSoilType } from '@/apis/baseInfo';
import { ElMessage } from 'element-plus';
export default function useSoilTypeHook() {
@@ -79,12 +79,14 @@ export default function useSoilTypeHook() {
},
]);
async function getList() {
+ _loading.value = true;
let params = {
current: pageData.value.currentPage,
size: pageData.value.pageSize,
...condition.value,
};
let res = await getSoilType(params);
+ _loading.value = false;
if (res.code == 200) {
data.value = res.data.records;
pageData.value.total = res.data.total;
@@ -109,11 +111,18 @@ export default function useSoilTypeHook() {
function handleSearchReset() {
resetPage();
}
- function handleEdit(row, index) {
+ function handleEdit({ row, index }) {
crudRef.value.rowEdit(row, index);
}
- function handleDel(row) {
- console.log('handleDel --- ', row);
+ async function handleDel({ row }) {
+ let res = await delSoilType(row.id);
+ if (res.code == 200) {
+ ElMessage({
+ type: 'success',
+ message: '删除成功',
+ });
+ getList();
+ }
}
async function handleSave(form, loading, done) {
let res = await saveSoilType(form);
@@ -153,8 +162,18 @@ export default function useSoilTypeHook() {
pageData.value.pageSize = 10;
getList();
}
- function handleDownSoilType() {
- console.log('handleDownSoilType');
+ async function handleDownSoilType() {
+ let res = await exportSoilType();
+ if (res.status == 200) {
+ let a = document.createElement('a');
+ let blob = new Blob([res.data]);
+ let url = window.URL.createObjectURL(blob);
+ a.href = url;
+ a.download = '土壤类型.xlsx';
+ a.click();
+ window.URL.revokeObjectURL(url);
+ a.remove();
+ }
}
return {
crudRef,
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/farmMachinery/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/farmMachinery/index.vue
new file mode 100644
index 0000000..df45352
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/farmMachinery/index.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/fertilizer/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/fertilizer/index.vue
new file mode 100644
index 0000000..0e05b52
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/fertilizer/index.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/basicInfo/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/index.vue
similarity index 100%
rename from sub-government-affairs-service/src/views/inputSuppliesManage/basicInfo/index.vue
rename to sub-government-affairs-service/src/views/inputSuppliesManage/material/index.vue
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
new file mode 100644
index 0000000..35b7864
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/pesticide/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/ratPoison/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/ratPoison/index.vue
new file mode 100644
index 0000000..0c4f543
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/ratPoison/index.vue
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
new file mode 100644
index 0000000..12cb106
--- /dev/null
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/material/seed/index.vue
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+