wangpeng
/
integrated_traffic_uniapp
forked from integrated_whb/UniApp_integrated_whb
1
0
Fork 0
Code Pull Requests Activity

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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
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,

3
pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
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,

22
pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
View File

@ -785,19 +785,17 @@
_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');
this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'auditUserList');
this.getUserList(this.pd.APPROVE_DEPARTMENT_ID,'approveUserList');
this.getUserList(this.pd.MONITOR_DEPARTMENT_ID,'monitorUserList');
this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList');
this.getUserList(this.pd.WORK_START_DEPARTMENT_ID,'workstartUserList');
this.getUserList(this.pd.WORK_END_DEPARTMENT_ID,'workendUserList');
this.getWorkUserList();
}
this.getUserList(this.pd.ANALYZE_DEPARTMENT_ID,'analyzeUserList');
this.getUserList(this.pd.CONFIRM_DEPARTMENT_ID,'confirmUserList');
this.getUserList(this.pd.LEADER_DEPARTMENT_ID,'leaderUserList');
this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'auditUserList');
this.getUserList(this.pd.APPROVE_DEPARTMENT_ID,'approveUserList');
this.getUserList(this.pd.MONITOR_DEPARTMENT_ID,'monitorUserList');
this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList');
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: '错误',

3
pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue
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,

3
pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue
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,

3
pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue
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,

3
pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue
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,

3
pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
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

