八项作业特级,一级,二级动火流程打回

pull/5/head
chenxinying 2024-01-24 17:15:20 +08:00
parent 589716c05d
commit b57bee505c
14 changed files with 290 additions and 270 deletions

View File

@ -348,7 +348,7 @@
this.pd.ACCEPT_TIME = e
this.$forceUpdate();//
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -380,6 +380,7 @@
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -219,7 +219,7 @@
}
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -242,6 +242,7 @@
formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: fileList,

View File

@ -785,7 +785,6 @@
_this.pd = res.data.pd; //map
if(_this.pd.STEP_ID == 0){
_this.forbidEdit = false;
}
this.getUserList(this.pd.ANALYZE_DEPARTMENT_ID,'analyzeUserList');
this.getUserList(this.pd.CONFIRM_DEPARTMENT_ID,'confirmUserList');
this.getUserList(this.pd.LEADER_DEPARTMENT_ID,'leaderUserList');
@ -796,8 +795,7 @@
this.getUserList(this.pd.WORK_START_DEPARTMENT_ID,'workstartUserList');
this.getUserList(this.pd.WORK_END_DEPARTMENT_ID,'workendUserList');
this.getWorkUserList();
}
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',

View File

@ -276,7 +276,7 @@
return true
return false
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -300,6 +300,7 @@
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -267,7 +267,7 @@
return true
return false
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -290,6 +290,7 @@
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -218,7 +218,7 @@
signtime.push(item.SIGNER_TIME)
})
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -240,6 +240,7 @@
formData.SIGNTIME = signtime
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -241,7 +241,7 @@
signtime.push(item.SIGNER_TIME)
})
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -265,6 +265,7 @@
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -331,7 +331,7 @@
this.pd.WORK_END_DATE = e
this.$forceUpdate();//
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -378,6 +378,7 @@
var signtime = [];
const formData={}
this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS
formData.SIGNTIME = signtime
formData.WORK_END_DATE = this.pd.WORK_END_DATE
formData.HOTWORK_ID = this.pd.HOTWORK_ID

View File

@ -94,6 +94,15 @@
loginSession();
},
methods: {
uploadImgFaults(files,signtime) {
this.imgList.map((item,index) => {
var img = {}
img.name = 'file'+index
img.uri = item.filePath
files.push(img)
signtime.push(item.SIGNER_TIME)
})
},
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
@ -121,18 +130,21 @@
uni.showLoading({
title: '请稍候'
})
var files = [];
var signtime = [];
const formData={}
Object.keys(this.pd).map(key => {
formData[key]=this.pd[key]
})
this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime
formData.CORPINFO_ID = loginUser.CORPINFO_ID
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
this.buttonloading = true
uni.uploadFile({
url: basePath + "app/hotwork/gas/save",
filePath: _this.imgList[0].filePath,
name: 'file',
files: files,
formData:formData,
success: (res) => {
uni.showToast({

View File

@ -198,7 +198,7 @@
current: 0
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -217,6 +217,7 @@
var signtime = [];
this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS
formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.USER_ID = loginUser.USER_ID

View File

@ -253,7 +253,7 @@
return true
return false
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
@ -277,6 +277,7 @@
formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,

View File

@ -7,12 +7,12 @@
<scroll-view scroll-y="false" >
<view class="form">
<view class="wui-form-list">
<view class="cu-form-group group-picker" >
<view class="cu-form-group bb-default" >
<view class="title">申请单位</view>
{{pd.APPLY_DEPARTMENT_NAME}}
</view>
<view class="cu-form-group group-picker" >
<view class="cu-form-group bb-default" >
<view class="title">申请人</view>
{{pd.APPLY_USER_NAME}}
</view>
@ -108,7 +108,6 @@
</template>
</uni-table>
</view>
<view class="wui-sign" >
<view class="title"></view>
<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button>
@ -129,8 +128,8 @@
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-2')"> </button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')"> </button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-1')"> </button>
<button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1')"> </button>
</view>
<view class="padding flex flex-direction">
</view>
@ -242,7 +241,7 @@
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
uni.showLoading({
title: '请稍候'
@ -257,38 +256,6 @@
}
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(measures.QUESTION1 && !measures.ANSWER1){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第一项',
duration: 1500
});
return;
}
if(measures.QUESTION2 && !measures.ANSWER2){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第二项',
duration: 1500
});
return;
}
if(measures.QUESTION3 && !measures.ANSWER3){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第三项',
duration: 1500
});
return;
}
if(measures.QUESTION4 && !measures.ANSWER4){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第四项',
duration: 1500
});
return;
}
if(!measures.SIGN_PATH){
uni.showToast({
icon: 'none',
@ -297,12 +264,46 @@
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION1 && !measures.ANSWER1){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第一项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION2 && !measures.ANSWER2){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第二项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION3 && !measures.ANSWER3){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第三项',
duration: 1500
});
return;
}
if(measures.STATUS=='1' && measures.QUESTION4 && !measures.ANSWER4){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未填写第四项',
duration: 1500
});
return;
}
}
const formData={}
var files = [];
var signtime = [];
this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS
formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID

View File

@ -127,8 +127,8 @@
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-2')"> </button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')"> </button>
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-1')"> </button>
<button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1')"> </button>
</view>
<view class="padding flex flex-direction">
</view>
@ -205,7 +205,7 @@
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
uni.showLoading({
title: '请稍候'
@ -243,6 +243,7 @@
formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
formData.PREPARERS = JSON.stringify(signers)
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',

View File

@ -305,7 +305,6 @@
var files = [];
var signtime = [];
const formData={}
this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime
formData.HOTWORK_ID = this.pd.HOTWORK_ID