diff --git a/src/apps/AppHelpDeclaration/SelectUser.vue b/src/apps/AppHelpDeclaration/SelectUser.vue deleted file mode 100644 index 0389c29f..00000000 --- a/src/apps/AppHelpDeclaration/SelectUser.vue +++ /dev/null @@ -1,339 +0,0 @@ - - - - - diff --git a/src/apps/AppHelpDeclaration/components/img/check-icon.png b/src/apps/AppHelpDeclaration/components/img/check-icon.png new file mode 100644 index 00000000..4955a075 Binary files /dev/null and b/src/apps/AppHelpDeclaration/components/img/check-icon.png differ diff --git a/src/apps/AppHelpDeclaration/details.vue b/src/apps/AppHelpDeclaration/details.vue index d7cc839a..c415547b 100644 --- a/src/apps/AppHelpDeclaration/details.vue +++ b/src/apps/AppHelpDeclaration/details.vue @@ -93,20 +93,15 @@
-
+
转交事件
- - -
审核处理
+
+ 审核处理 +
- -
前往办理
-
@@ -117,7 +112,6 @@ export default { list: [], data: {}, id: '', - doItShow: false, } }, onLoad(o) { @@ -142,8 +136,9 @@ export default { current: img }) }, + // 转交 1 ， 审核处理 2 toContent(status) { - uni.navigateTo({ url: `./result?status=${status}` }) + uni.navigateTo({ url: `./result?status=${status}&id=${this.id}` }) }, } } @@ -366,38 +361,24 @@ export default { display: flex; flex-direction: column; align-items: center; - width: 50%; - padding: 16px 0; + flex: 1; + padding: 28px 0; border-top: 1px solid #ddd; .hint { - margin-top: 16px; + font-size: 32px; - color: #666666; + color: #333; } } - .border-r { - border-right: 1px solid #ddd; - } - .doIt { - width: 56%; + .columns:last-child { + border-left: 1px solid #ddd; background: #3975c6; - text-align: center; - line-height: 112px; - font-size: 32px; - font-weight: 500; - color: #fff; + .hint { + font-size: 32px; + color: #FFF; + } } } - - .endDoIt { - background: #3975c6; - text-align: center; - padding: 34px 0; - - font-size: 32px; - font-weight: 500; - color: #ffffff; - } } } \ No newline at end of file diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue index 17210189..62ecddee 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -1,41 +1,45 @@ @@ -43,190 +47,187 @@ export default { data() { return { - forms: { - groupName: '', - groupId: '', - content: '', - files: [], - name: '' - }, - flag: false, - show: false, - status: '', //1转交 2拒绝受理 3我已办结 - myList: [], - id: '', + // operation: '', + description: '', + status: '', + files: [], + showPage: false, + id:'', + doUsername: '', selectUser: {}, - titleList: ['', '转交事件', '拒绝受理', '我已办结'] + auditStatus: '', + wxUserId: '', } }, - onLoad(option) { - this.status = option.status - this.id = option.id - this.forms.groupId = option.groupId - this.forms.groupName = option.groupName - this.typeList() - uni.$on('goback', (res) => { - this.selectUser = res - if(res.name) { - this.forms.name = res.name - }else{ - this.forms.name = res.girdName - } + onLoad(o) { + this.$dict.load('fpRiskPersonOperation1','fpRiskPersonOperation2','fpRiskType').then(()=>{ + this.status = o.status + this.id = o.id + this.showPage = true + }) - }, - onShow() { - console.log(this.titleList[this.status]) - document.title = this.titleList[this.status] + }, methods: { - - typeList() { - this.$http.post(`/app/appclapeventgroup/list`, null, { - params: { - size: 9999, - }, - }) - .then((res) => { - if (res.code == 0) { - this.myList = res.data.records - this.$forceUpdate() - } - }) + // 人员组件选择转交对象 + handlePartySelect(e) { + console.log(e); + this.wxUserId = e[0].id + this.doUsername = e[0].name }, - confirm() { - if(this.status == 1 && !this.forms.name) { - return this.$u.toast('请选择转交对象') - } - if(this.status != 1 && !this.forms.groupName) { - return this.$u.toast('请选择分类') - } - if(this.status != 1 && !this.forms.content) { - return this.$u.toast('请输入意见') - } - this.submit() - }, - submit() { //status 1转交 2拒绝受理 3我已办结 - var url = '', successText= '', params= '' - if(this.status == 1) { - url = `/app/appclapeventinfo/transfer` - successText = '转交成功' - params = { - ...this.forms, - girdId: this.selectUser.id, - girdName: this.selectUser.girdName, + submit() { + if (this.status == 1) { + if(!this.doUsername) { + return this.$u.toast('请选择转交对象') } - if(this.selectUser.name) { //选择的网格员 - params.girdId = this.selectUser.girdId - params.girdMemberId = this.selectUser.id - params.girdMemberName = this.selectUser.name + } + if (this.status == 2) { + if(!this.auditStatus) { + return this.$u.toast('请选择处理结果') } + } + + let url = '' + let form = {} + if (this.status == 1) { + form = { + doUsername: this.doUsername, + description: this.description, + files: this.files, + declarationId: this.id, + wxUserId: this.wxUserId, + } + url = '/app/apphelpdeclarationinfo/forward' } - if(this.status == 2) { - url = `/app/appclapeventinfo/refuse` - successText = '拒绝成功' - params = {...this.forms} + if (this.status == 2) { + form = { + auditStatus: this.auditStatus, + description: this.description, + files: this.files, + declarationId: this.id, + wxUserId: this.wxUserId, + } + url = '/app/apphelpdeclarationinfo/audit' } - if(this.status == 3) { - url = `/app/appclapeventinfo/finishByGirdMember` - successText = '办结成功' - params = {...this.forms} - } - params.id = this.id - this.$http.post(url, params).then((res) => { + this.$http.post(url,form).then(res => { if (res.code == 0) { - this.$u.toast(successText) - uni.$emit('updateDeatil') - uni.$emit('getListInit') + this.$u.toast('提交成功') + uni.$emit('update') setTimeout(() => { - if(this.status == 1) { - uni.navigateBack({delta: 2}) - }else { - uni.navigateBack() - } + uni.navigateBack({delta: 2}) },600) } }) - }, - selectStatus(e) { - this.forms.groupName = e[0].label - this.forms.groupId = e[0].value - }, - toSelectUser() { - uni.navigateTo({ url: './SelectUser' }) - }, + } }, + onShow() { + document.title = this.checkType == 1? "处理意见":this.checkType == 2? "处理结果": '' + } } - + \ No newline at end of file diff --git a/src/saas/AppConflictMediation/Content.vue b/src/saas/AppConflictMediation/Content.vue index 83133b7f..673b48c0 100644 --- a/src/saas/AppConflictMediation/Content.vue +++ b/src/saas/AppConflictMediation/Content.vue @@ -139,7 +139,7 @@ export default { params = {...this.forms} } params.id = this.id - this.$http.post(url, params).then((res) => { + this.$http.post(url, form).then((res) => { if (res?.code == 0) { this.$u.toast(successText) uni.$emit('update')