From b4661f300194a13c4bc391f2f45a3f7a0a8dff08 Mon Sep 17 00:00:00 2001
From: 安瑾然 <m17681517455@outlook.com>
Date: 星期二, 21 三月 2023 17:26:38 +0800
Subject: [PATCH] fix bug
---
miniprogram/pages/user/report/submitReport/index.ts | 382 +++++++++++++++++++++++++++++++-----------------------
1 files changed, 217 insertions(+), 165 deletions(-)
diff --git a/miniprogram/pages/user/report/submitReport/index.ts b/miniprogram/pages/user/report/submitReport/index.ts
index 60046d8..39cdb1e 100644
--- a/miniprogram/pages/user/report/submitReport/index.ts
+++ b/miniprogram/pages/user/report/submitReport/index.ts
@@ -1,121 +1,114 @@
// index.ts
-const submitReport =getApp()
+const submitReport = getApp()
import Toast from '@vant/weapp/toast/toast';
Page({
data: {
- capture:['camera'],
- beforList:'a',
- amountInvolved:'',
- workingLocation:'',
- Location:'',
- userIdCard:'',
- sex:'鐢�',
- realName:'',
- phone:'',
+ aaaform: {},
+ capture: ['camera'],
+ beforList: 'a',
+ amountInvolved: '',
+ workingLocation: '',
+ Location: '',
+ userIdCard: '',
+ sex: '鐢�',
+ realName: '',
+ phone: '',
fileImgList: [],
- transactionReceiptList:[],
- otherList:[],
+ transactionReceiptList: [],
+ otherList: [],
causeIndex: null,
- items: { name: '鏃ユ湡鏃堕棿閫夋嫨', value: 'dateTime' },
+ items: { name: '鏃ユ湡鏃堕棿閫夋嫨', value: 'dateTime' },
mode: 'dateTime',
reportDetail: {},
causeList: [],
imagesFile: [],
- cardIdList:[],
+ cardIdList: [],
images: [],
- materials:'',
- cheatTime:"",
+ materials: '',
+ cheatTime: "",
arraySex: [
- {sex:'鐢�',id:1},
- {sex:'濂�',id:0}
- ],
- sexId:0
+ { sex: '鐢�', id: 1 },
+ { sex: '濂�', id: 0 }
+ ],
+ sexId: 0
},
- getrealName(e){
+ getrealName(e) {
this.setData({
- realName:e.detail
+ realName: e.detail
})
},
- getsex(e){
+ getsex(e) {
this.setData({
- sex:e.detail
+ sex: e.detail
})
},
- getuserIdCard(e){
+ getuserIdCard(e) {
this.setData({
- userIdCard:e.detail
+ userIdCard: e.detail
})
},
- getLocation(e){
+ getLocation(e) {
this.setData({
- Location:e.detail
+ Location: e.detail
})
},
- getworkingLocation(e){
+ getworkingLocation(e) {
this.setData({
- workingLocation:e.detail
+ workingLocation: e.detail
})
},
- getamountInvolved(e){
+ getamountInvolved(e) {
this.setData({
- amountInvolved:e.detail
+ amountInvolved: e.detail
})
},
- onChangeTabs(e){
+ onChangeTabs(e) {
this.setData({
- beforList:e.detail.name
+ beforList: e.detail.name
})
},
- afterReadImg(event: { detail: { file: any; }; },name){
- console.log(event,name);
-
+ afterReadImg(event: { detail: { file: any; }; }, name) {
const { file } = event.detail;
- let that=this
- console.log(file);
-
+ let that = this
// 褰撹缃� mutiple 涓� true 鏃�, file 涓烘暟缁勬牸寮忥紝鍚﹀垯涓哄璞℃牸寮�
wx.uploadFile({
// filePath: this.data.imagesFile[index].tempFilePath,
- header: {
- 'token': wx.getStorageSync('token'),
- 'content-type': 'application/json'
- },
- url: submitReport.globalData.url+"/minio/upload",
- filePath: file.url,
- name: 'file',
- formData: { user: 'test' },
- success(res) {
- // 涓婁紶瀹屾垚闇�瑕佹洿鏂� fileList
- const { fileImgList = [] } = that.data;
- const { transactionReceiptList = [] } = that.data;
- const { otherList = [] } = that.data;
- const { cardIdList = [] } = that.data;
- let result = JSON.parse(res.data)
- if (that.data.beforList=='a') {
- cardIdList.push({ ...file, url: res.data });
- that.setData({ cardIdList });
- }else if(that.data.beforList=='b'){
- fileImgList.push({ ...file, url: res.data });
- that.setData({ fileImgList });
- }else if(that.data.beforList=='c'){
- transactionReceiptList.push({ ...file, url: res.data });
- that.setData({ transactionReceiptList });
- }else if(that.data.beforList=='d'){
- otherList.push({ ...file, url: res.data });
- that.setData({ otherList });
- }
-
-
- that.setData({
- materials: that.data.materials+=result.data+","
- })
- console.log(that.data.materials);
- },
+ header: {
+ 'token': wx.getStorageSync('token'),
+ 'content-type': 'application/json'
+ },
+ url: submitReport.globalData.url + "/minio/upload",
+ filePath: file.url,
+ name: 'file',
+ formData: { user: 'test' },
+ success(res) {
+ // 涓婁紶瀹屾垚闇�瑕佹洿鏂� fileList
+ const { fileImgList = [] } = that.data;
+ const { transactionReceiptList = [] } = that.data;
+ const { otherList = [] } = that.data;
+ const { cardIdList = [] } = that.data;
+ let result = JSON.parse(res.data)
+ if (that.data.beforList == 'a') {
+ cardIdList.push({ ...file, url: result.data });
+ that.setData({ cardIdList });
+ } else if (that.data.beforList == 'b') {
+ fileImgList.push({ ...file, url: result.data });
+ that.setData({ fileImgList });
+ } else if (that.data.beforList == 'c') {
+ transactionReceiptList.push({ ...file, url: result.data });
+ that.setData({ transactionReceiptList });
+ } else if (that.data.beforList == 'd') {
+ otherList.push({ ...file, url: result.data });
+ that.setData({ otherList });
+ }
+ that.setData({
+ materials: that.data.materials += result.data + ","
+ })
+ },
});
},
//閫夋嫨妗堜欢
pickCause(e: { detail: { value: string | number; }; }) {
- console.log(e);
this.setData({
causeIndex: e.detail.value
})
@@ -123,117 +116,109 @@
},
uploadImage() {
wx.chooseMedia({
- sourceType:['camera'],
+ sourceType: ['camera'],
mediaType: ['image'],
success: res => {
this.setData({
imagesFile: res.tempFiles
})
- console.log(this.data.imagesFile);
-
- for (let index = 0; index < this.data.imagesFile.length; index++) {
+ for (let index = 0; index < this.data.imagesFile.length; index++) {
wx.uploadFile({
- filePath: this.data.imagesFile[index].tempFilePath,
+ filePath: this.data.imagesFile[index].tempFilePath,
name: "file",
header: {
'token': wx.getStorageSync('token'),
'content-type': 'application/json'
},
- url: submitReport.globalData.url+"/minio/upload",
+ url: submitReport.globalData.url + "/minio/upload",
success: res => {
const result = JSON.parse(res.data)
- this.data.images.push({
- url:submitReport.globalData.imageUrl+"/img/"+result.data
- })
- this.setData({
- images:this.data.images
- })
- this.setData({
- materials: this.data.materials+=result.data+","
- })
- console.log(this.data.materials);
- }
- })
+ this.data.images.push({
+ url: submitReport.globalData.imageUrl + "/img/" + result.data
+ })
+ this.setData({
+ images: this.data.images
+ })
+ this.setData({
+ materials: this.data.materials += result.data + ","
+ })
+ }
+ })
}
}
})
-
- },
-//琚獥鏃堕棿
-onPickerChange(e){
- console.log(e)
- this.data.cheatTime=e.detail.value
-},
-subSex(e){
-console.log(e);
-},
-bindPickerChangeSex(e){
-console.log(e);
-this.setData({
- sexId:e.detail.value
-})
-this.setData({
- sex:this.data.arraySex[e.detail.value].sex
-})
-},
-getMoney:function(e){
- console.log(e.detail.value)
- this.data.reportDetail.amountInvolved=e.detail.value
-},
-getDe:function(e){
- console.log(e.detail.value)
- this.data.reportDetail.reportDescription=e.detail.value
- },
- getInfor:function(e){
- this.data.reportDetail.information=e.detail.value
- console.log(e.detail.value)
- },
+ },
+ //琚獥鏃堕棿
+ onPickerChange(e) {
+ this.data.cheatTime = e.detail.value
+ },
+ subSex(e) {
+ },
+ bindPickerChangeSex(e) {
+ this.setData({
+ sexId: e.detail.value
+ })
+ this.setData({
+ sex: this.data.arraySex[e.detail.value].sex
+ })
+ },
+ getMoney: function (e) {
+ this.data.reportDetail.amountInvolved = e.detail.value
+ },
+ getDe: function (e) {
+ this.data.reportDetail.reportDescription = e.detail.value
+ },
+ getInfor: function (e) {
+ this.data.reportDetail.information = e.detail.value
+ },
//閫氳繃
- cancel(){
- wx.navigateBack({
- delta:1
- })
+ cancel() {
+ wx.navigateBack({
+ delta: 1
+ })
},
pass() {
- console.log(this.data.realName);
- if (this.data.realName=='') {
+ if (this.data.realName == '') {
Toast('璇疯緭鍏ュ鍚嶏紒');
return
- } else if(this.data.userIdCard=='') {
+ } else if (this.data.userIdCard == '') {
Toast('璇疯緭鍏ヨ韩浠借瘉锛�');
return
- }else if(this.data.Location=='') {
+ } else if (this.data.Location == '') {
Toast('璇疯緭鍏ョ幇浣忓潃锛�');
return
- }else if(this.data.workingLocation=='') {
+ } else if (this.data.workingLocation == '') {
Toast('璇疯緭鍏ュ伐浣滃崟浣嶏紒');
return
- }else if(this.data.amountInvolved=='') {
+ } else if (this.data.amountInvolved == '') {
Toast('璇疯緭鍏ュ彈鎹熼噾棰濓紒');
return
- }else if(this.data.cardIdList.length!=2) {
+ } else if (this.data.cardIdList.length != 2) {
Toast('璇烽�夋嫨韬唤璇佺収鐗囷紒');
return
}
- if (this.data.fileImgList.length!=0||this.data.transactionReceiptList.length!=0||this.data.otherList.length!=0) {
-
- }else{
-
+ if (this.data.fileImgList.length != 0 || this.data.transactionReceiptList.length != 0 || this.data.otherList.length != 0) {
+
+ } else {
Toast('鐩稿叧鍚堝悓锛屼氦鏄撳嚟璇侊紝鍏朵粬;蹇呭～涓�椤癸紒');
return
}
- this.data.materials=this.data.materials.substring(0,this.data.materials.length-1);
- this.data.reportDetail.amountInvolved=this.data.amountInvolved,
- this.data.reportDetail.workingLocation=this.data.workingLocation,
- this.data.reportDetail.Location=this.data.Location,
- this.data.reportDetail.userIdCard=this.data.userIdCard,
- this.data.reportDetail.sex=this.data.sex,
- this.data.reportDetail.realName=this.data.realName,
- this.data.reportDetail.phone=this.data.phone,
- this.data.reportDetail.reportMaterials=this.data.materials
- this.data.reportDetail.userId=wx.getStorageSync('id')
- this.data.reportDetail.cheatTime=this.data.cheatTime
+ this.data.materials = this.data.materials.substring(0, this.data.materials.length - 1);
+ this.data.reportDetail.amountInvolved = this.data.amountInvolved
+ this.data.reportDetail.workingLocation = this.data.workingLocation
+ this.data.reportDetail.location = this.data.Location
+ this.data.reportDetail.userIdCard = this.data.userIdCard
+ this.data.reportDetail.sex = this.data.sex
+ this.data.reportDetail.realName = this.data.realName
+ this.data.reportDetail.phone = this.data.phone
+ this.data.reportDetail.reportMaterials = this.data.materials
+ this.data.reportDetail.userId = wx.getStorageSync('id')
+ this.data.reportDetail.cheatTime = this.data.cheatTime
+ this.data.reportDetail.idCardMaterials = this.data.cardIdList.map(res => res.url).join(',')
+ this.data.reportDetail.contractMaterials = this.data.fileImgList.map(res => res.url).join(',')
+ this.data.reportDetail.transactionMaterials = this.data.transactionReceiptList.map(res => res.url).join(',')
+ this.data.reportDetail.elseMaterials = this.data.otherList.map(res => res.url).join(',')
// if ( this.data.reportDetail.information==null|| this.data.reportDetail.reportDescription==null) {
// wx.showToast({
// icon: "none",
@@ -243,33 +228,31 @@
// }
wx.request(
{
- url: submitReport.globalData.url+"/wx/user/addReport",
+ url: submitReport.globalData.url + "/wx/user/addReport",
method: "POST",
data: this.data.reportDetail,
header: {
'token': wx.getStorageSync('token'),
'content-type': 'application/json'
}, success: (res) => {
- console.log(res)
wx.reLaunch({
- url:'../../report/index'
+ url: '../../report/index'
})
}
})
-
-
},
onLoad(e) {
+ let that = this
let phone = wx.getStorageSync('phone')
this.setData({
- phone:phone
+ phone: phone
})
var date = new Date()
var month = date.getMonth() + 1
var day = date.getDate()
- var hours=date.getHours()
- var minutes=date.getMinutes()
- var secends=date.getSeconds()
+ var hours = date.getHours()
+ var minutes = date.getMinutes()
+ var secends = date.getSeconds()
var time
if (month < 10) {
month = "0" + month
@@ -286,18 +269,87 @@
if (secends < 10) {
secends = "0" + secends
}
- this.data.cheatTime = date.getFullYear() + "-" + month + "-" + day + " " + hours+":"+minutes+":"+secends
- console.log( this.data.cheatTime)
+ this.data.cheatTime = date.getFullYear() + "-" + month + "-" + day + " " + hours + ":" + minutes + ":" + secends
+ this.loadData(e)
wx.request(
{
- url: submitReport.globalData.url+ "/cause/getCauseList",
+ url: submitReport.globalData.url + "/cause/getVxCauseList?phone=" + that.data.phone,
method: "GET",
- header: { 'token': wx.getStorageSync('token')},
+ header: { 'token': wx.getStorageSync('token') },
success: (res) => {
+ let causes = res.data.data
+ console.log(that.data.aaaform);
+ if (e.id) {
+ causes.push({
+ id: that.data.aaaform.causeId,
+ name: that.data.aaaform.description
+ })
+ }
this.setData({
- causeList: res.data.data.records
+ causeList: causes,
+ causeIndex: causes.findIndex(i => i.id == that.data.aaaform.causeId)
})
}
})
+ },
+ loadData(e: any) {
+ let that = this
+ const { arraySex } = this.data
+ if (e.id) {
+ wx.request({
+ url: submitReport.globalData.url + "/report/rejectReport/" + e.id,
+ method: "GET",
+ header: { 'token': wx.getStorageSync('token') },
+ success: res => {
+ let form = res.data.data
+ this.setData({
+ aaaform: form,
+ realName: form.realName,
+ phone: form.mobile,
+ userIdCard: form.userIdCard,
+ amountInvolved: form.amountInvolved,
+ sex: form.sex,
+ sexId: arraySex.filter(i => i.sex == form.sex)[0].code,
+ Location: form.location,
+ workingLocation: form.workingLocation,
+ cardIdList: form.idCardMaterials.split(',').map(i => {
+ return {
+ thumb: that.imgComplete(i),
+ url: i,
+ type: "image",
+ size: 999999
+ }
+ }),
+ fileImgList: form.contractMaterials.split(',').map(i => {
+ return {
+ thumb: that.imgComplete(i),
+ url: i,
+ type: "image",
+ size: 999999
+ }
+ }),
+ transactionReceiptList: form.transactionMaterials.split(',').map(i => {
+ return {
+ thumb: that.imgComplete(i),
+ url: i,
+ type: "image",
+ size: 999999
+ }
+ }),
+ otherList: form.elseMaterials.split(',').map(i => {
+ return {
+ thumb: that.imgComplete(i),
+ url: i,
+ type: "image",
+ size: 999999
+ }
+ })
+ })
+ }
+ })
+ }
+ },
+ imgComplete(file: String): String {
+ return submitReport.globalData.imageUrl + "/img/" + file
}
})
\ No newline at end of file
--
Gitblit v1.8.0