Commit dabbdb032dbbe689f9e949db7645a47ad3cf7f2b
1 parent
265e64e9
111
Showing
6 changed files
with
43 additions
and
16 deletions
Civil-Affairs-Bureau-WeChar @ 265e64e9a0c
| 1 | +Subproject commit 265e64e9a0cbb670ab3ba7d3d113ab4863bb0058 |
apis/modules/ryy.js
| @@ -7,5 +7,9 @@ export default { | @@ -7,5 +7,9 @@ export default { | ||
| 7 | }, | 7 | }, |
| 8 | addRegistration(data) { | 8 | addRegistration(data) { |
| 9 | return request.post('/childAdopt/registration',data) | 9 | return request.post('/childAdopt/registration',data) |
| 10 | + }, | ||
| 11 | + // 获取历史记录和流程 | ||
| 12 | + getHistory(pages) { | ||
| 13 | + return request.get('/childAdopt/registration/caseHistory',pages) | ||
| 10 | } | 14 | } |
| 11 | } | 15 | } |
| 12 | \ No newline at end of file | 16 | \ No newline at end of file |
pages/receiptRegistration/receiptRegistration.vue
| @@ -170,6 +170,8 @@ | @@ -170,6 +170,8 @@ | ||
| 170 | reporterType: "", | 170 | reporterType: "", |
| 171 | reporterOrganizationName: "", | 171 | reporterOrganizationName: "", |
| 172 | reporterOccupation: "", | 172 | reporterOccupation: "", |
| 173 | + userId: uni.getStorageSync('USERS_KEY').userId, | ||
| 174 | + reportPlatform: '数字民政服务平台小程序' | ||
| 173 | }, | 175 | }, |
| 174 | // 性别下拉框 | 176 | // 性别下拉框 |
| 175 | sexArray: ['男', '女'], | 177 | sexArray: ['男', '女'], |
| @@ -208,8 +210,6 @@ | @@ -208,8 +210,6 @@ | ||
| 208 | }, | 210 | }, |
| 209 | register(){ | 211 | register(){ |
| 210 | this.getTime(); | 212 | this.getTime(); |
| 211 | - this.form.reportPlatform = '数字民政服务平台小程序' | ||
| 212 | - console.log(this.form) | ||
| 213 | this.API.addRegistration(this.form).then(res => { | 213 | this.API.addRegistration(this.form).then(res => { |
| 214 | console.log(res) | 214 | console.log(res) |
| 215 | if (res.code == 200 ) { | 215 | if (res.code == 200 ) { |
pages/receiptRegistration/receiptRegistrationDetail.vue
| @@ -87,7 +87,7 @@ | @@ -87,7 +87,7 @@ | ||
| 87 | </view> | 87 | </view> |
| 88 | </view> | 88 | </view> |
| 89 | </view> | 89 | </view> |
| 90 | - <view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationSchedule')"> | 90 | + <view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationSchedule?item=' +JSON.stringify(item.chiAdoptCaseFlowExecuteNodeHistoryList))"> |
| 91 | <view>查看进度</view> | 91 | <view>查看进度</view> |
| 92 | <view class="top-box-img"><image src="../../static/right2.png"></image></view> | 92 | <view class="top-box-img"><image src="../../static/right2.png"></image></view> |
| 93 | </view> | 93 | </view> |
| @@ -103,11 +103,22 @@ | @@ -103,11 +103,22 @@ | ||
| 103 | // 接报信息 | 103 | // 接报信息 |
| 104 | message: {}, | 104 | message: {}, |
| 105 | // 报告主体内容 | 105 | // 报告主体内容 |
| 106 | - content: '' | 106 | + content: '', |
| 107 | + item: {} | ||
| 107 | }; | 108 | }; |
| 108 | }, | 109 | }, |
| 109 | computed: { | 110 | computed: { |
| 110 | }, | 111 | }, |
| 112 | + onLoad(params) { | ||
| 113 | + this.item = JSON.parse(params.item); | ||
| 114 | + this.message = this.item.chiAdoptCaseRegistrationPo; | ||
| 115 | + if (this.message.reporterType == '群众') { | ||
| 116 | + this.content = this.message.reporterOccupation; | ||
| 117 | + } else { | ||
| 118 | + this.content = this.message.reporterOrganizationName; | ||
| 119 | + } | ||
| 120 | + console.log('item', this.item) | ||
| 121 | + }, | ||
| 111 | methods: { | 122 | methods: { |
| 112 | gopath(e) { | 123 | gopath(e) { |
| 113 | uni.navigateTo({ | 124 | uni.navigateTo({ |
pages/receiptRegistration/receiptRegistrationList.vue
| 1 | <template> | 1 | <template> |
| 2 | <view> | 2 | <view> |
| 3 | <view> | 3 | <view> |
| 4 | - <view class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail')"> | ||
| 5 | - <view>时间时间时间时间时间<span style="margin-left: 20rpx;color: #547DFF;">流程状态</span></view> | 4 | + <view v-for="(item, index) in list" :key="index" class="top-box" @click="gopath('/pages/receiptRegistration/receiptRegistrationDetail?item=' +JSON.stringify(item))"> |
| 5 | + <view>{{item.chiAdoptCaseRegistrationPo.reportTime}}<span style="margin-left: 20rpx;color: #547DFF;">{{item.chiAdoptCaseFlowExecuteNodeHistoryList[item.chiAdoptCaseFlowExecuteNodeHistoryList.length-1].approvalStatus}}</span></view> | ||
| 6 | <view class="top-box-img"> | 6 | <view class="top-box-img"> |
| 7 | <image src="../../static/right2.png" mode="widthFix"></image> | 7 | <image src="../../static/right2.png" mode="widthFix"></image> |
| 8 | </view> | 8 | </view> |
| 9 | </view> | 9 | </view> |
| 10 | </view> | 10 | </view> |
| 11 | - <view style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;"> | 11 | + <view v-if="list.length == 0" style="width: 100%;text-align: center;margin-top: 100rpx;font-size: 30rpx;"> |
| 12 | 暂无数据 | 12 | 暂无数据 |
| 13 | </view> | 13 | </view> |
| 14 | </view> | 14 | </view> |
| @@ -18,10 +18,14 @@ | @@ -18,10 +18,14 @@ | ||
| 18 | export default { | 18 | export default { |
| 19 | data() { | 19 | data() { |
| 20 | return { | 20 | return { |
| 21 | + form:{ | ||
| 22 | + userId:uni.getStorageSync('USERS_KEY').userId, | ||
| 23 | + }, | ||
| 24 | + list:[] | ||
| 21 | } | 25 | } |
| 22 | }, | 26 | }, |
| 23 | onLoad() { | 27 | onLoad() { |
| 24 | - | 28 | + this.getHistory(); |
| 25 | }, | 29 | }, |
| 26 | methods: { | 30 | methods: { |
| 27 | gopath(e) { | 31 | gopath(e) { |
| @@ -29,6 +33,14 @@ | @@ -29,6 +33,14 @@ | ||
| 29 | url: e | 33 | url: e |
| 30 | }) | 34 | }) |
| 31 | }, | 35 | }, |
| 36 | + getHistory(){ | ||
| 37 | + this.API.getHistory(this.form).then(res => { | ||
| 38 | + if (res.code == 200) { | ||
| 39 | + this.list = res.data; | ||
| 40 | + } | ||
| 41 | + }) | ||
| 42 | + | ||
| 43 | + } | ||
| 32 | } | 44 | } |
| 33 | } | 45 | } |
| 34 | </script> | 46 | </script> |
pages/receiptRegistration/receiptRegistrationSchedule.vue
| 1 | <template> | 1 | <template> |
| 2 | <view class="page"> | 2 | <view class="page"> |
| 3 | - <view class="top-box"> | ||
| 4 | - <view>信息上报<span style="margin-left: 20rpx;color: #00D970;">已完成</span></view> | ||
| 5 | - </view> | ||
| 6 | - <view class="top-box"> | ||
| 7 | - <view>调查评估<span style="margin-left: 20rpx;color: #00D970;">已完成</span></view> | ||
| 8 | - </view> | ||
| 9 | - <view class="top-box"> | ||
| 10 | - <view>进行帮扶<span style="margin-left: 20rpx;color: #547DFF;">正在进行</span></view> | 3 | + <view class="top-box" v-for="(item, index) in list" :key="index"> |
| 4 | + <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> | ||
| 11 | </view> | 5 | </view> |
| 12 | </view> | 6 | </view> |
| 13 | </template> | 7 | </template> |
| @@ -17,8 +11,13 @@ | @@ -17,8 +11,13 @@ | ||
| 17 | export default { | 11 | export default { |
| 18 | data() { | 12 | data() { |
| 19 | return { | 13 | return { |
| 14 | + list: [] | ||
| 20 | }; | 15 | }; |
| 21 | }, | 16 | }, |
| 17 | + onLoad(params) { | ||
| 18 | + this.list = JSON.parse(params.item); | ||
| 19 | + console.log('list', this.list) | ||
| 20 | + }, | ||
| 22 | computed: { | 21 | computed: { |
| 23 | }, | 22 | }, |
| 24 | methods: { | 23 | methods: { |