diff --git a/src/api/homesteadSurvey/nhhncy.js b/src/api/homesteadSurvey/nhhncy.js
index 76bc8ea3..6830eacc 100644
--- a/src/api/homesteadSurvey/nhhncy.js
+++ b/src/api/homesteadSurvey/nhhncy.js
@@ -25,6 +25,23 @@ export function getNhhncy(id) {
method: 'get'
})
}
+// 查询列表
+export function queryHomesteadnhhncyList(query) {
+ return request({
+ url: '/home/homesteadnhhncy/queryList',
+ method: 'get',
+ params: query
+ })
+}
+
+
+export function addOutsidenhhncy(data) {
+ return request({
+ url: '/home/homesteadnhhncy/outsideAdd',
+ method: 'post',
+ data: data
+ })
+}
// 新增数据调查-农户户内成员
export function addNhhncy(data) {
diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js
new file mode 100644
index 00000000..2e89b41c
--- /dev/null
+++ b/src/api/sunVillage_info/sysCbf.js
@@ -0,0 +1,60 @@
+import request from '@/utils/request'
+
+//查询列表
+export function getList(data){
+ return request({
+ url:'/service/cbf/list',
+ method:'get',
+ params:data
+ })
+}
+//查询承包地块列表
+export function getCbdkms(data){
+ return request({
+ url:'/service/cbdkxx/getCbdkms',
+ method:'get',
+ params:data
+ })
+}
+
+//修改
+export function updateSysCfb(data){
+ return request({
+ url:'/service/cbf/edit',
+ method: 'post',
+ data: data
+ })
+}
+//批量修改承包方记事签字
+export function updateBatchSign(data,gsjs){
+ return request({
+ url:'/service/cbf/updateBatchSign?gsjs='+gsjs,
+ method: 'post',
+ data: data
+ })
+}
+//修改承包方记事签字
+export function updateSign(data){
+ return request({
+ url:'/service/cbf/updateSign',
+ method: 'post',
+ data: data
+ })
+}
+//批量修改承包方审核签字
+export function examineBatchSign(data,shyj){
+ return request({
+ url:'/service/cbf/examineBatchSign?shyj='+shyj,
+ method: 'post',
+ data: data
+ })
+}
+//修改承包方审核签字
+export function examineSign(data){
+ return request({
+ url:'/service/cbf/examineSign',
+ method: 'post',
+ data: data
+ })
+}
+
diff --git a/src/api/sunVillage_info/sysFbf.js b/src/api/sunVillage_info/sysFbf.js
new file mode 100644
index 00000000..5af4237e
--- /dev/null
+++ b/src/api/sunVillage_info/sysFbf.js
@@ -0,0 +1,18 @@
+import request from '@/utils/request'
+
+//查询列表
+export function getSysFfb(data){
+ return request({
+ url:'/service/fbf/sysFbfSelect',
+ method:'get',
+ params:data
+ })
+}
+//修改
+export function auditSign(data){
+ return request({
+ url:'/service/fbf/auditSign',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue
index 246d896a..9d05181b 100644
--- a/src/views/homesteadSurvey/add.vue
+++ b/src/views/homesteadSurvey/add.vue
@@ -848,6 +848,7 @@ export default {
Dialog({ type: 'danger', message: '请在地图上标注宅基地所在位置!' });
return;
}
+ this.permission = "false";
if(this.form.id == null){
let surveyItem = JSON.parse(localStorage.getItem("surveyItem"));
@@ -855,7 +856,7 @@ export default {
if(this.form.theGeomJson.hasOwnProperty('coordinates')) // 从后台获取的
this.$set(this.form, 'theGeomJson',this.form.theGeomJson.coordinates);
this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson));
- this.$set(this.form, 'surveyId', surveyItem.id);
+ this.$set(this.form, 'surveyId', surveyItem.id)
addZjdzd(this.form).then(response => {
let _this =this;
getZjdzd(response.data).then((res) => {
diff --git a/src/views/homesteadSurvey/index.vue b/src/views/homesteadSurvey/index.vue
index ff160ab5..014ff227 100644
--- a/src/views/homesteadSurvey/index.vue
+++ b/src/views/homesteadSurvey/index.vue
@@ -229,6 +229,7 @@
console.info(userId);
this.nickName = this.$store.state.user.nickName;
this.$set(this.queryParams, "rwzxr", userId);
+ this.$set(this.queryParams, "params", {deptId:100});
this.getList();
},1000)
@@ -331,6 +332,7 @@
if(this.active==1){
let params = {
"rwfbzt":"PUBLISHED",
+ "params":{deptId:this.$store.state.user.loginDeptId},
"pageNum": this.countyhc+1,
"pageSize":10,
}
@@ -346,6 +348,7 @@
let params = {
"rwwczt": "PUBLISHED",
"rwfbzt":"PUBLISHED",
+ "params":{deptId:this.$store.state.user.loginDeptId},
"pageNum": this.countwhc+1,
"pageSize":10,
}
@@ -361,6 +364,7 @@
let params = {
"rwwczt": "UNPUBLISHED",
"rwfbzt":"PUBLISHED",
+ "params":{deptId:this.$store.state.user.loginDeptId},
"pageNum": this.countqb+1,
"pageSize":10,
}
diff --git a/src/views/homesteadSurvey/list2.vue b/src/views/homesteadSurvey/list2.vue
index d841f650..a4b1d165 100644
--- a/src/views/homesteadSurvey/list2.vue
+++ b/src/views/homesteadSurvey/list2.vue
@@ -53,6 +53,7 @@
+
+
娃娃村
+{{this.$store.state.user.deptName}}
共有承包方800户
+共有承包方{{cbfCount}}户
共有承包方800户
+承包地{{cbfdkCount}}亩
电子签名
+信息核对
电子签名
+李佳佳
+{{item.cbfmc}}
444444444
13人
{{item.lxdh}}
{{item.cbfcysl}}
审核签字
娃娃村
+{{this.$store.state.user.deptName}}
800户
+{{cbfCount}}户
承包方
800户
-承包方
+{{cbfdkCount}}户
+承包地
800户
-承包方
+{{cbfGsqzCount}}户
+已公示签字确认
信息核对
电子签名
+信息核对
信息核对
-电子签名
+信息核对
电子签名
+