ykx/jy-safe-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复动火以及关键作业票

Browse Source
This commit is contained in:
yunkexin 2026-08-03 09:15:29 +08:00
parent 81996ac034
commit f6e3054079
2 changed files with 111 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

138
pages/apply/subPages/FO/jobFireShow.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<view style="padding-bottom: 80px;" :class="{ 'is-popup': isPopupMode }"> <view style="padding-bottom: 80px;">
<view class="card"> <view class="card">
<view class="background" v-if="!isPopupMode"></view> <view class="background" v-if="!isPopupMode"></view>
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm"> <u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm">
@ -258,9 +258,9 @@
</view> </view>
<audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" /> <audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" />
<check-action v-if="isLoadOK && tableKeyLocal === '1'&&isAuditLocal==='true' " :okApi="okApiLocal" :refuseApi="refuseApiLocal" :dataSource="$store.state.auditModel"></check-action> <check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
<view class="bottom-button" v-if="!isPopupMode"> <view class="bottom-button">
<u-button type="primary" class="bottom" v-if="isLoadOK&&tableKeyLocal==='1'&&!isAuditLocal" @click="onTableBtnAgree" color="#3d4b70">审阅</u-button> <u-button type="primary" class="bottom" v-if="isLoadOK&&tableKey==='1'&&!isAudit" @click="onTableBtnAgree" color="#3d4b70">审阅</u-button>
<!-- <button type="primary" class="bottom" v-if='isLoadOK&&tableKey==1' @click="onTableBtnAgree">签到</button> --> <!-- <button type="primary" class="bottom" v-if='isLoadOK&&tableKey==1' @click="onTableBtnAgree">签到</button> -->
</view> </view>
</view> </view>
@ -287,9 +287,8 @@
} from '../../../../services/common'; } from '../../../../services/common';
export default { export default {
// 添加 props 接收外部传入的参数
props: { props: {
// 动火工作票ID // 工作票ID
id: { id: {
type: [String, Number], type: [String, Number],
default: null default: null
@ -299,33 +298,6 @@
type: Boolean, type: Boolean,
default: false default: false
}, },
// 任务ID
taskID: {
type: String,
default: ''
},
// 表格标识
tableKey: {
type: [String, Number],
default: '0'
},
// 审批相关
okApi: {
type: String,
default: ''
},
refuseApi: {
type: String,
default: ''
},
approveID: {
type: String,
default: ''
},
isAudit: {
type: [String, Boolean],
default: false
}
}, },
data() { data() {
return { return {
@ -381,10 +353,10 @@
listPropUpload: ['PRE_SHIFT_MEETING_RECORD_ID'], listPropUpload: ['PRE_SHIFT_MEETING_RECORD_ID'],
listPropValUpload: [], listPropValUpload: [],
TaskID: "", TaskID: "",
tableKeyLocal: '0', tableKey: '0',
okApiLocal: '', okApi: '',
refuseApiLocal: '', refuseApi: '',
isAuditLocal: false, isAudit: false,
isLoadOK: false, isLoadOK: false,
showAudit: false, showAudit: false,
auditData: [], auditData: [],
@ -393,26 +365,19 @@
enumsText: {} // 存储枚举文本列表（用于下拉选择等场景） enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
} }
}, },
// 页面加载时调用（仅页面模式）
onLoad(option) { onLoad(option) {
if (option && option.ID) {
this.ID = option.ID; this.ID = option.ID;
this.TaskID = option.taskID || ''; this.TaskID = option.taskID;
this.tableKeyLocal = option.tableKey ? option.tableKey : '0' this.tableKey = option.tableKey ? option.tableKey : '0'
this.okApiLocal = option.okApi || '' this.okApi = option.okApi
this.refuseApiLocal = option.refuseApi || '' this.refuseApi = option.refuseApi
this.ApproveID = option.approveID || '' this.ApproveID = option.ApproveID
this.isAuditLocal = option.isAudit || false this.isAudit = option.isAudit
this.auditModel = {
if (this.isAuditLocal && this.TaskID) {
this.$store.commit('setAuditModel', {
...this.$store.state.auditModel, ...this.$store.state.auditModel,
TaskID: this.TaskID TaskID: option.taskID ? option.taskID : ''
})
} }
this.fetchEnums(['HMOperationTaskAuditEnum', 'SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']); this.fetchEnums(['HMOperationTaskAuditEnum', 'SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
}
}, },
watch: { watch: {
// 监听 props 的 id 变化，用于弹窗模式 // 监听 props 的 id 变化，用于弹窗模式
@ -422,12 +387,12 @@
if (val && !this.ID) { if (val && !this.ID) {
this.ID = val; this.ID = val;
this.TaskID = this.taskID || ''; this.TaskID = this.taskID || '';
this.tableKeyLocal = this.tableKey || '0' this.tableKey = this.tableKey || '0'
this.okApiLocal = this.okApi || '' this.okApi = this.okApi || ''
this.refuseApiLocal = this.refuseApi || '' this.refuseApi = this.refuseApi || ''
this.isAuditLocal = this.isAudit || false this.isAudit = this.isAudit || false
if (this.isAuditLocal && this.TaskID) { if (this.isAudit && this.TaskID) {
this.$store.commit('setAuditModel', { this.$store.commit('setAuditModel', {
...this.$store.state.auditModel, ...this.$store.state.auditModel,
TaskID: this.TaskID TaskID: this.TaskID
@ -439,26 +404,6 @@
} }
} }
}, },
mounted() {
// 如果 props 有 id 且 onLoad 未处理，在这里处理
if (this.id && !this.ID) {
this.ID = this.id;
this.TaskID = this.taskID || '';
this.tableKeyLocal = this.tableKey || '0'
this.okApiLocal = this.okApi || ''
this.refuseApiLocal = this.refuseApi || ''
this.isAuditLocal = this.isAudit || false
if (this.isAuditLocal && this.TaskID) {
this.$store.commit('setAuditModel', {
...this.$store.state.auditModel,
TaskID: this.TaskID
})
}
this.fetchEnums(['HMOperationTaskAuditEnum', 'SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
}
},
methods: { methods: {
fetchEnums(enumNames) { fetchEnums(enumNames) {
var dataParm = { var dataParm = {
@ -471,16 +416,10 @@
this.enumsText = newd[1] this.enumsText = newd[1]
this.loadData(); this.loadData();
this.loadAuditData() this.loadAuditData()
}).catch(err => {
console.error('获取枚举数据失败:', err)
}) })
}, },
loadData() { loadData() {
if (!this.ID) {
console.warn('jobFireShow: 未获取到 ID')
return
}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "CODE", 1) const json = initFilter(orgId, "", "CODE", 1)
extendRule(json, 'ID', 1, this.ID); extendRule(json, 'ID', 1, this.ID);
@ -496,9 +435,6 @@
}) })
} }
this.isLoadOK = true; this.isLoadOK = true;
}).catch(err => {
console.error('获取动火工作票数据失败:', err)
uni.$showErrorInfo('获取动火工作票数据失败')
}) })
}, },
onTableBtnAgree() { onTableBtnAgree() {
@ -515,25 +451,23 @@
}, },
loadAuditData() { loadAuditData() {
if (!this.ID) {
return Promise.resolve([])
}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, this.ID, "CODE", 1) const json = initFilter(orgId, this.ID, "CODE", 1)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getRequest(json, "/PF/Approve/GetApproveInfo").then(res => { getRequest(json, "/PF/Approve/GetApproveInfo").then(res => {
if (res && res.length > 0) { if (res) {
if (res[0].Nav_ApproveDetails && res[0].Nav_ApproveDetails.length > 0) { if (res && res[0].Nav_ApproveDetails.length > 0) {
res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM) res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM)
resolve(res)
} }
this.auditData = res this.auditData = res
resolve(res)
} else { } else {
this.auditData = [] uni.showToast({
resolve([]) title: '暂无审批数据',
icon: 'none'
})
} }
}).catch(err => { }).catch(err => {
console.error('获取审批数据失败:', err)
reject(err) reject(err)
}) })
}) })
@ -542,7 +476,11 @@
this.showAudit = false this.showAudit = false
}, },
async onNavigationBarButtonTap() { async onNavigationBarButtonTap() {
// const res = await this.loadAuditData()
// if (res) {
// this.auditData = res
this.showAudit = true this.showAudit = true
// }
} }
}, },
computed: { computed: {
@ -553,14 +491,4 @@
<style> <style>
@import url("../../../../style/css/newTemplate.css"); @import url("../../../../style/css/newTemplate.css");
/* 弹窗模式下隐藏底部按钮 */
.is-popup .bottom-button {
display: none !important;
}
/* 弹窗模式下调整内边距 */
.is-popup {
padding-bottom: 16px !important;
}
</style> </style>

203
pages/apply/subPages/FO2/jobShow.vue
View File

@ -1,60 +1,48 @@
<template> <template>
<view class="page-wrap" :class="{ 'is-popup': isPopupMode }"> <view class="page-wrap">
<view class="card"> <view class="card">
<uni-card margin="0" :is-shadow="true"> <uni-card margin="0" :is-shadow="true">
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="dataModel" ref="wForm" <u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="dataModel" ref="wForm" errorType="border-bottom">
errorType="border-bottom">
<!-- <u-form-item label="编号" prop="CODE" borderBottom> <!-- <u-form-item label="编号" prop="CODE" borderBottom>
<u--input v-model="dataModel.CODE" disabled disabledColor="#ffffff" placeholder="请输入编号" border="none" inputAlign="right"> <u--input v-model="dataModel.CODE" disabled disabledColor="#ffffff" placeholder="请输入编号" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> --> </u-form-item> -->
<u-form-item label="作业名称" prop="stepName" borderBottom> <u-form-item label="作业名称" prop="stepName" borderBottom>
<u--input v-model="dataModel.Nav_OperationStep.NAME" disabled disabledColor="#ffffff" <u--input v-model="dataModel.Nav_OperationStep.NAME" disabled disabledColor="#ffffff" placeholder="请输入作业名称" border="none" inputAlign="right"></u--input>
placeholder="请输入作业名称" border="none" inputAlign="right"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="审批层级" prop="AUDIT_LEVEL" borderBottom> <u-form-item label="审批层级" prop="AUDIT_LEVEL" borderBottom>
<u--input v-model="dataModel.AUDIT_LEVEL" disabled disabledColor="#ffffff" placeholder="请输入审批层级" <u--input v-model="dataModel.AUDIT_LEVEL" disabled disabledColor="#ffffff" placeholder="请输入审批层级" border="none" inputAlign="right"></u--input>
border="none" inputAlign="right"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="作业地点" prop="JOB_LOCATION" borderBottom> <u-form-item label="作业地点" prop="JOB_LOCATION" borderBottom>
<u--input v-model="dataModel.JOB_LOCATION" disabled disabledColor="#ffffff" <u--input v-model="dataModel.JOB_LOCATION" disabled disabledColor="#ffffff" placeholder="请输入作业地点" border="none" inputAlign="right"></u--input>
placeholder="请输入作业地点" border="none" inputAlign="right"></u--input>
</u-form-item> </u-form-item>
<u-form-item label="开始时间" prop="JOB_DATE" borderBottom> <u-form-item label="开始时间" prop="JOB_DATE" borderBottom>
<u--input v-model="dataModel.JOB_DATE" disabled disabledColor="#ffffff" placeholder="请输入开始时间" <u--input v-model="dataModel.JOB_DATE" disabled disabledColor="#ffffff" placeholder="请输入开始时间" border="none" inputAlign="right" :value="$u.timeFormat(dataModel.JOB_DATE,'yyyy-mm-dd hh:MM:ss')">
border="none" inputAlign="right"
:value="$u.timeFormat(dataModel.JOB_DATE,'yyyy-mm-dd hh:MM:ss')">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="结束时间" prop="JOB_END_DATE" borderBottom> <u-form-item label="结束时间" prop="JOB_END_DATE" borderBottom>
<u--input v-model="dataModel.JOB_END_DATE" disabled disabledColor="#ffffff" <u--input v-model="dataModel.JOB_END_DATE" disabled disabledColor="#ffffff" placeholder="请输入结束时间" border="none" inputAlign="right"
placeholder="请输入结束时间" border="none" inputAlign="right"
:value="$u.timeFormat(dataModel.JOB_END_DATE,'yyyy-mm-dd hh:MM:ss')"> :value="$u.timeFormat(dataModel.JOB_END_DATE,'yyyy-mm-dd hh:MM:ss')">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="作业申请人" prop="applyUser" borderBottom> <u-form-item label="作业申请人" prop="applyUser" borderBottom>
<u--input v-model="dataModel.Nav_ApplyUser.NAME" disabled disabledColor="#ffffff" <u--input v-model="dataModel.Nav_ApplyUser.NAME" disabled disabledColor="#ffffff" placeholder="请输入作业申请人" border="none" inputAlign="right">
placeholder="请输入作业申请人" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="属地部门" prop="Nav_Department.NAME" borderBottom> <u-form-item label="属地部门" prop="Nav_Department.NAME" borderBottom>
<u--input disabledColor="#fff" v-model="(dataModel.Nav_Department||{}).NAME" disabled fontSize="14px" <u--input disabledColor="#fff" v-model="(dataModel.Nav_Department||{}).NAME" disabled fontSize="14px" border="none" inputAlign="right">
border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="监护人" prop="monitorUser" borderBottom> <u-form-item label="监护人" prop="monitorUser" borderBottom>
<u--input v-model="dataModel.Nav_MonitorUser.NAME" disabled disabledColor="#ffffff" <u--input v-model="dataModel.Nav_MonitorUser.NAME" disabled disabledColor="#ffffff" placeholder="请输入监护人" border="none" inputAlign="right">
placeholder="请输入监护人" border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="作业区域" prop="Nav_Area.NAME" borderBottom> <u-form-item label="作业区域" prop="Nav_Area.NAME" borderBottom>
<u--input disabledColor="#fff" v-model="(dataModel.Nav_Area||{}).NAME" disabled fontSize="14px" <u--input disabledColor="#fff" v-model="(dataModel.Nav_Area||{}).NAME" disabled fontSize="14px" inputAlign="right" border="none">
inputAlign="right" border="none">
</u--input> </u--input>
</u-form-item> </u-form-item>
<u-form-item label="作业原因" prop="JobCause" borderBottom> <u-form-item label="作业原因" prop="JobCause" borderBottom>
<u--input v-model="dataModel.JobCause" disabled disabledColor="#ffffff" placeholder="请输入作业原因" <u--input v-model="dataModel.JobCause" disabled disabledColor="#ffffff" placeholder="请输入作业原因" border="none" inputAlign="right">
border="none" inputAlign="right">
</u--input> </u--input>
</u-form-item> </u-form-item>
<view v-if="OrgId=='d9871ba8-0eec-9e4a-bb87-7d5a540d8913'"> <view v-if="OrgId=='d9871ba8-0eec-9e4a-bb87-7d5a540d8913'">
@ -72,27 +60,22 @@
</u-form-item> </u-form-item>
</view> </view>
<view v-if="OrgId == '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" class="upload-title">安全措施确认</view> <view v-if="OrgId == '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" class="upload-title">安全措施确认</view>
<full-upload v-if="OrgId == '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" v-model="dataModel.Nav_Files" :listProp='listPropUpload' <full-upload v-if="OrgId == '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" v-model="dataModel.Nav_Files" :listProp='listPropUpload' :listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
:listPropVal='listPropValUpload' :isShowBtn="false"></full-upload>
<u-form-item label="作业人员" prop="UserNames" borderBottom> <u-form-item label="作业人员" prop="UserNames" borderBottom>
</u-form-item> </u-form-item>
<u--textarea autoHeight type="textarea" v-html="dataModel.UserNames" border="none" <u--textarea autoHeight type="textarea" v-html="dataModel.UserNames" border="none" inputAlign="right">
inputAlign="right">
</u--textarea> </u--textarea>
<u-form-item label="作业前安全确认" prop="UserConfirms" borderBottom> <u-form-item label="作业前安全确认" prop="UserConfirms" borderBottom>
</u-form-item> </u-form-item>
<u--textarea autoHeight type="textarea" disabled v-model="dataModel.UserConfirms" border="none" <u--textarea autoHeight type="textarea" disabled v-model="dataModel.UserConfirms" border="none" style="line-height: 100;" inputAlign="right">
style="line-height: 100;" inputAlign="right">
</u--textarea> </u--textarea>
<u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" label="作业流程及安全措施" prop="UserMeasures" borderBottom> <u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" label="作业流程及安全措施" prop="UserMeasures" borderBottom>
</u-form-item> </u-form-item>
<u--textarea v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" autoHeight type="textarea" disabled v-model="dataModel.UserMeasures" border="none" <u--textarea v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" autoHeight type="textarea" disabled v-model="dataModel.UserMeasures" border="none" inputAlign="right">
inputAlign="right">
</u--textarea> </u--textarea>
<u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" label="作业后处理措施" prop="UserDeals" borderBottom> <u-form-item v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" label="作业后处理措施" prop="UserDeals" borderBottom>
</u-form-item> </u-form-item>
<u--textarea v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" autoHeight type="textarea" disabled v-model="dataModel.UserDeals" border="none" <u--textarea v-if="OrgId!== '8b3c41aa-51b1-7ce9-1879-248a038c1b5c'" autoHeight type="textarea" disabled v-model="dataModel.UserDeals" border="none" inputAlign="right">
inputAlign="right">
</u--textarea> </u--textarea>
</u--form> </u--form>
</uni-card> </uni-card>
@ -109,11 +92,9 @@
</view> </view>
</view> </view>
<audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" /> <audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" />
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" <check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
:dataSource="$store.state.auditModel"></check-action> <view class="bottom-button">
<view class="bottom-button" v-if="!isPopupMode"> <button type="primary" class="bottom" v-if="isLoadOK&&tableKey==='1'&&!isAudit" @click="onTableBtnAgree">确认</button>
<button type="primary" class="bottom" v-if="isLoadOK&&tableKey==='1'&&!isAudit"
@click="onTableBtnAgree">确认</button>
<!-- <button type="primary" class="bottom" v-if='isLoadOK&&tableKey==1' @click="onTableBtnAgree">签到</button> --> <!-- <button type="primary" class="bottom" v-if='isLoadOK&&tableKey==1' @click="onTableBtnAgree">签到</button> -->
</view> </view>
</view> </view>
@ -149,45 +130,12 @@
components: { components: {
imageSign imageSign
}, },
// 添加 props 接收外部传入的参数
props: { props: {
// 工作票ID // 工作票ID
id: { id: {
type: [String, Number], type: [String, Number],
default: null default: null
}, },
// 是否为弹窗模式
isPopupMode: {
type: Boolean,
default: false
},
// 任务ID
taskID: {
type: String,
default: ''
},
// 表格标识
tableKey: {
type: [String, Number],
default: '0'
},
// 审批相关
okApi: {
type: String,
default: ''
},
refuseApi: {
type: String,
default: ''
},
approveID: {
type: String,
default: ''
},
isAudit: {
type: [String, Boolean],
default: false
}
}, },
data() { data() {
return { return {
@ -196,10 +144,10 @@
auditData: [], auditData: [],
ID: null, ID: null,
TaskID: null, TaskID: null,
tableKeyLocal: 0, tableKey: 0,
okApiLocal: '', okApi: '',
refuseApiLocal: '', refuseApi: '',
isAuditLocal: false, isAudit: false,
isLoadOK: false, isLoadOK: false,
userLists: [], userLists: [],
certificateLists: [], certificateLists: [],
@ -228,23 +176,13 @@
}, },
currentOperateUser: {}, currentOperateUser: {},
showPopup: false, showPopup: false,
// currentCertificate: {},
// showPopupCertificate: false,
} }
}, },
// 页面加载时调用（仅页面模式）
onLoad(opt) { onLoad(opt) {
// 如果是通过页面跳转打开，使用 onLoad 参数 this.handleGetJobGet(opt)
if (opt && opt.ID) {
this.handleGetJobGet({
ID: opt.ID,
taskID: opt.taskID || '',
tableKey: opt.tableKey || '0',
okApi: opt.okApi || '',
refuseApi: opt.refuseApi || '',
approveID: opt.approveID || '',
isAudit: opt.isAudit || false
})
this.loadAuditData() this.loadAuditData()
}
}, },
watch: { watch: {
// 监听 props 的 id 变化，用于弹窗模式 // 监听 props 的 id 变化，用于弹窗模式
@ -266,52 +204,29 @@
} }
} }
}, },
mounted() {
// 如果 props 有 id 且 onLoad 未处理，在这里处理
if (this.id && !this.ID) {
this.handleGetJobGet({
ID: this.id,
taskID: this.taskID || '',
tableKey: this.tableKey || '0',
okApi: this.okApi || '',
refuseApi: this.refuseApi || '',
approveID: this.approveID || '',
isAudit: this.isAudit || false
})
this.loadAuditData()
}
},
methods: { methods: {
handleGetJobGet(opt) { handleGetJobGet(opt) {
// 优先使用 props 传入的 id
const id = opt.ID || this.id;
if (!id) {
console.warn('jobShow: 未获取到 ID')
return
}
const orgId = uni.getStorageSync('orgId') const orgId = uni.getStorageSync('orgId')
const json = initFilter(orgId, "", "") const json = initFilter(orgId, "", "")
this.TaskID = opt.taskID || this.taskID || ''; this.TaskID = opt.taskID ? opt.taskID : '';
this.ID = id; this.ID = opt.ID ? opt.ID : '';
this.tableKeyLocal = opt.tableKey || this.tableKey || '0' this.tableKey = opt.tableKey ? opt.tableKey : '0'
this.okApiLocal = opt.okApi || this.okApi || '' this.okApi = opt.okApi
this.refuseApiLocal = opt.refuseApi || this.refuseApi || '' this.refuseApi = opt.refuseApi
this.ApproveID = opt.approveID || this.approveID || '' this.ApproveID = opt.ApproveID
this.isAuditLocal = opt.isAudit || this.isAudit || false this.isAudit = opt.isAudit
this.auditModel = {
if (this.isAuditLocal && this.TaskID) {
this.$store.commit('setAuditModel', {
...this.$store.state.auditModel, ...this.$store.state.auditModel,
TaskID: this.TaskID TaskID: opt.taskID ? opt.taskID : ''
})
} }
extendRule(json, 'ID', 1, opt.ID)
extendRule(json, 'ID', 1, id) // extendInclude(json, 'Nav_OperationStep');
// extendInclude(json, 'Nav_ApplyUser');
// extendInclude(json, 'Nav_MonitorUser');
// TODO: id 未获取
getRequest(json, "/FO/FOCrucialLicenseJob/FullGet").then(res => { getRequest(json, "/FO/FOCrucialLicenseJob/FullGet").then(res => {
this.dataModel = res this.dataModel = res
// 数据组装 - 作业人员 //数据组装
let strUserName = '' let strUserName = ''
if (res.Nav_CrucialLicensePerson && res.Nav_CrucialLicensePerson.length > 0) { if (res.Nav_CrucialLicensePerson && res.Nav_CrucialLicensePerson.length > 0) {
for (let i = 0; i < res.Nav_CrucialLicensePerson.length; i++) { for (let i = 0; i < res.Nav_CrucialLicensePerson.length; i++) {
@ -324,9 +239,10 @@
.Nav_CrucialLicensePerson[ .Nav_CrucialLicensePerson[
i].Nav_User.NAME; i].Nav_User.NAME;
} }
} }
} }
// 数据组装 - 安全确认 //数据组装
let strConfirms = '' let strConfirms = ''
if (res.Nav_SafeConfirms && res.Nav_SafeConfirms.length > 0) { if (res.Nav_SafeConfirms && res.Nav_SafeConfirms.length > 0) {
for (let i = 0; i < res.Nav_SafeConfirms.length; i++) { for (let i = 0; i < res.Nav_SafeConfirms.length; i++) {
@ -334,7 +250,7 @@
"." + res.Nav_SafeConfirms[i].NAME; "." + res.Nav_SafeConfirms[i].NAME;
} }
} }
// 数据组装 - 安全措施 //数据组装
let strMeasures = '' let strMeasures = ''
if (res.Nav_SafeMeasures && res.Nav_SafeMeasures.length > 0) { if (res.Nav_SafeMeasures && res.Nav_SafeMeasures.length > 0) {
for (let i = 0; i < res.Nav_SafeMeasures.length; i++) { for (let i = 0; i < res.Nav_SafeMeasures.length; i++) {
@ -342,7 +258,7 @@
"." + res.Nav_SafeMeasures[i].NAME; "." + res.Nav_SafeMeasures[i].NAME;
} }
} }
// 数据组装 - 后处理措施 //数据组装
let strDeals = '' let strDeals = ''
if (res.Nav_DealMeasures && res.Nav_DealMeasures.length > 0) { if (res.Nav_DealMeasures && res.Nav_DealMeasures.length > 0) {
for (let i = 0; i < res.Nav_DealMeasures.length; i++) { for (let i = 0; i < res.Nav_DealMeasures.length; i++) {
@ -361,9 +277,6 @@
this.dataModel.UserMeasures = strMeasures this.dataModel.UserMeasures = strMeasures
this.dataModel.UserDeals = strDeals this.dataModel.UserDeals = strDeals
this.isLoadOK = true this.isLoadOK = true
}).catch(err => {
console.error('获取工作票数据失败:', err)
uni.$showErrorInfo('获取工作票数据失败')
}) })
}, },
onTableBtnAgree() { onTableBtnAgree() {
@ -382,18 +295,19 @@
const json = initFilter(orgId, this.ID, "CODE", 1) const json = initFilter(orgId, this.ID, "CODE", 1)
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
getRequest(json, "/PF/Approve/GetApproveInfo").then(res => { getRequest(json, "/PF/Approve/GetApproveInfo").then(res => {
if (res && res.length > 0) { if (res) {
if (res[0].Nav_ApproveDetails && res[0].Nav_ApproveDetails.length > 0) { if (res && res[0].Nav_ApproveDetails.length > 0) {
res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM) res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM)
resolve(res)
} }
this.auditData = res this.auditData = res
resolve(res)
} else { } else {
this.auditData = [] uni.showToast({
resolve([]) title: '暂无审批数据',
icon: 'none'
})
} }
}).catch(err => { }).catch(err => {
console.error('获取审批数据失败:', err)
reject(err) reject(err)
}) })
}) })
@ -402,7 +316,11 @@
this.showAudit = false this.showAudit = false
}, },
async onNavigationBarButtonTap() { async onNavigationBarButtonTap() {
// const res = await this.loadAuditData()
// if (res) {
// this.auditData = res
this.showAudit = true this.showAudit = true
// }
} }
} }
} }
@ -442,11 +360,4 @@
.page-wrap>>>.u-upload__button { .page-wrap>>>.u-upload__button {
margin-bottom: 0; margin-bottom: 0;
} }
/* 弹窗模式下调整内边距，隐藏底部按钮区域 */
.page-wrap.is-popup {
padding: 0 0 16px 0;
}
</style> </style>