Merge remote-tracking branch 'origin/dev' into dev

pull/5/head
fangjiakai 2024-01-24 17:50:34 +08:00
commit 63f2bbd9f9
2 changed files with 4 additions and 2 deletions

View File

@ -287,7 +287,7 @@
current: 0 current: 0
}); });
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -307,6 +307,7 @@
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime
formData.APPLY_STATUS = APPLY_STATUS
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID

View File

@ -311,7 +311,7 @@
current: 0 current: 0
}); });
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -338,6 +338,7 @@
var signtime = []; var signtime = [];
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS
formData.SIGNTIME = signtime formData.SIGNTIME = signtime
formData.WORK_START_DATE = this.pd.WORK_START_DATE formData.WORK_START_DATE = this.pd.WORK_START_DATE
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = this.pd.HOTWORK_ID