diff --git a/src/components/pages/selectSysUser.vue b/src/components/pages/selectSysUser.vue index b861c6e7..98c7ea58 100644 --- a/src/components/pages/selectSysUser.vue +++ b/src/components/pages/selectSysUser.vue @@ -11,7 +11,8 @@
- {{ item.name }} + + {{ nodeKey == 'openId' ? item.realName : item.name }} ({{item.mobile}})
diff --git a/src/project/fd/AppIntegralApply/AppIntegralApply.vue b/src/project/fd/AppIntegralApply/AppIntegralApply.vue deleted file mode 100644 index f04122b1..00000000 --- a/src/project/fd/AppIntegralApply/AppIntegralApply.vue +++ /dev/null @@ -1,114 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/project/fd/AppPointsReview/AppPointsReview.vue b/src/project/fd/AppPointsReview/AppPointsReview.vue index 651b8882..155ee5fe 100644 --- a/src/project/fd/AppPointsReview/AppPointsReview.vue +++ b/src/project/fd/AppPointsReview/AppPointsReview.vue @@ -32,7 +32,7 @@
推送精选
-
{{item.createUserName}}积分+{{item.applyIntegral}}
+
{{item.integralUserName}}积分+{{item.applyIntegral}}
{{item.createTime}} {{ $dict.getLabel('appIntegralApplyEventStatus', item.status) }} @@ -46,7 +46,7 @@ - +
@@ -164,7 +164,10 @@ export default { this.search.type = '' this.search.typeName = '' this.getListInit() - } + }, + toAdd() { + uni.navigateTo({url: './integralAdd'}) + }, }, onReachBottom() { this.current = this.current + 1; diff --git a/src/project/fd/AppPointsReview/detail.vue b/src/project/fd/AppPointsReview/detail.vue index 1df12ff0..222f77ad 100644 --- a/src/project/fd/AppPointsReview/detail.vue +++ b/src/project/fd/AppPointsReview/detail.vue @@ -6,14 +6,14 @@
{{ $dict.getLabel('appIntegralApplyEventStatus', info.status) }}
-
申请人：{{info.createUserName}}
+
申请人：{{info.integralUserName}}
电话号码：{{info.phone}}

申请信息

-
+
取消 {{isEdit ? '保存' : '编辑'}}
@@ -21,7 +21,7 @@
积分值
- + {{info.applyIntegral}}
@@ -98,7 +98,8 @@ export default { info: {}, showVideo: false, videoUrl: '', - isEdit: false + isEdit: false, + flag: false }; }, onLoad(option) { @@ -117,6 +118,7 @@ export default { this.info = res.data this.info.images = res.data.files.filter(e => (['jpeg', 'jpg', 'png'].includes(e.name.split('.')[1]))) this.info.videos = res.data.files.filter(e => (['mp4'].includes(e.name.split('.')[1]))) + this.flag = false } }) }, @@ -167,14 +169,42 @@ export default { }, edit() { if(this.isEdit) { - this.editConfirm() + this.submit() }else { this.isEdit = true } }, - editConfirm() { + submit() { + if(this.flag) return - } + if (!this.info.content) { + return this.$u.toast('请输入详细描述') + } + + if ((this.info.images.length + this.info.videos.length) > 9) { + return this.$u.toast('图片和视频不得超过9个') + } else { + this.info.files = [...this.info.images,...this.info.videos] + } + + this.flag = true + this.$http.post(`/app/appintegraluserapply/updateByGirdMember`,{ + ...this.info, + userId: this.info.integralUserId, + // phone: this.info.phone, + // applyItemId: this.info.applyItemId, + // content: this.info.content, + // girdId: this.info.girdId, + // id: this.info.id + }).then(res=> { + if(res?.data) { + this.$u.toast('提交成功') + uni.$emit('updateList') + this.getDetail() + this.isEdit = false + } + }) + }, }, }; diff --git a/src/project/fd/AppIntegralApply/integralAdd.vue b/src/project/fd/AppPointsReview/integralAdd.vue similarity index 84% rename from src/project/fd/AppIntegralApply/integralAdd.vue rename to src/project/fd/AppPointsReview/integralAdd.vue index 6ea4ef69..4fb287f6 100644 --- a/src/project/fd/AppIntegralApply/integralAdd.vue +++ b/src/project/fd/AppPointsReview/integralAdd.vue @@ -2,8 +2,10 @@
*姓名
-
{{form.name || '请选择'}} - +
+ + +
@@ -16,7 +18,9 @@
*事件类型
- +
+ +
*积分值
@@ -49,7 +53,7 @@ -
{{user.girdName}}
+
{{form.girdName}}
@@ -66,8 +70,12 @@ export default { data() { return { form: { + name: '', + userId: '', + phone: '', + idNumber: '', applyItemId: '', - applyIntegral: '', + applyIntegral: 0, applyItemName: '', content: '', files: [], @@ -90,6 +98,8 @@ export default { this.id = o.id this.getDetail() } + this.form.girdId = this.user.girdId + this.form.girdName = this.user.girdName this.$dict.load(['clapEventStatus']) this.getType() }, @@ -108,6 +118,10 @@ export default { submit() { if(this.flag) return + if (!this.form.name) { + return this.$u.toast('请选择代申请人员') + } + if (!this.form.applyItemId) { return this.$u.toast('请选择事件类型') } @@ -122,17 +136,13 @@ export default { this.form.files = [...this.form.images,...this.form.videos] } - if (!this.form.girdId) { - return this.$u.toast('请选择所属网格') - } - this.flag = true - this.$http.post(`/app/appintegraluserapply/addOrUpdate`,{ + this.$http.post(`/app/appintegraluserapply/add`,{ ...this.form }).then(res=> { if(res?.data) { this.$u.toast('提交成功') - uni.$emit('edit') + uni.$emit('updateList') setTimeout(()=> { uni.navigateBack() },500) @@ -141,7 +151,7 @@ export default { }, // 事件类型 getType() { - this.$http.post(`/app/appintegralrule/listByFdAndGirdInfo`).then(res=> { + this.$http.post(`/app/appintegralrule/listByFD`).then(res=> { if(res?.data) { this.list = res.data this.dictList = res.data.map(v => { @@ -167,8 +177,11 @@ export default { } }) }, - toSelectUser() { - console.log(122) + handleSelectUser(v) { + this.form.name = v?.[0]?.realName || "" + this.form.userId = v?.[0]?.openId || "" + this.form.phone = v?.[0]?.phone || "" + this.form.idNumber = v?.[0]?.idNumber || "" }, } } @@ -244,9 +257,9 @@ export default { } } - ::v-deep .display { - display: inline-block; - } + // ::v-deep .display { + // display: inline-block; + // } .footer{ width: 100%; height: 96px;