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

特殊作业作业人显示

pull/5/head
chenxinying 2024-03-01 17:53:14 +08:00
parent 29a9391bb7
commit d5129650de
19 changed files with 236 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pages/application/blindboard/blindboard-apply/blindboard-apply-detail.vue
View File

@ -303,7 +303,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -475,7 +475,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -643,16 +643,23 @@
[
{name:'NAME',message:'请输入设备管线名'},
{name:'WORK_TYPE',message:'请选择作业类别'},
{name:'WORK_USER_ID',message:'请输入作业人'},
{name:'WORK_USER_USER_ID',message:'请选择作业人'},
{name:'PLS_ID',message:'请选择作业区域'},
{name:'WORK_START_USER_ID',message:'请选择实际作业开始负责人'},
{name:'WORKSHOP_USER_ID',message:'请选择车间人员'},
{name:'MEDIUM',message:'请输入介质'},
{name:'TEMPERATURE',message:'请输入温度'},
{name:'PRESSURE',message:'请输入压力'},
{name:'LEADER_USER_ID',message:'请选择单位领导'},
// {name:'BOARD_MATERIAL',message:'请输入材质'},
// {name:'BOARD_SPECIFICATION',message:'请输入规格'},
// {name:'BOARD_NO',message:'请输入编号'},
{name:'LEADER_USER_ID',message:'请选择所在单位'},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请输入安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{
name: 'CONFIRM_USER_ID',
message: '请选择作业负责人'
@ -980,8 +987,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},
@ -1214,13 +1221,6 @@
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人
*/

2
pages/application/blindboard/blindboard-detail/index.vue
View File

@ -237,7 +237,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">

87
pages/application/breakground/breakground-apply/breakground-apply-detail.vue
View File

@ -162,7 +162,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -408,7 +408,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -516,12 +516,12 @@
</view>
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">有关部门意见</view>
<view class="cu-form-title">有关水、电、汽、工艺、设备、消防、安全等部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">有关部门负责人</view>
<view class="title">有关水、电、汽、工艺、设备、消防、安全等部门负责人</view>
{{pd.SAFETY_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.SAFETY[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3">
@ -683,44 +683,56 @@
plxIndex:-1,
rules:
[
// {
// name: 'CHECK_NO',
// message: '请输入编号'
// },
// {
// name: 'WORK_START_DATE',
// message: '请输入作业开始时间'
// },
// {
// name: 'WORK_END_DATE',
// message: '请输入作业结束时间'
// },
{
name: 'WORK_PLACE',
message: '请输入作业地点'
{
name: 'SPECIAL_WORK',
message: '请输入关联的其他特殊作业及安全作业票编号'
},
// {
// name: 'WORK_CONTENT',
// message: '请输入作业内容、范围、方式'
// },
{
name: 'JOB_CONTENT',
message: '请输入作业内容'
},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请输入安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'},
{
name: 'RISK_IDENTIFICATION',
message: '请输入风险辨识结果'
},
{
name: 'WORK_PLACE',
message: '请输入作业地点'
},
{
name: 'JOB_CONTENT',
message: '请输入作业内容'
},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{
name: 'WORK_USER_USER_ID',
message: '请选择作业人'
},
{
name: 'CONFIRM_USER_ID',
message: '请选择作业负责人'
},
{
name: 'SAFETY_USER_ID',
message: '请选择有关部门负责人'
},
{
name: 'LEADER_USER_ID',
message: '请选择所在单位负责人'
},
{
name: 'APPROVE_USER_ID',
message: '请选择审批部门负责人'
},
{
name: 'WORK_START_USER_ID',
message: '请选择作业开始负责人'
},
{
name: 'WORK_END_USER_ID',
message: '请选择作业结束负责人'
},
{
name: 'ACCEPT_USER_ID',
message: '请选择验收部门负责人'
@ -1054,8 +1066,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},
@ -1329,12 +1341,7 @@
this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
this.$forceUpdate();//强制刷新
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人

43
pages/application/breakground/breakground-detail/index.vue
View File

@ -156,7 +156,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -223,7 +223,6 @@
</view>
<view class="wui-form-list">
<view v-if="signs.CONFIRM">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view>
@ -263,21 +262,21 @@
</view>
</view>
</view>
<view v-if="signs.AUDIT">
<view v-if="signs.SAFETY">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">审核部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.AUDIT[0].DESCR"></textarea>
<view class="cu-form-title">有关水、电、汽、工艺、设备、消防、安全等部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.SAFETY[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">审核部门负责人</view>
{{pd.AUDIT_USER_NAME}}
<view class="title">有关水、电、汽、工艺、设备、消防、安全等部门负责人</view>
{{pd.SAFETY_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.AUDIT[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3">
<view class="cu-item" v-for="(item,index) in signs.SAFETY[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;">
<image :src="baseImgPath + signs.AUDIT[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.AUDIT[0].SIGN_PATH[index])"
<image :src="baseImgPath + signs.SAFETY[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.SAFETY[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.AUDIT[0].SIGN_TIME[index]}}</text>
<text> {{signs.SAFETY[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
@ -285,12 +284,12 @@
<view v-if="signs.APPROVE">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">审批人意见</view>
<view class="cu-form-title">审批部门意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.APPROVE[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">审批负责人</view>
<view class="title">审批部门负责人</view>
{{pd.APPROVE_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.APPROVE[0].SIGN_TIME" :key="index" style="border-bottom: 1px solid #e3e3e3">
@ -303,25 +302,7 @@
</view>
</view>
<view v-if="signs.MONITOR">
<view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火前在岗班长意见</view>
<textarea maxlength="255" disabled="disabled" v-model="signs.MONITOR[0].DESCR"></textarea>
</view>
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">动火前在岗班长</view>
{{pd.MONITOR_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.MONITOR[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;">
<image :src="baseImgPath + signs.MONITOR[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.MONITOR[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.MONITOR[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.WORK_START">
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >

32
pages/application/confinedspace/confinedspace-apply/confinedspace-apply-detail.vue
View File

@ -267,7 +267,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -457,7 +457,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -631,13 +631,24 @@
{name:'LIMITSPACE_ID',message:'请选择受限空间名称'},
{name:'WORK_CONTENT',message:'请输入作业内容'},
{name:'MEDIUM_NAME',message:'请输入受限空间内原有介质名称'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
{name:'ANALYZE_USER_ID',message:'请选择分析单位负责人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
// {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
{name:'WORK_USER_USER_ID',message:'请选择作业人'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'LEADER_USER_ID',message:'请选择所在单位负责人'},
{
name: 'WORK_START_USER_ID',
message: '请选择作业开始负责人'
},
{
name: 'WORK_END_USER_ID',
message: '请选择作业结束负责人'
},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
{name:'PLS_ID',message:'请选择电子围栏'},
],
@ -1220,12 +1231,7 @@
this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
this.$forceUpdate();//强制刷新
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人
@ -1280,8 +1286,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},

2
pages/application/confinedspace/confinedspace-detail/index.vue
View File

@ -200,7 +200,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">

24
pages/application/cutroad/cutroad-apply/cutroad-apply-detail.vue
View File

@ -693,14 +693,6 @@
name: 'WORK_REASON',
message: '请输入断路原因'
},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请输入安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'},
{name:'PROJECT_MANAGER_USER_ID',message:'请输入作业项目负责人'},
{name:'APPROVE_USER_ID',message:'请输入审批人'},
{name:'AUDIT_USER_ID',message:'请输入消防、安全管理部门负责人'},
{name:'LEADER_USER_ID',message:'请输入所在单位负责人'},
{
name: 'RISK_IDENTIFICATION',
message: '请输入风险辨识结果'
@ -709,11 +701,25 @@
name: 'SPECIAL_WORK',
message: '请输入关联的其他特殊作业及安全作业票编号'
},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请输入安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'},
{name:'PROJECT_MANAGER_USER_ID',message:'请输入作业项目负责人'},
{name:'APPROVE_USER_ID',message:'请输入审批人'},
{name:'AUDIT_USER_ID',message:'请输入消防、安全管理部门负责人'},
{name:'LEADER_USER_ID',message:'请输入所在单位负责人'},
{
name: 'CONFIRM_USER_ID',
message: '请选择作业负责人'
},
{
name: 'WORK_START_USER_ID',
message: '请选择作业开始负责人'
},
{
name: 'WORK_END_USER_ID',
message: '请选择作业结束负责人'
},
{
name: 'ACCEPT_USER_ID',
message: '请选择验收部门负责人'

2
pages/application/cutroad/cutroad-detail/index.vue
View File

@ -156,7 +156,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">

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

@ -12,13 +12,14 @@
<text>八项作业</text>
</view> -->
<view class="apps-warp">
<navigator class="apps-item" hover-class="none" url="/pages/application/breakground/home">
<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/home">
<view class="imgs action">
<image src="../../static/icon-apps/icon-802.png" mode=""></image>
<view v-if="eight_work_count.BREAKGROUND_COUNT" class="cu-tag badge">{{eight_work_count.BREAKGROUND_COUNT}}</view>
<image src="../../static/icon-apps/icon-807.png" mode=""></image>
<view v-if="eight_work_count.HOTWORK_COUNT" class="cu-tag badge">{{eight_work_count.HOTWORK_COUNT}}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>动土作业</view>
<view>动火作业</view>
</view>
</navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/highwork/home">
@ -53,13 +54,13 @@
<!-- </view>-->
<!-- <view class="apps-warp">-->
<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/home">
<navigator class="apps-item" hover-class="none" url="/pages/application/breakground/home">
<view class="imgs action">
<image src="../../static/icon-apps/icon-807.png" mode=""></image>
<view v-if="eight_work_count.HOTWORK_COUNT" class="cu-tag badge">{{eight_work_count.HOTWORK_COUNT}}</view>
<image src="../../static/icon-apps/icon-802.png" mode=""></image>
<view v-if="eight_work_count.BREAKGROUND_COUNT" class="cu-tag badge">{{eight_work_count.BREAKGROUND_COUNT}}</view>
</view>
<view class="text-semi" style="text-align: center;">
<view>动火作业</view>
<view>动土作业</view>
</view>
</navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/electricity/home">

45
pages/application/electricity/electricity-apply/electricity-apply-detail.vue
View File

@ -298,7 +298,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -529,7 +529,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -727,12 +727,33 @@
rules:[
{name:'WORK_PLACE',message:'请输入作业地点'},
{name:'WORK_CONTENT',message:'请输入作业内容'},
// {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'CARD_NO',message:'请输入电工证号'},
{name:'ALLOW_POWER',message:'请输入电源接入点及许可用电功率'},
{name:'RATED_POWER',message:'请输入用电设备名称及额定功率'},
{name:'WORK_VOLTAGE',message:'请输入工作电压'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
{name:'LEADER_CARD_NO',message:'请输入负责人电工号'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
{name:'LEADER_CARD_NO',message:'请输入负责人电工号'},
{name:'ELECTRICITY_USER_ID',message:'请选择用电人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{name:'WORK_USER_USER_ID',message:'请选择作业人'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
{name:'AUDIT_USER_ID',message:'请选择用电单位负责人'},
{name:'APPROVE_USER_ID',message:'请选择配送电单负责人'},
{
name: 'WORK_START_USER_ID',
message: '请选择作业开始负责人'
},
{
name: 'WORK_END_USER_ID',
message: '请选择作业结束负责人'
},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
{name:'PLS_ID',message:'请选择电子围栏'},
],
todayDate:'',
otherAssignments:false,
@ -813,8 +834,7 @@
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.getUserList(this.pd.WORK_DEPARTMENT_ID,'workusersUserList');
this.getUserList(this.pd.WORK_USER_DEPARTMENT_ID,'workUsersList');
this.getUserList(this.pd.WORK_DEPARTMENT_ID,'workUsersList');
}else{
this.getSigns()
this.getMeasures()
@ -1343,12 +1363,7 @@
this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
this.$forceUpdate();//强制刷新
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人
@ -1387,8 +1402,8 @@
this.isUps=false;
this.pd.WORK_DEPARTMENT_ID=e[0].id;
this.pd.WORK_DEPARTMENT_NAME=e[0].name;
this.pd.WORK_USER_ID = ''
this.pd.WORK_USER_NAME = ''
this.pd.WORK_USER_USER_ID = ''
this.pd.WORK_USER_USER_NAME = ''
this.$forceUpdate();//强制刷新
this.getUserList(e[0].id,'workUsersList');
},
@ -1403,8 +1418,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},

2
pages/application/electricity/electricity-detail/index.vue
View File

@ -125,7 +125,7 @@
<uni-th align="center" style="font-weight: bold;">其他安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">签字</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in signs.MEASURES_CONFIRM" :key="item.BUS_ELECTRICITY_MEASURES_ID">
<uni-tr v-for="(item,index) in signs.MEASURES_CONFIRM" :key=" :key="index">
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.DESCR}}

6
pages/application/hidden-danger-management/hidden-danger-no-change/hidden-danger-no-change.vue
View File

@ -133,12 +133,12 @@
USERDEPT:loginUser.DEPARTMENT_ID,
SELFUSERID:loginUserId,
HIDDENDESCR:_this.name,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
success: (res) => {
// console.info(res.data);
console.log("打印数据:",res.data.varList)
console.log("打印数据:",res.data.varList)
if (res.data.result == 'success') {
uni.hideLoading();
_this.total = res.data.page.totalResult;

34
pages/application/highwork/highwork-apply/highwork-apply-detail.vue
View File

@ -19,7 +19,7 @@
<view class="cu-form-group bb-default">
<view class="title">作业高度（米）：</view>
<input name="input" ref="PROJECT_MANAGER" :disabled="forbidEdit" type="number" v-model="pd.WORK_HIGH" placeholder="请输入作业高度"></input>
<input name="input" ref="WORK_HIGH" :disabled="forbidEdit" type="number" v-model="pd.WORK_HIGH" placeholder="请输入作业高度"></input>
</view>
<view class="cu-form-group bb-default group-picker">
<view class="title">高处作业级别：</view>
@ -221,7 +221,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -457,7 +457,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -685,16 +685,20 @@
{name:'WORK_HIGH',message:'请输入作业高度'},
{name:'WORK_LEVEL',message:'请输入高处作业级别'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请输入安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请输入接受交底人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{name:'WORK_CONTENT',message:'请输入作业内容'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
// {name:'CONSTRUCTION_USER_ID',message:'请选择作业负责人'},
// {name:'LEADER_USER_ID',message:'请选择所在单位负责人'},
// {name:'AUDIT_USER_ID',message:'请选择审核部门'},
// {name:'APPROVE_USER_ID',message:'请选择审批部门'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
{name:'LEADER_USER_ID',message:'请选择所在单位负责人'},
{name:'AUDIT_USER_ID',message:'请选择审核部门'},
{name:'APPROVE_USER_ID',message:'请选择审批部门'},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
// {name:'CONFESS_USER',message:'请输入安全交底人'},
{name:'WORK_END_USER_ID',message:'请选择作业结束负责人'},
{name:'WORK_START_USER_ID',message:'请选择作业开始负责人'},
{name:'WORK_USER_USER_ID',message:'请选择作业人'},
{name:'PLS_ID',message:'请选择作业区域'},
],
todayDate:'',
otherAssignments:false,
@ -1078,8 +1082,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},
@ -1378,12 +1382,6 @@
this.pd.ANALYZE_USER_NAME=this.analyzeUserList[this.analyzeindex].NAME;
this.$forceUpdate();//强制刷新
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人

2
pages/application/highwork/highwork-detail/index.vue
View File

@ -194,7 +194,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">

38
pages/application/hoisting/hoisting-apply/hoisting-apply-detail.vue
View File

@ -91,6 +91,10 @@
</view>
</view>
</view>
<view class="cu-form-group" v-if="item.QUESTION1">
<view class="title">{{item.QUESTION1}}</view>
{{item.ANSWER1?item.ANSWER1:0}}
</view>
</uni-td>
<uni-td align="center">
<view class="group" v-if="item.STATUS=='-1'">
@ -244,7 +248,7 @@
<view class="title">作业人</view>
<picker @change="PickerWorkusers" :value="workusersindex" :range="workUsersList" range-key="NAME" :disabled="workUsersList.length == 0" @click="isBlankList('workuser')">
<view class="picker">
{{pd.WORK_USER_NAME?pd.WORK_USER_NAME:'请选择'}}
{{pd.WORK_USER_USER_NAME?pd.WORK_USER_USER_NAME:'请选择'}}
</view>
</picker>
</view>
@ -520,7 +524,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">
@ -748,20 +752,25 @@
// {name:'CHECK_NO',message:'请输入编号'},
{name:'WORK_PLACE',message:'请输入吊装地点'},
{name:'TOOL_NAME',message:'请输入吊具名称'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{name:'PART_WEIGHT',message:'请输入吊物质量(吨)'},
{name:'WORK_LEVEL',message:'请选择作业级别'},
{name:'WORK_CONTENT',message:'请输入吊物内容'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'SISUO_USER_ID',message:'请选择司索人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{name:'WORK_USER_USER_ID',message:'请选择作业人'},
{name:'CONFIRM_USER_ID',message:'请输入作业单位负责人'},
{name:'PROJECT_MANAGER_USER_ID',message:'请选择吊装指挥负责人'},
{name:'LEADER_USER_ID',message:'请输入所在单位负责人'},
{name:'AUDIT_USER_ID',message:'请选择审核部门负责人'},
{name:'WORK_START_USER_ID',message:'请输入作业开始负责人'},
{name:'WORK_END_USER_ID',message:'请输入作业结束负责人'},
{name:'LEADER_USER_ID',message:'请输入所在单位负责人'},
{name:'CONFIRM_USER_ID',message:'请输入作业单位负责人'},
{name:'AUDIT_USER_ID',message:'请选择审核部门负责人'},
{name:'LEADER_USER_ID',message:'请选择作业指挥负责人'},
{name:'ACCEPT_USER_ID',message:'请选择完工验收部门负责人'},
{name:'PLS_ID',message:'请选择电子围栏'},
],
todayDate:'',
otherAssignments:false,
@ -1124,8 +1133,8 @@
},
PickerWorkusers(e) {
this.workusersindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.pd.WORK_USER_USER_ID=this.workUsersList[this.workusersindex].USER_ID;
this.pd.WORK_USER_USER_NAME=this.workUsersList[this.workusersindex].NAME;
this.$forceUpdate();//强制刷新
},
@ -1421,13 +1430,6 @@
this.$forceUpdate();//强制刷新
},
PickerWorkuser(e) {
this.workuserindex = e.detail.value;
this.pd.WORK_USER_ID=this.workUserList[this.workuserindex].USER_ID;
this.pd.WORK_USER=this.workUserList[this.workuserindex].NAME;
this.$forceUpdate();//强制刷新
},
/*
*确认人
*/

16
pages/application/hoisting/hoisting-detail/index.vue
View File

@ -81,21 +81,7 @@
<view class="title">{{item.QUESTION1}}</view>
{{item.ANSWER1?item.ANSWER1:0}}
</view>
<view class="cu-form-group" v-if="item.QUESTION2">
<view class="title">{{item.QUESTION2}}</view>
{{item.ANSWER2?item.ANSWER2:0}}
</view>
<view class="cu-form-group" v-if="item.QUESTION3">
<view class="title">{{item.QUESTION3}}</view>
{{item.ANSWER3?item.ANSWER3:0}}
</view>
<view class="cu-form-group" v-if="item.QUESTION4">
<view class="title">{{item.QUESTION4}}</view>
{{item.ANSWER4?item.ANSWER4:0}}
</view>
</uni-td>
<uni-td align="center">
<view class="group" v-if="item.STATUS=='-1'">
@ -219,7 +205,7 @@
<view style="border-bottom: 1px solid #eeeeee; border-top: 1px solid #eeeeee">
<view class="cu-form-group" >
<view class="title">作业人</view>
{{pd.WORK_USER_NAME}}
{{pd.WORK_USER_USER_NAME}}
</view>
<view class="cu-item" v-for="(item,index) in signs.WORK_USER[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;">

25
pages/application/hoisting/hoisting-measures-confirm/hoisting-measures-confirm-detail.vue
View File

@ -27,7 +27,10 @@
<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>
</uni-td>
<uni-td align="center">
@ -191,6 +194,7 @@
return;
}
if (APPLY_STATUS == 1) {
if(!this.pd.DESCR){
uni.showToast({
icon: 'none',
@ -199,6 +203,25 @@
});
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;
}
}
}
const formData={}

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

@ -754,33 +754,31 @@
plsList:[],
plxIndex:-1,
rules:[
// {name:'CHECK_NO',message:'请输入编号'},
{name:'WORK_CONTENT',message:'请输入作业内容'},
{name:'WORK_PLACE',message:'请输入动火地点及动火部位'},
{name:'WORK_LEVEL',message:'请选择动火级别'},
{name:'WORK_FUNCTION',message:'请输入动火方式'},
// {name:'WORK_START_DATE',message:'请选择工作开始时间'},
// {name:'WORK_END_DATE',message:'请选择工作结束时间'},
// {name:'WORK_MANAGER',message:'请输入作业负责人'},
{name:'WORK_USER',message:'请输入动火人及证书编号'},
// {name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'SPECIAL_WORK',message:'请输入关联的其他特殊作业及安全作业票编号'},
{name:'RISK_IDENTIFICATION',message:'请输入风险辨识结果'},
// {name:'CONFESS_USER',message:'请输入安全交底人'},
// {name:'EDUCATE_USER',message:'请输入安全教育人'},
// {name:'ACCEPT_EDUCATE_USER',message:'请输入接受交底、教育人'},
// {name:'TRIAL_USER',message:'请输入动火措施初审人'},
{name:'ANALYZE_USER_ID',message:'请选择分析人'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
// {name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'LEADER_USER_ID',message:'请选择动火点车间负责人'},
// {name:'AUDIT_USER_ID',message:'请选择安全管理部门负责人'},
// {name:'APPROVE_USER_ID',message:'请选择动火审批人'},
{name:'MONITOR_USER_ID',message:'请选择验票班长'},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ANALYZE_USER_ID',message:'请选择分析人'},
{name:'GUARDIAN_USER_ID',message:'请选择监护人'},
{name:'CONFESS_USER_ID',message:'请选择安全交底人'},
{name:'ACCEPT_CONFESS_USER_ID',message:'请选择接受交底人'},
{name:'PLS_ID',message:'请选择电子围栏'},
{name:'CONFIRM_USER_ID',message:'请选择作业负责人'},
{name:'LEADER_USER_ID',message:'请选择所在单位负责人'},
{name:'MONITOR_USER_ID',message:'请选择动火前在岗班长'},
{
name: 'WORK_START_USER_ID',
message: '请选择作业开始负责人'
},
{
name: 'WORK_END_USER_ID',
message: '请选择作业结束负责人'
},
{name:'ACCEPT_USER_ID',message:'请选择验收部门负责人'},
{name:'PLS_ID',message:'请选择电子围栏'},
],
todayDate:'',
otherAssignments:false,
@ -1020,7 +1018,7 @@
}
this.buttonloading = true
uni.request({
url: basePath + "app/hotwork/"+_this.msg,
url: basePath + "app/hotwork/"+_this.msg,
method: 'POST',
dataType: 'json',
header:{

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

@ -133,7 +133,7 @@
<uni-th align="center" style="font-weight: bold;">其他安全措施</uni-th>
<uni-th align="center" style="font-weight: bold;width: 100px">签字</uni-th>
</uni-tr>
<uni-tr v-for="(item,index) in signs.MEASURES_CONFIRM" :key="item.BUS_HOTWORK_MEASURES_ID">
<uni-tr v-for="(item,index) in signs.MEASURES_CONFIRM" :key="index">
<uni-td>
<view style="margin-bottom: 20upx;">
{{item.DESCR}}