diff --git a/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js b/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js
index e22dc3d..37cb36b 100644
--- a/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js
+++ b/sub-government-affairs-service/src/apis/inputSuppliesApi/supervisionOfInputs.js
@@ -29,3 +29,28 @@ export function delSeedUseRegulatory(ids) {
export function getRowDetails({ url, id }) {
return request(`${url}${id}`);
}
+
+/* 肥料使用监管-列表 */
+export function getFertilizeUseRegulatoryRecords(params) {
+ return request('/inputGoods/supervise/fertilize/page', {
+ params,
+ });
+}
+/* 肥料使用监管-新增 */
+export function fertilizeUseRegulatorySave(data) {
+ return request('/inputGoods/supervise/fertilize/save', {
+ method: 'POST',
+ data,
+ });
+}
+/* 肥料使用监管-编辑 */
+export function editFertilizeUseRegulatory(data) {
+ return request('/inputGoods/supervise/fertilize/edit', {
+ data,
+ method: 'PUT',
+ });
+}
+/* 肥料使用监管-删除 */
+export function delFertilizeUseRegulatory(ids) {
+ return request(`/inputGoods/supervise/fertilize/delete/${ids}`);
+}
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue
index 7fe2ca0..f1119ca 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/fertilizerRegulation.vue
@@ -6,14 +6,14 @@
-
-
+
+
-
+
查询
重置
@@ -34,7 +34,7 @@
:total="tableTotal"
:current-page="formInline.current"
:page-size="formInline.size"
- :show-sort="true"
+ :show-sort="false"
@page-change="handlePaginationChange"
>
@@ -110,13 +110,20 @@ import { ref, reactive, computed, onMounted, onBeforeUnmount, nextTick } from 'v
import tableComponent from '@/components/tableComponent.vue';
import { ElMessage } from 'element-plus';
import inputSuppliesApi from '@/apis/inputSuppliesApi';
-const { getSeedList, seedSave, delSeed, getMaterailTypes } = inputSuppliesApi;
+const { getMaterailTypes } = inputSuppliesApi;
+import {
+ getFertilizeUseRegulatoryRecords,
+ fertilizeUseRegulatorySave,
+ editFertilizeUseRegulatory,
+ delFertilizeUseRegulatory,
+ getRowDetails,
+} from '@/apis/inputSuppliesApi/supervisionOfInputs';
import { useApp } from '@/hooks';
const app = useApp();
// 查询条件
const formInline = reactive({
- seedName: '',
+ name: '',
seedTypeId: '',
current: 1,
size: 10,
@@ -136,13 +143,16 @@ const selectedIds = ref([]);
const tableLoading = ref(false);
const tableTotal = ref(0);
const columns = ref([
- { prop: 'id', label: '编码' },
- { prop: 'seedName', label: '种子种苗名称' },
- { prop: 'varietyName', label: '品种名称' },
- { prop: 'brand', label: '品牌' },
- { prop: 'manufacturer', label: '生产厂家' },
- { prop: 'classifyName', label: '分类' },
- { prop: 'productUnit', label: '产品规格' },
+ { prop: 'regionName', label: '所属行政区域' },
+ { prop: 'regionCode', label: '行政区域编号' },
+ { prop: 'landName', label: '地块名称' },
+ { prop: 'landId', label: '地块编号' },
+ { prop: 'gridName', label: '所属网格' },
+ { prop: 'gridId', label: '网格编号' },
+ { prop: 'name', label: '负责人姓名' },
+ { prop: 'phone', label: '联系方式' },
+ { prop: 'fertilizeId', label: '化肥编号' },
+ { prop: 'fertilizeName', label: '化肥名称' },
// { prop: 'action', label: '操作', slotName: 'action', width: 230, fixed: 'right' },
]);
const handlePaginationChange = ({ page, pageSize }) => {
@@ -153,7 +163,7 @@ const handlePaginationChange = ({ page, pageSize }) => {
const loadData = async () => {
tableLoading.value = true;
try {
- let response = await getSeedList(formInline);
+ let response = await getFertilizeUseRegulatoryRecords(formInline);
tableLoading.value = false;
if (response.code == 200) {
tableData.value = response.data.records;
@@ -281,7 +291,7 @@ const handleDelete = (row) => {
};
const deleteGoods = async (ids) => {
try {
- let res = await delSeed(ids);
+ let res = await delFertilizeUseRegulatory(ids);
return res;
} catch (error) {
return false;
@@ -298,9 +308,9 @@ const onSaveCategory = () => {
console.log(param);
let response;
if (dialogTitle.value == '新增') {
- response = await seedSave(param);
+ response = await fertilizeUseRegulatorySave(param);
} else {
- response = await seedSave(param);
+ response = await editFertilizeUseRegulatory(param);
}
if (response.code == 200) {
cancelDialog();
diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue
index 9a63b04..e85b2bb 100644
--- a/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue
+++ b/sub-government-affairs-service/src/views/inputSuppliesManage/supervisionOfInputs/seedRegulation.vue
@@ -6,8 +6,8 @@