diff --git a/project/hlj/app/AppRatingTask/AppRatingTask.vue b/project/hlj/app/AppRatingTask/AppRatingTask.vue index 3d8cbe12..8fa07636 100644 --- a/project/hlj/app/AppRatingTask/AppRatingTask.vue +++ b/project/hlj/app/AppRatingTask/AppRatingTask.vue @@ -7,9 +7,9 @@ - - diff --git a/project/hlj/app/AppRatingTask/components/Detail.vue b/project/hlj/app/AppRatingTask/components/Detail.vue index ba60b08e..477ca135 100644 --- a/project/hlj/app/AppRatingTask/components/Detail.vue +++ b/project/hlj/app/AppRatingTask/components/Detail.vue @@ -1,123 +1,102 @@ @@ -135,6 +114,20 @@ data () { return { info: {}, + form: { + date: '', + name: '', + type: '', + examines: [], + examines1: [], + examinesName2: '', + examinesName1: '' + }, + search: { + current: 1, + size: 10, + name: '' + }, isShow: false, currIndex: 0, isLoading: false, @@ -149,12 +142,11 @@ }, created () { - this.isLoading = true if (this.params && this.params.id) { this.id = this.params.id - this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => { - this.getInfo(this.params.id) - }) + // this.$dict.load(['EP_registerPersonType', 'EP_communityHandleType', 'EP_highRiskIndustries', 'EP_travelType', 'yesOrNo', 'EP_homeStatus2', 'EP_quarantineStrategy', 'EP_controlMethod', 'EP_abnormalType']).then(() => { + // this.getInfo(this.params.id) + // }) } }, @@ -174,6 +166,28 @@ }) }, + onUserChange(e, type) { + if (e.length) { + this.form[type] = '1' + } else { + this.form[type] = '' + } + }, + + onConfirm (id) { + this.$refs.form.validate((valid) => { + if (valid) { + this.isShow = false + this.$emit('change', { + type: 'Detail', + params: { + id: id || '' + } + }) + } + }) + }, + cancel () { this.$emit('change', { type: 'List', @@ -185,4 +199,85 @@ diff --git a/project/hlj/app/AppRatingTask/components/FormDetail.vue b/project/hlj/app/AppRatingTask/components/FormDetail.vue new file mode 100644 index 00000000..247e5cde --- /dev/null +++ b/project/hlj/app/AppRatingTask/components/FormDetail.vue @@ -0,0 +1,301 @@ + + + + + diff --git a/project/hlj/app/AppRatingTask/components/List.vue b/project/hlj/app/AppRatingTask/components/List.vue index d8d5c1f4..9d9659cd 100644 --- a/project/hlj/app/AppRatingTask/components/List.vue +++ b/project/hlj/app/AppRatingTask/components/List.vue @@ -5,7 +5,7 @@
@@ -58,6 +69,9 @@ size: 10, name: '' }, + form: { + name: '' + }, colConfigs: [ { prop: 'name', label: '任务名称' }, { prop: 'phone', align: 'center', label: '创建人' }, @@ -67,7 +81,8 @@ ids: [], tableData: [], total: 0, - loading: false + loading: false, + isShow: false } }, @@ -98,11 +113,16 @@ }) }, - toDetail (id) { - this.$emit('change', { - type: 'Detail', - params: { - id: id || '' + onConfirm (id) { + this.$refs.form.validate((valid) => { + if (valid) { + this.isShow = false + this.$emit('change', { + type: 'FormDetail', + params: { + id: id || '' + } + }) } }) }, diff --git a/project/pingchang/apps/AppCommunityMember/Add.vue b/project/pingchang/apps/AppCommunityMember/Add.vue index 88ee9b76..2a0db606 100644 --- a/project/pingchang/apps/AppCommunityMember/Add.vue +++ b/project/pingchang/apps/AppCommunityMember/Add.vue @@ -79,7 +79,7 @@ > - +
@@ -130,7 +130,7 @@ export default { stopSignupTime: [{ required: true, message: '请选择截止时间', trigger: 'change' }], contactPerson: [{ required: true, message: '请输入联系人', trigger: 'change' }], contactPhone: [{ required: true, message: '请输入联系电话', trigger: 'change' }], - content: [{ required: true, message: '请输入活动介绍', trigger: 'change' }], + content: [{ required: true, message: '请输入活动介绍', trigger: 'blur' }], }, form: { areaId: '', @@ -149,7 +149,7 @@ export default { created() { console.log(this.user) this.dict.load("education", "sex", "nation", "developStatus") - this.disabledLevel = this.user.info.areaList.length - 1 + this.disabledLevel = this.user.info.areaList.length this.form.areaId = this.user.info.areaId }, methods: { diff --git a/project/pingchang/apps/AppCommunityMember/Detail.vue b/project/pingchang/apps/AppCommunityMember/Detail.vue index 919f57e8..e2403edf 100644 --- a/project/pingchang/apps/AppCommunityMember/Detail.vue +++ b/project/pingchang/apps/AppCommunityMember/Detail.vue @@ -19,7 +19,7 @@ {{ info.total }} {{ dict.getLabel('partyReportSignupStatus', info.signupStatus) }} {{ dict.getLabel('activityStatus', info.actionStatus) }} - {{ info.beginTime.substring(0, 10) }} 至 {{ info.endTime.substring(0, 10) }} + {{ info.beginTime }} 至 {{ info.endTime }} {{ info.stopSignupTime }} {{ info.contactPerson }} {{ info.contactPhone }} @@ -34,8 +34,9 @@ + + + {{ userInfo.userName }} + {{ userInfo.submitTime }} + {{ userInfo.content }} + + + + + + @@ -87,7 +103,9 @@ export default { {prop: "logStatus", label: "活动日志", align: "center", dict: 'partyReportSignupLogStatus'}, {slot: "options"}, ], - userList: [] + userList: [], + showDialog: false, + userInfo: {} } }, @@ -106,7 +124,7 @@ export default { getInfo() { this.instance.post(`/app/apppartyreport/queryDetailById?id=${this.id}`).then((res) => { if (res?.data) { - this.info = res.data; + this.info = res.data if (this.info.birthday) { this.info.birthday = this.info.birthday.substring(0, 10); } @@ -117,8 +135,20 @@ export default { this.instance.post(`/app/apppartyreport/signup-info?id=${this.id}`).then((res) => { if (res?.data) { res.data.map((item) => { - item.signupTime = item.signupTime.substring(0, 10) + if(item.signupTime) { + item.signupTime = item.signupTime.substring(0, 10) + } }) + this.userList = res.data + } + }); + }, + viewUser(row) { + this.instance.post(`app/apppartyreport/log?id=${row.id}`).then((res) => { + if (res.code == 0) { + this.userInfo = {...res.data} + this.userInfo.userName = row.partyName + this.showDialog = true } }); }, diff --git a/project/pingchang/apps/AppCommunityMember/Statistics.vue b/project/pingchang/apps/AppCommunityMember/Statistics.vue index da7400b3..79383a11 100644 --- a/project/pingchang/apps/AppCommunityMember/Statistics.vue +++ b/project/pingchang/apps/AppCommunityMember/Statistics.vue @@ -168,12 +168,7 @@ export default { { prop: "sex", label: "性别", align: "center", dict: "sex" }, { prop: "partyOrg", label: "所属组织", align: "center" }, { prop: "signupCount", label: "报名次数", align: "center", width: 150 }, - { - prop: "partakeCount", - label: "参与次数", - align: "center", - width: 150, - }, + { prop: "partakeCount", label: "参与次数", align: "center", width: 150 }, ], }; },