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/receiptRegistration/organization.vue b/pages/receiptRegistration/organization.vue
new file mode 100644
index 0000000..487c7b1
--- /dev/null
+++ b/pages/receiptRegistration/organization.vue
@@ -0,0 +1,325 @@
+
+
+
+
+
+ 上报历史
+
+
+
+
+
+ 我要上报
+
+
+
+
+
+ 发生地点
+
+
+
+
+
+
+
+
+
+ 儿童姓名
+
+
+
+
+
+
+
+
+
+ 儿童性别
+
+
+ {{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