From a6c73a023ddd5daa51536cdeced5b249e9fda131 Mon Sep 17 00:00:00 2001 From: SelfRidicule Date: Wed, 7 Aug 2024 14:06:17 +0800 Subject: [PATCH] 1 --- miniprogram/api/repair/repair.js | 11 +- miniprogram/app.js | 17 +++ .../pages/reportRepair/report/report.js | 119 +++++++++--------- .../pages/reportRepair/report/report.wxml | 2 +- 4 files changed, 86 insertions(+), 63 deletions(-) diff --git a/miniprogram/api/repair/repair.js b/miniprogram/api/repair/repair.js index c99e804..9aab609 100644 --- a/miniprogram/api/repair/repair.js +++ b/miniprogram/api/repair/repair.js @@ -35,4 +35,13 @@ export function selectRoomListRq(data) { method: "get", data }); -} \ No newline at end of file +} + +// 保存工单 +export function repairSaveRq(data) { + return request({ + url: '/repair/save', + method: "post", + data + }); +} diff --git a/miniprogram/app.js b/miniprogram/app.js index 8770cdd..6bebe4d 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -302,4 +302,21 @@ App({ } }) }, + selfUploadFile(url) { + let _this = this + return new Promise((resolve, reject) => { + wx.uploadFile({ + url: _this.DOMAIN_NAME + '/api/dfs/upload', + filePath: url, + name: 'file', + formData: {}, + success: res => { + resolve(JSON.parse(res.data)); + }, + fail: err => { + reject(err); + } + }) + }) + }, }) \ No newline at end of file diff --git a/miniprogram/pages/reportRepair/report/report.js b/miniprogram/pages/reportRepair/report/report.js index b1b2aa0..445ceec 100644 --- a/miniprogram/pages/reportRepair/report/report.js +++ b/miniprogram/pages/reportRepair/report/report.js @@ -11,6 +11,7 @@ import { deviceListRq, selectAddressListRq, selectRoomListRq, + repairSaveRq, } from "../../../api/repair/repair.js" @@ -66,16 +67,16 @@ Page({ "repairName": "", //维修名称 "repairLevel": "", //维修等级 "failureDate": null, //故障时间 - "typeId" : null , //故障类型 + "typeId": null, //故障类型 "repairDevice": null, //维修设备 "name": "", //用户名 "phone": "", //手机号码 - "addressId" : null ,// 地点id - "roomId" : null ,// 楼层id + "addressId": null, // 地点id + "roomId": null, // 楼层id "area": "", // 门牌号 - "content" : "", // 描述 - "repairVoice" : "", // 语音文件 - "repairImages" : '', //故障图片 + "content": "", // 描述 + "repairVoice": "", // 语音文件 + "repairImages": "", //故障图片 }, }, @@ -195,8 +196,8 @@ Page({ _this.setData({ typeColumns }) - // 查询设备 - _this.queryDevice(list[0].id) + // 查询设备 + _this.queryDevice(list[0].id) }) }, @@ -241,8 +242,8 @@ Page({ }, // 确认设备 - typeColumnsConfirm(e){ - console.log('typeColumnsConfirm' , e.detail); + typeColumnsConfirm(e) { + console.log('typeColumnsConfirm', e.detail); let _this = this const { picker, @@ -256,7 +257,7 @@ Page({ _this.setData({ detail, typeName, - typeVisible : false + typeVisible: false }) }, @@ -274,9 +275,9 @@ Page({ }, // 查询地点 - queryAddress(){ + queryAddress() { let _this = this - selectAddressListRq().then(res=>{ + selectAddressListRq().then(res => { console.log('selectAddressListRq', res); let list = res.rows.map(item => { return { @@ -289,13 +290,13 @@ Page({ _this.setData({ addressColumns }) - // 查询楼层 - _this.queryRoom(list[0].id) + // 查询楼层 + _this.queryRoom(list[0].id) }) }, // 查询楼层 - queryRoom(id){ + queryRoom(id) { let _this = this selectRoomListRq({ @@ -316,8 +317,8 @@ Page({ }) }, - // 选择地点 - addressColumnsChange(e) { + // 选择地点 + addressColumnsChange(e) { console.log('addressColumnsChange', e.detail); let _this = this const { @@ -334,9 +335,9 @@ Page({ } }, - // 确认地点 - addressColumnsConfirm(e){ - console.log('addressColumnsConfirm' , e.detail); + // 确认地点 + addressColumnsConfirm(e) { + console.log('addressColumnsConfirm', e.detail); let _this = this const { picker, @@ -350,7 +351,7 @@ Page({ _this.setData({ detail, addressName, - addressVisible : false + addressVisible: false }) }, @@ -433,7 +434,7 @@ Page({ }, // 清楚语音 - clearAudio(){ + clearAudio() { this.setData({ innerAudioContext: null, // 音频对象 innerAudioContextIsPlay: false, // 音频对象-是否播放 @@ -508,12 +509,12 @@ Page({ }, // 提交数据 - submitData() { + async submitData() { let _this = this; // 上传文件列表 let fileList = _this.data.fileList; - // 音频 - let voiceObj = _this.data.voiceObj; + // 音频 + let voiceObj = _this.data.voiceObj; // 数据 let detail = _this.data.detail; // @@ -534,55 +535,51 @@ Page({ _this.showErrMsg('请选择故障时间!') return; } - // 访客姓名 - if (!detail.name) { - _this.showErrMsg('请填写访客姓名!') + // 故障类型 + if (!detail.typeId) { + _this.showErrMsg('请选择故障类型!') return; } - // 访客手机号 - if (!detail.phone) { - _this.showErrMsg('请填写访客手机号!') + // 故障地点 + if (!detail.addressId) { + _this.showErrMsg('请选择故障地点!') return; } - // 证件号 - if (!detail.cardNo) { - _this.showErrMsg('请填写证件号!') + // 门牌号 + if (!detail.area) { + _this.showErrMsg('请输入门牌号!') return; } - // 到访时间 - if (!detail.visitTime) { - _this.showErrMsg('请选择到访时间!') - return; - } - // 离开时间 - if (!detail.leaveTime) { - _this.showErrMsg('请选择离开时间!') - return; - } - // 来访事由 - if (!detail.visitContent) { - _this.showErrMsg('请填写来访事由!') + // 故障描述 + if (!detail.content) { + _this.showErrMsg('请输入故障描述!') return; } // 图片上传 if (fileList && fileList.length > 0) { - detail.photo = fileList[0].relativeUrl // 头像-相对路径 - detail.url = fileList[0].url // 人脸设备图片-全路径 - } else { - _this.showErrMsg('请上传照片!') - return; + detail.repairImages = JSON.stringify(fileList.map(item => { + return { + name: item.relativeUrl, + url: item.relativeUrl, + uid: item.relativeUrl, + } + })) + } + // 音频 + if (voiceObj && voiceObj.tempFilePath) { + await app.selfUploadFile(voiceObj.tempFilePath).then(res => { + console.log('selfUploadFile', res); + detail.repairVoice = JSON.stringify({ + url: res.fileName, + time: voiceObj.duration + }) + }) } // // 添加数据 - visitorPersonRq(detail).then(res => { + repairSaveRq(detail).then(res => { console.log('visitorPersonRq', res); - // 刷新上个页面参数 - let pages = getCurrentPages(); //获取page - let prevPage = pages[pages.length - 2]; //上一个页面（父页面） - prevPage.setData({ - changeData: true - }) - // + // if (res.code == 0) { wx.navigateBack() } else { diff --git a/miniprogram/pages/reportRepair/report/report.wxml b/miniprogram/pages/reportRepair/report/report.wxml index 0fad946..df125b2 100644 --- a/miniprogram/pages/reportRepair/report/report.wxml +++ b/miniprogram/pages/reportRepair/report/report.wxml @@ -72,7 +72,7 @@ - +