diff --git a/package-lock.json b/package-lock.json index 71cde541..ea57fbd7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4281,7 +4281,7 @@ "fastclick": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/fastclick/-/fastclick-1.0.6.tgz", - "integrity": "sha512-cXyDBT4g0uWl/Xe75QspBDAgAWQ0lkPi/zgp6YFEUHj6WV6VIZl7R6TiDZhdOVU3W4ehp/8tG61Jev1jit+ztQ==", + "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=", "dev": true }, "fastparse": { @@ -4436,7 +4436,7 @@ "font-awesome.css": { "version": "4.7.2", "resolved": "https://registry.npmjs.org/font-awesome.css/-/font-awesome.css-4.7.2.tgz", - "integrity": "sha512-FIyRbig4PDY15NGzejM3b8OQ/lWvId8PHnE4CnuDtc8/YYs07cvnqLCyfvIJPwJl5SA/Rq+9jAe9W+Fr1pv0DA==" + "integrity": "sha1-B1pCARQo8gJyVO9phgx1ergWyVI=" }, "for-in": { "version": "1.0.2", @@ -12350,7 +12350,7 @@ "vue-html5-editor": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/vue-html5-editor/-/vue-html5-editor-1.1.1.tgz", - "integrity": "sha512-Ckmb8djta+XQMUQaxRcCUNBXEzjPF5p6c2nQ5ICcIuR8eYz4b0HAGzXlSDfL3ZxkrVHO2Hx0VrUORLu2Lwem4g==", + "integrity": "sha1-WRAhCoMNjI00eaHx/shHMZKqA7M=", "dev": true }, "vue-lazyload": { diff --git a/src/api/sunVillage_info/sysCbf.js b/src/api/sunVillage_info/sysCbf.js index 98e2ddce..bf4cca86 100644 --- a/src/api/sunVillage_info/sysCbf.js +++ b/src/api/sunVillage_info/sysCbf.js @@ -96,4 +96,30 @@ export function cbfDataStatistics(){ }) } +// 承包方家庭成员 +export function listFamilyMember(params){ + return request({ + url: '/open/villageAffairs/public/familyMember/list', + method: 'get', + params: params + }) +} + +// 获取承包合同 +export function getContractByCode(params) { + return request({ + url: '/open/villageAffairs/public/contract/detail', + method: 'get', + params: params + }); +} + +// 获取承包地块信息 +export function listContractedLand(params) { + return request({ + url: '/open/villageAffairs/public/contractedLand/list', + method: 'get', + params: params + }); +} diff --git a/src/router/index.js b/src/router/index.js index 3405220b..ff538b07 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -4056,6 +4056,15 @@ export const constantRoutes = [ }, component: (resolve) => require(['@/views/sunVillage_info/list_cbfsq'], resolve) }, + { + path: '/sunVillage_info/list_cbfsq_view', + name: 'sunVillageInfoListCbfsqView', + meta: { + title: '承包方授权', + hidden: true, + }, + component: (resolve) => require(['@/views/sunVillage_info/list_cbfsq_view'], resolve) + }, { ////阳光村务（新）-- 合同信息 path: '/sunVillage_info/list_vote_detail', name: 'sunVillageInfoListVoteDetail', diff --git a/src/views/homesteadSurvey/add.vue b/src/views/homesteadSurvey/add.vue index 22f58a05..419f4f26 100644 --- a/src/views/homesteadSurvey/add.vue +++ b/src/views/homesteadSurvey/add.vue @@ -852,10 +852,13 @@ export default { if(this.form.id == null){ let surveyItem = JSON.parse(localStorage.getItem("surveyItem")); - this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson)); - 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)); + if(this.form.theGeomJson instanceof Array){ + this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson)); + }else if(typeof this.form.theGeomJson === 'string'){ + let theGeometry = JSON.parse( this.form.theGeomJson); + if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的 + this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates)); + } this.$set(this.form, 'surveyId', surveyItem.id) addZjdzd(this.form).then(response => { let _this =this; diff --git a/src/views/homesteadSurvey/fsssAdd.vue b/src/views/homesteadSurvey/fsssAdd.vue index b768c4f9..daf1039c 100644 --- a/src/views/homesteadSurvey/fsssAdd.vue +++ b/src/views/homesteadSurvey/fsssAdd.vue @@ -44,7 +44,7 @@ - +

