From e3f8916911792143f457d211182c13933c4397f4 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 19 May 2022 17:38:34 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BD=AC=E4=BA=A4=20=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/img/check-icon.png | Bin 0 -> 1279 bytes src/apps/AppHelpDeclaration/details.vue | 51 +-- src/apps/AppHelpDeclaration/result.vue | 388 +++++++++--------- src/saas/AppConflictMediation/Content.vue | 2 +- 4 files changed, 216 insertions(+), 225 deletions(-) create mode 100644 src/apps/AppHelpDeclaration/components/img/check-icon.png 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 0000000000000000000000000000000000000000..4955a0753fa23593e7483be30477a05d21ce1d96 GIT binary patch literal 1279 zcmVW^00001b5ch_0Itp) z=>Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91E}#Pd1ONa40RR91FaQ7m0F6Qo=Kuf%X-PyuRA>d&nOkfWRUF2@({>T8 zP(tmFv{gZF4^R*>Y9!!=CvBohD@4LAB+@{9kf$!xJ}eLTpz)HJ7}2P$iJ&HUK_%Fx zTEdeNLSkYF5P0AcQy`*MwwLYhpYP1D&2D#gc4s@Yot=l>Ip_S(IluYOH|NZL3zXqu zM5I%d8@JIeyOWT2%L?4sBW=l~9MH)w8}M*MHVe=Vk&3bb5ATsyN#ZL&DpS%9e8%sK zNOMB)EuljxX#G8Y1?iPRIX60Fod~`o^j#B~0-N#hURjLK6I zQJFO|gdP!Tatp2Fr$j2oTT(spFOE?jj~4^2`;=TN^P)0cZr}))yw$}*mmGZ60SVoT z;V|X#>|~%z3cmhpsl0pT(#DwTdZxe*@6E z(o*lhprGxG?6_1-Q5tvhJ}L=N%S*ZTUuuf{-__HAE=uF6MHbG5>w*oR0GDs(?(16P z+WVl(^ecY|+-o=Nk)6ENFDQiRLG_*G{jdv4s|())9Oj$MWAiNNQzO7e;4fHE-;$N zjLTIj2z=c85Fv*1ach*f{xt9iFYm!Q3iY!Uo?8m^oB;-ht-kBHS{&RC)XcD;-{C#% z{DHE{r>nH7t)6KW6HgoVN^P7j6XmgNVw+Pr#FXe&qUB+03cX6a{3)=U2HV>$Kvksz z|Ia~$?sxZZP9xd3If6eFks3ZDeN4qF`|kN`_ca5%)>_jH#f6%;&WCxvlfOWH{T*w pRQTzAcnVE<5c-gYzWS!RavN-Mi)=X993TJy002ovPDHLkV1l+cPrm>F literal 0 HcmV?d00001 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..118dee92 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -1,41 +1,44 @@ @@ -43,190 +46,197 @@ 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 + + uni.$on('goback', (res) => { + this.selectUser = res + if(res.name) { + this.doUsername = res.name + this.wxUserId = res.id + }else{ + this.doUsername = res.girdName + this.wxUserId = res.id + } + }) }) - }, - 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() - } - }) - }, - - 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, - } - if(this.selectUser.name) { //选择的网格员 - params.girdId = this.selectUser.girdId - params.girdMemberId = this.selectUser.id - params.girdMemberName = this.selectUser.name - } - } - if(this.status == 2) { - url = `/app/appclapeventinfo/refuse` - successText = '拒绝成功' - params = {...this.forms} - } - if(this.status == 3) { - url = `/app/appclapeventinfo/finishByGirdMember` - successText = '办结成功' - params = {...this.forms} - } - params.id = this.id - this.$http.post(url, params).then((res) => { - if (res.code == 0) { - this.$u.toast(successText) - uni.$emit('updateDeatil') - uni.$emit('getListInit') - setTimeout(() => { - if(this.status == 1) { - uni.navigateBack({delta: 2}) - }else { - uni.navigateBack() - } - },600) - } - }) - }, - selectStatus(e) { - this.forms.groupName = e[0].label - this.forms.groupId = e[0].value - }, + // 选择转交对象 toSelectUser() { uni.navigateTo({ url: './SelectUser' }) }, + + submit() { + if (this.status == 1) { + if(!this.doUsername) { + return this.$u.toast('请选择转交对象') + } + } + if (this.status == 2) { + if(!this.auditStatus) { + return this.$u.toast('请选择处理结果') + } + } + + // let ids = []; + // ids.push(this.id); + 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) { + form = { + auditStatus: this.auditStatus, + description: this.description, + files: this.files, + declarationId: this.id, + wxUserId: this.wxUserId, + } + url = '/app/apphelpdeclarationinfo/audit' + } + this.$http.post(url,form).then(res => { + if (res.code == 0) { + this.$u.toast('提交成功') + uni.$emit('update') + setTimeout(() => { + uni.navigateBack({delta: 2}) + },600) + } + }) + } }, + 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') From 05faf2db0db6f593b727024e3b0d346a9162d5b8 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 19 May 2022 17:54:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8D=A2=E4=BA=BA=E5=91=98=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppHelpDeclaration/result.vue | 40 ++++++++++++++++---------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue index 118dee92..a1f29614 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -9,8 +9,11 @@
- - + + + +
通过审核
@@ -64,23 +67,30 @@ export default { this.id = o.id this.showPage = true - uni.$on('goback', (res) => { - this.selectUser = res - if(res.name) { - this.doUsername = res.name - this.wxUserId = res.id - }else{ - this.doUsername = res.girdName - this.wxUserId = res.id - } - }) + // uni.$on('goback', (res) => { + // this.selectUser = res + // if(res.name) { + // this.doUsername = res.name + // this.wxUserId = res.id + // }else{ + // this.doUsername = res.girdName + // this.wxUserId = res.id + // } + // }) }) }, methods: { - // 选择转交对象 - toSelectUser() { - uni.navigateTo({ url: './SelectUser' }) + // 网格选择转交对象 + // toSelectUser() { + // uni.navigateTo({ url: './SelectUser' }) + // }, + + // 人员组件选择转交对象 + handlePartySelect(e) { + this.wxUserId = e[0].id + this.doUsername = e[0].name + // this.getUserList() }, submit() { From cbd50c1b685088fe87d72b7e4e67cec291b52882 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 19 May 2022 18:02:54 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppHelpDeclaration/result.vue | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/src/apps/AppHelpDeclaration/result.vue b/src/apps/AppHelpDeclaration/result.vue index a1f29614..8c10a5d3 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -67,30 +67,15 @@ export default { this.id = o.id this.showPage = true - // uni.$on('goback', (res) => { - // this.selectUser = res - // if(res.name) { - // this.doUsername = res.name - // this.wxUserId = res.id - // }else{ - // this.doUsername = res.girdName - // this.wxUserId = res.id - // } - // }) }) }, methods: { - // 网格选择转交对象 - // toSelectUser() { - // uni.navigateTo({ url: './SelectUser' }) - // }, - // 人员组件选择转交对象 handlePartySelect(e) { + console.log(e); this.wxUserId = e[0].id this.doUsername = e[0].name - // this.getUserList() }, submit() { @@ -105,8 +90,6 @@ export default { } } - // let ids = []; - // ids.push(this.id); let url = '' let form = {} if (this.status == 1) { From ea60f05a498c2d37938fedc9bbf2ff91a855074f Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 19 May 2022 18:03:43 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/apps/AppHelpDeclaration/SelectUser.vue | 339 --------------------- src/apps/AppHelpDeclaration/result.vue | 2 - 2 files changed, 341 deletions(-) delete mode 100644 src/apps/AppHelpDeclaration/SelectUser.vue 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/result.vue b/src/apps/AppHelpDeclaration/result.vue index 8c10a5d3..62ecddee 100644 --- a/src/apps/AppHelpDeclaration/result.vue +++ b/src/apps/AppHelpDeclaration/result.vue @@ -12,8 +12,6 @@ -
通过审核