Browse Source

request

wyx
fp 1 month ago
parent
commit
e8a4bbca29
  1. 19
      common/api.js
  2. 108
      common/rec.js
  3. 5
      main.js
  4. 109
      pages/tabBar/xjPage/xj.vue
  5. 4
      utils/request.js
  6. 240
      utils/ruoyi.js

19
common/api.js

@ -2,7 +2,24 @@ import { request } from './http.js';
export const listHouseWithCount = (data) => {
return request({
url: '/system/dict/data/list',
method: 'GET',
method: 'get',
data,
});
};
// 巡检上报
export function addInspection(data) {
return request({
url: '/mz/inspection/add',
method: 'post',
data,
});
};
// 房屋专属左侧组织树
export function getdeptList() {
return request({
url: '/mz/building/getdeptList',
method: 'get'
})
}

108
common/rec.js

@ -0,0 +1,108 @@
import request from "@/utils/request";
// 查询选房记录列表
export function listRecselect(data) {
return request({
url: `/apartment/manager/chooseRoomRecs?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
method: "post",
data,
});
}
// 查询选房记录详细
export function getRecSelectInfo(id) {
return request({
url: "/apartment/manager/chooseRoomRecDetail?chooseRoomRecId=" + id,
method: "get",
});
}
// 查询入住记录列表
export function listRecCheckin(data) {
return request({
url: `/apartment/manager/listCheckInRecs?pageNum=${data.pageNum}&pageSize=${data.pageSize}`,
method: "post",
data,
});
}
// 查询选房记录详细
export function getRecCheckinInfo(id) {
return request({
url: "/apartment/manager/checkInRecDetail?checkInRecId=" + id,
method: "get",
});
}
// 查询退房记录列表
export function listCheckOutRec(pageNum, pageSize, requestBody) {
return request({
url: "/apartment/manager/listCheckOutRec?pageNum=" + pageNum + "&pageSize=" + pageSize,
method: "post",
data: requestBody,
});
}
// 查询退房记录详细
export function getRecCheckOutInfo(id) {
return request({
url: "/apartment/manager/checkOutRecDetail?checkOutRecId=" + id,
method: "get",
});
}
// 房屋三级联动
export function queryDeptDropdownList(query) {
return request({
url: "/system/dept/queryDeptDropdownList",
method: "get",
params: query,
});
}
// 续期记录
export function listRenewRec(query) {
return request({
url: "/mz/renewal/queryRenewalRecord",
method: "get",
params: query,
});
}
// 续期办理
export function handleRenewal(data) {
return request({
url: "/mz/renewal/handleRenewal",
method: "post",
data: data,
});
}
// 入住趋势
export function getRoomTrend(query) {
return request({
url: "/mz/room/roomTrend",
method: "get",
params: query,
});
}
// 查询续期记录详情
export function renewalRecordDetail(query) {
return request({
url: `/mz/renewal/queryRenewalRecordById/${query.renewalId}`,
method: "get",
params: query,
});
}
// 分页查询消息
export function messageList(query) {
return request({
url: "/message/page",
method: "get",
params: query,
});
}
// 补充合同文件
export function supplementOfflineContract(data) {
return request({
url: "/mz/checkin/supplementOfflineContract",
method: "post",
data: data,
});
}

5
main.js

@ -5,7 +5,12 @@ Vue.use(uView);
// #ifndef VUE3
import Vue from 'vue'
import './uni.promisify.adaptor'
import { handleTree } from "@/utils/ruoyi";
Vue.config.productionTip = false
Vue.prototype.handleTree = handleTree
App.mpType = 'app'
// uni.$u.config.unit = 'rpx'
const app = new Vue({

109
pages/tabBar/xjPage/xj.vue

@ -5,28 +5,28 @@
<view class="xjTitle">填写信息</view>
<view class="xjTips">请您填写相关问题</view>
<view class="conItem">
<u-form labelPosition="left" :rules="rules" :model="userInfo" ref="uForm">
<u-form labelPosition="left">
<u-form-item labelAlign="right" labelWidth="100px" label="乐业社区" prop="sex" borderBottom
@click="lysqShow = true; hideKeyboard()" ref="item1">
<u--input v-model="userInfo.sex" disabled disabledColor="#ffffff" placeholder="请选择" border="none"></u--input>
@click="lysqShow = true" ref="item1">
<u--input v-model="form.apartmentId" disabled disabledColor="#ffffff" placeholder="请选择" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item labelAlign="right" labelWidth="100px" label="巡检问题类型" prop="userInfo.sex" borderBottom
@click="wtlxShow = true; hideKeyboard()" ref="item1">
<u--input v-model="userInfo.sex" disabled disabledColor="#ffffff" placeholder="请选择" border="none"></u--input>
<u-form-item labelAlign="right" labelWidth="100px" label="巡检问题类型" borderBottom
@click="wtlxShow = true" ref="item1">
<u--input v-model="form.questionType" disabled disabledColor="#ffffff" placeholder="请选择" border="none"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item labelAlign="right" labelWidth="100px" label="标题内容" prop="userInfo.sex" borderBottom ref="item1">
<u--textarea v-model="userInfo.sex" placeholder="请输入内容" count maxlength="500"></u--textarea>
<u-form-item labelAlign="right" labelWidth="100px" label="标题内容" borderBottom ref="item1">
<u--textarea v-model="form.title" placeholder="请输入内容" count maxlength="500"></u--textarea>
</u-form-item>
<u-form-item labelAlign="right" labelWidth="100px" label="问题描述" prop="userInfo.sex" borderBottom ref="item1">
<u--textarea v-model="userInfo.sex" placeholder="请输入内容" count maxlength="500"></u--textarea>
<u-form-item labelAlign="right" labelWidth="100px" label="问题描述" borderBottom ref="item1">
<u--textarea v-model="form.content" placeholder="请输入内容" count maxlength="500"></u--textarea>
</u-form-item>
<u-form-item labelAlign="right" labelWidth="120px" label="上传图片/视频" prop="userInfo.sex" borderBottom ref="item1">
<u-form-item labelAlign="right" labelWidth="120px" label="上传图片/视频" borderBottom ref="item1">
<u-upload
v-model="fileList"
:max-count="10"
@ -54,19 +54,19 @@
</view>
<view class="conItem" style="margin-top: 40rpx;">
<u--form labelPosition="left" :model="userInfo1" ref="uForm">
<u-form-item labelAlign="right" labelWidth="100px" label="巡检人姓名" prop="userInfo.name" borderBottom ref="item1">
<u--input v-model="userInfo.name" border="none"></u--input>
<u--form labelPosition="left">
<u-form-item labelAlign="right" labelWidth="100px" label="巡检人姓名" borderBottom ref="item1">
<u--input v-model="form.inspector" border="none"></u--input>
</u-form-item>
<u-form-item labelAlign="right" labelWidth="100px" label="巡检人电话" prop="userInfo.phone" borderBottom ref="item1">
<u--input v-model="userInfo.phone" border="none"></u--input>
<u-form-item labelAlign="right" labelWidth="100px" label="巡检人电话" borderBottom ref="item1">
<u--input v-model="form.inspectorPhone" border="none"></u--input>
</u-form-item>
</u--form>
</view>
<view class="btn" @click="handleBtn">提交</view>
<u-action-sheet :show="lysqShow" :actions="actions" title="请选择乐业社区" @close="lysqShow = false" @select="sexSelect">
<u-action-sheet :show="lysqShow" :actions="deptOptions" title="请选择乐业社区" @close="lysqShow = false" @select="handleTreeSelect">
</u-action-sheet>
<u-action-sheet :show="wtlxShow" :actions="actions1" title="请选择问题类型" @close="wtlxShow = false" @select="sexSelect">
</u-action-sheet>
@ -74,26 +74,29 @@
</template>
<script>
import { listHouseWithCount } from '@/common/api.js';
import {
queryDeptDropdownList,
} from "@/common/rec";
import { getdeptList,addInspection } from '@/common/api.js';
export default {
data () {
return {
wtlxShow: false,
lysqShow: false,
actions: [
{ name: '乐业社区1', },
{ name: '乐业社区2', },
],
deptOptions: [],
actions1: [
{ name: '问题1', },
{ name: '问题2', },
],
userInfo: {
sex: '',
},
userInfo1: {
name: '',
phone: '',
form: {
apartmentId: '',
questionType: '',
title: '',
content: '',
inspector: '',
inspectorPhone: '',
inspectionTime: '',
imageList: []
},
rules:{
sex:[
@ -106,7 +109,7 @@ export default {
}
},
onLoad () {
this.handleLogin()
this.getTree()
},
methods: {
afterRead(event) {
@ -116,30 +119,40 @@ export default {
onDelete(event) {
this.fileList.splice(event.index, 1)
},
async handleLogin () {
try {
const res = await listHouseWithCount({
pageNum: 1,
pageSize: 200,
getTree(){
getdeptList().then(async (res) => {
this.deptOptions = this.handleTree(
res.data,
"deptId",
"parentId",
"children",
2
);
// console.log(this.deptOptions[0].children);
// console.log(this.deptOptions[0].children.map(item=> item.deptName));
this.deptOptions = await this.getListByParentId("1", '156');
console.log(this.deptOptions);
});
},
//
async getListByParentId(type, id) {
return new Promise((resolve, reject) => {
queryDeptDropdownList({ type, id }).then((res) => {
resolve(res.data);
});
});
console.log(res, 666);
// uni.setStorageSync('token', res.token); // Token
// uni.showToast({ title: '' });
} catch (error) {
console.error('登录失败:', error);
}
},
handleBtn () {
this.$refs['uForm'].validate((valid) => {
if (valid) {
console.log(this.userInfo);
}
addInspection().then(res=>{
console.log(res);
})
},
sexSelect (e) {
this.model1.userInfo.sex = e.name
this.$refs.uForm.validateField('userInfo.sex')
handleTreeSelect (e) {
console.log(e);
// this.model1.userInfo.sex = e.name
// this.$refs.uForm.validateField('userInfo.sex')
},
}
}

4
utils/request.js

@ -8,9 +8,9 @@ export default function request(options = {}) {
return new Promise((resolve, reject) => {
uni.request({
url: baseUrl + options.url,
method: options.method || "GET",
method: options.method || "get",
data:
options.method === "GET" ? options.data : options.data || {},
options.method === "post" ? options.data : options.params || {},
header: {
"Content-Type": options.contentType || "application/json;charset=UTF-8",
Authorization: token ? `Bearer ${token}` : "",

240
utils/ruoyi.js

@ -0,0 +1,240 @@
/**
* 通用js方法封装处理
* Copyright (c) 2019 ruoyi
*/
// 日期格式化
export function parseTime(time, pattern) {
if (arguments.length === 0 || !time) {
return null
}
const format = pattern || '{y}-{m}-{d} {h}:{i}:{s}'
let date
if (typeof time === 'object') {
date = time
} else {
if ((typeof time === 'string') && (/^[0-9]+$/.test(time))) {
time = parseInt(time)
} else if (typeof time === 'string') {
time = time.replace(new RegExp(/-/gm), '/').replace('T', ' ').replace(new RegExp(/\.[\d]{3}/gm), '');
}
if ((typeof time === 'number') && (time.toString().length === 10)) {
time = time * 1000
}
date = new Date(time)
}
const formatObj = {
y: date.getFullYear(),
m: date.getMonth() + 1,
d: date.getDate(),
h: date.getHours(),
i: date.getMinutes(),
s: date.getSeconds(),
a: date.getDay()
}
const time_str = format.replace(/{(y|m|d|h|i|s|a)+}/g, (result, key) => {
let value = formatObj[key]
// Note: getDay() returns 0 on Sunday
if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value] }
if (result.length > 0 && value < 10) {
value = '0' + value
}
return value || 0
})
return time_str
}
// 表单重置
export function resetForm(refName) {
if (this.$refs[refName]) {
this.$refs[refName].resetFields();
}
}
// 添加日期范围
export function addDateRange(params, dateRange, propName) {
let search = params;
search.params = typeof (search.params) === 'object' && search.params !== null && !Array.isArray(search.params) ? search.params : {};
dateRange = Array.isArray(dateRange) ? dateRange : [];
if (typeof (propName) === 'undefined') {
search.params['beginTime'] = dateRange[0];
search.params['endTime'] = dateRange[1];
} else {
search.params['begin' + propName] = dateRange[0];
search.params['end' + propName] = dateRange[1];
}
return search;
}
// 回显数据字典
export function selectDictLabel(datas, value) {
if (value === undefined) {
return "";
}
var actions = [];
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + value)) {
actions.push(datas[key].label);
return true;
}
})
if (actions.length === 0) {
actions.push(value);
}
return actions.join('');
}
// 回显数据字典(字符串、数组)
export function selectDictLabels(datas, value, separator) {
if (value === undefined || value.length ===0) {
return "";
}
if (Array.isArray(value)) {
value = value.join(",");
}
var actions = [];
var currentSeparator = undefined === separator ? "," : separator;
var temp = value.split(currentSeparator);
Object.keys(value.split(currentSeparator)).some((val) => {
var match = false;
Object.keys(datas).some((key) => {
if (datas[key].value == ('' + temp[val])) {
actions.push(datas[key].label + currentSeparator);
match = true;
}
})
if (!match) {
actions.push(temp[val] + currentSeparator);
}
})
return actions.join('').substring(0, actions.join('').length - 1);
}
// 字符串格式化(%s )
export function sprintf(str) {
var args = arguments, flag = true, i = 1;
str = str.replace(/%s/g, function () {
var arg = args[i++];
if (typeof arg === 'undefined') {
flag = false;
return '';
}
return arg;
});
return flag ? str : '';
}
// 转换字符串,undefined,null等转化为""
export function parseStrEmpty(str) {
if (!str || str == "undefined" || str == "null") {
return "";
}
return str;
}
// 数据合并
export function mergeRecursive(source, target) {
for (var p in target) {
try {
if (target[p].constructor == Object) {
source[p] = mergeRecursive(source[p], target[p]);
} else {
source[p] = target[p];
}
} catch (e) {
source[p] = target[p];
}
}
return source;
};
/**
* 构造树型结构数据
* @param {*} data 数据源
* @param {*} id id字段 默认 'id'
* @param {*} parentId 父节点字段 默认 'parentId'
* @param {*} children 孩子节点字段 默认 'children'
* @param {*} maxLevel 最大层级 默认 null
*/
export function handleTree(data, id, parentId, children, maxLevel) {
let config = {
id: id || 'id',
parentId: parentId || 'parentId',
childrenList: children || 'children'
};
var childrenListMap = {};
var nodeIds = {};
var tree = [];
for (let d of data) {
let parentId = d[config.parentId];
if (childrenListMap[parentId] == null) {
childrenListMap[parentId] = [];
}
nodeIds[d[config.id]] = d;
childrenListMap[parentId].push(d);
}
for (let d of data) {
let parentId = d[config.parentId];
if (nodeIds[parentId] == null) {
// 添加过滤条件:第一层数据levelType必须为0
if (d.levelType === undefined || d.levelType === 0) {
tree.push(d);
}
}
}
for (let t of tree) {
adaptToChildrenList(t, 1);
}
function adaptToChildrenList(o, level) {
if (childrenListMap[o[config.id]] !== null) {
if (maxLevel && level >= maxLevel) {
// 当达到最大层级时,清除子节点数据
o[config.childrenList] = [];
return;
}
o[config.childrenList] = childrenListMap[o[config.id]];
}
if (o[config.childrenList]) {
for (let c of o[config.childrenList]) {
adaptToChildrenList(c, level + 1);
}
}
}
return tree;
}
/**
* 参数处理
* @param {*} params 参数
*/
export function tansParams(params) {
let result = ''
for (const propName of Object.keys(params)) {
const value = params[propName];
var part = encodeURIComponent(propName) + "=";
if (value !== null && value !== "" && typeof (value) !== "undefined") {
if (typeof value === 'object') {
for (const key of Object.keys(value)) {
if (value[key] !== null && value[key] !== "" && typeof (value[key]) !== 'undefined') {
let params = propName + '[' + key + ']';
var subPart = encodeURIComponent(params) + "=";
result += subPart + encodeURIComponent(value[key]) + "&";
}
}
} else {
result += part + encodeURIComponent(value) + "&";
}
}
}
return result
}
// 验证是否为blob格式
export function blobValidate(data) {
return data.type !== 'application/json'
}
Loading…
Cancel
Save