diff --git a/src/api/operation/news/index.js b/src/api/operation/news/index.js new file mode 100644 index 0000000..0ce3d27 --- /dev/null +++ b/src/api/operation/news/index.js @@ -0,0 +1,45 @@ +import httpService from "@/request" + +// 资讯 +export function newsList(params) { + return httpService({ + url: `/user/information/list`, + method: 'get', + params: params, + }) +} +export function newsInfo(params) { + return httpService({ + url: `/user/information/findById`, + method: 'get', + params: params, + }) +} +export function itemSelect(params) { + return httpService({ + url: `/user/informationCategory/allList`, + method: 'get', + params: params, + }) +} +export function newsUpdate(params) { + return httpService({ + url: `/user/information/update`, + method: 'post', + data: params, + }) +} +export function newsDel(params) { + return httpService({ + url: `/user/information/delete`, + method: 'post', + data: params, + }) +} +export function newsInsert(params) { + return httpService({ + url: `/user/information/insert`, + method: 'post', + data: params, + }) +} \ No newline at end of file diff --git a/src/api/operation/news/item.js b/src/api/operation/news/item.js new file mode 100644 index 0000000..0b605fd --- /dev/null +++ b/src/api/operation/news/item.js @@ -0,0 +1,31 @@ +import httpService from "@/request" + +// 资讯分类 +export function newsItemList(params) { + return httpService({ + url: `/user/informationCategory/list`, + method: 'get', + params: params, + }) +} +export function newsItemUpdate(params) { + return httpService({ + url: `/user/informationCategory/update`, + method: 'post', + data: params, + }) +} +export function newsItemDel(params) { + return httpService({ + url: `/user/informationCategory/delete`, + method: 'post', + data: params, + }) +} +export function newsItemInsert(params) { + return httpService({ + url: `/user/informationCategory/insert`, + method: 'post', + data: params, + }) +} \ No newline at end of file diff --git a/src/views/Basic/Employee/index.vue b/src/views/Basic/Employee/index.vue index 8ecd668..fb0ed07 100644 --- a/src/views/Basic/Employee/index.vue +++ b/src/views/Basic/Employee/index.vue @@ -90,7 +90,7 @@ 编辑 - + 重置密码 diff --git a/src/views/Basic/EstateInfo/_houseManage/index.vue b/src/views/Basic/EstateInfo/_houseManage/index.vue index d95e93a..ff2433a 100644 --- a/src/views/Basic/EstateInfo/_houseManage/index.vue +++ b/src/views/Basic/EstateInfo/_houseManage/index.vue @@ -91,6 +91,7 @@ diff --git a/src/views/Operation/Activity/_activityManage/depend/form.vue b/src/views/Operation/Activity/_activityManage/depend/form.vue index 4f4c404..6fd0dcd 100644 --- a/src/views/Operation/Activity/_activityManage/depend/form.vue +++ b/src/views/Operation/Activity/_activityManage/depend/form.vue @@ -33,17 +33,24 @@ placeholder="请选择" style="width: 80%" > - {{item.unit}} - + {{ item.unit }} + - + @@ -53,11 +60,16 @@ placeholder="请选择" style="width: 80%" > - {{item.name}} - + {{ item.name }} + - + - - - + + + - - - + + + - + - + - + - + - + - + - + - + - + - - 活动图片 - - + + 活动图片 + + @@ -156,7 +189,7 @@ import { activityInsert, activityUpdate, activityInfo, - organizerSelect + organizerSelect, } from "@/api/operation/activity"; export default { props: { @@ -176,12 +209,12 @@ export default { }; }, mounted() { - this.getOrganizer() + this.getOrganizer(); }, methods: { - async getOrganizer(){ - let res = await organizerSelect() - this.options.organizer = res.data + async getOrganizer() { + let res = await organizerSelect(); + this.options.organizer = res.data; }, addClose() { this.$refs.ruleForm.resetFields(); @@ -219,7 +252,7 @@ export default { handleChange(data) { this.fileList = data; if (data[0].status === "done") { - console.log('-------done-------'); + console.log("-------done-------"); this.form.imgUrls.push(data[0].response.data); } }, @@ -246,8 +279,8 @@ export default { pic.push(obj); } this.fileList = pic; - }else{ - this.form.imgUrls=[] + } else { + this.form.imgUrls = []; } }); } else { diff --git a/src/views/Operation/Activity/_activityManage/index.vue b/src/views/Operation/Activity/_activityManage/index.vue index 279507d..c00e01c 100644 --- a/src/views/Operation/Activity/_activityManage/index.vue +++ b/src/views/Operation/Activity/_activityManage/index.vue @@ -39,6 +39,7 @@ diff --git a/src/views/Operation/BBS/_topic/index.vue b/src/views/Operation/BBS/_topic/index.vue index 2c3ff76..9e4741e 100644 --- a/src/views/Operation/BBS/_topic/index.vue +++ b/src/views/Operation/BBS/_topic/index.vue @@ -2,7 +2,9 @@
社区话题
- 新增话题 + 新增话题 - - 无图片 + + 无图片
- + 批量删除 @@ -49,30 +58,35 @@
- +
\ No newline at end of file + diff --git a/src/views/Operation/News/_newsItem/depend/config.js b/src/views/Operation/News/_newsItem/depend/config.js new file mode 100644 index 0000000..352e804 --- /dev/null +++ b/src/views/Operation/News/_newsItem/depend/config.js @@ -0,0 +1,50 @@ +export const formItem = [ + { + type: 'input', + label:'分类名称', + prop:'name', + placeholder:'请输入' + }, +] +export const columns = [ + { + title: "分类名称", + dataIndex: "name", + }, + { + title: "资讯数", + dataIndex: "informationNum", + }, + { + title: "是否显示在app上", + dataIndex: "isShow", + customRender: function (isShow) { + switch (isShow) { + case true: + return '是' + break; + case false: + return '否' + break; + default: + break; + } + } + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] +export const pagination = { + current: 1, + total: 0, + pageSize: 10, + showTotal: (total) => `共 ${total} 条`, + showSizeChanger: true, + showQuickJumper: true, +} \ No newline at end of file diff --git a/src/views/Operation/News/_newsItem/depend/form.js b/src/views/Operation/News/_newsItem/depend/form.js new file mode 100644 index 0000000..80c1823 --- /dev/null +++ b/src/views/Operation/News/_newsItem/depend/form.js @@ -0,0 +1,8 @@ +export const form = { + id:undefined, + name: undefined, + isShow:false, +} +export const rules = { + name:[{required:true,message:'请输入标题',trigger:'blur'}], +} \ No newline at end of file diff --git a/src/views/Operation/News/_newsItem/depend/form.vue b/src/views/Operation/News/_newsItem/depend/form.vue new file mode 100644 index 0000000..bb32bbb --- /dev/null +++ b/src/views/Operation/News/_newsItem/depend/form.vue @@ -0,0 +1,113 @@ + + + + + diff --git a/src/views/Operation/News/_newsItem/index.vue b/src/views/Operation/News/_newsItem/index.vue index 3132256..1da19b7 100644 --- a/src/views/Operation/News/_newsItem/index.vue +++ b/src/views/Operation/News/_newsItem/index.vue @@ -1,15 +1,166 @@ - - \ No newline at end of file + diff --git a/src/views/Operation/News/_newsManage/depend/config.js b/src/views/Operation/News/_newsManage/depend/config.js new file mode 100644 index 0000000..c574fc3 --- /dev/null +++ b/src/views/Operation/News/_newsManage/depend/config.js @@ -0,0 +1,166 @@ +export const formItem = [ + + { + type: 'select', + label:'状态', + prop:'status', + option:[{ id:1,name:'报名未开始'},{ id:2,name:'报名进行中'},{ id:3,name:'活动未开始'},{ id:4,name:'活动进行中'},{ id:5,name:'活动已结束'}], + placeholder:'请选择状态' + }, + { + type: 'time', + label:'报名时间', + start: 'registrationStartTime', + end:'registrationEndTime', + }, + { + type: 'time', + label:'活动时间', + start: 'activityStartTime', + end:'activityEndTime', + }, + { + type: 'input', + label:'活动标题', + prop:'title', + placeholder:'请输入' + }, + { + type: 'input', + label:'主办方', + prop:'organizerName', + placeholder:'请输入' + }, + { + type: 'input', + label:'活动联系人', + prop:'activityContact', + placeholder:'请输入' + }, + +] +export const columns = [ + { + title: "发布时间", + dataIndex: "createDate", + width: "12%", + }, + { + title: "图片", + dataIndex: "imgpic", + width: "10%", + scopedSlots: { customRender: "imgpic"} + }, + { + title: "活动状态", + dataIndex: "status", + width: "6%", + customRender: function (status) { + switch (status) { + case 1: + return '报名未开始' + case 2: + return '报名进行中' + case 3: + return '活动未开始' + case 4: + return '活动进行中' + case 5: + return '活动已结束' + } + } + }, + { + title: "活动标题", + dataIndex: "title", + width: "8%", + }, + { + title: "活动地点", + dataIndex: "activityAddress", + width: "8%", + }, + { + title: "是否显示在app", + dataIndex: "isShow", + width: "5%", + customRender: function (isShow) { + switch (isShow) { + case true: + return '显示' + case false: + return '不显示' + } + } + }, + { + title: "主办方", + dataIndex: "organizerName", + width: "8%", + }, + { + title: "活动内容", + dataIndex: "content", + width: "8%", + }, + { + title: "报名人数", + dataIndex: "registrationNum", + width: "5%", + }, + { + title: "报名时间", + width: "12%", + customRender: function (data) { + return (data.registrationStartTime + '——' + data.registrationEndTime) + } + }, + { + title: "活动时间", + width: "12%", + customRender: function (data) { + return (data.activityStartTime + '——' + data.activityEndTime) + } + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] +export const detailColumns = [ + { + title: "报名人", + dataIndex: "name", + width: "22%", + }, + { + title: "报名联系方式", + dataIndex: "tel", + width: "32%", + }, + { + title: "报名时间", + dataIndex: "createDate", + width: "32%", + }, +] +export const pagination = { + current: 1, + total: 0, + pageSize: 10, + showTotal: (total) => `共 ${total} 条`, + showSizeChanger: true, + showQuickJumper: true, +} +export const detailpagination = { + current: 1, + total: 0, + pageSize: 10, + showTotal: (total) => `共 ${total} 条`, + showSizeChanger: true, + showQuickJumper: true, +} \ No newline at end of file diff --git a/src/views/Operation/News/_newsManage/depend/detail.vue b/src/views/Operation/News/_newsManage/depend/detail.vue new file mode 100644 index 0000000..de6fcae --- /dev/null +++ b/src/views/Operation/News/_newsManage/depend/detail.vue @@ -0,0 +1,173 @@ + + + + + diff --git a/src/views/Operation/News/_newsManage/depend/form.js b/src/views/Operation/News/_newsManage/depend/form.js new file mode 100644 index 0000000..4038b9a --- /dev/null +++ b/src/views/Operation/News/_newsManage/depend/form.js @@ -0,0 +1,48 @@ +export const form = { + id:undefined, + title:undefined, + organizerId:undefined, + isShow:false, + activityObject:undefined, + content:undefined, + registrationStartTime:undefined, + registrationEndTime:undefined, + activityStartTime:undefined, + activityEndTime:undefined, + activityAddress:undefined, + registrationNumMax:undefined, + registrationCost:undefined, + activityContact:undefined, + activityTel:undefined, + imgUrls:[] +} +export const rules = { + title:[{required:true,message:'请输入标题',trigger:'blur'}], + organizerId:[{required:true,message:'请选择',trigger:'change'}], + isShow:[{required:true,message:'请选择',trigger:'change'}], + activityObject:[{required:true,message:'请选择活动对象',trigger:'change'}], + content:[{required:true,message:'请输入内容',trigger:'blur'}], + registrationStartTime:[{required:true,message:'请选择',trigger:'change'}], + registrationEndTime:[{required:true,message:'请选择',trigger:'change'}], + activityStartTime:[{required:true,message:'请选择',trigger:'change'}], + activityEndTime:[{required:true,message:'请选择',trigger:'change'}], + activityAddress:[{required:true,message:'请输入活动地址',trigger:'blur'}], + registrationNumMax:[{required:true,message:'请输入人数上限',trigger:'blur'}], + registrationCost:[{required:true,message:'请输入报名费用',trigger:'blur'}], + activityContact:[{required:true,message:'请输入活动联系人',trigger:'blur'}], + activityTel:[{required:true,message:'请输入活动联系方式',trigger:'blur'}], +} +export const options = { + isShow:[ + { id:true, name:'显示' }, + { id:false, name:'不显示' }, + ], + activityObject: [ + { id:1, name:'全部' }, + { id:2, name:'住户' }, + { id:3, name:'业主' }, + { id:4, name:'租户' }, + { id:5, name:'管家' }, + ], + organizer:[] +} \ No newline at end of file diff --git a/src/views/Operation/News/_newsManage/depend/form.vue b/src/views/Operation/News/_newsManage/depend/form.vue new file mode 100644 index 0000000..6fd0dcd --- /dev/null +++ b/src/views/Operation/News/_newsManage/depend/form.vue @@ -0,0 +1,296 @@ + + + + + diff --git a/src/views/Operation/News/_newsManage/index.vue b/src/views/Operation/News/_newsManage/index.vue index 3132256..c00e01c 100644 --- a/src/views/Operation/News/_newsManage/index.vue +++ b/src/views/Operation/News/_newsManage/index.vue @@ -1,15 +1,201 @@ - - \ No newline at end of file + diff --git a/src/views/Operation/clientSet/index.vue b/src/views/Operation/clientSet/index.vue index c005446..031ce5e 100644 --- a/src/views/Operation/clientSet/index.vue +++ b/src/views/Operation/clientSet/index.vue @@ -98,7 +98,7 @@ - +