From 0a8586b97e611b9797811387db7906c6a78d8d4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=83=B3?= <826276471@qq.com> Date: Tue, 8 Apr 2025 09:27:53 +0800 Subject: [PATCH] feat --- .../src/router/modules/inputSupplies/index.js | 12 +- .../enterpriseDealerCheck/index.vue | 1 - .../inputSuppliesManage/hooks/useBasicInfo.js | 4 +- .../material/farmMachinery/index.vue | 2 +- .../useSupervise/index.vue | 186 +++++++++++++++++- .../component/landsManage/index.vue | 86 +++++--- .../views/trace/agricultural/coding/index.vue | 1 + 7 files changed, 250 insertions(+), 42 deletions(-) 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 aa2fdf4..627f16e 100644 --- a/sub-government-affairs-service/src/router/modules/inputSupplies/index.js +++ b/sub-government-affairs-service/src/router/modules/inputSupplies/index.js @@ -72,12 +72,12 @@ const inputSuppliesRoutes = [ // component: () => import('@/views/inputSuppliesManage/enterpriseDealerCheck/index.vue'), // meta: { title: '企业经销商抽检', icon: 'Document' }, // }, - // { - // path: '/sub-government-affairs-service/useSupervise', - // name: 'useSupervise', - // component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), - // meta: { title: '使用监管', icon: 'Document' }, - // }, + { + path: '/sub-government-affairs-service/useSupervise', + name: 'useSupervise', + component: () => import('@/views/inputSuppliesManage/useSupervise/index.vue'), + meta: { title: '使用监管', icon: 'Document' }, + }, { path: '/sub-government-affairs-service/leaseSupervise', name: 'leaseSupervise', diff --git a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue index 304d5e6..fc4c94f 100644 --- a/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue +++ b/sub-government-affairs-service/src/views/inputSuppliesManage/enterpriseDealerCheck/index.vue @@ -30,7 +30,6 @@ diff --git a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue index f42ee87..63b0cbc 100644 --- a/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue +++ b/sub-government-affairs-service/src/views/landManage/component/landsManage/index.vue @@ -76,12 +76,12 @@ import { ref, reactive, onMounted, watch } from 'vue'; import { CRUD_OPTIONS } from '@/config'; import { useUserStore } from '@/store/modules/user'; import { getLandsList, exportLands, delLand, saveLand, importLands, editLand } from '@/apis/land.js'; +import { getRegion } from '@/apis'; import { ElMessage } from 'element-plus'; import useLandHook from './useLandHook'; import Attrs from './common/Attrs.vue'; import { getAssetsFile, downloadFile } from '@/utils'; import { useApp } from '@/hooks'; -import { get } from 'lodash'; const app = useApp(); const { loadFinish, resetLandType, searchCondition, unitOptions, unitValue, landTreeDic } = useLandHook(); @@ -93,6 +93,7 @@ watch( () => { if (loadFinish.value == 2) { getList(); + handleGetRegion(); } } ); @@ -257,11 +258,10 @@ const option = reactive({ value: 'id', label: 'gridName', }, - dicMethod: 'get', dicHeaders: { authorization: UserStore.token, }, - dicFormatter: (res) => res?.data?.records ?? [], + dicFormatter: handleGetGrid, rules: [ { required: true, @@ -271,7 +271,7 @@ const option = reactive({ ], }, { - label: '用地分类', + label: '用地分类1', prop: 'landTypeId', type: 'cascader', dicData: landTreeDic, @@ -288,21 +288,17 @@ const option = reactive({ label: '用地分类', prop: 'landClassificationType', addDisplay: false, + editDisplay: false, }, { label: '位置', - prop: 'villageCode', + prop: '_villageCode', type: 'cascader', props: { label: 'areaName', value: 'areaCode', children: 'areaChildVOS', }, - dicUrl: `${VITE_APP_BASE_API}/system/area/region?areaCode=530000`, - dicHeaders: { - authorization: UserStore.token, - }, - dicFormatter: (res) => res.data ?? [], rules: [ { required: true, @@ -331,6 +327,7 @@ const option = reactive({ label: '是否土地流转', prop: 'isTransferView', addDisplay: false, + editDisplay: false, }, { label: '面积', @@ -450,6 +447,7 @@ const landOwnerAttrs = ref([]); const landAttrs = ref([]); const rowData = ref([]); const importExcelRef = ref(); +const regionData = ref([]); // #endregion /* --------------- methods --------------- */ @@ -473,15 +471,39 @@ async function getList(reset = 1) { const { total, records } = res.data; data.value = records; data.value.forEach((v) => { - v.isTransfer = v.landTransfer || 1; - v.isTransferView = v.landTransfer == 1 ? '否' : '是'; + v.isTransfer = v.landTransfer || '1'; + v.isTransferView = v.landTransfer == '1' ? '否' : '是'; v.coordinateView = v.coordinate; v.soilTypeName = v.soilType; v.soilTypeId = v.soilId; + v._villageCode = handleArea(v); + v.landTypeId = [v.pid, v.landType]; + console.log('vvv', v); }); pageData.value.total = total; } } +function handleGetGrid(res) { + console.log('res', res); + return res.records ?? []; +} +async function handleGetRegion() { + let res = await getRegion(); + if (res.code == 200) { + option.group[0].column[5]; + } + console.log('region', res); +} +function handleArea(v) { + const { provinceCode, cityCode, county, townCode, villageCode } = v; + let _area = [provinceCode, cityCode, county, townCode, villageCode]; + let _arr = []; + for (let i = 0; i < _area.length; i++) { + if (!_area[i]) return; + _arr.push(_area[i]); + } + return _arr; +} function handleSizeChange(val) { pageData.value.pageSize = val; @@ -525,7 +547,7 @@ function handleDelete(id) { .catch(() => {}); } function handleView(obj) { - handleAttrs(obj); + handleOtherInfo(obj); rowData.value = obj; crudRef.value.rowView(obj); } @@ -559,27 +581,30 @@ function handleData(val) { data.propertyCertificateUrl = urls.join(); data.landCertificateUrl = landOwnerUrls.join(); data.landUrl = landUrls.join(); - data.villageCode = data.villageCode[data.villageCode.length - 1] || ''; + data.villageCode = data._villageCode[data._villageCode.length - 1] || ''; data.landTypeId = data.landTypeId[data.landTypeId.length - 1]; data.soilType = data.soilTypeId; if (local.value.length != 0) { data.coordinate = `${local.value[0]}E,${local.value[1]}N`; } + delete data.address; + delete data.provinceCode; + delete data.cityCode; + delete data.county; + delete data.townCode; return data; } async function handleRowSave(val, done, loading) { - console.log('save', val); let data = handleData(val); - console.log('save -data', data); - // const res = await saveLand(data); + const res = await saveLand(data); loading(); - // if (res.code == 200) { - // ElMessage.success('保存成功'); - // getList(); - // attrs.value = []; - // landOwnerAttrs.value = []; - // done(); - // } + if (res.code == 200) { + ElMessage.success('保存成功'); + getList(); + attrs.value = []; + landOwnerAttrs.value = []; + done(); + } } async function handleRowUpdate(form, index, done, loading) { let data = handleData(form); @@ -591,12 +616,15 @@ async function handleRowUpdate(form, index, done, loading) { } } -async function rowEdit(obj) { - console.log('rowEdit', obj); - handleAttrs(obj); - crudRef.value.rowEdit(obj); +async function rowEdit(row) { + console.log('rowEdit', row); + handleOtherInfo(row); + crudRef.value.rowEdit(row); } -function handleAttrs(obj) { +function handleOtherInfo(obj) { + landArea.value = obj.area; + unitValue.value = obj.landUnit; + console.log('option', obj._villageCode, option.group[0].column[4]); if (obj.propertyCertificateUrl) { attrs.value = obj.propertyCertificateUrl.split(',').map((v, i) => { return { diff --git a/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue b/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue index 27bc67f..68b1864 100644 --- a/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue +++ b/sub-government-affairs-service/src/views/trace/agricultural/coding/index.vue @@ -522,6 +522,7 @@ const rowEdit = (row) => { }; const rowUpdate = (row, index, done, loading) => { delete row.base64; + console.log('row', row); setCity(row); UpdateEntity(row) .then((res) => {