16
pages/application/hotwork/hotwork-gas/gas-detail.vue
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({

3
pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue
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

3
pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue
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,

359
pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
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>
@ -72,43 +72,42 @@
<!-- 表头行 -->
<uni-tr>
<uni-th align="center" style="font-weight: bold;">主要安全措施</uni-th>
<uni-th align="center">
<view class="title">操作</view>
</uni-th>
<uni-th align="center">
<view class="title">操作</view>
</uni-th>
</uni-tr>
<template v-for="(item,index) in measuresList">
<uni-tr>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
</view>
<template v-for="(item,index) in measuresList">
<uni-tr>
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.PROTECTIVE_MEASURES}}
</view>
<view class="cu-form-group" v-if="item.QUESTION1">
<view class="title">{{item.QUESTION1}}</view>
<input name="input" v-model="item.ANSWER1" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION2">
<view class="title">{{item.QUESTION2}}</view>
<input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION3">
<view class="title">{{item.QUESTION3}}</view>
<input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view>
<input name="input" v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
</view>
</uni-td>
<view class="cu-form-group" v-if="item.QUESTION1">
<view class="title">{{item.QUESTION1}}</view>
<input name="input" v-model="item.ANSWER1" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION2">
<view class="title">{{item.QUESTION2}}</view>
<input name="input" v-model="item.ANSWER2" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION3">
<view class="title">{{item.QUESTION3}}</view>
<input name="input" v-model="item.ANSWER3" type="number" placeholder="请输入"></input>
</view>
<view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view>
<input name="input" v-model="item.ANSWER4" type="number" placeholder="请输入"></input>
</view>
</uni-td>
<uni-td align="center">
<view class="title" @click="$noMultipleClicks(goToSign,index)">签字</view>
</uni-td>
</uni-tr>
</template>
<uni-td align="center">
<view class="title" @click="$noMultipleClicks(goToSign,index)">签字</view>
</uni-td>
</uni-tr>
</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>
@ -165,7 +164,7 @@
},
onLoad(event){
this.pd.HOTWORK_ID = event.HOTWORK_ID;
this.getData();
this.getData();
// 初始化现场作业负责人
this.getDept();
this.getMeasures();
@ -186,7 +185,7 @@
// 取消监听
beforeDestroy() {
uni.$off('dangerous_options_submit');
},
},
methods: {
//跳转事件
goToDetail(e) {
@ -194,24 +193,24 @@
url: '/pages/application/hotwork/hotwork-gas/gas-list?HOTWORK_ID='+e
});
},
goToSign(index) {
const measures = this.measuresList[index]
const signImgList = []
if (measures.SIGN_PATH) {
signImgList.push({"filePath":measures.SIGN_PATH,"SIGNER_TIME":measures.SIGN_TIME})
}
const imgList = []
if (measures.IMG_PATH) {
measures.IMG_PATH.split(",").forEach(item => {
imgList.push({"filePath":item})
})
}
setMeasures(measures.PROTECTIVE_MEASURES)
uni.navigateTo({
url: '/pages/application/dangerous_options/index?index='+index +
'&STATUS='+(measures.STATUS || 1) + '&signImgList='+JSON.stringify(signImgList) + '&imgList='+JSON.stringify(imgList)
});
},
goToSign(index) {
const measures = this.measuresList[index]
const signImgList = []
if (measures.SIGN_PATH) {
signImgList.push({"filePath":measures.SIGN_PATH,"SIGNER_TIME":measures.SIGN_TIME})
}
const imgList = []
if (measures.IMG_PATH) {
measures.IMG_PATH.split(",").forEach(item => {
imgList.push({"filePath":item})
})
}
setMeasures(measures.PROTECTIVE_MEASURES)
uni.navigateTo({
url: '/pages/application/dangerous_options/index?index='+index +
'&STATUS='+(measures.STATUS || 1) + '&signImgList='+JSON.stringify(signImgList) + '&imgList='+JSON.stringify(imgList)
});
},
getData() {
var _this = this;
uni.showLoading({
@ -227,7 +226,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
},
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
@ -242,102 +241,104 @@
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
uni.showLoading({
title: '请稍候'
})
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
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',
title: '第'+(i+1)+'项未签字',
duration: 1500
});
return;
}
}
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.SIGN_PATH){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未签字',
duration: 1500
});
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.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID
formData.MEASURES = JSON.stringify(this.measuresList)
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
}
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
formData.MEASURES = JSON.stringify(this.measuresList)
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
},
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)
})
},
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)
})
},
getMeasures(){
var _this = this;
@ -350,8 +351,8 @@
url: basePath + '/app/hotwork/listAllMeasuresForSign?tm=' + new Date().getTime(),
data: {
CORPINFO_ID:loginUser.CORPINFO_ID,
CONFIRM_ID:loginUser.USER_ID,
HOTWORK_ID: _this.pd.HOTWORK_ID,
CONFIRM_ID:loginUser.USER_ID,
HOTWORK_ID: _this.pd.HOTWORK_ID,
},
success: function (res) {
_this.measuresList = res.data.measuresForSignList
@ -385,40 +386,40 @@
});
},
showDeptTree(index) {
this.isUps=true
this.$refs['tkiTree'+index][0]._show();
},
showDeptTree(index) {
this.isUps=true
this.$refs['tkiTree'+index][0]._show();
},
deptTreeConfirm(e,i) {
this.isUps=false;
this.measuresList[i].DEPARTMENT_ID=e[0].id;
this.measuresList[i].DEPARTMENT_NAME=e[0].name;
this.measuresList[i].USER_ID = ''
this.measuresList[i].USER_NAME = ''
this.getUserList(e[0].id,i);
},
deptTreeConfirm(e,i) {
this.isUps=false;
this.measuresList[i].DEPARTMENT_ID=e[0].id;
this.measuresList[i].DEPARTMENT_NAME=e[0].name;
this.measuresList[i].USER_ID = ''
this.measuresList[i].USER_NAME = ''
this.getUserList(e[0].id,i);
},
deptTreeCancel(e) {
this.isUps=false;
},
deptTreeCancel(e) {
this.isUps=false;
},
pickerUser(e,i) {
this.measuresList[i].userIndex = e.detail.value;
this.measuresList[i].USER_ID=this.measuresList[i].userList[e.detail.value].USER_ID;
this.measuresList[i].USER_NAME=this.measuresList[i].userList[e.detail.value].NAME;
this.$forceUpdate();//强制刷新
},
pickerUser(e,i) {
this.measuresList[i].userIndex = e.detail.value;
this.measuresList[i].USER_ID=this.measuresList[i].userList[e.detail.value].USER_ID;
this.measuresList[i].USER_NAME=this.measuresList[i].userList[e.detail.value].NAME;
this.$forceUpdate();//强制刷新
},
isBlankList(i) {
if (this.measuresList[i].userList.length == 0) {
uni.showToast({
icon: 'none',
title: '请先选择确认单位',
duration: 1500
})
}
},
isBlankList(i) {
if (this.measuresList[i].userList.length == 0) {
uni.showToast({
icon: 'none',
title: '请先选择确认单位',
duration: 1500
})
}
},
//获取人员列表
getUserList(dept,i){
@ -461,7 +462,7 @@
},
//完成
subCanvas(e) {
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.imgList.splice(0,this.imgList.length);
this.imgList.push(e);
this.hideModal()

135
pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
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>
@ -162,7 +162,7 @@
},
onLoad(event){
this.pd.HOTWORK_ID = event.HOTWORK_ID;
this.getData();
this.getData();
// 初始化现场作业负责人
this.getDept();
this.getMeasures();
@ -190,7 +190,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
},
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
@ -205,76 +205,77 @@
});
},
goSubmit(){
goSubmit(APPLY_STATUS){
var _this = this;
uni.showLoading({
title: '请稍候'
})
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.USER_ID){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未设置确认人',
duration: 1500
});
return;
}
}
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i]
if(!measures.USER_ID){
uni.showToast({
icon: 'none',
title: '第'+(i+1)+'项未设置确认人',
duration: 1500
});
return;
}
}
const formData={}
var files = [];
var signtime = [];
const signers = this.measuresList.map(item => {
return {
BUS_HOTWORK_MEASURES_ID: item.BUS_HOTWORK_MEASURES_ID,
USER_ID: item.USER_ID
}
})
this.uploadImgFaults(files,signtime)
formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID
formData.PREPARERS = JSON.stringify(signers)
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
const formData={}
var files = [];
var signtime = [];
const signers = this.measuresList.map(item => {
return {
BUS_HOTWORK_MEASURES_ID: item.BUS_HOTWORK_MEASURES_ID,
USER_ID: item.USER_ID
}
})
this.uploadImgFaults(files,signtime)
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',
files: files,
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
},
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)
})
},
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)
})
},
getMeasures(){
var _this = this;

1
pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue
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