diff --git a/src/api/operation/comIntro/index.js b/src/api/operation/comIntro/index.js new file mode 100644 index 0000000..b382cf2 --- /dev/null +++ b/src/api/operation/comIntro/index.js @@ -0,0 +1,55 @@ +import httpService from "@/request" + +// 查询所有的社区介绍信息 +export function getCommunityList(params) { + return httpService({ + url: `/user/communityIntroduction/list`, + method: 'get', + params: params, + }) +} + +// 添加社区介绍信息 +export function AddCommunityIntro(params) { + return httpService({ + url: `/user/communityIntroduction/insert`, + method: 'post', + data: params, + }) +} + +// 根据社区介绍主键Id查询社区介绍信息 +export function findCommunityIntro(params) { + return httpService({ + url: `/user/communityIntroduction/findById`, + method: 'get', + params: params, + }) +} + +// 修改社区介绍信息 +export function updateCommunityIntro(params) { + return httpService({ + url: `/user/communityIntroduction/update`, + method: 'post', + data: params, + }) +} + +// 删除社区介绍信息 +export function delCommunityIntro(params) { + return httpService({ + url: `/user/communityIntroduction/delete`, + method: 'post', + data: params, + }) +} + +// 启用社区介绍信息 +export function enableCommunityIntro(params) { + return httpService({ + url: `/user/communityIntroduction/enable`, + method: 'get', + params: params, + }) +} \ No newline at end of file diff --git a/src/api/operation/recommand/index.js b/src/api/operation/recommand/index.js new file mode 100644 index 0000000..f050159 --- /dev/null +++ b/src/api/operation/recommand/index.js @@ -0,0 +1,46 @@ +import httpService from "@/request" + +// 查询所有的咨询建议/投诉表扬 +export function getAdviceList(params) { + return httpService({ + url: `/user/advice/list`, + method: 'get', + params: params, + }) +} + +// 查询今日咨询建议/投诉表扬数量 +export function getTodayAdvice(params) { + return httpService({ + url: `/user/advice/findTodayAdviceNum`, + method: 'get', + params: params, + }) +} + +// 批量删除咨询建议/投诉表扬 +export function delAdvice(params) { + return httpService({ + url: `/user/advice/delete`, + method: 'post', + data: params, + }) +} + +// 根据id查询咨询建议/投诉表扬 +export function adviceDetail(params) { + return httpService({ + url: `/user/advice/findById`, + method: 'get', + params: params, + }) +} + +// 回复咨询建议/投诉表扬 +export function replyDetail(params) { + return httpService({ + url: `/user/advice/reply`, + method: 'post', + data: params, + }) +} \ No newline at end of file diff --git a/src/api/operation/suggestion/index.js b/src/api/operation/suggestion/index.js new file mode 100644 index 0000000..a95f8ec --- /dev/null +++ b/src/api/operation/suggestion/index.js @@ -0,0 +1,64 @@ +import httpService from "@/request" + +// 查询所有便民电话信息 +export function getPhoneList(params) { + return httpService({ + url: `/user/conveniencePhone/list`, + method: 'get', + params: params, + }) +} + +// 添加便民电话信息 +export function addPhone(params) { + return httpService({ + url: `/user/conveniencePhone/insert`, + method: 'post', + data: params, + }) +} + +// 根据便民电话主键id查询便民电话信息 +export function findPhone(params) { + return httpService({ + url: `/user/conveniencePhone/findById`, + method: 'get', + params: params, + }) +} + +// 修改便民电话信息 +export function updatePhone(params) { + return httpService({ + url: `/user/conveniencePhone/update`, + method: 'post', + data: params, + }) +} + +// 定时检查信息 +export function reminderInfo(params) { + return httpService({ + url: `/user/conveniencePhone/reminderInfo`, + method: 'get', + params: params, + }) +} + +// 更新定时检查信息 +export function updateReminder(params) { + return httpService({ + url: `/user/conveniencePhone/updateReminder`, + method: 'post', + data: params, + }) +} + +// 批量删除便民电话 +export function delPhone(params) { + return httpService({ + url: `/user/conveniencePhone/delete`, + method: 'post', + data: params, + }) +} \ No newline at end of file diff --git a/src/api/shop/order/index.js b/src/api/shop/order/index.js index 9755551..110aa36 100644 --- a/src/api/shop/order/index.js +++ b/src/api/shop/order/index.js @@ -25,3 +25,12 @@ export function shopOrderCancel(params) { params: params, }) } + +// 根据ID查询订单记录 +export function getOrderRecord(params) { + return httpService({ + url: `/user/shopOrder/orderRecord`, + method: 'get', + params: params, + }) +} diff --git a/src/router/operation.js b/src/router/operation.js index cecbcf9..1210923 100644 --- a/src/router/operation.js +++ b/src/router/operation.js @@ -189,4 +189,31 @@ export default [ }, ] }, + { + path: '/Recommand', + name: "Recommand", + title: "建议咨询", + icon: 'question-circle', + hide: false, + component: resolve => require(['@/views/Operation/Recommand'], resolve), + meta: {title: '建议咨询'}, + }, + { + path: '/Suggestion', + name: "Suggestion", + title: "便民电话", + icon: 'phone', + hide: false, + component: resolve => require(['@/views/Operation/Suggestion'], resolve), + meta: {title: '便民电话'}, + }, + { + path: '/CommunityIntro', + name: "CommunityIntro", + title: "社区介绍", + icon: 'snippets', + hide: false, + component: resolve => require(['@/views/Operation/CommunityIntro'], resolve), + meta: {title: '社区介绍'}, + }, ] \ No newline at end of file diff --git a/src/views/Basic/Authority/depend/permissions.vue b/src/views/Basic/Authority/depend/permissions.vue index 17e5bad..0f15bac 100644 --- a/src/views/Basic/Authority/depend/permissions.vue +++ b/src/views/Basic/Authority/depend/permissions.vue @@ -30,7 +30,6 @@
+ +
+ + + + + + + + + + +
+
+ + + + + + + + + + +
+ diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js index 3885a93..14d99eb 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/depend/form.js @@ -26,6 +26,10 @@ export const form = { ownerTel:undefined, tenantName:undefined, tenantTel:undefined, + ownerName:undefined, //业主姓名 + ownerTel:undefined, //业主电话 + tenantName: undefined,//租户姓名 + tenantTel: undefined,//租户电话 } const handleConfirm = (rule,value,callback) => { diff --git a/src/views/Basic/WorkOrder/index.vue b/src/views/Basic/WorkOrder/index.vue index effbc10..04a215b 100644 --- a/src/views/Basic/WorkOrder/index.vue +++ b/src/views/Basic/WorkOrder/index.vue @@ -324,8 +324,6 @@ export default { uploadHeaders, headList: [], form:{ - pageNum: 1, - size: 10, status: undefined, workOrderTypeId: undefined, keyword: '' @@ -504,6 +502,7 @@ export default { }) }, getData() { + let obj = Object.assign(this.form, {pageNum: this.pagination.current,size: this.pagination.pageSize}) getAllWorkOrder(this.form).then(res => { this.tableData = res.data.rows; this.pagination.total = res.data.total; @@ -695,7 +694,6 @@ export default { }) }, handleTableChange(pagination) { - console.log(pagination); const pager = { ...this.pagination }; pager.current = pagination.current; pager.pageSize = pagination.pageSize; diff --git a/src/views/Operation/CommunityIntro/depend/config.js b/src/views/Operation/CommunityIntro/depend/config.js new file mode 100644 index 0000000..2fe4bb9 --- /dev/null +++ b/src/views/Operation/CommunityIntro/depend/config.js @@ -0,0 +1,71 @@ +export const form = { + name: '', + status: undefined, + createName: '', + nearModifyDateStart: '', + nearModifyDateEnd: '', + createDateStart: '', + createDateEnd: '', +} + +export const addForm = { + name: '', + content: '', + imgUrls: [], +} + +export const columns = [ + { + title: "模版名称", + width: "9%", + dataIndex: "name", + }, + { + title: "内容", + width: "15%", + dataIndex: "content", + scopedSlots: { customRender: "content" }, + }, + { + title: "启用状态", + width: "12%", + dataIndex: "status", + scopedSlots: { customRender: "status" }, + }, + { + title: "创建人名称", + width: "12%", + dataIndex: "createName", + }, + { + title: "最近修改时间", + width: "16%", + dataIndex: "nearModifyDate", + }, + { + title: "创建时间", + width: "16%", + dataIndex: "createDate", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] + +export const rules = { + name: [{ required: true, message: "请输入名称", trigger: "blur" }], + content: [{ required: true, message: "请输入内容", trigger: "blur" }], +} + +export function doStr(str, number) { + if(str.length >= number) { + return str.substr(0,number-1) + '...' + } else { + return str + } +} \ No newline at end of file diff --git a/src/views/Operation/CommunityIntro/index.vue b/src/views/Operation/CommunityIntro/index.vue new file mode 100644 index 0000000..bc8b2ee --- /dev/null +++ b/src/views/Operation/CommunityIntro/index.vue @@ -0,0 +1,307 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Recommand/depend/config.js b/src/views/Operation/Recommand/depend/config.js new file mode 100644 index 0000000..e30a481 --- /dev/null +++ b/src/views/Operation/Recommand/depend/config.js @@ -0,0 +1,86 @@ +export const columns = [ + { + title: "序号", + width: "6%", + dataIndex: "id", + }, + { + title: "内容", + width: "12%", + dataIndex: "content", + }, + { + title: "类型", + width: "8%", + dataIndex: "type", + customRender: function (type) { + switch (type) { + case 1: return '咨询' + case 2: return '建议' + case 3: return '投诉' + case 4: return '表扬' + } + } + }, + { + title: "发布人", + width: "9%", + dataIndex: "releaseName", + }, + { + title: "发布时间", + width: "12%", + dataIndex: "releaseDate", + }, + { + title: "状态", + width: "8%", + dataIndex: "status", + customRender: function (status) { + switch (status) { + case 3: return '已反馈' + case 2: return '反馈中' + case 1: return '未反馈' + } + } + }, + { + title: "评分数", + width: "10%", + dataIndex: "rate", + scopedSlots: { customRender: "rate" }, + }, + { + title: "最后一次回复/提问时间", + width: "14%", + dataIndex: "lastFeedBackDate", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] +export const replyColumns = [ + { + title: "创建人", + width: "43%", + dataIndex: "createUserType", + scopedSlots: { customRender: "create" }, + }, + { + title: "反馈内容", + width: "43%", + dataIndex: "content", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "13%", + scopedSlots: { customRender: "action" }, + }, +] \ No newline at end of file diff --git a/src/views/Operation/Recommand/index.vue b/src/views/Operation/Recommand/index.vue new file mode 100644 index 0000000..476b8b6 --- /dev/null +++ b/src/views/Operation/Recommand/index.vue @@ -0,0 +1,354 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Suggestion/depend/config.js b/src/views/Operation/Suggestion/depend/config.js new file mode 100644 index 0000000..75c5225 --- /dev/null +++ b/src/views/Operation/Suggestion/depend/config.js @@ -0,0 +1,72 @@ +export const columns = [ + { + title: "名称", + width: "12%", + dataIndex: "name", + }, + { + title: "联系方式", + width: "12%", + dataIndex: "tel", + }, + { + title: "类型", + width: "12%", + dataIndex: "type", + customRender: function (type) { + switch (type) { + case 1: return '业委会' + case 2: return '绿化' + case 3: return '快递' + case 4: return '搬家' + } + } + }, + { + title: "状态", + width: "12%", + dataIndex: "status", + customRender: function (status) { + switch (status) { + case 1: return '正常' + case 2: return '有误' + case 3: return '空号' + case 4: return '搬家' + } + } + }, + { + title: "下次检查时间", + width: "16%", + dataIndex: "nextControlDate", + }, + { + title: "APP端排序权重", + width: "12%", + dataIndex: "weight", + }, + { + title: "提醒内容", + width: "12%", + dataIndex: "remindContent", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "180", + fixed: "right", + scopedSlots: { customRender: "action" }, + }, +] + +export const rules = { + name: [{ required: true, message: "请输入名称", trigger: "blur" }], + tel: [ + { required: true, message: "请输入手机号", trigger: "blur" }, + { min: 11, max: 11, message: "手机号只能为11位", trigger: "blur" }, + ], + type: [{ required: true, message: "请选择类型", trigger: "change" }], + status: [{ required: true, message: "请选择状态", trigger: "change" }], + weight: [{ required: true, message: "请输入权重", trigger: "blur" }], +} \ No newline at end of file diff --git a/src/views/Operation/Suggestion/index.vue b/src/views/Operation/Suggestion/index.vue new file mode 100644 index 0000000..da7b937 --- /dev/null +++ b/src/views/Operation/Suggestion/index.vue @@ -0,0 +1,327 @@ + + + + + \ No newline at end of file diff --git a/src/views/Shop/OrderManage/depend/detail.vue b/src/views/Shop/OrderManage/depend/detail.vue index 12f54c7..93a3322 100644 --- a/src/views/Shop/OrderManage/depend/detail.vue +++ b/src/views/Shop/OrderManage/depend/detail.vue @@ -16,22 +16,12 @@ 确认发货取消订单 - - - - - - - - - - - - - + + + + @@ -111,13 +101,14 @@