From 7a8fbb2b5a89e027f731166b3d1fdf7cb010b923 Mon Sep 17 00:00:00 2001 From: bibi <541660090@qq.com> Date: Wed, 2 Mar 2022 16:09:51 +0800 Subject: [PATCH] 1 --- src/api/operation/inspection/plan.js | 52 +++++ src/api/operation/inspection/point.js | 39 ++++ src/api/operation/inspection/route.js | 47 ++++ src/router/basic.js | 18 +- src/router/operation.js | 36 ++++ .../_inspectionPlan/depend/config.js | 80 +++++++ .../_inspectionPlan/depend/detail.vue | 111 ++++++++++ .../_inspectionPlan/depend/form.js | 21 ++ .../_inspectionPlan/depend/form.vue | 201 ++++++++++++++++++ .../_inspectionPlan/index.vue | 190 +++++++++++++++++ .../_inspectionPoint/depend/config.js | 80 +++++++ .../_inspectionPoint/depend/detail.vue | 111 ++++++++++ .../_inspectionPoint/depend/form.js | 21 ++ .../_inspectionPoint/depend/form.vue | 201 ++++++++++++++++++ .../_inspectionPoint/index.vue | 190 +++++++++++++++++ .../_inspectionRoute/depend/config.js | 80 +++++++ .../_inspectionRoute/depend/detail.vue | 111 ++++++++++ .../_inspectionRoute/depend/form.js | 21 ++ .../_inspectionRoute/depend/form.vue | 201 ++++++++++++++++++ .../_inspectionRoute/index.vue | 190 +++++++++++++++++ .../Operation/InspectionManage/index.vue | 13 ++ .../Payment/BillManage/_oweList/index.vue | 30 +-- .../BillManage/_payList/depend/config.js | 68 ++++-- .../Payment/BillManage/_payList/index.vue | 29 +-- src/views/Payment/PayPlan/depend/config.js | 22 +- src/views/Payment/PayPlan/index.vue | 30 ++- .../Payment/PrepayManage/depend/form.vue | 1 + 27 files changed, 2095 insertions(+), 99 deletions(-) create mode 100644 src/api/operation/inspection/plan.js create mode 100644 src/api/operation/inspection/point.js create mode 100644 src/api/operation/inspection/route.js create mode 100644 src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js create mode 100644 src/views/Operation/InspectionManage/_inspectionPlan/depend/detail.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionPlan/depend/form.js create mode 100644 src/views/Operation/InspectionManage/_inspectionPlan/depend/form.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionPlan/index.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionPoint/depend/config.js create mode 100644 src/views/Operation/InspectionManage/_inspectionPoint/depend/detail.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionPoint/depend/form.js create mode 100644 src/views/Operation/InspectionManage/_inspectionPoint/depend/form.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionPoint/index.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionRoute/depend/config.js create mode 100644 src/views/Operation/InspectionManage/_inspectionRoute/depend/detail.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionRoute/depend/form.js create mode 100644 src/views/Operation/InspectionManage/_inspectionRoute/depend/form.vue create mode 100644 src/views/Operation/InspectionManage/_inspectionRoute/index.vue create mode 100644 src/views/Operation/InspectionManage/index.vue diff --git a/src/api/operation/inspection/plan.js b/src/api/operation/inspection/plan.js new file mode 100644 index 0000000..037b9f5 --- /dev/null +++ b/src/api/operation/inspection/plan.js @@ -0,0 +1,52 @@ +import httpService from "@/request" + +export function planList(params) { + return httpService({ + url: `/user/inspectionPlan/list`, + method: 'get', + params: params, + }) +} +export function planisEnable(params) { + return httpService({ + url: `/user/inspectionPlan/isEnable`, + method: 'get', + params: params, + }) +} +export function planInfo(params) { + return httpService({ + url: `/user/inspectionPlan/findById`, + method: 'get', + params: params, + }) +} +export function planInsert(params) { + return httpService({ + url: `/user/inspectionPlan/insert`, + method: 'post', + data: params, + }) +} +export function planDel(params) { + return httpService({ + url: `/user/inspectionPlan/delete`, + method: 'post', + data: params, + }) +} +export function planUpdate(params) { + return httpService({ + url: `/user/inspectionPlan/update`, + method: 'post', + data: params, + }) +} +// 巡检记录 +export function inspectionExecute(params) { + return httpService({ + url: `/user/inspectionExecute/list`, + method: 'get', + params: params, + }) +} diff --git a/src/api/operation/inspection/point.js b/src/api/operation/inspection/point.js new file mode 100644 index 0000000..8bcb06f --- /dev/null +++ b/src/api/operation/inspection/point.js @@ -0,0 +1,39 @@ +import httpService from "@/request" + +// 巡检点 +// list +export function pointList(params) { + return httpService({ + url: `/user/inspectionPoint/list`, + method: 'get', + params: params, + }) +} +export function pointInfo(params) { + return httpService({ + url: `/user/inspectionPoint/findById`, + method: 'get', + params: params, + }) +} +export function pointInsert(params) { + return httpService({ + url: `/user/inspectionPoint/insert`, + method: 'post', + data: params, + }) +} +export function pointDel(params) { + return httpService({ + url: `/user/inspectionPoint/delete`, + method: 'post', + data: params, + }) +} +export function pointUpdate(params) { + return httpService({ + url: `/user/inspectionPoint/update`, + method: 'post', + data: params, + }) +} diff --git a/src/api/operation/inspection/route.js b/src/api/operation/inspection/route.js new file mode 100644 index 0000000..2e55e2b --- /dev/null +++ b/src/api/operation/inspection/route.js @@ -0,0 +1,47 @@ +import httpService from "@/request" + + +// 路线 +export function routerList(params) { + return httpService({ + url: `/user/inspectionRouter/list`, + method: 'get', + params: params, + }) +} +export function routerisEnable(params) { + return httpService({ + url: `/user/inspectionRouter/isEnable`, + method: 'get', + params: params, + }) +} +export function routerInfo(params) { + return httpService({ + url: `/user/inspectionRouter/findById`, + method: 'get', + params: params, + }) +} +export function routerInsert(params) { + return httpService({ + url: `/user/inspectionRouter/insert`, + method: 'post', + data: params, + }) +} +export function routerDel(params) { + return httpService({ + url: `/user/inspectionRouter/delete`, + method: 'post', + data: params, + }) +} +export function routerUpdate(params) { + return httpService({ + url: `/user/inspectionRouter/update`, + method: 'post', + data: params, + }) +} + diff --git a/src/router/basic.js b/src/router/basic.js index 4aaab23..682441b 100644 --- a/src/router/basic.js +++ b/src/router/basic.js @@ -82,15 +82,15 @@ export default [ }, ] }, - { - path: '/Workorder', - name: "Workorder", - title: "工单管理", - icon: 'solution', - hide: false, - component: resolve => require(['@/views/Basic/WorkOrder'], resolve), - meta: {title: '工单管理'} - }, + // { + // path: '/Workorder', + // name: "Workorder", + // title: "工单管理", + // icon: 'solution', + // hide: false, + // component: resolve => require(['@/views/Basic/WorkOrder'], resolve), + // meta: {title: '工单管理'} + // }, // { // path: '/attendance', // name: "Attendance", diff --git a/src/router/operation.js b/src/router/operation.js index b0f5598..dd52897 100644 --- a/src/router/operation.js +++ b/src/router/operation.js @@ -16,6 +16,42 @@ export default [ component: resolve => require(['@/views/Operation/ClientSet'], resolve), meta: {title: '用户端设置'}, }, + { + path: '/InspectionManage', + name: "InspectionManage", + title: "巡检管理", + icon: 'retweet', + hide: false, + component: resolve => require(['@/views/Operation/InspectionManage'], resolve), + redirect: '/InspectionManage/InspectionPoint', + meta: {title: '巡检管理'}, + children: [ + { + path: '/InspectionManage/InspectionPoint', + name: "InspectionPoint", + title: "巡检点", + hide: false, + component: resolve => require(['@/views/Operation/InspectionManage/_inspectionPoint'], resolve), + meta: {title: '巡检点'}, + }, + { + path: '/InspectionManage/InspectionRoute', + name: "InspectionRoute", + title: "巡检路线", + hide: false, + component: resolve => require(['@/views/Operation/InspectionManage/_inspectionRoute'], resolve), + meta: {title: '巡检路线'}, + }, + { + path: '/InspectionManage/InspectionPlan', + name: "InspectionPlan", + title: "巡检计划", + hide: false, + component: resolve => require(['@/views/Operation/InspectionManage/_inspectionPlan'], resolve), + meta: {title: '巡检计划'}, + }, + ] + }, { path: '/Activity', name: "Activity", diff --git a/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js b/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js new file mode 100644 index 0000000..d0b7ea0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPlan/depend/config.js @@ -0,0 +1,80 @@ +export const formItem = [ + { + type: 'select', + label:'资讯分类', + prop:'categoryId', + option:[], + placeholder:'请选择' + }, + { + type: 'select', + label:'发布状态', + prop:'status', + option:[{ id:1,name:'未发布'},{ id:2,name:'已发布'},], + placeholder:'请选择状态' + }, + { + type: 'time', + label:'创建时间', + start: 'createStartDate', + end:'createEndDate', + }, + { + type: 'input', + label:'标题', + prop:'title', + placeholder:'请输入' + }, +] +export const columns = [ + + { + title: "标题", + dataIndex: "title", + width: "10%", + }, + { + title: "分类", + dataIndex: "categoryName", + width: "10%", + }, + { + title: "发布状态", + dataIndex: "status", + width: "6%", + customRender: function (status) { + switch (status) { + case 1: + return '未发布' + case 2: + return '已发布' + } + } + }, + { + title: "阅读量", + dataIndex: "viewsNum", + width: "10%", + }, + { + title: "创建时间", + dataIndex: "createDate", + width: "12%", + }, + { + 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/InspectionManage/_inspectionPlan/depend/detail.vue b/src/views/Operation/InspectionManage/_inspectionPlan/depend/detail.vue new file mode 100644 index 0000000..ee18a80 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPlan/depend/detail.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.js b/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.js new file mode 100644 index 0000000..1358dae --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.js @@ -0,0 +1,21 @@ +export const form = { + id:undefined, + title:undefined, + categoryId:undefined, + status:undefined, + content:undefined, + imgUrls:[] +} +export const rules = { + title:[{required:true,message:'请输入标题',trigger:'blur'}], + categoryId:[{required:true,message:'请选择分类',trigger:'change'}], + status:[{required:true,message:'请选择',trigger:'change'}], + content:[{required:true,message:'请输入',trigger:'blur'}], +} +export const options = { + status:[ + { id:1, name:'未发布' }, + { id:2, name:'已发布' }, + ], + categoryId:[] +} \ No newline at end of file diff --git a/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.vue b/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.vue new file mode 100644 index 0000000..2bd27a0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPlan/depend/form.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionPlan/index.vue b/src/views/Operation/InspectionManage/_inspectionPlan/index.vue new file mode 100644 index 0000000..93b6ce6 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPlan/index.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionPoint/depend/config.js b/src/views/Operation/InspectionManage/_inspectionPoint/depend/config.js new file mode 100644 index 0000000..d0b7ea0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPoint/depend/config.js @@ -0,0 +1,80 @@ +export const formItem = [ + { + type: 'select', + label:'资讯分类', + prop:'categoryId', + option:[], + placeholder:'请选择' + }, + { + type: 'select', + label:'发布状态', + prop:'status', + option:[{ id:1,name:'未发布'},{ id:2,name:'已发布'},], + placeholder:'请选择状态' + }, + { + type: 'time', + label:'创建时间', + start: 'createStartDate', + end:'createEndDate', + }, + { + type: 'input', + label:'标题', + prop:'title', + placeholder:'请输入' + }, +] +export const columns = [ + + { + title: "标题", + dataIndex: "title", + width: "10%", + }, + { + title: "分类", + dataIndex: "categoryName", + width: "10%", + }, + { + title: "发布状态", + dataIndex: "status", + width: "6%", + customRender: function (status) { + switch (status) { + case 1: + return '未发布' + case 2: + return '已发布' + } + } + }, + { + title: "阅读量", + dataIndex: "viewsNum", + width: "10%", + }, + { + title: "创建时间", + dataIndex: "createDate", + width: "12%", + }, + { + 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/InspectionManage/_inspectionPoint/depend/detail.vue b/src/views/Operation/InspectionManage/_inspectionPoint/depend/detail.vue new file mode 100644 index 0000000..ee18a80 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPoint/depend/detail.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.js b/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.js new file mode 100644 index 0000000..1358dae --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.js @@ -0,0 +1,21 @@ +export const form = { + id:undefined, + title:undefined, + categoryId:undefined, + status:undefined, + content:undefined, + imgUrls:[] +} +export const rules = { + title:[{required:true,message:'请输入标题',trigger:'blur'}], + categoryId:[{required:true,message:'请选择分类',trigger:'change'}], + status:[{required:true,message:'请选择',trigger:'change'}], + content:[{required:true,message:'请输入',trigger:'blur'}], +} +export const options = { + status:[ + { id:1, name:'未发布' }, + { id:2, name:'已发布' }, + ], + categoryId:[] +} \ No newline at end of file diff --git a/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.vue b/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.vue new file mode 100644 index 0000000..2bd27a0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPoint/depend/form.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionPoint/index.vue b/src/views/Operation/InspectionManage/_inspectionPoint/index.vue new file mode 100644 index 0000000..27bf318 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionPoint/index.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionRoute/depend/config.js b/src/views/Operation/InspectionManage/_inspectionRoute/depend/config.js new file mode 100644 index 0000000..d0b7ea0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionRoute/depend/config.js @@ -0,0 +1,80 @@ +export const formItem = [ + { + type: 'select', + label:'资讯分类', + prop:'categoryId', + option:[], + placeholder:'请选择' + }, + { + type: 'select', + label:'发布状态', + prop:'status', + option:[{ id:1,name:'未发布'},{ id:2,name:'已发布'},], + placeholder:'请选择状态' + }, + { + type: 'time', + label:'创建时间', + start: 'createStartDate', + end:'createEndDate', + }, + { + type: 'input', + label:'标题', + prop:'title', + placeholder:'请输入' + }, +] +export const columns = [ + + { + title: "标题", + dataIndex: "title", + width: "10%", + }, + { + title: "分类", + dataIndex: "categoryName", + width: "10%", + }, + { + title: "发布状态", + dataIndex: "status", + width: "6%", + customRender: function (status) { + switch (status) { + case 1: + return '未发布' + case 2: + return '已发布' + } + } + }, + { + title: "阅读量", + dataIndex: "viewsNum", + width: "10%", + }, + { + title: "创建时间", + dataIndex: "createDate", + width: "12%", + }, + { + 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/InspectionManage/_inspectionRoute/depend/detail.vue b/src/views/Operation/InspectionManage/_inspectionRoute/depend/detail.vue new file mode 100644 index 0000000..ee18a80 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionRoute/depend/detail.vue @@ -0,0 +1,111 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.js b/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.js new file mode 100644 index 0000000..1358dae --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.js @@ -0,0 +1,21 @@ +export const form = { + id:undefined, + title:undefined, + categoryId:undefined, + status:undefined, + content:undefined, + imgUrls:[] +} +export const rules = { + title:[{required:true,message:'请输入标题',trigger:'blur'}], + categoryId:[{required:true,message:'请选择分类',trigger:'change'}], + status:[{required:true,message:'请选择',trigger:'change'}], + content:[{required:true,message:'请输入',trigger:'blur'}], +} +export const options = { + status:[ + { id:1, name:'未发布' }, + { id:2, name:'已发布' }, + ], + categoryId:[] +} \ No newline at end of file diff --git a/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.vue b/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.vue new file mode 100644 index 0000000..2bd27a0 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionRoute/depend/form.vue @@ -0,0 +1,201 @@ + + + + + diff --git a/src/views/Operation/InspectionManage/_inspectionRoute/index.vue b/src/views/Operation/InspectionManage/_inspectionRoute/index.vue new file mode 100644 index 0000000..93b6ce6 --- /dev/null +++ b/src/views/Operation/InspectionManage/_inspectionRoute/index.vue @@ -0,0 +1,190 @@ + + + + diff --git a/src/views/Operation/InspectionManage/index.vue b/src/views/Operation/InspectionManage/index.vue new file mode 100644 index 0000000..b0561c2 --- /dev/null +++ b/src/views/Operation/InspectionManage/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Payment/BillManage/_oweList/index.vue b/src/views/Payment/BillManage/_oweList/index.vue index 10cc52d..fdbdace 100644 --- a/src/views/Payment/BillManage/_oweList/index.vue +++ b/src/views/Payment/BillManage/_oweList/index.vue @@ -1,26 +1,12 @@ diff --git a/src/views/Payment/BillManage/_payList/depend/config.js b/src/views/Payment/BillManage/_payList/depend/config.js index 5d8ac50..8ddd0d0 100644 --- a/src/views/Payment/BillManage/_payList/depend/config.js +++ b/src/views/Payment/BillManage/_payList/depend/config.js @@ -1,40 +1,70 @@ export const formItem = [ { - type: 'input', - label:'费用名称', - prop:'name', - placeholder:'请输入' + type: 'time', + label:'收款时间', + }, + { + type: 'select', + label:'收款方式', }, ] export const columns = [ { - title: "费用名称", + title: "账单名称", dataIndex: "name", }, { - title: "计费方式", - dataIndex: "feetype", + title: "房屋", + dataIndex: "", + }, + { + title: "户主", + dataIndex: "", + }, + { + title: "承租人", + dataIndex: "", + }, + { + title: "建筑面积", + dataIndex: "", + }, + { + title: "流水号", + dataIndex: "", + }, + { + title: "收费标准", + dataIndex: "", + }, + { + title: "费用周期", + dataIndex: "", }, { - title: "计量方式", - dataIndex: "type", + title: "应收金额", + dataIndex: "", }, { - title: "单价", - dataIndex: "price", + title: "实收金额", + dataIndex: "", }, { - title: "单位", - dataIndex: "unit", + title: "违约金额", + dataIndex: "", }, { - title: "操作", - dataIndex: "action", - key: "action", - width: "180", - fixed: "right", - scopedSlots: { customRender: "action" }, + title: "收款时间", + dataIndex: "", }, + // { + // title: "操作", + // dataIndex: "action", + // key: "action", + // width: "180", + // fixed: "right", + // scopedSlots: { customRender: "action" }, + // }, ] export const pagination = { current: 1, diff --git a/src/views/Payment/BillManage/_payList/index.vue b/src/views/Payment/BillManage/_payList/index.vue index 10cc52d..f624c00 100644 --- a/src/views/Payment/BillManage/_payList/index.vue +++ b/src/views/Payment/BillManage/_payList/index.vue @@ -1,26 +1,12 @@ diff --git a/src/views/Payment/PayPlan/depend/config.js b/src/views/Payment/PayPlan/depend/config.js index 5d8ac50..17802cd 100644 --- a/src/views/Payment/PayPlan/depend/config.js +++ b/src/views/Payment/PayPlan/depend/config.js @@ -8,24 +8,28 @@ export const formItem = [ ] export const columns = [ { - title: "费用名称", + title: "账单名称", dataIndex: "name", }, { - title: "计费方式", - dataIndex: "feetype", + title: "开始时间", + dataIndex: "", }, { - title: "计量方式", - dataIndex: "type", + title: "结束时间", + dataIndex: "", }, { - title: "单价", - dataIndex: "price", + title: "自动扣费时间(每月)", + dataIndex: "", }, { - title: "单位", - dataIndex: "unit", + title: "创建人", + dataIndex: "", + }, + { + title: "创建时间", + dataIndex: "", }, { title: "操作", diff --git a/src/views/Payment/PayPlan/index.vue b/src/views/Payment/PayPlan/index.vue index 10cc52d..931969f 100644 --- a/src/views/Payment/PayPlan/index.vue +++ b/src/views/Payment/PayPlan/index.vue @@ -1,25 +1,22 @@