diff --git a/src/api/operation/facility/index.js b/src/api/operation/facility/index.js new file mode 100644 index 0000000..c7e4189 --- /dev/null +++ b/src/api/operation/facility/index.js @@ -0,0 +1,102 @@ +import httpService from "@/request" + +//分类 +// 查询所有的设施/设备分类 +export function getFacilitiesList(params) { + return httpService({ + url: `/user/facilitiesCategory/list`, + method: 'get', + params: params, + }) +} + +// 添加设施/设备分类信息 +export function addFacility(params) { + return httpService({ + url: `/user/facilitiesCategory/insert`, + method: 'post', + data: params, + }) +} + +// 批量删除设施/设备分类 +export function delFacility(params) { + return httpService({ + url: `/user/facilitiesCategory/delete`, + method: 'post', + data: params, + }) +} + +// 根据设施/设备分类主键id查询设施/设备分类信息 +export function findFacility(params) { + return httpService({ + url: `/user/facilitiesCategory/findById`, + method: 'get', + params: params, + }) +} + +// 修改设施分类信息(不允许修改设施分类类型) +export function updateFacility(params) { + return httpService({ + url: `/user/facilitiesCategory/update`, + method: 'post', + data: params, + }) +} + +//管理 +// 查询所有的设施/设备管理 +export function facilityInfoList(params) { + return httpService({ + url: `/user/facilitiesManage/list`, + method: 'get', + params: params, + }) +} + +// 添加设施/设备信息 +export function addFacilityInfo(params) { + return httpService({ + url: `/user/facilitiesManage/insert`, + method: 'post', + data: params, + }) +} + +// 根据设施/设备主键id查询设施/设备信息 +export function findFacilityInfo(params) { + return httpService({ + url: `/user/facilitiesManage/findById`, + method: 'get', + params: params, + }) +} + +// 根据设施/设备主键id查询设施/设备情况list记录 +export function findRecordList(params) { + return httpService({ + url: `/user/facilitiesManage/situationList`, + method: 'get', + params: params, + }) +} + +// 修改设施/设备信息 +export function updateFacilityInfo(params) { + return httpService({ + url: `/user/facilitiesManage/update`, + method: 'post', + data: params, + }) +} + +// 批量删除设施/设备信息 +export function delFacilityInfo(params) { + return httpService({ + url: `/user/facilitiesManage/delete`, + 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 index a95f8ec..2ae3f9e 100644 --- a/src/api/operation/suggestion/index.js +++ b/src/api/operation/suggestion/index.js @@ -61,4 +61,40 @@ export function delPhone(params) { method: 'post', data: params, }) +} + +// 查询所有的便民电话类型 +export function getPhontTypeList(params) { + return httpService({ + url: `/user/conveniencePhoneType/list`, + method: 'get', + params: params, + }) +} + +// 添加便民电话类型 +export function addPhontType(params) { + return httpService({ + url: `/user/conveniencePhoneType/insert`, + method: 'post', + data: params, + }) +} + +// 修改便民电话类型 +export function updatePhontType(params) { + return httpService({ + url: `/user/conveniencePhoneType/update`, + method: 'post', + data: params, + }) +} + +// 删除便民电话类型 +export function delPhontType(params) { + return httpService({ + url: `/user/conveniencePhoneType/delete`, + method: 'get', + params: params, + }) } \ No newline at end of file diff --git a/src/router/operation.js b/src/router/operation.js index 1210923..60b2879 100644 --- a/src/router/operation.js +++ b/src/router/operation.js @@ -216,4 +216,32 @@ export default [ component: resolve => require(['@/views/Operation/CommunityIntro'], resolve), meta: {title: '社区介绍'}, }, + { + path: '/Facility', + name: "Facility", + title: "设施设备", + icon: 'solution', + hide: false, + component: resolve => require(['@/views/Operation/Facility'], resolve), + redirect: '/Facility/FacilityType', + meta: {title: '设施设备'}, + children: [ + { + path: '/Facility/FacilityType', + name: "FacilityType", + title: "设施设备分类", + hide: false, + component: resolve => require(['@/views/Operation/Facility/_facilityType'], resolve), + meta: {title: '设施设备分类'}, + }, + { + path: '/Facility/FacilityInfo', + name: "FacilityInfo", + title: "设施设备管理", + hide: false, + component: resolve => require(['@/views/Operation/Facility/_facilityInfo'], resolve), + meta: {title: '设施设备管理'}, + } + ] + }, ] \ No newline at end of file diff --git a/src/views/Basic/EstateInfo/_buildingManage/depend/config.js b/src/views/Basic/EstateInfo/_buildingManage/depend/config.js index 97f3917..e620bb7 100644 --- a/src/views/Basic/EstateInfo/_buildingManage/depend/config.js +++ b/src/views/Basic/EstateInfo/_buildingManage/depend/config.js @@ -70,8 +70,22 @@ export const form = { name: '', buildingInfoImgUrls:[] } + +const handleConfirm = (rule,value,callback) => { + if(!value){ + callback(); + }else{ + // 正则判断失败抛出错误,否则直接callback() + if(/[\u4E00-\u9FA5]/g.test(value)) { + callback(new Error("不能输入中文!")); + }else{ + callback(); + } + } +} + export const rules = { - name:[{required:true,message:'请输入楼栋',trigger:'blur'}], + name:[{required:true,message:'请输入楼栋',trigger:'blur'},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], } export const unitColumns = [ diff --git a/src/views/Basic/EstateInfo/_buildingManage/depend/form.vue b/src/views/Basic/EstateInfo/_buildingManage/depend/form.vue index fd91e0c..fd9a506 100644 --- a/src/views/Basic/EstateInfo/_buildingManage/depend/form.vue +++ b/src/views/Basic/EstateInfo/_buildingManage/depend/form.vue @@ -138,6 +138,18 @@ function getBase64(file) { reader.onerror = (error) => reject(error); }); } +const handleConfirm = (rule,value,callback) => { + if(!value){ + callback(); + }else{ + // 正则判断失败抛出错误,否则直接callback() + if(/[\u4E00-\u9FA5]/g.test(value)) { + callback(new Error("不能输入中文!")); + }else{ + callback(); + } + } +} export default { props: { show: Boolean, @@ -168,11 +180,12 @@ export default { publicFloor:null, manageBuildingId:null }, + rules:{ - name:[{required:true,message:'请输入单元名称',trigger:'blur'}], - floor:[{required:true,message:'请输入楼层数',trigger:'blur'}], + name:[{required:true,message:'请输入单元名称',trigger:'blur'},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], + floor:[{required:true,message:'请输入楼层数',trigger:'blur'},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], elevator:[{required:true,message:'是否有电梯',trigger:'change'}], - publicFloor:[{required:true,message:'公共楼层数',trigger:'blur'}], + publicFloor:[{required:true,message:'公共楼层数',trigger:'blur'},{validator: (rule,value,callback) => handleConfirm(rule,value,callback)}], } } }; diff --git a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue index 1d6a29d..09a082f 100644 --- a/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue +++ b/src/views/Basic/EstateInfo/_houseHoldInfo/index.vue @@ -53,7 +53,7 @@ - {{item.identity==3?'租户':1?'业主':2?'业主亲属':'租户亲属'}} + {{item.identity==3?'租户':item.identity==1?'业主':item.identity==2?'业主亲属':'租户亲属'}} diff --git a/src/views/Basic/EstateInfo/_houseManage/depend/form.js b/src/views/Basic/EstateInfo/_houseManage/depend/form.js index 4067a1c..fe04a53 100644 --- a/src/views/Basic/EstateInfo/_houseManage/depend/form.js +++ b/src/views/Basic/EstateInfo/_houseManage/depend/form.js @@ -20,6 +20,20 @@ export const form = { estateImgUrls:[], remarks:undefined, } + +const handleConfirm = (rule,value,callback) => { + if(!value){ + callback(); + }else{ + // 正则判断失败抛出错误,否则直接callback() + if(/[\u4E00-\u9FA5]/g.test(value)) { + callback(new Error("不能输入中文!")); + }else{ + callback(); + } + } +} + // 校验 export const rules = { manageBuildingId:[ @@ -33,6 +47,7 @@ export const rules = { ], name: [ { required: true, message: "请输入房屋名称", trigger: "blur" }, + {validator: (rule,value,callback) => handleConfirm(rule,value,callback)} ], manageEstateTypeId: [ { required: true, message: "请选择房屋类型", trigger: "change" }, diff --git a/src/views/Basic/WorkOrder/index.vue b/src/views/Basic/WorkOrder/index.vue index 04a215b..86dfef3 100644 --- a/src/views/Basic/WorkOrder/index.vue +++ b/src/views/Basic/WorkOrder/index.vue @@ -355,6 +355,12 @@ export default { // 分页 // 列 columns: [ + { + title: "创建时间", + key: "createDate", + dataIndex: "createDate", + width: 215, + }, { title: "工单状态", key: "tags", diff --git a/src/views/Operation/Announcement/depend/form.vue b/src/views/Operation/Announcement/depend/form.vue index 0348926..b91cd81 100644 --- a/src/views/Operation/Announcement/depend/form.vue +++ b/src/views/Operation/Announcement/depend/form.vue @@ -69,7 +69,7 @@ name="file" :multiple="true" :action="`${$upload}`" - :file-list="documentList" + :file-list="documentList" accept=".doc,.DOC,.xls,.XLS,.xlsx,.XLSX,.pdf,.PDF" :headers="uploadHeaders" @change="changeFile" diff --git a/src/views/Operation/CommunityIntro/index.vue b/src/views/Operation/CommunityIntro/index.vue index bc8b2ee..9042ed0 100644 --- a/src/views/Operation/CommunityIntro/index.vue +++ b/src/views/Operation/CommunityIntro/index.vue @@ -82,7 +82,7 @@ - + @@ -161,7 +161,9 @@ export default { this.getData() }, handlerChange() { - + this.pagination.current = val.current; + this.pagination.pageSize = val.pageSize; + this.getData() }, detailClose() { this.addForm = { diff --git a/src/views/Operation/Facility/_facilityInfo/depend/config.js b/src/views/Operation/Facility/_facilityInfo/depend/config.js new file mode 100644 index 0000000..5346e4e --- /dev/null +++ b/src/views/Operation/Facility/_facilityInfo/depend/config.js @@ -0,0 +1,141 @@ +export const form= { + type: 1, + name: '', + facilitiesCategoryId: undefined, + code: '', + status: undefined, + createStartDate: undefined, + createEndDate: undefined, +} + +export const addForm = { + name: '', + address: '', + facilitiesCategoryId: undefined, + brand: '', + procurementCosts: '', + purchasingManufacturer: '', + manufacturerPhone: '', + warrantyPeriodYears: 0, + warrantyPeriodMonths: 0, + validityStart: '', + validityEnd: '', + openStartDate: '', + openEndDate: '', + remakes: '', + docUrls: [], +} + +export const columns = [ + { + title: "设施编号", + width: "10%", + dataIndex: "code", + }, + { + title: "设施分类名称", + width: "8%", + dataIndex: "facilitiesCategoryName", + }, + { + title: "设施名称", + width: "9%", + dataIndex: "name", + }, + { + title: "添加人", + width: "8%", + dataIndex: "createName", + }, + { + title: "设施状态", + width: "8%", + dataIndex: "status", + customRender: function(status) { + switch(status) { + case 1: return '空置中' + case 2: return '使用中' + case 3: return '已停用' + } + } + }, + { + title: "设施品牌", + width: "8%", + dataIndex: "brand", + }, + { + title: "采购费用(元)", + width: "8%", + dataIndex: "procurementCosts", + }, + { + title: "采购厂家", + width: "8%", + dataIndex: "purchasingManufacturer", + }, + { + title: "厂家电话", + width: "8%", + dataIndex: "manufacturerPhone", + }, + { + title: "质保期限", + width: "6%", + dataIndex: "warrantyPeriodYears", + scopedSlots: { customRender: "quality" }, + }, + { + title: "设备有效期", + width: "16%", + dataIndex: "validityStart", + scopedSlots: { customRender: "time" }, + }, + // { + // title: "设备有效期开始", + // width: "8%", + // dataIndex: "validityStart", + // }, + // { + // title: "设备有效期结束", + // width: "8%", + // dataIndex: "validityEnd", + // }, + { + title: "文件", + width: "12%", + dataIndex: "docList", + scopedSlots: { customRender: "document" }, + }, + { + title: "备注", + width: "8%", + dataIndex: "remakes", + }, + { + 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/Facility/_facilityInfo/depend/detail.vue b/src/views/Operation/Facility/_facilityInfo/depend/detail.vue new file mode 100644 index 0000000..5245487 --- /dev/null +++ b/src/views/Operation/Facility/_facilityInfo/depend/detail.vue @@ -0,0 +1,134 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Facility/_facilityInfo/index.vue b/src/views/Operation/Facility/_facilityInfo/index.vue new file mode 100644 index 0000000..29c276a --- /dev/null +++ b/src/views/Operation/Facility/_facilityInfo/index.vue @@ -0,0 +1,452 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Facility/_facilityType/depend/config.js b/src/views/Operation/Facility/_facilityType/depend/config.js new file mode 100644 index 0000000..86a322a --- /dev/null +++ b/src/views/Operation/Facility/_facilityType/depend/config.js @@ -0,0 +1,66 @@ +export const form= { + type: 1, + name: '', + code: '', + createStartDate: undefined, + createEndDate: undefined, +} + +export const addForm = { + name: '', + imgUrls: [], +} + +export const columns = [ + { + title: "分类编号", + width: "18%", + dataIndex: "code", + }, + { + title: "分类名称", + width: "12%", + dataIndex: "name", + }, + // { + // title: "分类类型", + // width: "9%", + // dataIndex: "type", + // }, + { + title: "添加人名称", + width: "15%", + dataIndex: "createName", + }, + { + title: "设施数量", + width: "12%", + dataIndex: "num", + }, + { + title: "添加时间", + width: "16%", + dataIndex: "createDate", + }, + { + title: "操作", + dataIndex: "action", + key: "action", + width: "240", + 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/Facility/_facilityType/index.vue b/src/views/Operation/Facility/_facilityType/index.vue new file mode 100644 index 0000000..2ddc667 --- /dev/null +++ b/src/views/Operation/Facility/_facilityType/index.vue @@ -0,0 +1,263 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Facility/index.vue b/src/views/Operation/Facility/index.vue new file mode 100644 index 0000000..b0561c2 --- /dev/null +++ b/src/views/Operation/Facility/index.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Recommand/index.vue b/src/views/Operation/Recommand/index.vue index 476b8b6..7d1d05e 100644 --- a/src/views/Operation/Recommand/index.vue +++ b/src/views/Operation/Recommand/index.vue @@ -211,8 +211,10 @@ export default { this.selTime = []; this.getData(); }, - handlerChange() { - + handlerChange(val) { + this.pagination.current = val.current; + this.pagination.pageSize = val.pageSize; + this.getData() }, detailClose() { this.adviceInfo = {}; diff --git a/src/views/Operation/Suggestion/depend/addType.vue b/src/views/Operation/Suggestion/depend/addType.vue new file mode 100644 index 0000000..8c6043f --- /dev/null +++ b/src/views/Operation/Suggestion/depend/addType.vue @@ -0,0 +1,160 @@ + + + + + \ No newline at end of file diff --git a/src/views/Operation/Suggestion/depend/config.js b/src/views/Operation/Suggestion/depend/config.js index 75c5225..813dc0e 100644 --- a/src/views/Operation/Suggestion/depend/config.js +++ b/src/views/Operation/Suggestion/depend/config.js @@ -12,15 +12,7 @@ export const columns = [ { title: "类型", width: "12%", - dataIndex: "type", - customRender: function (type) { - switch (type) { - case 1: return '业委会' - case 2: return '绿化' - case 3: return '快递' - case 4: return '搬家' - } - } + dataIndex: "typeName", }, { title: "状态", diff --git a/src/views/Operation/Suggestion/index.vue b/src/views/Operation/Suggestion/index.vue index da7b937..12d3e98 100644 --- a/src/views/Operation/Suggestion/index.vue +++ b/src/views/Operation/Suggestion/index.vue @@ -18,6 +18,7 @@ 新增电话 + 新增电话类型 定时检查
- 业委会 - 绿化 - 快递 - 搬家 + + {{item.name}} + @@ -128,13 +128,19 @@ 关闭
+ \ No newline at end of file diff --git a/src/views/Yszc/index.vue b/src/views/Yszc/index.vue index 203c65f..4aaf755 100644 --- a/src/views/Yszc/index.vue +++ b/src/views/Yszc/index.vue @@ -1,399 +1,342 @@ \ No newline at end of file diff --git a/web.zip b/web.zip index f5f2249..3578670 100644 Binary files a/web.zip and b/web.zip differ