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-31 15:14:01 +08:00
parent 282c948a7d
commit a14c542742
21 changed files with 339 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/select-tree/select-tree.vue
View File

@ -29,7 +29,9 @@
<view class="tki-tree-check-yes" v-if="item.checked" :class="{'radio':!multiple}" :style="{'border-color':confirmColor}"> <view class="tki-tree-check-yes" v-if="item.checked" :class="{'radio':!multiple}" :style="{'border-color':confirmColor}">
<view class="tki-tree-check-yes-b" :style="{'background-color':confirmColor}"></view> <view class="tki-tree-check-yes-b" :style="{'background-color':confirmColor}"></view>
</view> </view>
<view class="tki-tree-check-no" v-else :class="{'radio':!multiple}" :style="{'border-color':confirmColor}"></view> <template v-if="item.source.disabled !== true">
<view class="tki-tree-check-no" v-if="!item.checked" :class="{'radio':!multiple}" :style="{'border-color':confirmColor}"></view>
</template>
</view> </view>
</view> </view>
</block> </block>

4
pages/application/eight-assignments.vue
View File

@ -48,10 +48,10 @@
<view>动土作业</view> <view>动土作业</view>
</view> </view>
</navigator> </navigator>
<navigator v-show="premission['high-work']" class="apps-item" hover-class="none" url="/pages/application/high-work/home"> <navigator v-show="premission['high-work']" class="apps-item" hover-class="none" url="/pages/application/highwork/home">
<view class="imgs action"> <view class="imgs action">
<image src="../../static/icon-apps/icon-803.png" mode=""></image> <image src="../../static/icon-apps/icon-803.png" mode=""></image>
<view v-if="eight_work_count.HIGH_WORK_COUNT" class="cu-tag badge">{{eight_work_count.HIGH_WORK_COUNT}}</view> <view v-if="eight_work_count.HIGHWORK_COUNT" class="cu-tag badge">{{eight_work_count.HIGHWORK_COUNT}}</view>
</view> </view>
<view class="text-semi" style="text-align: center;"> <view class="text-semi" style="text-align: center;">
<view>高处作业</view> <view>高处作业</view>

8
pages/application/hotwork/hotwork-accept/hotwork-accept-detail.vue
View File

@ -45,7 +45,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -189,9 +189,9 @@
var signtime = []; var signtime = [];
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.ACCEPT_TIME = this.pd.ACCEPT_TIME formData.ACCEPT_TIME = _this.pd.ACCEPT_TIME
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

2
pages/application/hotwork/hotwork-acceptconfess/hotwork-acceptconfess-detail.vue
View File

@ -36,7 +36,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">

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

