From c0cae56e97ae1ddbc943b44c1d7512604a71e185 Mon Sep 17 00:00:00 2001 From: QI_YUJIE <2878090898@qq.com> Date: Fri, 18 Aug 2023 16:29:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=97=E6=8E=A5=E5=8F=A3=E5=AF=B9?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/contracted/dk.js | 44 ++ .../village/contractor/contractor.vue | 12 +- .../contractor/contractorDetailAdd.vue | 10 +- .../contractor/contractorLandDetail.vue | 19 +- .../contracted/village/massif/massif.vue | 148 +++++- .../village/massif/massifDetail.vue | 464 ++++++++++++------ 6 files changed, 516 insertions(+), 181 deletions(-) diff --git a/src/api/contracted/dk.js b/src/api/contracted/dk.js index cb464e34..8f5b92be 100644 --- a/src/api/contracted/dk.js +++ b/src/api/contracted/dk.js @@ -8,3 +8,47 @@ export function listDk(params) { params: params }); } + +// 地块信息详情 +export function getDk(id) { + return request({ + url: '/service/dk/get/' + id, + method: 'get' + }); +} + +// 新增地块属性信息 +export function addDk(data) { + return request({ + url: '/service/dk/add', + method: 'post', + data: data + }) +} + +// 修改地块属性信息 +export function updateDk(data) { + return request({ + url: '/service/dk/edit', + method: 'post', + data: data + }) +} + +// 删除地块信息 +export function deleteDk(id) { + return request({ + url: '/service/dk/remove/' + id, + method: 'get' + }); +} + + +// 生成地块编码 +export function generateLandCode(params) { + return request({ + url: '/service/dk/generateCode', + method: 'get', + params: params + }); +} diff --git a/src/views/contracted/village/contractor/contractor.vue b/src/views/contracted/village/contractor/contractor.vue index 53419da0..51d142ce 100644 --- a/src/views/contracted/village/contractor/contractor.vue +++ b/src/views/contracted/village/contractor/contractor.vue @@ -166,8 +166,16 @@ // on confirm deleteCbf(id).then(res => { if(res.code == 200){ - this.$toast.success('删除成功'); - this.cbfList.splice(index, 1); + this.$toast({ + icon: 'success', + message: '删除成功', + duration: "1000", + onClose: () => { + this.cbfList.splice(index, 1); + this.totalNum = this.totalNum - 1; + } + }); + } }); }).catch(() => { diff --git a/src/views/contracted/village/contractor/contractorDetailAdd.vue b/src/views/contracted/village/contractor/contractorDetailAdd.vue index a5c5ece2..d6706e8c 100644 --- a/src/views/contracted/village/contractor/contractorDetailAdd.vue +++ b/src/views/contracted/village/contractor/contractorDetailAdd.vue @@ -10,12 +10,12 @@
- - - + + + { - if (response.code == 200) { - this.$toast({ - icon: 'success', - message: '保存成功', - duration:"1000", - onClose: () => { - this.goBack(); - } - }); - } - }); */ } else { this.form.deptId = this.$route.params.deptId; this.form.cbfbm = this.$route.params.cbfbm; @@ -337,7 +325,12 @@ }); }, onMapDrawFinished(data) { - this.form.theGeom = JSON.stringify(data); + if (data) { + this.form.theGeom = JSON.stringify(data); + } else { + this.form.theGeom = null; + } + }, }, }; diff --git a/src/views/contracted/village/massif/massif.vue b/src/views/contracted/village/massif/massif.vue index 68f26e01..a5cf25bd 100644 --- a/src/views/contracted/village/massif/massif.vue +++ b/src/views/contracted/village/massif/massif.vue @@ -16,68 +16,170 @@ v-model="value" shape="round" background="transparent" - placeholder="请输入姓名搜索" + placeholder="请输入地块代码搜索" @search="onSearch" > -
+

+ 新增

-

承包

+ +

{{dict.dictLabel}}

-

自留地 5153亩

+

{{ tagName }} {{ totalNum }}块

地块代码 地块名称 面积(亩) - - - 45412353553 - 西湖地地块名称 - 7 - - - + + + + {{ item.dkbm }} + {{ item.dkmc }} + {{ item.scmjm }} + + + +
@@ -238,6 +418,14 @@ overflow: initial; } + /deep/ .van-field--disabled .van-field__label { + color: #646566; + } + + /deep/ .van-field__label { + width: 7em; + } + .tb_main{ position: relative; p{