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 @@
公告
-
+
新增公告
@@ -87,6 +87,11 @@ export default {
this.searchForm = data;
this.getData()
},
+ changeTime(data,start,end){
+ this.searchForm[start] = data[0]
+ this.searchForm[end] = data[1]
+ console.log(this.searchForm);
+ },
async getData() {
let res = await announcementList({
pageNum: this.pagination.current,
diff --git a/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js b/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js
index 2cf09c5..6a05d8d 100644
--- a/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js
+++ b/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js
@@ -34,6 +34,7 @@ export const formItem = [
{
type: 'time',
label: '实际时间',
+ prop:'actualBeginDate',
start: 'actualBeginDateStart',
end:'actualBeginDateEnd'
},
diff --git a/src/views/Operation/News/_newsManage/depend/config.js b/src/views/Operation/News/_newsManage/depend/config.js
index d0b7ea0..191c8d4 100644
--- a/src/views/Operation/News/_newsManage/depend/config.js
+++ b/src/views/Operation/News/_newsManage/depend/config.js
@@ -15,7 +15,8 @@ export const formItem = [
},
{
type: 'time',
- label:'创建时间',
+ label: '创建时间',
+ prop:'create',
start: 'createStartDate',
end:'createEndDate',
},
diff --git a/src/views/Shop/ScoreSetting/index.vue b/src/views/Shop/ScoreSetting/index.vue
index 51419f8..eda3fac 100644
--- a/src/views/Shop/ScoreSetting/index.vue
+++ b/src/views/Shop/ScoreSetting/index.vue
@@ -18,7 +18,10 @@
-
+
签到奖励设置
@@ -29,7 +32,10 @@
- {{ setForm.signType === 1 ? "一周每日签到模式" : "" }}
+ {{ setForm.signType === 1 ? "一周每日签到模式" : "" }}
@@ -41,24 +47,31 @@
用户将由第一天起重新签到。
-
+
- {{ setForm.signReward === 1 ? "商城积分" : "" }}
+ {{ setForm.signReward === 1 ? "商城积分" : "" }}
-
+
@@ -66,7 +79,7 @@
>{{ item.label
}}
{
- this.dailyScore[index].value = ele
- })
- this.time[0] = res.data.signBeginTime
- this.time[1] = res.data.signEndTime
+ res.data.signRewardSetting.split(",").forEach((ele, index) => {
+ this.dailyScore[index].value = ele;
+ });
+ this.time[0] = res.data.signBeginTime;
+ this.time[1] = res.data.signEndTime;
},
async onSubmit() {
let res = await Setting(this.setForm);