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 @@ @@ -83,6 +84,27 @@ + + + + + + + +
+
+
+ +
+ + +
@@ -90,7 +112,7 @@ diff --git a/src/views/sunVillage_info/list_chronicles_process.vue b/src/views/sunVillage_info/list_chronicles_process.vue index ede7cbe0..f8ad8471 100644 --- a/src/views/sunVillage_info/list_chronicles_process.vue +++ b/src/views/sunVillage_info/list_chronicles_process.vue @@ -8,24 +8,24 @@
-

娃娃村

+

{{this.$store.state.user.deptName}}

-

共有承包方800

+

共有承包方{{cbfCount}}

-

共有承包方800

+

承包地{{cbfdkCount}}

-
+
-
+
- - - + + + + + + +
-
- +
+ 批量记事签字
-
+
单独记事签字
- + + +

电子签名

+
+
+ +
+ + + +
@@ -85,6 +217,27 @@ background-size: 100% 100%; border: none; } + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + + } + + .van-cell::after { + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0.426667rem; + bottom: 0; + left: 0.426667rem; + border:none; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } .home_wrapper{ background: #e9e9e9; min-height: 100vh; diff --git a/src/views/sunVillage_info/list_chronicles_single_process.vue b/src/views/sunVillage_info/list_chronicles_single_process.vue index 2b5e1f95..19411eda 100644 --- a/src/views/sunVillage_info/list_chronicles_single_process.vue +++ b/src/views/sunVillage_info/list_chronicles_single_process.vue @@ -9,24 +9,41 @@

信息核对

- - - - - - - - - - - + + + + + + + + + + + + + + + +
-
+
- - + + + + + +
-
+
- - - + + + + + + +
-
- +
+ 审核签字
- + + +

电子签名

+
+
+ +
+ + + +
@@ -83,7 +242,27 @@ background-size: 100% 100%; border: none; } -.home_wrapper{ + .van-cell::after { + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0.426667rem; + bottom: 0; + left: 0.426667rem; + border:none; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + + } + .home_wrapper{ background: #e9e9e9; min-height: 100vh; width: 100vw; diff --git a/src/views/sunVillage_info/list_contractor.vue b/src/views/sunVillage_info/list_contractor.vue index cb95e143..d25f4f3f 100644 --- a/src/views/sunVillage_info/list_contractor.vue +++ b/src/views/sunVillage_info/list_contractor.vue @@ -7,35 +7,36 @@
- +
-
查询
+
查询
- -
+ +
-

李佳佳

+

{{item.cbfmc}}

-

444444444

-

13人

+

{{item.lxdh}}

+

{{item.cbfcysl}}

- +
diff --git a/src/views/sunVillage_info/list_contractor_process.vue b/src/views/sunVillage_info/list_contractor_process.vue index 678b75d2..6fac2c86 100644 --- a/src/views/sunVillage_info/list_contractor_process.vue +++ b/src/views/sunVillage_info/list_contractor_process.vue @@ -8,21 +8,21 @@
-

娃娃村

+

{{this.$store.state.user.deptName}}

-

800

+

{{cbfCount}}

承包方

-

800

-

承包方

+

{{cbfdkCount}}

+

承包地

-

800

-

承包方

+

{{cbfGsqzCount}}

+

已公示签字确认

@@ -33,15 +33,21 @@

信息核对

- - - + + + + + + +
-
+
-
+
- - - + + + + + + +
-
- +
+ 批量审核签字
-
+
单独审核签字
- + + +

电子签名

+
+
+ +
+ + + +
@@ -101,6 +243,26 @@ background-size: 100% 100%; border: none; } + .van-cell::after { + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0.426667rem; + bottom: 0; + left: 0.426667rem; + border:none; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + + } .home_wrapper{ background: #e9e9e9; min-height: 100vh; diff --git a/src/views/sunVillage_info/list_contractor_single_process.vue b/src/views/sunVillage_info/list_contractor_single_process.vue index 60607078..effb7141 100644 --- a/src/views/sunVillage_info/list_contractor_single_process.vue +++ b/src/views/sunVillage_info/list_contractor_single_process.vue @@ -1,78 +1,236 @@ @@ -83,82 +241,102 @@ background-size: 100% 100%; border: none; } -.home_wrapper{ + .van-cell::after { + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0.426667rem; + bottom: 0; + left: 0.426667rem; + border:none; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + + } + .home_wrapper{ background: #e9e9e9; min-height: 100vh; width: 100vw; - .header_main { - height: 116px; - background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat; - background-size: 100% 100%; - position: fixed; - top: 0; - left: 0; - width: 100%; - font-size: 36px; - line-height: 116px; - text-align: center; - color: #fff; - position: relative; + .header_main { + height: 116px; + background: url('../../assets/images/sunVillage_info/list_head.png') no-repeat; + background-size: 100% 100%; + position: fixed; + top: 0; + left: 0; + width: 100%; + font-size: 36px; + line-height: 116px; + text-align: center; + color: #fff; + position: relative; - .return_btn { - width: 24px; - height: 43.2px; - background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat; - background-size: 20px 36px; - position: absolute; - left: 38px; - top: 36px; - } - } - .release_head{ - height: 90px; - padding:0 23px; - display: flex; - align-items: center; - font-size: 26px; - color: #929292; - .people{ - flex: 1; - display: flex; - align-items: center; - .icon{ - width: 24px; - height: 21px; - background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat; - background-size: 100% 100%; - display: block; - margin-right: 8px; - } - } - .time{ - flex: 1; - display: flex; - align-items: center; - justify-content:flex-end; - .icon{ - width: 25px; - height: 25px; - background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat; - background-size: 100% 100%; - display: block; - margin-right: 8px; - } - } - } - .release_conetnt{ - padding:0 22px; - font-size: 32px; - color: #252525; - line-height: 44px; - img{ - max-width: 100%; - margin-bottom: 16px; - } - p{ - margin-bottom: 16px; - } - } + .return_btn { + width: 24px; + height: 43.2px; + background: url('../../assets/images/sunVillage_info/list_icon_5.png') center center no-repeat; + background-size: 20px 36px; + position: absolute; + left: 38px; + top: 36px; + } + } + .release_head{ + height: 90px; + padding:0 23px; + display: flex; + align-items: center; + font-size: 26px; + color: #929292; + .people{ + flex: 1; + display: flex; + align-items: center; + .icon{ + width: 24px; + height: 21px; + background: url('../../assets/images/sunVillage_info/details_icon_1.png') no-repeat; + background-size: 100% 100%; + display: block; + margin-right: 8px; + } + } + .time{ + flex: 1; + display: flex; + align-items: center; + justify-content:flex-end; + .icon{ + width: 25px; + height: 25px; + background: url('../../assets/images/sunVillage_info/details_icon_2.png') no-repeat; + background-size: 100% 100%; + display: block; + margin-right: 8px; + } + } + } + .release_conetnt{ + padding:0 22px; + font-size: 32px; + color: #252525; + line-height: 44px; + img{ + max-width: 100%; + margin-bottom: 16px; + } + p{ + margin-bottom: 16px; + } + } .list_main{ padding:25px; background: #ffffff; @@ -176,46 +354,46 @@ box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1); position: relative; padding-top: 10vw; - img{ - position: absolute; - left: 50%; - width: 15vw; - transform: translate(-50%,calc(-50% - 10vw)); - border: 5PX solid #e9e9e9; - border-radius: 100%; - } - /deep/ .van-field__label{ - /*padding-left: 10PX;*/ - width: auto; - display: flex; - align-items: start; - color: #ffffff; - margin-right: 6vw; - } - /deep/ .van-cell{ - background-color: transparent; - } - .textarea{ - /deep/ .van-field__value{ - background-color: #ffffff; - border-radius: 10PX; - } - /deep/ .van-field__control{ - padding: 12PX; - color: #666666; - } - } - /deep/ .van-field__value{ - background-color: transparent; - border-radius: 10PX; - } - /deep/ .van-field__control{ - padding: 0PX; - color: #ffffff; - } - /deep/ .van-cell--required::before{ - left: 60PX; - } + img{ + position: absolute; + left: 50%; + width: 15vw; + transform: translate(-50%,calc(-50% - 10vw)); + border: 5PX solid #e9e9e9; + border-radius: 100%; + } + /deep/ .van-field__label{ + /*padding-left: 10PX;*/ + width: auto; + display: flex; + align-items: start; + color: #ffffff; + margin-right: 6vw; + } + /deep/ .van-cell{ + background-color: transparent; + } + .textarea{ + /deep/ .van-field__value{ + background-color: #ffffff; + border-radius: 10PX; + } + /deep/ .van-field__control{ + padding: 12PX; + color: #666666; + } + } + /deep/ .van-field__value{ + background-color: transparent; + border-radius: 10PX; + } + /deep/ .van-field__control{ + padding: 0PX; + color: #ffffff; + } + /deep/ .van-cell--required::before{ + left: 60PX; + } } .subForm2{ padding:25px; @@ -226,21 +404,21 @@ box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1); position: relative; padding-top: 10vw; - .topImg{ - position: absolute; - left: 50%; - width: 15vw; - transform: translate(-50%,calc(-50% - 10vw)); - border: 5PX solid #e9e9e9; - border-radius: 100%; - } - .bottomImg{ - position: absolute; - left: 50%; - top: 50%; - width: 25vw; - transform: translate(-50%,-50%); - } + .topImg{ + position: absolute; + left: 50%; + width: 15vw; + transform: translate(-50%,calc(-50% - 10vw)); + border: 5PX solid #e9e9e9; + border-radius: 100%; + } + .bottomImg{ + position: absolute; + left: 50%; + top: 50%; + width: 25vw; + transform: translate(-50%,-50%); + } } .titBox{ display: flex; @@ -264,5 +442,5 @@ /deep/ .van-cell--required::before{ left: 85PX; } -} + } diff --git a/src/views/sunVillage_info/list_employer_process.vue b/src/views/sunVillage_info/list_employer_process.vue index 3dd683a9..8a03f841 100644 --- a/src/views/sunVillage_info/list_employer_process.vue +++ b/src/views/sunVillage_info/list_employer_process.vue @@ -9,22 +9,30 @@

信息核对

- - - - - - - - - + + + + + + + + + + + + + + +
-
+
-
+
- - - + + + + + + +
-
- +
+ 审核签字
- + + +

电子签名

+
+
+ +
+ + + +
@@ -77,6 +220,28 @@ background-size: 100% 100%; border: none; } + + .van-cell::after { + position: absolute; + box-sizing: border-box; + content: ' '; + pointer-events: none; + right: 0.426667rem; + bottom: 0; + left: 0.426667rem; + border:none; + -webkit-transform: scaleY(.5); + transform: scaleY(.5); + } + + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0px; + + } .home_wrapper{ background: #e9e9e9; min-height: 100vh; diff --git a/src/views/sunVillage_info/list_signature_pdf.vue b/src/views/sunVillage_info/list_signature_pdf.vue index ca71f427..2e69414a 100644 --- a/src/views/sunVillage_info/list_signature_pdf.vue +++ b/src/views/sunVillage_info/list_signature_pdf.vue @@ -45,7 +45,6 @@ this.$toast.loading({ message: "正在加载文件", forbidClick: true, - duration: 20000, }); loadingTask.promise.then(pdf => { this.numPages = pdf.numPages