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

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

# Conflicts:
#	pages/application/hotwork/hotwork-apply/hotwork-apply-detail.vue
pull/5/head
fangjiakai 2024-01-24 17:24:23 +08:00
parent 63b5d07ef6 b57bee505c
commit 81dcd9329a
13 changed files with 280 additions and 258 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.pd.ACCEPT_TIME = e
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -380,6 +380,7 @@
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
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: files, 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; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -242,6 +242,7 @@
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = this.pd.HOTWORK_ID
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: fileList, files: fileList,

3
pages/application/hotwork/hotwork-approve/hotwork-approve-detail.vue
View File

@ -276,7 +276,7 @@
return true return true
return false return false
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -300,6 +300,7 @@
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
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: files, files: files,

3
pages/application/hotwork/hotwork-audit/hotwork-audit-detail.vue
View File

@ -267,7 +267,7 @@
return true return true
return false return false
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -290,6 +290,7 @@
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
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: files, files: files,

3
pages/application/hotwork/hotwork-confess/hotwork-confess-detail.vue
View File

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

3
pages/application/hotwork/hotwork-confirm/hotwork-confirm-detail.vue
View File

@ -241,7 +241,7 @@
signtime.push(item.SIGNER_TIME) signtime.push(item.SIGNER_TIME)
}) })
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -265,6 +265,7 @@
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
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: files, 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.pd.WORK_END_DATE = e
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
uni.showLoading({ uni.showLoading({
@ -378,6 +378,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_END_DATE = this.pd.WORK_END_DATE formData.WORK_END_DATE = this.pd.WORK_END_DATE
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = this.pd.HOTWORK_ID

16
pages/application/hotwork/hotwork-gas/gas-detail.vue
View File

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

3
pages/application/hotwork/hotwork-guardian/hotwork-guardian-detail.vue
View File

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

135
pages/application/hotwork/hotwork-measures/hotwork-measures-detail.vue
View File

@ -127,8 +127,8 @@
</view> </view>
</view> </view>
<view class="cu-bar btn-group" style="margin-top: 30upx;"> <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 class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'-1')">打 回</button>
<button :loading="buttonloading" class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'2')">通 过</button> <button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit,'1')">通 过</button>
</view> </view>
<view class="padding flex flex-direction"> <view class="padding flex flex-direction">
</view> </view>
@ -162,7 +162,7 @@
}, },
onLoad(event){ onLoad(event){
this.pd.HOTWORK_ID = event.HOTWORK_ID; this.pd.HOTWORK_ID = event.HOTWORK_ID;
this.getData(); this.getData();
// 初始化现场作业负责人 // 初始化现场作业负责人
this.getDept(); this.getDept();
this.getMeasures(); this.getMeasures();
@ -190,7 +190,7 @@
HOTWORK_ID: _this.pd.HOTWORK_ID, HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID, CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID, USER_ID:loginUser.USER_ID,
}, },
success: (res) => { success: (res) => {
if ("success" == res.data.result) { if ("success" == res.data.result) {
uni.hideLoading(); uni.hideLoading();
@ -205,76 +205,77 @@
}); });
}, },
goSubmit(){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
uni.showLoading({ uni.showLoading({
title: '请稍候' title: '请稍候'
}) })
if (_this.imgList.length <= 0) { if (_this.imgList.length <= 0) {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请签字', title: '请签字',
duration: 1500 duration: 1500
}); });
return; return;
} }
for (let i = 0; i < this.measuresList.length; i++) { for (let i = 0; i < this.measuresList.length; i++) {
const measures = this.measuresList[i] const measures = this.measuresList[i]
if(!measures.USER_ID){ if(!measures.USER_ID){
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '第'+(i+1)+'项未设置确认人', title: '第'+(i+1)+'项未设置确认人',
duration: 1500 duration: 1500
}); });
return; return;
} }
} }
const formData={} const formData={}
var files = []; var files = [];
var signtime = []; var signtime = [];
const signers = this.measuresList.map(item => { const signers = this.measuresList.map(item => {
return { return {
BUS_HOTWORK_MEASURES_ID: item.BUS_HOTWORK_MEASURES_ID, BUS_HOTWORK_MEASURES_ID: item.BUS_HOTWORK_MEASURES_ID,
USER_ID: item.USER_ID USER_ID: item.USER_ID
} }
}) })
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.HOTWORK_ID = _this.pd.HOTWORK_ID formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.PREPARERS = JSON.stringify(signers) formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ formData.PREPARERS = JSON.stringify(signers)
url: basePath+'app/hotwork/nextStep', uni.uploadFile({
files: files, url: basePath+'app/hotwork/nextStep',
formData:formData, files: files,
success: (res) => { formData:formData,
uni.showToast({ success: (res) => {
icon:'none', uni.showToast({
title: '保存成功', icon:'none',
duration: 2000 title: '保存成功',
}); duration: 2000
_this.goback() });
}, _this.goback()
fail: (err) => { },
uni.hideLoading(); fail: (err) => {
uni.showModal({ uni.hideLoading();
content: err.errMsg, uni.showModal({
showCancel: false content: err.errMsg,
}); showCancel: false
} });
}) }
})
}, },
uploadImgFaults(files,signtime) { uploadImgFaults(files,signtime) {
this.imgList.map((item,index) => { this.imgList.map((item,index) => {
var img = {} var img = {}
img.name = 'file'+index img.name = 'file'+index
img.uri = item.filePath img.uri = item.filePath
files.push(img) files.push(img)
signtime.push(item.SIGNER_TIME) signtime.push(item.SIGNER_TIME)
}) })
}, },
getMeasures(){ getMeasures(){
var _this = this; var _this = this;

1
pages/application/hotwork/hotwork-monitor/hotwork-monitor-detail.vue
View File

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