From dabbdb032dbbe689f9e949db7645a47ad3cf7f2b Mon Sep 17 00:00:00 2001
From: “DataPlanet” <“1950895181@qq.com”>
Date: Wed, 6 Dec 2023 01:43:47 +0800
Subject: [PATCH] 111

---
 Civil-Affairs-Bureau-WeChar                               |  1 +
 apis/modules/ryy.js                                       |  4 ++++
 pages/receiptRegistration/receiptRegistration.vue         |  4 ++--
 pages/receiptRegistration/receiptRegistrationDetail.vue   | 15 +++++++++++++--
 pages/receiptRegistration/receiptRegistrationList.vue     | 20 ++++++++++++++++----
 pages/receiptRegistration/receiptRegistrationSchedule.vue | 15 +++++++--------
 6 files changed, 43 insertions(+), 16 deletions(-)
 create mode 160000 Civil-Affairs-Bureau-WeChar

diff --git a/Civil-Affairs-Bureau-WeChar b/Civil-Affairs-Bureau-WeChar
new file mode 160000
index 0000000..265e64e
--- /dev/null
+++ b/Civil-Affairs-Bureau-WeChar
@@ -0,0 +1 @@
+Subproject commit 265e64e9a0cbb670ab3ba7d3d113ab4863bb0058
diff --git a/apis/modules/ryy.js b/apis/modules/ryy.js
index 9ef6b7f..608bee4 100644
--- a/apis/modules/ryy.js
+++ b/apis/modules/ryy.js
@@ -7,5 +7,9 @@ export default {
 	},
 	addRegistration(data) {
 		return request.post('/childAdopt/registration',data)
+	},
+	// 获取历史记录和流程
+	getHistory(pages) {
+		return request.get('/childAdopt/registration/caseHistory',pages)
 	}
 }
\ No newline at end of file
diff --git a/pages/receiptRegistration/receiptRegistration.vue b/pages/receiptRegistration/receiptRegistration.vue
index 78c71e8..a1347ea 100644
--- a/pages/receiptRegistration/receiptRegistration.vue
+++ b/pages/receiptRegistration/receiptRegistration.vue
@@ -170,6 +170,8 @@
 					reporterType: "",
 					reporterOrganizationName: "",
 					reporterOccupation: "",
+					userId: uni.getStorageSync('USERS_KEY').userId,
+					reportPlatform: '数字民政服务平台小程序'
 				},
 				// 性别下拉框
 				sexArray: ['男', '女'],
@@ -208,8 +210,6 @@
 			},
 			register(){
 				this.getTime();
-				this.form.reportPlatform = '数字民政服务平台小程序'
-				console.log(this.form)
 				this.API.addRegistration(this.form).then(res => {
 					console.log(res)
 					if (res.code == 200 ) {
diff --git a/pages/receiptRegistration/receiptRegistrationDetail.vue b/pages/receiptRegistration/receiptRegistrationDetail.vue
index 0574428..191ffbd 100644
--- a/pages/receiptRegistration/receiptRegistrationDetail.vue
+++ b/pages/receiptRegistration/receiptRegistrationDetail.vue
@@ -87,7 +87,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationSchedule')">
+				<view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationSchedule?item=' +JSON.stringify(item.chiAdoptCaseFlowExecuteNodeHistoryList))">
 					<view>查看进度</view>
 					<view class="top-box-img"><image src="../../static/right2.png"></image></view>
 				</view>
@@ -103,11 +103,22 @@
 				// 接报信息
 				      message: {},
 				      // 报告主体内容
-				      content: ''
+				      content: '',
+					  item: {}
 			};
 		},
 		computed: {
 		},
+		onLoad(params) {
+			this.item = JSON.parse(params.item);
+			this.message = this.item.chiAdoptCaseRegistrationPo;
+			if (this.message.reporterType == '群众') {
+				this.content = this.message.reporterOccupation;
+			} else {
+				this.content = this.message.reporterOrganizationName;
+			}
+			console.log('item', this.item)
+		},
 		methods: {
 			gopath(e) {
 				uni.navigateTo({
diff --git a/pages/receiptRegistration/receiptRegistrationList.vue b/pages/receiptRegistration/receiptRegistrationList.vue
index f517461..f00d82d 100644
--- a/pages/receiptRegistration/receiptRegistrationList.vue
+++ b/pages/receiptRegistration/receiptRegistrationList.vue
@@ -1,14 +1,14 @@
 <template>
 	<view>
 		<view>
-			<view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail')">
-				<view>时间时间时间时间时间<span style="margin-left: 20rpx;color: #547DFF;">流程状态</span></view>
+			<view v-for="(item, index) in list" :key="index" class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail?item=' +JSON.stringify(item))">
+				<view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].approvalStatus}}</span></view>
 				<view class="top-box-img">
 					<image src="../../static/right2.png" mode="widthFix"></image>
 				</view>
 			</view>
 		</view>
-		<view style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;">
+		<view v-if="list.length == 0" style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;">
 			暂无数据
 		</view>
 	</view>
@@ -18,10 +18,14 @@
 	export default {
 		data() {
 			return {
+				form:{
+					userId:uni.getStorageSync('USERS_KEY').userId,
+				},
+				list:[]
 			}
 		},
 		onLoad() {
-			
+			this.getHistory();
 		},
 		methods: {
 			gopath(e) {
@@ -29,6 +33,14 @@
 					url: e
 				})
 			},
+			getHistory(){
+				this.API.getHistory(this.form).then(res => {
+					if (res.code == 200) {
+						this.list = res.data;
+					}
+				})
+				
+			}
 		}
 	}
 </script>
diff --git a/pages/receiptRegistration/receiptRegistrationSchedule.vue b/pages/receiptRegistration/receiptRegistrationSchedule.vue
index de68702..b1f0a88 100644
--- a/pages/receiptRegistration/receiptRegistrationSchedule.vue
+++ b/pages/receiptRegistration/receiptRegistrationSchedule.vue
@@ -1,13 +1,7 @@
 <template>
 	<view class="page">
-		<view  class="top-box">
-			<view>信息上报<span style="margin-left: 20rpx;color: #00D970;">已完成</span></view>
-		</view>
-		<view  class="top-box">
-			<view>调查评估<span style="margin-left: 20rpx;color: #00D970;">已完成</span></view>
-		</view>
-		<view  class="top-box">
-			<view>进行帮扶<span style="margin-left: 20rpx;color: #547DFF;">正在进行</span></view>
+		<view  class="top-box" v-for="(item, index) in list" :key="index">
+			<view>{{item.nodeName}}<span v-if="item.nodeAuditStatus =='true'" style="margin-left: 20rpx;color: #00D970;">已完成</span><span v-if="item.nodeAuditStatus =='flase'" style="margin-left: 20rpx;color: red;">正在进行</span></view>
 		</view>
 	</view>
 </template>
@@ -17,8 +11,13 @@
 	export default {
 		data() {
 			return {
+				list: []
 			};
 		},
+		onLoad(params) {
+			this.list = JSON.parse(params.item);
+			console.log('list', this.list)
+		},
 		computed: {
 		},
 		methods: {
--
libgit2 0.21.4