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

受限空间和高处作业意见改为必填，气体分析加分析地点，动火加安全副总审批

pull/5/head
chenxinying 2024-02-05 15:37:11 +08:00
parent daca12f37c
commit c436c4ac5d
29 changed files with 704 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pages.json
View File

@ -439,6 +439,7 @@
"path": "pages/application/highwork/highwork-workuser/highwork-workuser-detail", "path": "pages/application/highwork/highwork-workuser/highwork-workuser-detail",
"style": {} "style": {}
}, },
{ {
"path": "pages/application/highwork/highwork-leader/highwork-leader-detail", "path": "pages/application/highwork/highwork-leader/highwork-leader-detail",
"style": {} "style": {}
@ -447,6 +448,7 @@
"path": "pages/application/highwork/highwork-audit/highwork-audit-detail", "path": "pages/application/highwork/highwork-audit/highwork-audit-detail",
"style": {} "style": {}
}, },
{ {
"path": "pages/application/highwork/highwork-approve/highwork-approve-detail", "path": "pages/application/highwork/highwork-approve/highwork-approve-detail",
"style": {} "style": {}
@ -508,6 +510,10 @@
"path": "pages/application/hotwork/hotwork-audit/hotwork-audit-detail", "path": "pages/application/hotwork/hotwork-audit/hotwork-audit-detail",
"style": {} "style": {}
}, },
{
"path": "pages/application/hotwork/hotwork-safety/hotwork-safety-detail",
"style": {}
},
{ {
"path": "pages/application/hotwork/hotwork-approve/hotwork-approve-detail", "path": "pages/application/hotwork/hotwork-approve/hotwork-approve-detail",
"style": {} "style": {}

10
pages/application/confinedspace/confinedspace-accept/confinedspace-accept-detail.vue
View File

@ -165,6 +165,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
if(APPLY_STATUS == 1){ if(APPLY_STATUS == 1){
if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){ if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){
uni.showToast({ uni.showToast({
@ -191,7 +199,7 @@
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.ACCEPT_TIME = _this.pd.ACCEPT_TIME formData.ACCEPT_TIME = _this.pd.ACCEPT_TIME
formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

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

@ -247,6 +247,28 @@
</picker> </picker>
</view> </view>
</view> </view>
<view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="!forbidEdit">
<view class="title">作业人单位</view>
<view class="picker-tree-box">
<view class="picker-tree" @tap="showWorkusersTree">{{pd.WORK_USER_DEPARTMENT_NAME?pd.WORK_USER_DEPARTMENT_NAME:'请选择'}}</view>
</view>
<tki-tree ref="tkiTree_workusers"
:selectParent=true
:range="treeNode"
rangeKey="name"
@confirm="workuserstreeConfirm"
@cancel="workuserstreeCancel"></tki-tree>
</view>
<view class="cu-form-group" v-if="!forbidEdit">
<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:'请选择'}}
</view>
</picker>
</view>
</view>
<view class="wui-form-list" v-if="!forbidEdit"> <view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="!forbidEdit"> <view class="cu-form-group" v-if="!forbidEdit">
<view class="title">作业负责人单位</view> <view class="title">作业负责人单位</view>
@ -269,28 +291,7 @@
</picker> </picker>
</view> </view>
</view> </view>
<view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="!forbidEdit">
<view class="title">作业人单位</view>
<view class="picker-tree-box">
<view class="picker-tree" @tap="showWorkusersTree">{{pd.WORK_USER_DEPARTMENT_NAME?pd.WORK_USER_DEPARTMENT_NAME:'请选择'}}</view>
</view>
<tki-tree ref="tkiTree_workusers"
:selectParent=true
:range="treeNode"
rangeKey="name"
@confirm="workuserstreeConfirm"
@cancel="workuserstreeCancel"></tki-tree>
</view>
<view class="cu-form-group" v-if="!forbidEdit">
<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:'请选择'}}
</view>
</picker>
</view>
</view>
<view class="wui-form-list" v-if="!forbidEdit"> <view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="!forbidEdit"> <view class="cu-form-group" v-if="!forbidEdit">
<view class="title">所在单位</view> <view class="title">所在单位</view>
@ -449,6 +450,21 @@
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.CONFIRM"> <view v-if="signs.CONFIRM">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view> <view class="cu-form-title">作业负责人意见</view>
@ -468,21 +484,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.LEADER"> <view v-if="signs.LEADER">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">所在单位意见</view> <view class="cu-form-title">所在单位意见</view>

12
pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail.vue
View File

@ -9,7 +9,7 @@
<detail v-if="pd.CONFINEDSPACE_ID" :confinedspaceId="pd.CONFINEDSPACE_ID"></detail> <detail v-if="pd.CONFINEDSPACE_ID" :confinedspaceId="pd.CONFINEDSPACE_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" >
@ -162,6 +162,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
@ -169,7 +177,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime
formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

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

@ -196,6 +196,21 @@
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.CONFIRM"> <view v-if="signs.CONFIRM">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view> <view class="cu-form-title">作业负责人意见</view>
@ -215,21 +230,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.LEADER"> <view v-if="signs.LEADER">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">所在单位意见</view> <view class="cu-form-title">所在单位意见</view>

8
pages/application/confinedspace/confinedspace-gas/gas-detail.vue
View File

@ -37,13 +37,17 @@
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">分析部位：</view> <view class="title">分析部位：</view>
<input name="input" ref="ANALYZE_PLACE" v-model="pd.ANALYZE_PLACE" placeholder="请输入分析部位"></input> <input name="input" ref="ANALYZE_PART" v-model="pd.ANALYZE_PART" placeholder="请输入分析部位"></input>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">氧气含量：</view> <view class="title">氧气含量：</view>
<input name="input" ref="OXYGEN_CONTENT" v-model="pd.OXYGEN_CONTENT" placeholder="请输入氧气含量"></input> <input name="input" ref="OXYGEN_CONTENT" v-model="pd.OXYGEN_CONTENT" placeholder="请输入氧气含量"></input>
</view> </view>
<view class="cu-form-group">
<view class="title">分析地点：</view>
<input name="input" ref="ANALYZE_PLACE" v-model="pd.ANALYZE_PLACE" placeholder="请输入氧气含量"></input>
</view>
<view class="cu-form-group"> <view class="cu-form-group">
<view> <view>
@ -106,7 +110,7 @@
pd:{},// 数据 pd:{},// 数据
rules:[ rules:[
{name:'ANALYZE_TIME',message:'请输入取样分析时间'}, {name:'ANALYZE_TIME',message:'请输入取样分析时间'},
{name:'ANALYZE_PLACE',message:'请输入分析部位'}, {name:'ANALYZE_PART',message:'请输入分析部位'},
{name:'OXYGEN_CONTENT',message:'请输入氧气含量'}, {name:'OXYGEN_CONTENT',message:'请输入氧气含量'},
], ],
GAS_NAME1:'', GAS_NAME1:'',

3
pages/application/confinedspace/confinedspace-gas/gas-list.vue
View File

@ -14,7 +14,7 @@
<view v-for="(item,index) of list" :key="index" :data-id="item.CONFINEDSPACEGAS_ID" class="dy-list-item p20"> <view v-for="(item,index) of list" :key="index" :data-id="item.CONFINEDSPACEGAS_ID" class="dy-list-item p20">
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>分析时间:{{item.ANALYZE_TIME}}</text> <text>分析时间:{{item.ANALYZE_TIME}}</text>
<text>分析地点:{{item.ANALYZE_PLACE}}</text> <text>分析部位:{{item.ANALYZE_PART}}</text>
</view> </view>
<view class="dy-subtitle-flex" v-if="(GAS_NAME1 && item.DATA1) || (GAS_NAME2 && item.DATA2)"> <view class="dy-subtitle-flex" v-if="(GAS_NAME1 && item.DATA1) || (GAS_NAME2 && item.DATA2)">
<text v-if="GAS_NAME1 && item.DATA1">{{ GAS_NAME1 }}：{{item.DATA1}}</text> <text v-if="GAS_NAME1 && item.DATA1">{{ GAS_NAME1 }}：{{item.DATA1}}</text>
@ -26,6 +26,7 @@
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>含氧量：{{item.OXYGEN_CONTENT}}</text> <text>含氧量：{{item.OXYGEN_CONTENT}}</text>
<text v-if="item.ANALYZE_PLACE">分析地点:{{item.ANALYZE_PLACE}}</text>
</view> </view>
<view class="dy-subtitle-flex" style="height: 34upx;"> <view class="dy-subtitle-flex" style="height: 34upx;">
<text>分析人：{{item.ANALYZE_USER}}</text> <text>分析人：{{item.ANALYZE_USER}}</text>

12
pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail.vue
View File

@ -9,7 +9,7 @@
<detail v-if="pd.CONFINEDSPACE_ID" :confinedspaceId="pd.CONFINEDSPACE_ID"></detail> <detail v-if="pd.CONFINEDSPACE_ID" :confinedspaceId="pd.CONFINEDSPACE_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" v-if="!files.length"> <view class="wui-sign" v-if="!files.length">
@ -164,6 +164,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
@ -171,7 +179,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID formData.CONFINEDSPACE_ID = _this.pd.CONFINEDSPACE_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

8
pages/application/confinedspace/confinedspace-list/index.vue
View File

@ -201,14 +201,14 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail?CONFINEDSPACE_ID='+e url: '/pages/application/confinedspace/confinedspace-acceptconfess/confinedspace-acceptconfess-detail?CONFINEDSPACE_ID='+e
}); });
}else if(this.flow === '作业负责人签字'){
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail?CONFINEDSPACE_ID='+e
});
}else if(this.flow === '作业人签字'){ }else if(this.flow === '作业人签字'){
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-workuser/confinedspace-workuser-detail?CONFINEDSPACE_ID='+e url: '/pages/application/confinedspace/confinedspace-workuser/confinedspace-workuser-detail?CONFINEDSPACE_ID='+e
}); });
}else if(this.flow === '作业负责人签字'){
uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-confirm/confinedspace-confirm-detail?CONFINEDSPACE_ID='+e
});
}else if(this.flow === '所在单位签字'){ }else if(this.flow === '所在单位签字'){
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail?CONFINEDSPACE_ID='+e url: '/pages/application/confinedspace/confinedspace-leader/confinedspace-leader-detail?CONFINEDSPACE_ID='+e

21
pages/application/confinedspace/home.vue
View File

@ -97,16 +97,6 @@
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/confinedspace/confinedspace-list/index?flow=作业负责人签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
<view v-if="count.CONFIRM" class="cu-tag badge">{{count.CONFIRM}}</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/confinedspace/confinedspace-list/index?flow=作业人签字"> <navigator class="apps-item" hover-class="none" url="/pages/application/confinedspace/confinedspace-list/index?flow=作业人签字">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image> <image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
@ -117,6 +107,17 @@
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/confinedspace/confinedspace-list/index?flow=作业负责人签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
<view v-if="count.CONFIRM" class="cu-tag badge">{{count.CONFIRM}}</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/confinedspace/confinedspace-list/index?flow=所在单位签字"> <navigator class="apps-item" hover-class="none" url="/pages/application/confinedspace/confinedspace-list/index?flow=所在单位签字">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-907.png" mode=""></image> <image src="../../../static/icon-apps/icon-907.png" mode=""></image>

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

@ -165,6 +165,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
if(APPLY_STATUS == 1){ if(APPLY_STATUS == 1){
if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){ if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){
uni.showToast({ uni.showToast({

10
pages/application/highwork/highwork-approve/highwork-approve-detail.vue
View File

@ -163,6 +163,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
@ -170,7 +178,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

10
pages/application/highwork/highwork-audit/highwork-audit-detail.vue
View File

@ -164,13 +164,21 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

10
pages/application/highwork/highwork-confirm/highwork-confirm-detail.vue
View File

@ -162,6 +162,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
@ -169,7 +177,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime formData.SIGNTIME = signtime
formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

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

@ -190,6 +190,21 @@
</view> </view>
<view class="wui-form-list"> <view class="wui-form-list">
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.CONFIRM"> <view v-if="signs.CONFIRM">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">作业负责人意见</view> <view class="cu-form-title">作业负责人意见</view>
@ -209,21 +224,7 @@
</view> </view>
</view> </view>
</view> </view>
<view v-if="signs.WORK_USER">
<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}}
</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;">
<image :src="baseImgPath + signs.WORK_USER[0].SIGN_PATH[index]" :data-index="index" @click="ViewShowImage(baseImgPath + signs.WORK_USER[0].SIGN_PATH[index])"
mode="" style="width: 200upx;height: 200upx;"></image>
<text> {{signs.WORK_USER[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.LEADER"> <view v-if="signs.LEADER">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">所在单位意见</view> <view class="cu-form-title">所在单位意见</view>

10
pages/application/highwork/highwork-leader/highwork-leader-detail.vue
View File

@ -164,6 +164,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}
@ -171,7 +179,7 @@
this.uploadImgFaults(files,signtime) this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime.join(",") formData.SIGNTIME = signtime.join(",")
formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID formData.HIGHWORK_ID = _this.pd.HIGHWORK_ID
formData.DESCR = _this.pd.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 formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({ uni.uploadFile({

8
pages/application/highwork/highwork-list/index.vue
View File

@ -204,14 +204,14 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail?HIGHWORK_ID='+e url: '/pages/application/highwork/highwork-acceptconfess/highwork-acceptconfess-detail?HIGHWORK_ID='+e
}); });
}else if(this.flow === '作业负责人签字'){
uni.navigateTo({
url: '/pages/application/highwork/highwork-confirm/highwork-confirm-detail?HIGHWORK_ID='+e
});
}else if(this.flow === '作业人签字'){ }else if(this.flow === '作业人签字'){
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/highwork/highwork-workuser/highwork-workuser-detail?HIGHWORK_ID='+e url: '/pages/application/highwork/highwork-workuser/highwork-workuser-detail?HIGHWORK_ID='+e
}); });
}else if(this.flow === '作业负责人签字'){
uni.navigateTo({
url: '/pages/application/highwork/highwork-confirm/highwork-confirm-detail?HIGHWORK_ID='+e
});
}else if(this.flow === '所在单位签字'){ }else if(this.flow === '所在单位签字'){
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/highwork/highwork-leader/highwork-leader-detail?HIGHWORK_ID='+e url: '/pages/application/highwork/highwork-leader/highwork-leader-detail?HIGHWORK_ID='+e

25
pages/application/highwork/home.vue
View File

@ -72,16 +72,6 @@
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/highwork/highwork-list/index?flow=作业负责人签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
<view v-if="count.CONFIRM" class="cu-tag badge">{{count.CONFIRM}}</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/highwork-list/index?flow=作业人签字"> <navigator class="apps-item" hover-class="none" url="/pages/application/highwork/highwork-list/index?flow=作业人签字">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image> <image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
@ -92,6 +82,17 @@
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/highwork/highwork-list/index?flow=作业负责人签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-yxkj-2.png" mode=""></image>
<view v-if="count.CONFIRM" class="cu-tag badge">{{count.CONFIRM}}</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/highwork-list/index?flow=所在单位签字"> <navigator class="apps-item" hover-class="none" url="/pages/application/highwork/highwork-list/index?flow=所在单位签字">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-907.png" mode=""></image> <image src="../../../static/icon-apps/icon-907.png" mode=""></image>
@ -108,7 +109,7 @@
<view v-if="count.AUDIT" class="cu-tag badge">{{count.AUDIT}}</view> <view v-if="count.AUDIT" class="cu-tag badge">{{count.AUDIT}}</view>
</view> </view>
<view class="text-semi" style="text-align: center;"> <view class="text-semi" style="text-align: center;">
<view>安全管理部门</view> <view>审核部门</view>
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
@ -118,7 +119,7 @@
<view v-if="count.APPROVE" class="cu-tag badge">{{count.APPROVE}}</view> <view v-if="count.APPROVE" class="cu-tag badge">{{count.APPROVE}}</view>
</view> </view>
<view class="text-semi" style="text-align: center;"> <view class="text-semi" style="text-align: center;">
<view>审批人</view> <view>审批部门</view>
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>

10
pages/application/hotwork/home.vue
View File

@ -110,6 +110,16 @@
<view>意见</view> <view>意见</view>
</view> </view>
</navigator> </navigator>
<navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-list/index?flow=安全副总签字">
<view class="imgs action">
<image src="../../../static/icon-apps/icon-901.png" mode=""></image>
<view v-if="count.SAFETY" class="cu-tag badge">{{count.SAFETY}}</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/hotwork/hotwork-list/index?flow=审批人签字"> <navigator class="apps-item" hover-class="none" url="/pages/application/hotwork/hotwork-list/index?flow=审批人签字">
<view class="imgs action"> <view class="imgs action">
<image src="../../../static/icon-apps/icon-901.png" mode=""></image> <image src="../../../static/icon-apps/icon-901.png" mode=""></image>

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

@ -165,6 +165,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
if(APPLY_STATUS == 1){ if(APPLY_STATUS == 1){
if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){ if(new Date(this.pd.ACCEPT_TIME).getTime() - new Date(this.pd.WORK_END_DATE).getTime() >= 3600000){
uni.showToast({ uni.showToast({

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

@ -316,8 +316,11 @@
</view> </view>
</view> </view>
<view class="wui-form-list" v-if="!forbidEdit"> <view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="pd.WORK_LEVEL != '二级'"> <view class="cu-form-group">
<view class="title">安全管理部门</view> <view class="title">安全管理部门</view>
<view v-if="pd.AUDIT_DEPARTMENT_NAME" class="cleared" @click="cancelSelect('audit')">
清除
</view>
<view class="picker-tree-box"> <view class="picker-tree-box">
<view class="picker-tree" @tap="showAuditTree">{{pd.AUDIT_DEPARTMENT_NAME?pd.AUDIT_DEPARTMENT_NAME:'请选择'}}</view> <view class="picker-tree" @tap="showAuditTree">{{pd.AUDIT_DEPARTMENT_NAME?pd.AUDIT_DEPARTMENT_NAME:'请选择'}}</view>
</view> </view>
@ -328,7 +331,7 @@
@confirm="audittreeConfirm" @confirm="audittreeConfirm"
@cancel="audittreeCancel"></tki-tree> @cancel="audittreeCancel"></tki-tree>
</view> </view>
<view class="cu-form-group" v-if="pd.WORK_LEVEL != '二级'"> <view class="cu-form-group">
<view class="title">安全管理部门负责人</view> <view class="title">安全管理部门负责人</view>
<picker @change="PickerAudit" :value="auditindex" :range="auditUserList" range-key="NAME" :disabled="auditUserList.length == 0" @click="isBlankList('audit')"> <picker @change="PickerAudit" :value="auditindex" :range="auditUserList" range-key="NAME" :disabled="auditUserList.length == 0" @click="isBlankList('audit')">
<view class="picker"> <view class="picker">
@ -337,6 +340,31 @@
</picker> </picker>
</view> </view>
</view> </view>
<view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="pd.WORK_LEVEL != '特级'">
<view class="title">安全副总部门</view>
<view v-if="pd.SAFETY_DEPARTMENT_NAME" class="cleared" @click="cancelSelect('safety')">
清除
</view>
<view class="picker-tree-box">
<view class="picker-tree" @tap="showSafetyTree">{{pd.SAFETY_DEPARTMENT_NAME?pd.SAFETY_DEPARTMENT_NAME:'请选择'}}</view>
</view>
<tki-tree ref="tkiTree_safety"
:selectParent=true
:range="treeNode"
rangeKey="name"
@confirm="safetytreeConfirm"
@cancel="safetytreeCancel"></tki-tree>
</view>
<view class="cu-form-group" v-if="pd.WORK_LEVEL != '特级'">
<view class="title">安全副总</view>
<picker @change="PickerSafety" :value="safetyindex" :range="safetyUserList" range-key="NAME" :disabled="safetyUserList.length == 0">
<view class="picker">
{{pd.SAFETY_USER_NAME?pd.SAFETY_USER_NAME:'请选择'}}
</view>
</picker>
</view>
</view>
<view class="wui-form-list" v-if="!forbidEdit"> <view class="wui-form-list" v-if="!forbidEdit">
<view class="cu-form-group" v-if="pd.WORK_LEVEL != '二级' && pd.WORK_LEVEL != '一级'"> <view class="cu-form-group" v-if="pd.WORK_LEVEL != '二级' && pd.WORK_LEVEL != '一级'">
<view class="title">动火审批单位</view> <view class="title">动火审批单位</view>
@ -577,6 +605,26 @@
</view> </view>
</view> </view>
<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.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.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="imgs" style="display: flex;justify-content: space-between;align-items: flex-end;padding: 20upx 50upx;">
<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.SAFETY[0].SIGN_TIME[index]}}</text>
</view>
</view>
</view>
</view>
<view v-if="signs.APPROVE"> <view v-if="signs.APPROVE">
<view class="cu-form-textarea" style="border: none;"> <view class="cu-form-textarea" style="border: none;">
<view class="cu-form-title">动火审批人意见</view> <view class="cu-form-title">动火审批人意见</view>
@ -732,6 +780,8 @@
leaderindex:-1, leaderindex:-1,
auditUserList:[], auditUserList:[],
auditindex:-1, auditindex:-1,
safetyindex:-1,
safetyUserList:[],
approveUserList:[], approveUserList:[],
approveindex:-1, approveindex:-1,
monitorUserList:[], monitorUserList:[],
@ -848,6 +898,7 @@
this.getUserList(this.pd.CONFIRM_DEPARTMENT_ID,'confirmUserList'); this.getUserList(this.pd.CONFIRM_DEPARTMENT_ID,'confirmUserList');
this.getUserList(this.pd.LEADER_DEPARTMENT_ID,'leaderUserList'); this.getUserList(this.pd.LEADER_DEPARTMENT_ID,'leaderUserList');
this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'auditUserList'); this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'auditUserList');
this.getUserList(this.pd.AUDIT_DEPARTMENT_ID,'safetyUserList');
this.getUserList(this.pd.APPROVE_DEPARTMENT_ID,'approveUserList'); this.getUserList(this.pd.APPROVE_DEPARTMENT_ID,'approveUserList');
this.getUserList(this.pd.MONITOR_DEPARTMENT_ID,'monitorUserList'); this.getUserList(this.pd.MONITOR_DEPARTMENT_ID,'monitorUserList');
this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList'); this.getUserList(this.pd.ACCEPT_DEPARTMENT_ID,'acceptUserList');
@ -957,6 +1008,7 @@
required = false required = false
} }
}) })
if(this.pd.WORK_LEVEL != '二级'){ if(this.pd.WORK_LEVEL != '二级'){
if(!this.pd.AUDIT_USER_ID){ if(!this.pd.AUDIT_USER_ID){
uni.showToast({ uni.showToast({
@ -1033,6 +1085,7 @@
levelChange(e){ levelChange(e){
this.levelindex = e.detail.value; this.levelindex = e.detail.value;
this.pd.WORK_LEVEL=this.levelList[this.levelindex].name; this.pd.WORK_LEVEL=this.levelList[this.levelindex].name;
console.log(e.detail.value)
if(e.detail.value == '2'){ if(e.detail.value == '2'){
this.pd.AUDIT_DEPARTMENT_ID=''; this.pd.AUDIT_DEPARTMENT_ID='';
this.pd.AUDIT_DEPARTMENT_NAME=''; this.pd.AUDIT_DEPARTMENT_NAME='';
@ -1049,6 +1102,12 @@
this.pd.APPROVE_USER_ID=''; this.pd.APPROVE_USER_ID='';
this.pd.APPROVE_USER_NAME=''; this.pd.APPROVE_USER_NAME='';
} }
if(e.detail.value == '0'){
this.pd.SAFETY_DEPARTMENT_ID='';
this.pd.SAFETY_DEPARTMENT_NAME='';
this.pd.SAFETY_USER_ID='';
this.pd.SAFETY_USER_NAME='';
}
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
getDept() { getDept() {
@ -1248,6 +1307,7 @@
}) })
} }
break break
case 'approve': case 'approve':
if(this.approveUserList.length == 0) { if(this.approveUserList.length == 0) {
uni.showToast({ uni.showToast({
@ -1277,6 +1337,28 @@
break break
} }
}, },
cancelSelect(dept) {
if (dept == 'audit') {
this.pd.AUDIT_DEPARTMENT_ID = ''
this.pd.AUDIT_DEPARTMENT_NAME = ''
this.pd.AUDIT_USER_ID = ''
this.pd.AUDIT_USER_NAME = ''
this.auditUserList = []
this.auditindex = -1
this.$refs.tkiTree_audit._reTreeList()
this.$refs.tkiTree_audit._initTree(this.treeNode)
}
if(dept == 'safety'){
this.pd.SAFETY_DEPARTMENT_ID = ''
this.pd.SAFETY_DEPARTMENT_NAME = ''
this.pd.SAFETY_USER_ID = ''
this.pd.SAFETY_USER_NAME = ''
this.safetyUserList = []
this.safetyindex = -1
this.$refs.tkiTree_safety._reTreeList()
this.$refs.tkiTree_safety._initTree(this.treeNode)
}
},
/* /*
*安全交底人 *安全交底人
@ -1549,6 +1631,36 @@
this.$forceUpdate();//强制刷新 this.$forceUpdate();//强制刷新
}, },
/*
*安全副总
*/
// 确定回调事件
safetytreeConfirm(e) {
this.isUps=false;
this.pd.SAFETY_DEPARTMENT_ID=e[0].id;
this.pd.SAFETY_DEPARTMENT_NAME=e[0].name;
this.pd.SAFETY_USER_ID = ''
this.pd.SAFETY_USER_NAME = ''
this.$forceUpdate();//强制刷新
this.getUserList(e[0].id,'safetyUserList');
},
// 取消回调事件
safetytreeCancel(e) {
this.isUps=false;
},
// 显示树形选择器
showSafetyTree() {
this.isUps=true
this.$refs.tkiTree_safety._show();
},
PickerSafety(e) {
this.safetyindex = e.detail.value;
this.pd.SAFETY_USER_ID=this.safetyUserList[this.safetyindex].USER_ID;
this.pd.SAFETY_USER_NAME=this.safetyUserList[this.safetyindex].NAME;
this.$forceUpdate();//强制刷新
},
/* /*
*审批人 *审批人
*/ */

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

@ -164,6 +164,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}

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

@ -162,6 +162,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}

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

@ -18,13 +18,18 @@
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">代表性气体：</view> <view class="title">代表性气体：</view>
<input name="input" ref="ANALYZE_PLACE" v-model="pd.ANALYZE_PLACE" placeholder="请输入代表性气体"></input> <input name="input" ref="ANALYZE_GAS" v-model="pd.ANALYZE_GAS" placeholder="请输入代表性气体"></input>
</view> </view>
<view class="cu-form-group"> <view class="cu-form-group">
<view class="title">分析结果：</view> <view class="title">分析结果：</view>
<input name="input" ref="ANALYZE_RESULT" v-model="pd.ANALYZE_RESULT" placeholder="请输入"></input> <input name="input" ref="ANALYZE_RESULT" v-model="pd.ANALYZE_RESULT" placeholder="请输入"></input>
</view> </view>
<view class="cu-form-group">
<view class="title">分析地点：</view>
<input name="input" ref="ANALYZE_PLACE" v-model="pd.ANALYZE_PLACE" placeholder="请输入"></input>
</view>
<view class="cu-form-group"> <view class="cu-form-group">
<view> <view>
<text class="title">分析人：</text> <text class="title">分析人：</text>
@ -82,7 +87,7 @@
pd:{},// 数据 pd:{},// 数据
rules:[ rules:[
{name:'ANALYZE_TIME',message:'请输入分析时间'}, {name:'ANALYZE_TIME',message:'请输入分析时间'},
{name:'ANALYZE_PLACE',message:'请输入分析点'}, {name:'ANALYZE_GAS',message:'请输入代表性气体'},
{name:'ANALYZE_RESULT',message:'请输入分析结果'}, {name:'ANALYZE_RESULT',message:'请输入分析结果'},
], ],
currentTime:formatDate(new Date(),'yyyy-MM-dd hh:mm') currentTime:formatDate(new Date(),'yyyy-MM-dd hh:mm')

3
pages/application/hotwork/hotwork-gas/gas-list.vue
View File

@ -13,10 +13,11 @@
<view v-for="(item,index) of list" :key="index" :data-id="item.HOTWORKGAS_ID" class="dy-list-item p20"> <view v-for="(item,index) of list" :key="index" :data-id="item.HOTWORKGAS_ID" class="dy-list-item p20">
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>分析时间:{{item.ANALYZE_TIME}}</text> <text>分析时间:{{item.ANALYZE_TIME}}</text>
<text>代表性气体:{{item.ANALYZE_PLACE}}</text> <text>代表性气体:{{item.ANALYZE_GAS}}</text>
</view> </view>
<view class="dy-subtitle-flex"> <view class="dy-subtitle-flex">
<text>分析数据：{{item.ANALYZE_RESULT}}</text> <text>分析数据：{{item.ANALYZE_RESULT}}</text>
<text v-if="item.ANALYZE_PLACE">分析地点:{{item.ANALYZE_PLACE}}</text>
</view> </view>
<view class="dy-subtitle-flex" style="height: 34upx;"> <view class="dy-subtitle-flex" style="height: 34upx;">
<text>分析人：</text> <text>分析人：</text>

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

@ -164,6 +164,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}

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

@ -50,10 +50,11 @@
</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.LEADER_USER_NAME}}</text> <text>动火点所在单位负责人：{{item.LEADER_USER_NAME}}</text>
<text v-if="item.AUDIT_USER_NAME">安全管理部门负责人：{{item.AUDIT_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 v-if="item.AUDIT_USER_NAME">安全管理部门负责人：{{item.AUDIT_USER_NAME}}</text> <text v-if="item.SAFETY_USER_NAME">安全副总：{{item.SAFETY_USER_NAME}}</text>
<text v-if="item.APPROVE_USER_NAME">审批部门负责人：{{item.APPROVE_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)">
@ -223,6 +224,10 @@
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hotwork/hotwork-audit/hotwork-audit-detail?HOTWORK_ID='+e url: '/pages/application/hotwork/hotwork-audit/hotwork-audit-detail?HOTWORK_ID='+e
}); });
}else if(this.flow === '安全副总签字'){
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-safety/hotwork-safety-detail?HOTWORK_ID='+e
});
}else if(this.flow === '审批人签字'){ }else if(this.flow === '审批人签字'){
uni.navigateTo({ uni.navigateTo({
url: '/pages/application/hotwork/hotwork-approve/hotwork-approve-detail?HOTWORK_ID='+e url: '/pages/application/hotwork/hotwork-approve/hotwork-approve-detail?HOTWORK_ID='+e

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

@ -150,6 +150,14 @@
}); });
return; return;
} }
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = []; var files = [];
var signtime = []; var signtime = [];
const formData={} const formData={}

