diff --git a/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js
index b13e65c..b16adb0 100644
--- a/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js
+++ b/sub-government-affairs-service/src/apis/landResourceManagement/landManagement/index.js
@@ -68,3 +68,12 @@ export function getLandById(id) {
params: { landId: id },
});
}
+
+// 土地信息审批(PUT)
+export function approveLand(data) {
+ return request({
+ url: '/land-resource/approval/approval',
+ method: 'POST',
+ data,
+ });
+}
diff --git a/sub-government-affairs-service/src/composables/useLandCrud.js b/sub-government-affairs-service/src/composables/useLandCrud.js
index 3b26c1b..b6f8e95 100644
--- a/sub-government-affairs-service/src/composables/useLandCrud.js
+++ b/sub-government-affairs-service/src/composables/useLandCrud.js
@@ -1,5 +1,5 @@
import { ref } from 'vue';
-import { fetchLandList, deleteLand, createLand, updateLand } from '@/apis/landResourceManagement/landManagement';
+import { createLand, deleteLand, editLand, fetchLandList, getLandById } from '@/apis/landResourceManagement/landManagement';
import { ElMessageBox, ElMessage } from 'element-plus';
import { cloneDeep } from 'lodash';
@@ -36,7 +36,7 @@ export function useLandCrud(type) {
await createLand({ ...data, type });
ElMessage.success('新增成功');
} else {
- await updateLand(data);
+ await editLand(data);
ElMessage.success('更新成功');
}
formVisible.value = false;
diff --git a/sub-government-affairs-service/src/views/resource/database/ForestLand.vue b/sub-government-affairs-service/src/views/resource/database/ForestLand.vue
new file mode 100644
index 0000000..9cc63e1
--- /dev/null
+++ b/sub-government-affairs-service/src/views/resource/database/ForestLand.vue
@@ -0,0 +1,7 @@
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/resource/database/Grassland.vue b/sub-government-affairs-service/src/views/resource/database/Grassland.vue
index 5209aa7..68a239d 100644
--- a/sub-government-affairs-service/src/views/resource/database/Grassland.vue
+++ b/sub-government-affairs-service/src/views/resource/database/Grassland.vue
@@ -142,18 +142,8 @@
@@ -272,6 +262,22 @@ const crudOptions = reactive({
icon: 'delete',
event: ({ row }) => handleDelete(row),
},
+ {
+ name: '审核',
+ icon: 'approve',
+ event: ({ row }) => onApprove(row),
+ },
+ // TODO: 驳回应该有填写驳回原因的弹窗
+ {
+ name: '驳回',
+ icon: 'reject',
+ event: ({ row }) => onReject(row),
+ },
+ {
+ name: '驳回原因',
+ icon: 'reject',
+ event: ({ row }) => onRejectReason(row),
+ },
],
});
const handleTabChange = ({ name }) => {
@@ -347,7 +353,7 @@ const handleSubmit = async () => {
// ---------------------------------------------------------------------
// 业务代码
// ---------------------------------------------------------------------
-import { createLand, deleteLand, editLand, fetchLandList, getLandById } from '@/apis/landResourceManagement/landManagement';
+import { createLand, deleteLand, editLand, fetchLandList, getLandById, approveLand } from '@/apis/landResourceManagement/landManagement';
onMounted(() => {
getData();
@@ -385,6 +391,53 @@ const fetchLandTypeData = async () => {
console.error('获取土地类型数据失败', error);
}
};
+const submitAll = async () => {
+ console.log('提交表单:', formData.value);
+ await editLand(formData.value);
+ ElMessage.success('保存成功');
+ resetForm();
+ visible.value = false;
+};
+
+const onApprove = async (row) => {
+ // UNSUBMIT(-1,"未提交"),
+ // REVIEW(0,"待审核"),
+ // PASS(1,"通过"),
+ // REFUSE(2,"驳回");
+ if (row.landStatus !== 0) {
+ ElMessage.error('该地块状态不是待审核状态');
+ return;
+ }
+ const requiredBody = {
+ bizType: 'landResInfo',
+ bizId: row.id,
+ status: 1,
+ opinion: '',
+ };
+ await approveLand(requiredBody);
+ ElMessage.success('审核成功');
+ getData();
+};
+
+const onReject = async (row) => {
+ if (row.landStatus !== 0) {
+ ElMessage.error('该地块状态不是待审核状态');
+ return;
+ }
+ const requiredBody = {
+ bizType: 'landResInfo',
+ bizId: row.id,
+ status: 2,
+ opinion: '',
+ };
+ await approveLand(requiredBody);
+ ElMessage.success('驳回成功');
+ getData();
+};
+// 显示驳回原因
+const onRejectReason = async (row) => {
+ ElMessageBox.alert(row.rejectReason || '无驳回原因', '驳回原因');
+};
const handleAdd = () => {
console.log('handleAdd');
resetForm();
diff --git a/sub-government-affairs-service/src/views/resource/database/components/LandForm.vue b/sub-government-affairs-service/src/views/resource/database/components/LandForm.vue
index e69de29..dae4e5f 100644
--- a/sub-government-affairs-service/src/views/resource/database/components/LandForm.vue
+++ b/sub-government-affairs-service/src/views/resource/database/components/LandForm.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sub-government-affairs-service/src/views/resource/database/components/LandSearch.vue b/sub-government-affairs-service/src/views/resource/database/components/LandSearch.vue
index e69de29..e58c3fc 100644
--- a/sub-government-affairs-service/src/views/resource/database/components/LandSearch.vue
+++ b/sub-government-affairs-service/src/views/resource/database/components/LandSearch.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+