Merge remote-tracking branch 'origin/dev' into lmy20231110
commit
e777225a63
|
@ -7,176 +7,176 @@
|
||||||
<view class="form">
|
<view class="form">
|
||||||
<view class="wui-form-list">
|
<view class="wui-form-list">
|
||||||
<view class="de-drawer">
|
<view class="de-drawer">
|
||||||
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenImgs">
|
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenImgs">
|
||||||
<view class="action">
|
<view class="action">
|
||||||
隐患照片
|
隐患照片
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-if="hiddenForm.hiddenImgs">
|
<view class="cu-form-group" v-if="hiddenForm.hiddenImgs">
|
||||||
<view class="grid col-4 grid-square flex-sub">
|
<view class="grid col-4 grid-square flex-sub">
|
||||||
<view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage"
|
<view class="bg-img" v-for="(item,index) in hiddenForm.hiddenImgs" :key="index" @tap="ViewImage"
|
||||||
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH">
|
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.hiddenImgs[index].FILEPATH">
|
||||||
<image :src="baseImgPath + hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image>
|
<image :src="baseImgPath + hiddenForm.hiddenImgs[index].FILEPATH" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenVideos">
|
<view class="cu-bar bg-white" v-if="hiddenForm.hiddenVideos">
|
||||||
<view class="action">
|
<view class="action">
|
||||||
隐患视频
|
隐患视频
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-if="hiddenForm.hiddenVideos">
|
<view class="cu-form-group" v-if="hiddenForm.hiddenVideos">
|
||||||
<view class="grid col-4 grid-square flex-sub">
|
<view class="grid col-4 grid-square flex-sub">
|
||||||
<view class="bg-img" v-for="(item,vindex) in hiddenForm.hiddenVideos" :key="vindex"
|
<view class="bg-img" v-for="(item,vindex) in hiddenForm.hiddenVideos" :key="vindex"
|
||||||
style="background-color: #000">
|
style="background-color: #000">
|
||||||
<image src="/static/icon-apps/video.png" mode="aspectFill" @click="playVideo"
|
<image src="/static/icon-apps/video.png" mode="aspectFill" @click="playVideo"
|
||||||
:data-src="hiddenForm.hiddenVideos[vindex].FILEPATH"></image>
|
:data-src="hiddenForm.hiddenVideos[vindex].FILEPATH"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-textarea">
|
<view class="cu-form-textarea">
|
||||||
<view class="cu-form-title text-hui">隐患描述</view>
|
<view class="cu-form-title text-hui">隐患描述</view>
|
||||||
<textarea maxlength="-1" disabled v-model="hiddenForm.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
|
<textarea maxlength="-1" disabled v-model="hiddenForm.HIDDENDESCR" placeholder="请对隐患进行详细描述(必填项)"></textarea>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">隐患部位</view>
|
<view class="title">隐患部位</view>
|
||||||
<view class="picker-tree-box">
|
<view class="picker-tree-box">
|
||||||
<view>{{ hiddenForm.HIDDENPART }}</view>
|
<view>{{ hiddenForm.HIDDENPART }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">隐患级别</view>
|
<view class="title">隐患级别</view>
|
||||||
<view class="picker-tree-box">
|
<view class="picker-tree-box">
|
||||||
<view>{{ hiddenForm.HIDDENLEVEL_NAME }}</view>
|
<view>{{ hiddenForm.HIDDENLEVEL_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">隐患类型</view>
|
<view class="title">隐患类型</view>
|
||||||
<view class="picker-tree-box">
|
<view class="picker-tree-box">
|
||||||
<view>{{ hiddenForm.HIDDENTYPE_NAME }}</view>
|
<view>{{ hiddenForm.HIDDENTYPE_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">隐患处置:</view>
|
<view class="title">隐患处置:</view>
|
||||||
<view>限期整改</view>
|
<view>限期整改</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">整改期限:</view>
|
<view class="title">整改期限:</view>
|
||||||
<view>{{ hiddenForm.RECTIFICATIONDEADLINE }}</view>
|
<view>{{ hiddenForm.RECTIFICATIONDEADLINE }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title" style="height: auto;">
|
<view class="title" style="height: auto;">
|
||||||
<view>整改部门:</view>
|
<view>整改部门:</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="picker-tree-box">
|
<view class="picker-tree-box">
|
||||||
{{ hiddenForm.RECTIFICATIONDEPT_NAME }}
|
{{ hiddenForm.RECTIFICATIONDEPT_NAME }}
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">整改人:</view>
|
<view class="title">整改人:</view>
|
||||||
<view>{{ hiddenForm.RECTIFICATIONOR_NAME }}</view>
|
<view>{{ hiddenForm.RECTIFICATIONOR_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
||||||
<view class="title">整改时间:</view>
|
<view class="title">整改时间:</view>
|
||||||
<view>{{ hiddenForm.RECTIFICATIONTIME }}</view>
|
<view>{{ hiddenForm.RECTIFICATIONTIME }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
||||||
<view class="action">
|
<view class="action">
|
||||||
整改照片
|
整改照片
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
<view class="cu-form-group" v-show="hiddenForm.STATE==='2'||hiddenForm.STATE==='4'">
|
||||||
<view class="grid col-4 grid-square flex-sub">
|
<view class="grid col-4 grid-square flex-sub">
|
||||||
<view class="bg-img" v-for="(item,index) in hiddenForm.zgImgs" :key="index" @tap="ViewImage1"
|
<view class="bg-img" v-for="(item,index) in hiddenForm.zgImgs" :key="index" @tap="ViewImage1"
|
||||||
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.zgImgs[index].FILEPATH">
|
:data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.zgImgs[index].FILEPATH">
|
||||||
<image :src="baseImgPath + hiddenForm.zgImgs[index].FILEPATH" mode="aspectFill"></image>
|
<image :src="baseImgPath + hiddenForm.zgImgs[index].FILEPATH" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
||||||
<view class="title">验收时间:</view>
|
<view class="title">验收时间:</view>
|
||||||
<ruiDatePicker v-if="TabCur == 1" :start="todayDate" fields="minute" :value="CHECKTIME || '请选择'"
|
<ruiDatePicker v-if="TabCur == 1" :start="todayDate" fields="minute" :value="CHECKTIME || '请选择'"
|
||||||
@change="changeDiscoverDate"></ruiDatePicker>
|
@change="changeDiscoverDate"></ruiDatePicker>
|
||||||
<view v-else>{{hiddenForm.CHECKTIME}}</view>
|
<view v-else>{{hiddenForm.CHECKTIME}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
<view class="cu-bar bg-white" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
||||||
<view class="action">
|
<view class="action">
|
||||||
验收照片
|
验收照片
|
||||||
</view>
|
</view>
|
||||||
<view class="action">
|
<view class="action">
|
||||||
{{hiddenForm.ysImgs.length}}/4
|
{{hiddenForm.ysImgs.length}}/4
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
<view class="cu-form-group" v-show="hiddenForm.STATE==='4'||TabCur==='1'">
|
||||||
<view class="grid col-4 grid-square flex-sub">
|
<view class="grid col-4 grid-square flex-sub">
|
||||||
<view class="bg-img" v-for="(item,index) in hiddenForm.ysImgs" :key="index" @tap="ViewImage2" :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.ysImgs[index].FILEPATH">
|
<view class="bg-img" v-for="(item,index) in hiddenForm.ysImgs" :key="index" @tap="ViewImage2" :data-id="item.IMGFILES_ID" data-type="0" :data-url="hiddenForm.ysImgs[index].FILEPATH">
|
||||||
<image v-if="item.IMGFILES_ID" :src="baseImgPath + hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
|
<image v-if="item.IMGFILES_ID" :src="baseImgPath + hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
|
||||||
<image v-else :src="hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
|
<image v-else :src="hiddenForm.ysImgs[index].FILEPATH" mode="aspectFill"></image>
|
||||||
<view class="cu-tag bg-red" @tap.stop="DelImg" data-type="0" :data-index="index" v-if="TabCur == 1">
|
<view class="cu-tag bg-red" @tap.stop="DelImg" data-type="0" :data-index="index" v-if="TabCur == 1">
|
||||||
<text class='cuIcon-close'></text>
|
<text class='cuIcon-close'></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="solids" @tap="ChooseImage(0)" v-if="hiddenForm.ysImgs.length<4 && TabCur == 1">
|
<view class="solids" @tap="ChooseImage(0)" v-if="hiddenForm.ysImgs.length<4 && TabCur == 1">
|
||||||
<text class='cuIcon-cameraadd'></text>
|
<text class='cuIcon-cameraadd'></text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view v-if="punishForm">
|
<view v-if="punishForm">
|
||||||
<view class="dy-list-item p20">
|
<view class="dy-list-item p20">
|
||||||
<view class="dy-title-flex align-center">
|
<view class="dy-title-flex align-center">
|
||||||
<text>处罚信息</text>
|
<text>处罚信息</text>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">处罚原因:</view>
|
<view class="title">处罚原因:</view>
|
||||||
<view>{{ punishForm.REASON }}</view>
|
<view>{{ punishForm.REASON }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">处罚金额:</view>
|
<view class="title">处罚金额:</view>
|
||||||
<view>{{ punishForm.AMOUT }}元</view>
|
<view>{{ punishForm.AMOUT }}元</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">被处罚单位:</view>
|
<view class="title">被处罚单位:</view>
|
||||||
<view>{{ punishForm.UNITS_NAME }}</view>
|
<view>{{ punishForm.UNITS_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">被处罚人:</view>
|
<view class="title">被处罚人:</view>
|
||||||
<view>{{ punishForm.PERSON_NAME }}</view>
|
<view>{{ punishForm.PERSON_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">下发人:</view>
|
<view class="title">下发人:</view>
|
||||||
<view>{{ punishForm.CREATOR_NAME }}</view>
|
<view>{{ punishForm.CREATOR_NAME }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">下发处罚时间:</view>
|
<view class="title">下发处罚时间:</view>
|
||||||
<view>{{ punishForm.DATE }}</view>
|
<view>{{ punishForm.DATE }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-bar bg-white" v-if="punishForm.HANDLE_IMG">
|
<view class="cu-bar bg-white" v-if="punishForm.HANDLE_IMG">
|
||||||
<view class="action">
|
<view class="action">
|
||||||
罚款缴纳单
|
罚款缴纳单
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-if="punishForm.HANDLE_IMG">
|
<view class="cu-form-group" v-if="punishForm.HANDLE_IMG">
|
||||||
<view class="grid col-4 grid-square flex-sub">
|
<view class="grid col-4 grid-square flex-sub">
|
||||||
<view class="bg-img">
|
<view class="bg-img" @tap="viewImagePunish">
|
||||||
<image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image>
|
<image :src="baseImgPath + punishForm.HANDLE_IMG" mode="aspectFill"></image>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group">
|
<view class="cu-form-group">
|
||||||
<view class="title">是否缴纳罚款:</view>
|
<view class="title">是否缴纳罚款:</view>
|
||||||
<view>{{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}</view>
|
<view>{{punishForm.HANDLED === '1' ? '已缴' : '未缴' }}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
|
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
|
||||||
<view class="title">处罚处理人:</view>
|
<view class="title">处罚处理人:</view>
|
||||||
<view >{{punishForm.PERSON_NAME}}</view>
|
<view >{{punishForm.PERSON_NAME}}</view>
|
||||||
</view>
|
</view>
|
||||||
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
|
<view class="cu-form-group" v-if="punishForm.HANDLED === '1'">
|
||||||
<view class="title" >处罚处理时间:</view>
|
<view class="title" >处罚处理时间:</view>
|
||||||
<view >{{punishForm.HANLDE_TIME}}</view>
|
<view >{{punishForm.HANLDE_TIME}}</view>
|
||||||
</view>
|
</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 v-if="TabCur == 1" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)">验收</button>
|
<button v-if="TabCur == 1" class="cu-btn bg-blue margin-tb-sm lg" @click="$noMultipleClicks(goSubmit)">验收</button>
|
||||||
|
@ -223,7 +223,7 @@ export default {
|
||||||
ysImgs:[],
|
ysImgs:[],
|
||||||
CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm')
|
CHECKTIME :formatDate(new Date(), 'yyyy-MM-dd hh:mm')
|
||||||
},
|
},
|
||||||
punishForm:{},
|
punishForm:{},
|
||||||
videoSrc:'',
|
videoSrc:'',
|
||||||
modalShow:false,
|
modalShow:false,
|
||||||
todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
|
todayDate:formatDate(new Date(), 'yyyy-MM-dd hh:mm'),
|
||||||
|
@ -256,15 +256,22 @@ export default {
|
||||||
uni.hideLoading();//结束加载中动画
|
uni.hideLoading();//结束加载中动画
|
||||||
if (res.data != null) {
|
if (res.data != null) {
|
||||||
this.hiddenForm = res.data.pd
|
this.hiddenForm = res.data.pd
|
||||||
if(res.data.pd.punishForm){
|
if(res.data.pd.punishForm){
|
||||||
this.punishForm = res.data.pd.punishForm
|
this.punishForm = res.data.pd.punishForm
|
||||||
}else{
|
}else{
|
||||||
this.punishForm = null;
|
this.punishForm = null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
viewImagePunish(e) {
|
||||||
|
let files = [];
|
||||||
|
files.push(this.baseImgPath + this.punishForm.HANDLE_IMG)
|
||||||
|
uni.previewImage({
|
||||||
|
urls: files
|
||||||
|
});
|
||||||
|
},
|
||||||
ViewImage(e) {
|
ViewImage(e) {
|
||||||
let files = [];
|
let files = [];
|
||||||
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {
|
for (var i = 0; i < this.hiddenForm.hiddenImgs.length; i++) {
|
||||||
|
@ -294,18 +301,18 @@ export default {
|
||||||
this.$forceUpdate();//强制刷新
|
this.$forceUpdate();//强制刷新
|
||||||
},
|
},
|
||||||
ViewImage2(e) {
|
ViewImage2(e) {
|
||||||
let files =[];
|
let files =[];
|
||||||
for(var i=0;i<this.hiddenForm.ysImgs.length;i++){
|
for(var i=0;i<this.hiddenForm.ysImgs.length;i++){
|
||||||
if(e.currentTarget.dataset.id){
|
if(e.currentTarget.dataset.id){
|
||||||
files.push(this.baseImgPath + this.hiddenForm.ysImgs[i].FILEPATH)
|
files.push(this.baseImgPath + this.hiddenForm.ysImgs[i].FILEPATH)
|
||||||
}else {
|
}else {
|
||||||
files.push(this.hiddenForm.ysImgs[i].FILEPATH)
|
files.push(this.hiddenForm.ysImgs[i].FILEPATH)
|
||||||
}
|
|
||||||
}
|
}
|
||||||
uni.previewImage({
|
}
|
||||||
urls: files,
|
uni.previewImage({
|
||||||
current: e.currentTarget.dataset.id ? this.baseImgPath + e.currentTarget.dataset.url : e.currentTarget.dataset.url
|
urls: files,
|
||||||
});
|
current: e.currentTarget.dataset.id ? this.baseImgPath + e.currentTarget.dataset.url : e.currentTarget.dataset.url
|
||||||
|
});
|
||||||
},
|
},
|
||||||
DelImg(e) {
|
DelImg(e) {
|
||||||
var _this = this;
|
var _this = this;
|
||||||
|
@ -347,17 +354,17 @@ export default {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
fnImagePreview(list, index) {
|
fnImagePreview(list, index) {
|
||||||
const urls = [];
|
const urls = [];
|
||||||
for (let i = 0; i < list.length; i++) {
|
for (let i = 0; i < list.length; i++) {
|
||||||
urls.push(list[i].url);
|
urls.push(list[i].url);
|
||||||
}
|
}
|
||||||
const current = urls[index];
|
const current = urls[index];
|
||||||
uni.previewImage({
|
uni.previewImage({
|
||||||
urls,
|
urls,
|
||||||
current
|
current
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
changeRadioGroup(e){
|
changeRadioGroup(e){
|
||||||
if(this.TabCur == 2) return
|
if(this.TabCur == 2) return
|
||||||
this.hiddenForm.ISPUNISH = e.detail.value
|
this.hiddenForm.ISPUNISH = e.detail.value
|
||||||
|
@ -450,7 +457,7 @@ export default {
|
||||||
|
|
||||||
<style scoped>
|
<style scoped>
|
||||||
.dy-title-flex{
|
.dy-title-flex{
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-size: 35upx;
|
font-size: 35upx;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue