diff --git a/apis/modules/ly.js b/apis/modules/ly.js
index 3dca82d..b13e617 100644
--- a/apis/modules/ly.js
+++ b/apis/modules/ly.js
@@ -1,9 +1,13 @@
import request from '../../service/request.js'
import utils from '../../service/utils.js'
export default {
+ // 获取详情界桩
+ getariesInfo(data){
+ return request.get('/areBoundary/ariesInfo/'+data)
+ },
// 修改界桩
removeplie(data){
- return request.put('/areBoundary/plie',data)
+ return request.put('/areBoundary/ariesInfo',data)
},
// 添加界桩
addplie(data){
@@ -43,7 +47,7 @@ export default {
},
// 行政区
getplie(data){
- return request.get('/areBoundary/plie/list',data)
+ return request.get('/areBoundary/ariesInfo/list',data)
},
// 申报小区门牌
adddoorplate(data){
diff --git a/apis/modules/ryy.js b/apis/modules/ryy.js
index 608bee4..645d6da 100644
--- a/apis/modules/ryy.js
+++ b/apis/modules/ryy.js
@@ -11,5 +11,9 @@ export default {
// 获取历史记录和流程
getHistory(pages) {
return request.get('/childAdopt/registration/caseHistory',pages)
+ },
+ // 获取机构
+ getListRoles(pages) {
+ return request.get('/system/user/listRoles',pages)
}
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 0b67a98..725c11f 100644
--- a/pages.json
+++ b/pages.json
@@ -361,6 +361,24 @@
"enablePullDownRefresh": false
}
+ },
+ {
+ "path" : "pages/receiptRegistration/organization",
+ "style" :
+ {
+ "navigationBarTitleText": "机构上报",
+ "enablePullDownRefresh": false
+ }
+
+ },
+ {
+ "path" : "pages/receiptRegistration/townShip",
+ "style" :
+ {
+ "navigationBarTitleText": "乡镇上报",
+ "enablePullDownRefresh": false
+ }
+
}
,{
diff --git a/pages/declaration/declaration.vue b/pages/declaration/declaration.vue
index 648e18b..936773f 100644
--- a/pages/declaration/declaration.vue
+++ b/pages/declaration/declaration.vue
@@ -617,7 +617,7 @@
类型
- {{doorplate.cellType?doorplate.cellType:'请选择'}}
+ {{doorplate.gridman?doorplate.gridman:'请选择'}}
@@ -640,7 +640,7 @@
- 曾用名
+ 门牌号
- 历史地名
+ 门牌地址
+
@@ -9,21 +9,21 @@
- 暂无数据
+ 暂无数据
-
-
-
-
-
+ },
+ }
+ }
+
+
+ }
+
diff --git a/pages/declaration/declarationListdetail.vue b/pages/declaration/declarationListdetail.vue
index 05a4e3a..1649df2 100644
--- a/pages/declaration/declarationListdetail.vue
+++ b/pages/declaration/declarationListdetail.vue
@@ -363,9 +363,9 @@
{{info.historicalPlaceNames?info.historicalPlaceNames:'-'}}
历史地名
-
+
- {{info.cellType?info.cellType:'-'}}
+ {{info.gridman?info.gridman:'-'}}
类型
diff --git a/pages/declaration/list.vue b/pages/declaration/list.vue
index dfc3790..311541a 100644
--- a/pages/declaration/list.vue
+++ b/pages/declaration/list.vue
@@ -24,7 +24,7 @@
- 建筑名称备案
+ 建筑物备案
@@ -41,7 +41,7 @@
- 界桩界线管护
+ 界桩管护
diff --git a/pages/declaration/newDeclaration.vue b/pages/declaration/newDeclaration.vue
index 090aa29..93f2912 100644
--- a/pages/declaration/newDeclaration.vue
+++ b/pages/declaration/newDeclaration.vue
@@ -270,6 +270,34 @@
+
+
+
+ {{item.name}}*
+
+
+ {{item.cent?item.cent:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+ {{item.name}}*
+
+
+ {{item.cent?item.cent:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+ 上报历史
+
+
+
+
+
+ 我要上报
+
+
+
+
+
+ 发生地点
+
+
+
+
+
+
+
+
+
+ 儿童姓名
+
+
+
+
+
+
+
+
+
+ 儿童性别
+
+
+ {{form.sex?sexArray[form.sex]:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 儿童年龄
+
+
+
+
+
+
+
+
+
+ 报告原因
+
+
+
+
+
+
+
+
+
+ 其他信息
+
+
+
+
+
+
+
+
+ 报告人信息
+
+
+
+
+
+ 所属机构
+
+
+ {{form.filingAgencyName?organizationArray[index2]:'请选择'}}
+
+
+
+
+
+
+
+
+
+
+ 报告类型
+
+
+ {{form.reportType?reportArray[index1]:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 姓名
+
+
+
+
+
+
+
+
+
+ 与儿童关系
+
+
+
+
+
+
+
+
+
+ 电话
+
+
+
+
+
+
+
+
+
+ 报告主体
+
+
+ {{form.reporterType?SubjectArray[index]:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 职业
+
+
+
+
+
+
+
+
+
+ 单位名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/receiptRegistration/receiptRegistration.vue b/pages/receiptRegistration/receiptRegistration.vue
index a1347ea..1d9f968 100644
--- a/pages/receiptRegistration/receiptRegistration.vue
+++ b/pages/receiptRegistration/receiptRegistration.vue
@@ -1,235 +1,105 @@
-
-
-
-
- 上报历史
-
-
- 我要上报
-
-
-
-
- 发生地点
-
-
-
-
-
-
-
-
-
- 儿童姓名
-
-
-
-
-
-
-
-
-
- 儿童性别
-
-
- {{form.sex?sexArray[form.sex]:'请选择'}}
-
-
-
-
-
-
-
-
-
- 儿童年龄
-
-
-
-
-
-
-
-
-
- 报告原因
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-
- 其他信息
-
-
-
-
-
+
+ 机构上报
- 报告人信息
-
-
-
-
- 姓名
-
-
-
-
-
-
-
-
-
- 与儿童关系
-
-
-
-
-
-
-
-
-
- 电话
-
-
-
-
-
-
-
-
-
- 报告主体
-
-
- {{form.reporterType?SubjectArray[index]:'请选择'}}
-
-
-
-
-
-
-
-
-
- 职业
-
-
-
-
-
+
+
+
-
-
-
- 单位名称
-
-
-
-
-
+
+ 乡镇上报
-
-
-
-
-
-
-
+
+
+ .bottom-my {
+ position: relative;
+ .bottom-my-img {
+ image {
+ width: 710rpx;
+ height: 69rpx;
+ box-shadow: 5rpx 10rpx 20rpx 0 #b5f4d5;
+ border-radius: 100rpx;
+ }
+ }
+ .bottom-my-text {
+ position: absolute;
+ top: 25%;
+ left: 8%;
+ transform: translate(-25%, -8%);
+ color: #fff;
+ font-size: 28rpx;
+ }
+ }
+}
+
diff --git a/pages/receiptRegistration/townShip.vue b/pages/receiptRegistration/townShip.vue
new file mode 100644
index 0000000..6bd4836
--- /dev/null
+++ b/pages/receiptRegistration/townShip.vue
@@ -0,0 +1,238 @@
+
+
+
+
+
+ 上报历史
+
+
+ 我要上报
+
+
+
+
+ 发生地点
+
+
+
+
+
+
+
+
+
+ 儿童姓名
+
+
+
+
+
+
+
+
+
+ 儿童性别
+
+
+ {{form.sex?sexArray[form.sex]:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 儿童年龄
+
+
+
+
+
+
+
+
+
+ 报告原因
+
+
+
+
+
+
+
+
+
+ 其他信息
+
+
+
+
+
+
+
+ 报告人信息
+
+
+
+
+ 姓名
+
+
+
+
+
+
+
+
+
+ 与儿童关系
+
+
+
+
+
+
+
+
+
+ 电话
+
+
+
+
+
+
+
+
+
+ 报告主体
+
+
+ {{form.reporterType?SubjectArray[index]:'请选择'}}
+
+
+
+
+
+
+
+
+
+ 职业
+
+
+
+
+
+
+
+
+
+ 单位名称
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/ly/image17.png b/static/ly/image17.png
new file mode 100644
index 0000000..c574929
--- /dev/null
+++ b/static/ly/image17.png
diff --git a/static/ly/image18.png b/static/ly/image18.png
new file mode 100644
index 0000000..e5b90a8
--- /dev/null
+++ b/static/ly/image18.png