From e34287e0ccab2c055bb45b7167e88ba7d1b73b4a Mon Sep 17 00:00:00 2001 From: luochenyi <541660090@qq.com> Date: Mon, 14 Mar 2022 16:49:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=97=B6=E9=97=B4=E9=87=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 25 +---------- src/components/searchForm/index.vue | 32 ++++++++++---- .../Activity/_activityManage/index.vue | 43 ++++--------------- .../Operation/Announcement/depend/config.js | 3 +- src/views/Operation/Announcement/index.vue | 7 ++- .../_inspectionPlan/depend/config.js | 1 + .../News/_newsManage/depend/config.js | 3 +- src/views/Shop/ScoreSetting/index.vue | 41 ++++++++++++------ 8 files changed, 70 insertions(+), 85 deletions(-) diff --git a/README.md b/README.md index b07d320..678a22d 100644 --- a/README.md +++ b/README.md @@ -1,24 +1 @@ -# ansu-business - -## Project setup -``` -yarn install -``` - -### Compiles and hot-reloads for development -``` -yarn serve -``` - -### Compiles and minifies for production -``` -yarn build -``` - -### Lints and fixes files -``` -yarn lint -``` - -### Customize configuration -See [Configuration Reference](https://cli.vuejs.org/config/). +未开发功能：缴费计划、账单管理（暂无接口），工单管理（暂无接口） \ No newline at end of file diff --git a/src/components/searchForm/index.vue b/src/components/searchForm/index.vue index 05db067..80f80cf 100644 --- a/src/components/searchForm/index.vue +++ b/src/components/searchForm/index.vue @@ -21,7 +21,7 @@ >{{ option.name }} - +
查询 @@ -42,7 +42,7 @@ export default { this.itemList = val let obj = {} for(let k of val){ - if(k.type === 'time'){ + if(k.type==='time'){ obj[k.start] = undefined obj[k.end] = undefined }else{ @@ -62,17 +62,31 @@ export default { }, methods: { getSearch() { - this.$emit('getSearch', this.form) + let obj = {} + for(let k in this.form){ + if (!Array.isArray(this.form[k])) { + obj[k] = this.form[k] + }else{ + console.log(k); + let start = k + 'StartTime' + let end = k + 'EndTime' + obj[start] = this.form[k][0] + obj[end] = this.form[k][1] + } + } + let obj1 = Object.assign({}, obj) + console.log(obj1); + this.$emit('getSearch', obj1) }, resetForm() { this.$refs.ruleForm.resetFields(); - this.$emit('getSearch', this.form,'clear') + this.getSearch() }, - // changeTime(data,start,end){ - // this.$emit('changeTime', data,start,end) - // this.form[start] = data[0] - // this.form[end] = data[1] - // } + changeTime(data,start,end){ + this.$emit('changeTime', data,start,end) + this.form[start] = data[0] + this.form[end] = data[1] + } }, }; diff --git a/src/views/Operation/Activity/_activityManage/index.vue b/src/views/Operation/Activity/_activityManage/index.vue index 26dfb81..e07a9e1 100644 --- a/src/views/Operation/Activity/_activityManage/index.vue +++ b/src/views/Operation/Activity/_activityManage/index.vue @@ -115,36 +115,9 @@ export default { this.getData(); }, methods: { - search(data,type) { - if(type ==='clear'){ - this.searchForm = { - activityAddress: undefined, - organizerName: undefined, - activityContact: undefined, - activityTel: undefined, - title: undefined, - status: undefined, - registrationStartTime: undefined, - registrationEndTime: undefined, - activityStartTime: undefined, - activityEndTime: undefined, - } - }else{ - let obj = {} - for(let k in data) { - if(Array.isArray(data[k])) { - console.log(data[k]); - let start = k + 'StartTime' - obj[start] = data[k][0] - let end = k + 'EndTime' - obj[end] = data[k][1] - }else{ - obj[k] = data[k] - } - } - console.log(obj); - this.searchForm = obj; - } + search(data) { + console.log(data); + this.searchForm = data; this.getData() }, async getData() { @@ -157,11 +130,11 @@ export default { this.pagination.total = res.data.total; this.selectedRowKeys = []; }, - // changeTime(data,start,end){ - // this.searchForm[start] = data[0] - // this.searchForm[end] = data[1] - // console.log(this.searchForm); - // }, + changeTime(data,start,end){ + this.searchForm[start] = data[0] + this.searchForm[end] = data[1] + console.log(this.searchForm); + }, edit(id) { this.editId = id; this.drawer.show = true; diff --git a/src/views/Operation/Announcement/depend/config.js b/src/views/Operation/Announcement/depend/config.js index 7b696e6..785e6aa 100644 --- a/src/views/Operation/Announcement/depend/config.js +++ b/src/views/Operation/Announcement/depend/config.js @@ -21,7 +21,8 @@ export const formItem = [ }, { type: 'time', - label:'更新时间', + label: '更新时间', + prop:'modify', start: 'modifyStartTime', end:'modifyEndTime' }, diff --git a/src/views/Operation/Announcement/index.vue b/src/views/Operation/Announcement/index.vue index b0a0361..3f04b83 100644 --- a/src/views/Operation/Announcement/index.vue +++ b/src/views/Operation/Announcement/index.vue @@ -1,7 +1,7 @@