附属设施信息

diff --git a/src/views/homesteadSurvey/zrzAdd.vue b/src/views/homesteadSurvey/zrzAdd.vue index c090134f..9213441b 100644 --- a/src/views/homesteadSurvey/zrzAdd.vue +++ b/src/views/homesteadSurvey/zrzAdd.vue @@ -270,10 +270,17 @@ export default { submitzjd(){ this.$refs.form.validate().then(() => { if(this.form.id == null){ - this.$set(this.form, 'theGeomJson', JSON.parse( this.form.theGeomJson)); - 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, 'theGeomJson', JSON.parse( this.form.theGeomJson)); + // 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)); + if(this.form.theGeomJson instanceof Array){ + this.$set(this.form, 'theGeomJson', JSON.stringify( this.form.theGeomJson)); + }else if(typeof this.form.theGeomJson === 'string'){ + let theGeometry = JSON.parse( this.form.theGeomJson); + if(theGeometry.hasOwnProperty('coordinates')) // 从后台获取的 + this.$set(this.form, 'theGeomJson', JSON.stringify(theGeometry.coordinates)); + } addZrz(this.form).then(response => { let _this =this this.$toast({ @@ -332,7 +339,7 @@ export default { onMapDrawFinished(data) { console.info(data); this.drawInsert = data; - this.form.theGeomJson = JSON.stringify(this.drawInsert); + this.form.theGeomJson = this.drawInsert; }, // 当申请地图被重置时 onMapDrawReseted() { diff --git a/src/views/sunVillage_info/list_cbf.vue b/src/views/sunVillage_info/list_cbf.vue index 17ec70cc..a882a5eb 100644 --- a/src/views/sunVillage_info/list_cbf.vue +++ b/src/views/sunVillage_info/list_cbf.vue @@ -22,15 +22,15 @@
- - -

{{item.cbhtbm}}

-

{{item.signingMode}}

-

{{item.signingStatus}}

+ + +

{{item.cbhtbm}}

+

{{item.signingStatus}}

+

{{item.signingMode}}

-

{{item.cbfmc}}

-

{{item.htzmjm.toFixed(2)}} 亩

+

{{item.cbfmc}}

+

{{item.htzmjm.toFixed(2)}} 亩

@@ -48,10 +48,10 @@

合同网签

-
+

合同预览

@@ -156,6 +156,9 @@ created() { this.height = window.screen.height * 1.28 - 20; this.getCbfInfo(); + this.houseGetDicts("signing_status").then((res) => { + this.signingStatusData = res.data; + }); // this.queryParams.cbfbm = JSON.parse(Cookies.get('user')).idcard; }, methods: { @@ -260,6 +263,15 @@ this.$notify({ type: 'success', message: '删除成功' }); }); }, + formatDict(item){ + let colorval = ""; + this.signingStatusData.map(function (e){ + if(item.signingStatus === e.dictLabel){ + colorval = e.remark; + } + }) + return colorval; + }, signaImgFun(url) { this.signatureImg = url; }, @@ -327,7 +339,7 @@ // 签署合同下载 handleDownload(id) { this.$dialog.confirm({ - message: '是否确认下载签署合同？', + message: '是否下载承包合同？', }).then(() => { // on confirm signedContractDownload(id).then(res => { @@ -511,7 +523,7 @@ background: #ffedcd; border-radius: 8px; font-size: 24px; - color: #f8a83d; + color: #ffffff; text-align: center; line-height: 34px; flex-shrink: 0; diff --git a/src/views/sunVillage_info/list_cbfsq.vue b/src/views/sunVillage_info/list_cbfsq.vue index 62f63e99..d5381eae 100644 --- a/src/views/sunVillage_info/list_cbfsq.vue +++ b/src/views/sunVillage_info/list_cbfsq.vue @@ -9,61 +9,132 @@

承包方授权

- - - - - - - - - - -
{{form.cbfdcjs}}
- - - - - - - -
{{form.gsjs}}
- - - - - - - - - -
{{form.gsjgyj}}
- - - - - - - - - - -
{{form.gsshyj}}
- - - - - - - + + + + + + +
{{form.cbfmc}}
+ + + + + + + + + +
{{form.cbfdcjs}}
+ + + + + + + +
{{form.gsjs}}
+ + + + + + + + + +
{{form.gsjgyj}}
+ + + + + + + + + + +
{{form.gsshyj}}
+ + + + + + + + + +
+
+
+

+ + {{ item.cyxm }} +

+

{{ item.yhzgx }}

+

+ {{ item. cyxb }} + + +

+
+

+ + {{ item.cyzjhm }} +

+
+

{{ item.sfgyr }}

+
+ + + + + + + + + + + + + + + + + + +
+
+

{{ item.dkmc }}

+

{{ item.dkbm }}

+
+
+

{{ item.htmjm }}亩

+ +

{{ item.dldj }}

+

{{ item.tdyt }}

+

基本农田:{{ item.sfjbnt }}

+
+
+ +

东:{{ item.dkdz }}

+

西:{{ item. dkxz }}

+

南:{{ item.dknz }}

+

北:{{ item.dkbz }}

+
+
+ + + + @@ -85,25 +156,54 @@ - - - -
- +
+ + 公示结果签字 + + + 授权 + +
+ + + + + + + +
+ +
+ +
+ 保存签字 + 清空画板 +
+ + @@ -433,4 +632,128 @@ width: 50vw; transform: translate(-50%,10%); } + .signature-box { + border: 1px dashed #666; + margin: 2px 20px; + height: 100%; + /*canvas{*/ + /* height: 100%!important;*/ + /*}*/ + } + .signature-footer { + transform: rotate(90deg); + width: auto; + position: absolute; + top: 50%; + left: 0PX; + + .clearBtn { + margin-left: 15px; + } + } + .member_item{ + border-radius: 30px; + background: #fff; + box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1); + padding:25px 32px; + margin-bottom: 20px; + display: flex; + align-items: center; + justify-content: space-between; + .item_left{ + flex: 1; + .item_left_tt{ + display: flex; + justify-content: space-between; + align-items: center; + font-size: 14PX; + .name{ + display: flex; + align-items: center; + font-size: 16PX; + img{ + width: 5vw; + margin-right: 2vw; + } + } + .sex{ + display: flex; + align-items: center; + img{ + width: 3vw; + margin-left: 1vw; + } + } + } + .id_card{ + display: flex; + align-items: center; + font-size: 14PX; + margin-top: 1vh; + img{ + width: 5vw; + margin-right: 2vw; + } + } + } + .item_right{ + margin-left: 15vw; + padding: 2PX 15PX; + background: #d0f4e5; + color: #2ecb8a; + border: 1px solid #8be3be; + border-radius: 30PX; + } + } + .land_item{ + border-radius: 30px; + background: #fff; + box-shadow: 4px 6px 5px rgba(63, 68, 75, 0.1); + padding:25px 32px; + margin-bottom: 20px; + font-size: 14PX; + .item_tt{ + display: flex; + justify-content: space-between; + align-items: center; + p:first-child{ + font-size: 16PX; + color: #333333; + } + p:last-child{ + color: #44e4a3; + } + } + .item_type{ + display: flex; + justify-content: space-between; + align-items: center; + color:#5f5f5f; + margin-top: 1vh; + p:nth-child(1){ + color: #fb9627; + border: 1px solid #fb9627; + padding: 0 10PX; + border-radius: 50PX; + } + span{ + color: #ffffff; + background: #fb9627; + border-radius: 100%; + display: inline-block; + width: 15PX; + height: 15PX; + line-height: 15PX; + font-size: 12PX; + margin-right: 5PX; + } + } + .item_direction{ + display: flex; + justify-content: space-between; + align-items: center; + color:#5f5f5f; + margin-top: 1vh; + } + } diff --git a/src/views/sunVillage_info/list_cbfsq_view.vue b/src/views/sunVillage_info/list_cbfsq_view.vue new file mode 100644 index 00000000..a901162e --- /dev/null +++ b/src/views/sunVillage_info/list_cbfsq_view.vue @@ -0,0 +1,637 @@ + + + + + diff --git a/src/views/sunVillage_info/list_cbht.vue b/src/views/sunVillage_info/list_cbht.vue index 4f83f96c..3f876469 100644 --- a/src/views/sunVillage_info/list_cbht.vue +++ b/src/views/sunVillage_info/list_cbht.vue @@ -30,18 +30,18 @@
- - -

{{item.cbhtbm}}

+ + +

{{item.cbhtbm}}

+

{{item.signingStatus}}

+ :style="{'background': item.signingMode === '线上'?'#F9BE0C':'#08BE4E'}"> {{item.signingMode}}

-

{{item.signingStatus}}

-

{{item.cbfmc}}

+

{{item.cbfmc}}

-

{{item.htzmjm.toFixed(2)}} 亩

+

{{item.htzmjm.toFixed(2)}} 亩

@@ -138,6 +138,7 @@ htqsShow:false, noticeUrl:"", fileList: [], + signingStatusData:[], listLength: '0', queryParams: { pageNum: 1, @@ -169,6 +170,9 @@ if (this.$route.query.type == 'code') { this.showBtn = false; } + this.houseGetDicts("signing_status").then((res) => { + this.signingStatusData = res.data; + }); this.height = window.screen.height * 1.28 - 20; }, methods: { @@ -197,6 +201,15 @@ }); }, + formatDict(item){ + let colorval = ""; + this.signingStatusData.map(function (e){ + if(item.signingStatus === e.dictLabel){ + colorval = e.remark; + } + }) + return colorval; + }, goDetail(id) { this.$router.push({ path: '/sunVillage_info/list_cbht_detail', @@ -337,7 +350,7 @@ // 签署合同下载 handleDownload(id) { this.$dialog.confirm({ - message: '是否确认下载签署合同？', + message: '是否下载承包合同？', }).then(() => { // on confirm signedContractDownload(id).then(res => { @@ -530,7 +543,7 @@ background: #ffedcd; border-radius: 8px; font-size: 24px; - color: #f8a83d; + color: #ffffff; text-align: center; line-height: 34px; flex-shrink: 0; diff --git a/src/views/sunVillage_info/list_contract_signature.vue b/src/views/sunVillage_info/list_contract_signature.vue index 237d3a82..ae7f763a 100644 --- a/src/views/sunVillage_info/list_contract_signature.vue +++ b/src/views/sunVillage_info/list_contract_signature.vue @@ -91,7 +91,19 @@
-

已完成

+

签字完成

+

{{form.signCompletedRatio}}

+ +

{{form.signCompletedCount}}份

+

批量归档 >

+ + +
+
+
+ +
+

归档完成

{{form.htywcfsbfb}}

{{form.htywcfs}}份

diff --git a/src/views/sunVillage_info/list_contractor.vue b/src/views/sunVillage_info/list_contractor.vue index 1a227983..164d724a 100644 --- a/src/views/sunVillage_info/list_contractor.vue +++ b/src/views/sunVillage_info/list_contractor.vue @@ -95,9 +95,9 @@ }, detailsClick(item){ if(this.$route.query.sqStatus){ - this.$router.push({path:'/sunVillage_info/list_cbfsq',query:{id:item.id,sqStatus:true}}) + this.$router.push({path:'/sunVillage_info/list_cbfsq_view',query:{id:item.id,sqStatus:true}}) }else{ - this.$router.push({path:'/sunVillage_info/list_cbfsq',query:{id:item.id,shStatus:true}}) + this.$router.push({path:'/sunVillage_info/list_cbfsq_view',query:{id:item.id,shStatus:true}}) } }, onRefreshContractor(){ diff --git a/src/views/sunVillage_info/list_fbfsq.vue b/src/views/sunVillage_info/list_fbfsq.vue index 4f55d878..3fc24b41 100644 --- a/src/views/sunVillage_info/list_fbfsq.vue +++ b/src/views/sunVillage_info/list_fbfsq.vue @@ -10,7 +10,9 @@

发包方授权

- + +
{{form.fbfmc}}
+