@ -120,21 +120,21 @@
</view> </view>
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION1 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION1">
<view class="title">{{item.QUESTION1}}</view> <view class="title">{{item.QUESTION1}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER1" placeholder="请输入"></input> {{item.ANSWER1?item.ANSWER1:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION2 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION2">
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER2" placeholder="请输入"></input> {{item.ANSWER2?item.ANSWER2:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER3" placeholder="请输入"></input> {{item.ANSWER3?item.ANSWER3:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
<input name="input" :disabled="forbidEdit" v-model="item.ANSWER4" placeholder="请输入"></input> {{item.ANSWER4?item.ANSWER4:0}}
</view> </view>
</uni-td> </uni-td>
<uni-td align="center"> <uni-td align="center">
@ -450,11 +450,15 @@
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">作业区域</view> <view class="title">作业区域</view>
<picker @change="pickerPls" :value="plxIndex" :range="plsList" range-key="regName"> <view class="picker-tree-box">
<view class="picker"> <view class="picker-tree" @tap="showPlsTree">{{pd.PLS_NAME?pd.PLS_NAME:'请选择'}}</view>
{{pd.PLS_NAME?pd.PLS_NAME:'请选择'}}
</view> </view>
</picker> <tki-tree ref="tkiTree_pls"
:selectParent=true
:range="plsNode"
rangeKey="name"
@confirm="plstreeConfirm"
@cancel="plstreeCancel"></tki-tree>
</view> </view>
</view> </view>
@ -480,6 +484,14 @@
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_NAME}}
</view> </view>
<view v-if="signs.CONFESS[0].IMG_PATH" style="display: flex;align-items: flex-end;padding: 0 30upx">
<view v-for="(item,index) in signs.CONFESS[0].IMG_PATH" :key="index" style="margin-right:20upx">
<view class="imgs">
<image :src="baseImgPath + signs.CONFESS[0].IMG_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].IMG_PATH[index])"
mode="" style="width: 50upx;height: 50upx;"></image>
</view>
</view>
</view>
<view class="cu-item" v-for="(item,index) in signs.CONFESS[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-item" v-for="(item,index) in signs.CONFESS[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3">
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath + signs.CONFESS[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].SIGN_PATH[index])" <image :src="baseImgPath + signs.CONFESS[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].SIGN_PATH[index])"
@ -710,6 +722,7 @@
workUserList:[], workUserList:[],
workstartindex:-1, workstartindex:-1,
workstartUserList:[], workstartUserList:[],
plsNode:[],
workendindex:-1, workendindex:-1,
workendUserList:[], workendUserList:[],
confirmindex:-1, confirmindex:-1,
@ -1135,13 +1148,13 @@
header: { header: {
'Content-type':'application/x-www-form-urlencoded' 'Content-type':'application/x-www-form-urlencoded'
}, },
url: basePath+'/app/eightwork/getPlsList', url: basePath+'/app/electronicFence/listTree',
data: { data: {
CORPINFO_ID:loginUser.CORPINFO_ID, CORPINFO_ID:loginUser.CORPINFO_ID,
}, },
success: function(res){ success: function(res){
if("success" == res.data.result){ if("success" == res.data.result){
_this.plsList=res.data.varList _this.plsNode=eval(res.data.zTreeNodes);
} else { } else {
uni.showToast({ uni.showToast({
title: res.data.message, title: res.data.message,
@ -1621,13 +1634,22 @@
this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME; this.pd.ACCEPT_USER_NAME=this.acceptUserList[this.acceptindex].NAME;
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
showPlsTree(){
pickerPls(e) { this.isUps=true
this.plxIndex = e.detail.value; this.$refs.tkiTree_pls._show();
this.pd.PLS_ID=this.plsList[this.plxIndex].uuid; },
this.pd.PLS_NAME=this.plsList[this.plxIndex].regName; plstreeConfirm(e) {
this.isUps=false;
console.log(e[0])
this.pd.PLS_ID=e[0].id;
this.pd.PLS_NAME=e[0].name;
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
// 取消回调事件
plstreeCancel(e) {
this.isUps=false;
},
changeStartDate(e) { changeStartDate(e) {
this.pd.WORK_START_DATE = e this.pd.WORK_START_DATE = e

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

@ -12,29 +12,37 @@
<view class="cu-form-title">动火审批人意见</view> <view class="cu-form-title">动火审批人意见</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea> <textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
</view> </view>
<view class="wui-sign" > <view class="wui-sign" v-if="!files.length">
<view class="title">动火审批人</view> <view class="title">动火审批人</view>
<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button> <view>
<view>
<button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button>
</view>
</view>
</view> </view>
<view class="wui-sign-box" v-show="imgList && imgList.length > 0"> <view class="wui-sign-box wui-sign-box1" v-show="imgList && imgList.length > 0">
<view class="sign-title"> <view class="sign-title">
签字照片： 签字照片：
</view> </view>
<view class="wui-sign-cotent"> <view class="wui-sign-cotent">
<view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath"> <view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath">
<image :src="imgList[index].filePath" mode="aspectFit"></image> <image :src="imgList[index].filePath" mode="aspectFit"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg(index)">
<text class='cuIcon-close'></text>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-modal" :class="modalName=='Modal'?'show':''"> <view class="cu-modal" :class="modalName=='Modal'?'show':''">
<writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board> <writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board>
</view> </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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -160,9 +168,9 @@
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
@ -246,16 +254,18 @@
*手写板 *手写板
*/ */
showModal(e) { showModal(e) {
this.modalName = e.currentTarget.dataset.target this.modalName = 'Modal'
},
DelImg(index){
this.imgList.splice(index,1)
}, },
hideModal(e) { hideModal(e) {
this.modalName = null this.modalName = null
}, },
//完成 //完成
subCanvas(e) { subCanvas(e) {
this.imgList.splice(0,this.imgList.length);
this.imgList.push(e); this.imgList.push(e);
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.hideModal() this.hideModal()
}, },
ViewImage(e) { ViewImage(e) {
@ -292,7 +302,19 @@
} }
} }
</script> </script>
<style scoped>
<style> .wui-sign-box1{
margin-top: 20upx;
display: block;
}
.sign-img{
position: relative;
border-bottom: 1px dashed #eee;
padding-top: 20upx;
}
.cu-tag{
position: absolute;
right: 20upx;
top: 20upx;
}
</style> </style>

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

@ -12,29 +12,37 @@
<view class="cu-form-title">安全管理部门意见</view> <view class="cu-form-title">安全管理部门意见</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea> <textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
</view> </view>
<view class="wui-sign"> <view class="wui-sign" v-if="!files.length">
<view class="title">安全管理部门负责人</view> <view class="title">安全管理部门负责人</view>
<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button> <view>
<view>
<button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button>
</view>
</view>
</view> </view>
<view class="wui-sign-box" v-show="imgList && imgList.length > 0"> <view class="wui-sign-box wui-sign-box1" v-show="imgList && imgList.length > 0">
<view class="sign-title"> <view class="sign-title">
签字照片： 签字照片：
</view> </view>
<view class="wui-sign-cotent"> <view class="wui-sign-cotent">
<view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath"> <view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath">
<image :src="imgList[index].filePath" mode="aspectFit"></image> <image :src="imgList[index].filePath" mode="aspectFit"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg(index)">
<text class='cuIcon-close'></text>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-modal" :class="modalName=='Modal'?'show':''"> <view class="cu-modal" :class="modalName=='Modal'?'show':''">
<writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board> <writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board>
</view> </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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -160,9 +168,9 @@
var signtime = []; var signtime = [];
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
@ -252,16 +260,18 @@
*手写板 *手写板
*/ */
showModal(e) { showModal(e) {
this.modalName = e.currentTarget.dataset.target this.modalName = 'Modal'
},
DelImg(index){
this.imgList.splice(index,1)
}, },
hideModal(e) { hideModal(e) {
this.modalName = null this.modalName = null
}, },
//完成 //完成
subCanvas(e) { subCanvas(e) {
this.imgList.splice(0,this.imgList.length);
this.imgList.push(e); this.imgList.push(e);
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.hideModal() this.hideModal()
}, },
ViewImage(e) { ViewImage(e) {
@ -298,7 +308,19 @@
} }
} }
</script> </script>
<style scoped>
<style> .wui-sign-box1{
margin-top: 20upx;
display: block;
}
.sign-img{
position: relative;
border-bottom: 1px dashed #eee;
padding-top: 20upx;
}
.cu-tag{
position: absolute;
right: 20upx;
top: 20upx;
}
</style> </style>

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

@ -8,6 +8,27 @@
<view class="form"> <view class="form">
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail> <detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-bar bg-white margin-top">
<view class="action">
上传图片
</view>
<view class="action">
{{ aqimgList.length }}/2
</view>
</view>
<view class="cu-form-group">
<view class="grid col-4 grid-square flex-sub">
<view class="bg-img" v-for="(item,index) in aqimgList" :key="index" @tap="viewImage(index,'aqimgList')">
<image :src="baseImgPath + item.filePath" mode="aspectFill"></image>
<view class="cu-tag bg-red" @tap.stop="delImg" data-type="2" :data-index="index">
<text class='cuIcon-close'></text>
</view>
</view>
<view class="solids" @tap="chooseImage()" v-if="aqimgList.length<2">
<text class='cuIcon-cameraadd'></text>
</view>
</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>
@ -29,7 +50,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -64,6 +85,7 @@
measuresList:[], measuresList:[],
modalName:null, modalName:null,
imgList:[], imgList:[],
aqimgList: [],
} }
}, },
onLoad(event){ onLoad(event){
@ -140,6 +162,74 @@
signtime.push(item.SIGNER_TIME) signtime.push(item.SIGNER_TIME)
}) })
}, },
delImg(e) {
var _this = this;
uni.showModal({
title: '秦安双控',
content: '确定要删除这张图片吗？',
cancelColor: "#000000",
cancelText: '取消',
confirmText: '确定',
success: res => {
if (res.confirm) {
uni.request({
url: basePath+'/app/eightwork/deleteFile',
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
FILE_PATH:_this.aqimgList[e.currentTarget.dataset.index].filePath
},
success: (res) => {
uni.showToast({
icon: 'none',
title: '删除成功',
duration: 1500
});
this.aqimgList.splice(e.currentTarget.dataset.index, 1)
},
fail: (err) => {
uni.showModal({
content: "删除失败",
showCancel: false
});
}
})
}
}
})
},
chooseImage() {
uni.chooseImage({
count: 1, //默认9
sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
sourceType: ['camera', 'album'], //从相册选择
success: (res) => {
uni.uploadFile({
url: basePath+'/app/eightwork/saveFile',
filePath: res.tempFilePaths[0],
name: 'file',
formData: {
CORPINFO_ID:loginUser.CORPINFO_ID,
},
success: ({data}) => {
let img = {};
img.filePath = JSON.parse(data).FILE_PATH;
this.aqimgList.push(img)
console.log(this.aqimgList)
},
fail: (err) => {
uni.showModal({
content: "图片上传失败",
showCancel: false
});
}
})
}
});
},
goSubmit(APPLY_STATUS){ goSubmit(APPLY_STATUS){
var _this = this; var _this = this;
let required = true let required = true
@ -163,6 +253,9 @@
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 formData.APPLY_STATUS = APPLY_STATUS
formData.IMG_PATH = this.aqimgList.map(item => {
return item.filePath
}).join(",")
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',
files: files, files: files,

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

@ -34,7 +34,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -168,8 +168,8 @@
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
formData.DESCR = this.pd.DESCR formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

24
pages/application/hotwork/hotwork-detail/index.vue
View File

@ -87,21 +87,21 @@
</view> </view>
</view> </view>
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION1 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION1">
<view class="title">{{item.QUESTION1}}</view> <view class="title">{{item.QUESTION1}}</view>
<input name="input" :disabled="true" v-model="item.ANSWER1" placeholder="请输入"></input> {{item.ANSWER1?item.ANSWER1:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION2 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION2">
<view class="title">{{item.QUESTION2}}</view> <view class="title">{{item.QUESTION2}}</view>
<input name="input" :disabled="true" v-model="item.ANSWER2" placeholder="请输入"></input> {{item.ANSWER2?item.ANSWER2:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION3 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION3">
<view class="title">{{item.QUESTION3}}</view> <view class="title">{{item.QUESTION3}}</view>
<input name="input" :disabled="true" v-model="item.ANSWER3" placeholder="请输入"></input> {{item.ANSWER3?item.ANSWER3:0}}
</view> </view>
<view class="cu-form-group" v-if="item.QUESTION4 && item.STATUS=='1'"> <view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view> <view class="title">{{item.QUESTION4}}</view>
<input name="input" :disabled="true" v-model="item.ANSWER4" placeholder="请输入"></input> {{item.ANSWER4?item.ANSWER4:0}}
</view> </view>
</uni-td> </uni-td>
<uni-td align="center"> <uni-td align="center">
@ -172,6 +172,14 @@
<view class="title">安全交底人</view> <view class="title">安全交底人</view>
{{pd.CONFESS_USER_NAME}} {{pd.CONFESS_USER_NAME}}
</view> </view>
<view v-if="signs.CONFESS[0].IMG_PATH" style="display: flex;align-items: flex-end;padding: 0 30upx">
<view v-for="(item,index) in signs.CONFESS[0].IMG_PATH" :key="index" style="margin-right:20upx">
<view class="imgs">
<image :src="baseImgPath + signs.CONFESS[0].IMG_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].IMG_PATH[index])"
mode="" style="width: 50upx;height: 50upx;"></image>
</view>
</view>
</view>
<view class="cu-item" v-for="(item,index) in signs.CONFESS[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3"> <view class="cu-item" v-for="(item,index) in signs.CONFESS[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3">
<view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;"> <view class="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<image :src="baseImgPath + signs.CONFESS[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].SIGN_PATH[index])" <image :src="baseImgPath + signs.CONFESS[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.CONFESS[0].SIGN_PATH[index])"

2
pages/application/hotwork/hotwork-endwork/hotwork-endwork-detail.vue
View File

@ -39,7 +39,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">

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

@ -38,7 +38,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">

51
pages/application/hotwork/hotwork-leader/hotwork-leader-detail.vue
View File

@ -9,32 +9,40 @@
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail> <detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
<view class="wui-form-list"> <view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;"> <view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">所在单位意见</view> <view class="cu-form-title">所在单位负责人意见</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea> <textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
</view> </view>
<view class="wui-sign"> <view class="wui-sign" v-if="!files.length">
<view class="title">所在单位负责人</view> <view class="title">所在单位负责人</view>
<button class="cu-btn bg-green shadow" @tap="showModal" data-target="Modal">手写签字</button> <view>
<view>
<button class="cu-btn bg-green shadow" @tap="showModal">新增手写签字</button>
</view>
</view>
</view> </view>
<view class="wui-sign-box" v-show="imgList && imgList.length > 0"> <view class="wui-sign-box wui-sign-box1" v-show="imgList && imgList.length > 0">
<view class="sign-title"> <view class="sign-title">
签字照片： 签字照片：
</view> </view>
<view class="wui-sign-cotent"> <view class="wui-sign-cotent">
<view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath"> <view class="sign-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" data-type="0" :data-url="imgList[index].filePath">
<image :src="imgList[index].filePath" mode="aspectFit"></image> <image :src="imgList[index].filePath" mode="aspectFit"></image>
<view class="cu-tag bg-red" @tap.stop="DelImg(index)">
<text class='cuIcon-close'></text>
</view>
</view>
</view> </view>
</view> </view>
</view> </view>
<view class="cu-modal" :class="modalName=='Modal'?'show':''"> <view class="cu-modal" :class="modalName=='Modal'?'show':''">
<writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board> <writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board>
</view> </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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -161,9 +169,9 @@
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime.join(",")
formData.HOTWORK_ID = this.pd.HOTWORK_ID formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = this.pd.DESCR formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({
@ -272,16 +280,18 @@
*手写板 *手写板
*/ */
showModal(e) { showModal(e) {
this.modalName = e.currentTarget.dataset.target this.modalName = 'Modal'
},
DelImg(index){
this.imgList.splice(index,1)
}, },
hideModal(e) { hideModal(e) {
this.modalName = null this.modalName = null
}, },
//完成 //完成
subCanvas(e) { subCanvas(e) {
this.imgList.splice(0,this.imgList.length);
this.imgList.push(e); this.imgList.push(e);
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm'); e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.hideModal() this.hideModal()
}, },
ViewImage(e) { ViewImage(e) {
@ -318,6 +328,19 @@
} }
</script> </script>
<style> <style scoped>
.wui-sign-box1{
margin-top: 20upx;
display: block;
}
.sign-img{
position: relative;
border-bottom: 1px dashed #eee;
padding-top: 20upx;
}
.cu-tag{
position: absolute;
right: 20upx;
top: 20upx;
}
</style> </style>

20
pages/application/hotwork/hotwork-list/index.vue
View File

@ -38,21 +38,23 @@
<text>申请人:{{item.APPLY_USER_NAME}}</text> <text>申请人:{{item.APPLY_USER_NAME}}</text>
<text>分析人:{{item.ANALYZE_USER_NAME}}</text> <text>分析人:{{item.ANALYZE_USER_NAME}}</text>
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>作业负责人：{{item.CONFIRM_USER_NAME}}</text>
<text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
<text>审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>监护人：{{item.GUARDIAN_USER_NAME}}</text> <text>监护人：{{item.GUARDIAN_USER_NAME}}</text>
<text>安全交底人：{{item.CONFESS_USER_NAME}}</text> <text>安全交底人：{{item.CONFESS_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text>
<text>作业负责人：{{item.CONFIRM_USER_NAME}}</text>
</view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>接受交底人：{{item.ACCEPT_CONFESS_USER_NAME}}</text> <text v-if="item.AUDIT_USER_NAME">安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text>
<text v-if="item.APPROVE_USER_NAME">审批部门负责人：{{item.APPROVE_USER_NAME}}</text>
</view> </view>
<view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)"> <view class="dy-subtitle-flex" @click="$noMultipleClicks(goToDetail,item.HOTWORK_ID)">
<text>动火前在岗班长：{{item.MONITOR_USER_NAME}}</text> <text>动火前在岗班长：{{item.MONITOR_USER_NAME}}</text>

2
pages/application/hotwork/hotwork-measures-confirm/hotwork-measures-confirm-detail.vue
View File

@ -256,7 +256,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.APPLY_STATUS = APPLY_STATUS 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?_this.pd.DESCR:"无"
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
formData.MEASURES = JSON.stringify(this.measuresList) formData.MEASURES = JSON.stringify(this.measuresList)

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

@ -39,7 +39,7 @@
</view> </view>
<view class="cu-form-group" > <view class="cu-form-group" >
<view class="title">作业结束负责人</view> <view class="title">确认人</view>
<picker @change="pickerUser($event,index)" :value="item.userIndex" :range="item.userList" range-key="NAME" :disabled="item.userList.length == 0" @click="isBlankList(index)"> <picker @change="pickerUser($event,index)" :value="item.userIndex" :range="item.userList" range-key="NAME" :disabled="item.userList.length == 0" @click="isBlankList(index)">
<view class="picker"> <view class="picker">
{{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}} {{measuresList[index].USER_NAME?measuresList[index].USER_NAME:'请选择'}}

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

@ -34,7 +34,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">
@ -156,8 +156,8 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime
formData.APPLY_STATUS = APPLY_STATUS 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?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID formData.USER_ID = loginUser.USER_ID
uni.uploadFile({ uni.uploadFile({
url: basePath+'app/hotwork/nextStep', url: basePath+'app/hotwork/nextStep',

2
pages/application/hotwork/hotwork-startwork/hotwork-startwork-detail.vue
View File

@ -39,7 +39,7 @@
</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-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</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> <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">