335
pages/application/hotwork/hotwork-safety/hotwork-safety-detail.vue Normal file
View File

@ -0,0 +1,335 @@
<template>
<view >
<cu-custom bgColor="bg-gradual-blueness" :isBack="true" >
<block slot="backText">返回</block>
<block slot="content">安全副总意见</block>
</cu-custom>
<scroll-view scroll-y="false" >
<view class="form">
<detail v-if="pd.HOTWORK_ID" :hotworkId="pd.HOTWORK_ID"></detail>
<view class="wui-form-list">
<view class="cu-form-textarea" style="border-bottom: 1px dashed #eee;">
<view class="cu-form-title">安全副总意见</view>
<textarea maxlength="255" v-model="pd.DESCR" placeholder="请输入意见"></textarea>
</view>
<view class="wui-sign" v-if="!files.length">
<view class="title">安全副总</view>
<view>
<view>
<button class="cu-btn bg-green shadow" @tap="showModal">手写签字</button>
</view>
</view>
</view>
<view class="wui-sign-box wui-sign-box1" v-show="imgList && imgList.length > 0">
<view class="sign-title">
签字照片：
</view>
<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">
<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 class="cu-modal" :class="modalName=='Modal'?'show':''">
<writing-board @confirm="subCanvas" @cancel="hideModal"></writing-board>
</view>
</view>
<view class="cu-bar btn-group" style="margin-top: 30upx;">
<button class="cu-btn bg-red margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(-1))">打回</button>
<button class="cu-btn bg-green margin-tb-sm lg" @click="$noMultipleClicks(goSubmit(1))">通过</button>
</view>
<view class="padding flex flex-direction">
</view>
</scroll-view>
</view>
</template>
<script>
import {
basePath,corpinfoId,deptId,loginUser,formatDate,loginSession,baseImgPath
} from '@/common/tool.js';
import tkiTree from "@/components/select-tree/select-tree.vue"
import writingBoard from "@/components/writing-board/writing-board.vue"
import gcoord from '@/common/gcoord.js'
import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
import detail from '@/pages/application/hotwork/hotwork-detail/index'
export default {
components: {
tkiTree,ruiDatePicker,writingBoard,detail
},
data() {
return {
baseImgPath:baseImgPath,
buttonloading: false,
isUps:false,
forbidEdit:true,// 禁止修改
msg:'add',
noClick:true,
treeNode:[],//部门下拉数据
files: [],
pd:{},// 数据
measuresList:[],
modalName:null,
imgList:[],
}
},
onLoad(event){
this.todayDate = formatDate(new Date(), 'yyyy-MM-dd hh:mm');
this.pd.HOTWORK_ID = event.HOTWORK_ID;
if(this.pd.HOTWORK_ID){
this.msg="edit";
this.getData();
}else {
// 初始化作业负责人
this.pd.APPLY_DEPARTMENT_ID = loginUser.DEPARTMENT_ID;
this.pd.APPLY_DEPARTMENT_NAME = loginUser.DEPARTMENT_NAME;
this.pd.APPLY_USER_ID = loginUser.USER_ID;
this.pd.APPLY_USER_NAME = loginUser.NAME;
this.forbidEdit = false;
}
// 初始化现场作业负责人
this.getDept();
this.getLimitSpace();
loginSession();
},
methods: {
//跳转事件
goToDetail(e) {
uni.navigateTo({
url: '/pages/application/hotwork/hotwork-gas/gas-list?HOTWORK_ID='+e
});
},
getData() {
var _this = this;
uni.showLoading({
title: '请稍候'
})
uni.request({
url: basePath + '/app/hotwork/findById',
method: 'POST',
header: {
'Content-type': 'application/x-www-form-urlencoded'
},
data: {
HOTWORK_ID: _this.pd.HOTWORK_ID,
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
success: (res) => {
if ("success" == res.data.result) {
uni.hideLoading();
_this.pd = res.data.pd; //参数map
} else if ("exception" == data.result) {
uni.showToast({
title: '错误',
duration: 2000
});
}
}
});
},
ViewShowImage(url) {
let files = [];
files.push(url)
uni.previewImage({
urls: files,
current: 0
});
},
validStr(str){
if (str!=null && str!='' && typeof(str)!="undefined" && str!=0)
return true
return false
},
goSubmit(APPLY_STATUS){
var _this = this;
let required = true
uni.showLoading({
title: '请稍候'
})
if (_this.imgList.length <= 0) {
uni.showToast({
icon: 'none',
title: '请签字',
duration: 1500
});
return;
}
if (!_this.pd.DESCR) {
uni.showToast({
icon: 'none',
title: '请输入负责人意见',
duration: 1500
});
return;
}
var files = [];
var signtime = [];
const formData={}
this.uploadImgFaults(files,signtime)
formData.SIGNTIME = signtime
formData.HOTWORK_ID = _this.pd.HOTWORK_ID
formData.DESCR = _this.pd.DESCR?_this.pd.DESCR:"无"
formData.USER_ID = loginUser.USER_ID
formData.APPLY_STATUS = APPLY_STATUS
uni.uploadFile({
url: basePath+'app/hotwork/nextStep',
files: files,
formData:formData,
success: (res) => {
uni.showToast({
icon:'none',
title: '保存成功',
duration: 2000
});
_this.goback()
},
fail: (err) => {
uni.hideLoading();
uni.showModal({
content: err.errMsg,
showCancel: false
});
}
})
},
getDept() {
var _this = this;
uni.request({
url: basePath + '/app/sys/listTree',//部门下拉接口
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
data: {
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
success: (res) => {
if("success" == res.data.result){
_this.treeNode=eval(res.data.zTreeNodes);
} else {
uni.showToast({
title: res.data.message,
duration: 2000
});
}
}
});
},
//获取人员列表
getUserList(dept,list,i){
//发送 post 请求
var _this=this
uni.request({
method: 'POST',
dataType: 'json',
header: {
'Content-type':'application/x-www-form-urlencoded'
},
url: basePath+'/app/sys/listUser',
data: {
DEPARTMENT_ID:dept,
tm:new Date().getTime(),
CORPINFO_ID:loginUser.CORPINFO_ID,
USER_ID:loginUser.USER_ID,
},
success: function(res){
if("success" == res.data.result){
if(i>-1) {
_this[list][i] = [];
_this[list][i] = res.data.userList;
_this.$forceUpdate();//强制刷新
}else{
_this[list]=res.data.userList;
}
}else{
uni.showToast({
title: res.data.message,
duration: 2000
});
}
}
})
},
/*
*手写板
*/
showModal(e) {
this.modalName = 'Modal'
},
DelImg(index){
this.imgList.splice(index,1)
},
hideModal(e) {
this.modalName = null
},
//完成
subCanvas(e) {
this.imgList.splice(0,this.imgList.length);
this.imgList.push(e);
e.SIGNER_TIME = formatDate(new Date(), 'yyyy-MM-dd hh:mm')
this.hideModal()
},
ViewImage(e) {
let files =[];
files.push(e.currentTarget.dataset.url)
uni.previewImage({
urls: files,
current: e.currentTarget.dataset.url
});
},
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)
})
},
goback(){
var pages = getCurrentPages(); // 获取当前页面栈
var prePage = pages[pages.length - 2]; // 上二级页面
prePage.$vm.initflag = true; // A 页面 init方法 为true
uni.navigateBack({delta: 1});
uni.hideLoading();
},
radioType(e){
this.HASINSTRUCTOR = e.detail.value
},
goToEdit(){
this.forbidEdit = false;
}
}
}
</script>
<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>