关联工作票
This commit is contained in:
parent
81f2b72a34
commit
0c2bbe81b1
@ -1,7 +1,7 @@
|
||||
<template>
|
||||
<view style="padding-bottom: 80px;">
|
||||
<view style="padding-bottom: 80px;" :class="{ 'is-popup': isPopupMode }">
|
||||
<view class="card">
|
||||
<view class="background"></view>
|
||||
<view class="background" v-if="!isPopupMode"></view>
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="model" class="demo-ruleForm">
|
||||
<view style="position: relative;">
|
||||
<view style="position: absolute;left: -10px;color: #3d4b70;top: -3px;">*</view>
|
||||
@ -258,9 +258,9 @@
|
||||
|
||||
</view>
|
||||
<audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" />
|
||||
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi" :dataSource="$store.state.auditModel"></check-action>
|
||||
<view class="bottom-button">
|
||||
<u-button type="primary" class="bottom" v-if="isLoadOK&&tableKey==='1'&&!isAudit" @click="onTableBtnAgree" color="#3d4b70">审阅</u-button>
|
||||
<check-action v-if="isLoadOK && tableKeyLocal === '1'&&isAuditLocal==='true' " :okApi="okApiLocal" :refuseApi="refuseApiLocal" :dataSource="$store.state.auditModel"></check-action>
|
||||
<view class="bottom-button" v-if="!isPopupMode">
|
||||
<u-button type="primary" class="bottom" v-if="isLoadOK&&tableKeyLocal==='1'&&!isAuditLocal" @click="onTableBtnAgree" color="#3d4b70">审阅</u-button>
|
||||
<!-- <button type="primary" class="bottom" v-if='isLoadOK&&tableKey==1' @click="onTableBtnAgree">签到</button> -->
|
||||
</view>
|
||||
</view>
|
||||
@ -287,6 +287,46 @@
|
||||
} from '../../../../services/common';
|
||||
|
||||
export default {
|
||||
// 添加 props 接收外部传入的参数
|
||||
props: {
|
||||
// 动火工作票ID
|
||||
id: {
|
||||
type: [String, Number],
|
||||
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() {
|
||||
return {
|
||||
imgurl: config.uni_app_web_api_url + ':5199',
|
||||
@ -341,10 +381,10 @@
|
||||
listPropUpload: ['PRE_SHIFT_MEETING_RECORD_ID'],
|
||||
listPropValUpload: [],
|
||||
TaskID: "",
|
||||
tableKey: '0',
|
||||
okApi: '',
|
||||
refuseApi: '',
|
||||
isAudit: false,
|
||||
tableKeyLocal: '0',
|
||||
okApiLocal: '',
|
||||
refuseApiLocal: '',
|
||||
isAuditLocal: false,
|
||||
isLoadOK: false,
|
||||
showAudit: false,
|
||||
auditData: [],
|
||||
@ -353,19 +393,71 @@
|
||||
enumsText: {} // 存储枚举文本列表（用于下拉选择等场景）
|
||||
}
|
||||
},
|
||||
// 页面加载时调用（仅页面模式）
|
||||
onLoad(option) {
|
||||
if (option && option.ID) {
|
||||
this.ID = option.ID;
|
||||
this.TaskID = option.taskID;
|
||||
this.tableKey = option.tableKey ? option.tableKey : '0'
|
||||
this.okApi = option.okApi
|
||||
this.refuseApi = option.refuseApi
|
||||
this.ApproveID = option.ApproveID
|
||||
this.isAudit = option.isAudit
|
||||
this.auditModel = {
|
||||
this.TaskID = option.taskID || '';
|
||||
this.tableKeyLocal = option.tableKey ? option.tableKey : '0'
|
||||
this.okApiLocal = option.okApi || ''
|
||||
this.refuseApiLocal = option.refuseApi || ''
|
||||
this.ApproveID = option.approveID || ''
|
||||
this.isAuditLocal = option.isAudit || false
|
||||
|
||||
if (this.isAuditLocal && this.TaskID) {
|
||||
this.$store.commit('setAuditModel', {
|
||||
...this.$store.state.auditModel,
|
||||
TaskID: option.taskID ? option.taskID : ''
|
||||
TaskID: this.TaskID
|
||||
})
|
||||
}
|
||||
|
||||
this.fetchEnums(['HMOperationTaskAuditEnum', 'SKEvaluateLevelEnum', 'FOJobStepEnum', 'FOYesOrNoEnum']);
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 监听 props 的 id 变化，用于弹窗模式
|
||||
id: {
|
||||
immediate: true,
|
||||
handler(val) {
|
||||
if (val && !this.ID) {
|
||||
this.ID = val;
|
||||
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']);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
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: {
|
||||
fetchEnums(enumNames) {
|
||||
@ -379,10 +471,16 @@
|
||||
this.enumsText = newd[1]
|
||||
this.loadData();
|
||||
this.loadAuditData()
|
||||
}).catch(err => {
|
||||
console.error('获取枚举数据失败:', err)
|
||||
})
|
||||
|
||||
},
|
||||
loadData() {
|
||||
if (!this.ID) {
|
||||
console.warn('jobFireShow: 未获取到 ID')
|
||||
return
|
||||
}
|
||||
const orgId = uni.getStorageSync('orgId')
|
||||
const json = initFilter(orgId, "", "CODE", 1)
|
||||
extendRule(json, 'ID', 1, this.ID);
|
||||
@ -398,6 +496,9 @@
|
||||
})
|
||||
}
|
||||
this.isLoadOK = true;
|
||||
}).catch(err => {
|
||||
console.error('获取动火工作票数据失败:', err)
|
||||
uni.$showErrorInfo('获取动火工作票数据失败')
|
||||
})
|
||||
},
|
||||
onTableBtnAgree() {
|
||||
@ -414,23 +515,25 @@
|
||||
|
||||
},
|
||||
loadAuditData() {
|
||||
if (!this.ID) {
|
||||
return Promise.resolve([])
|
||||
}
|
||||
const orgId = uni.getStorageSync('orgId')
|
||||
const json = initFilter(orgId, this.ID, "CODE", 1)
|
||||
return new Promise((resolve, reject) => {
|
||||
getRequest(json, "/PF/Approve/GetApproveInfo").then(res => {
|
||||
if (res) {
|
||||
if (res && res[0].Nav_ApproveDetails.length > 0) {
|
||||
if (res && res.length > 0) {
|
||||
if (res[0].Nav_ApproveDetails && res[0].Nav_ApproveDetails.length > 0) {
|
||||
res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM)
|
||||
resolve(res)
|
||||
}
|
||||
this.auditData = res
|
||||
resolve(res)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '暂无审批数据',
|
||||
icon: 'none'
|
||||
})
|
||||
this.auditData = []
|
||||
resolve([])
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('获取审批数据失败:', err)
|
||||
reject(err)
|
||||
})
|
||||
})
|
||||
@ -439,11 +542,7 @@
|
||||
this.showAudit = false
|
||||
},
|
||||
async onNavigationBarButtonTap() {
|
||||
// const res = await this.loadAuditData()
|
||||
// if (res) {
|
||||
// this.auditData = res
|
||||
this.showAudit = true
|
||||
// }
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
@ -454,4 +553,14 @@
|
||||
|
||||
<style>
|
||||
@import url("../../../../style/css/newTemplate.css");
|
||||
|
||||
/* 弹窗模式下隐藏底部按钮 */
|
||||
.is-popup .bottom-button {
|
||||
display: none !important;
|
||||
}
|
||||
|
||||
/* 弹窗模式下调整内边距 */
|
||||
.is-popup {
|
||||
padding-bottom: 16px !important;
|
||||
}
|
||||
</style>
|
||||
@ -1,5 +1,5 @@
|
||||
<template>
|
||||
<view class="page-wrap">
|
||||
<view class="page-wrap" :class="{ 'is-popup': isPopupMode }">
|
||||
<view class="card">
|
||||
<uni-card margin="0" :is-shadow="true">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="dataModel" ref="wForm"
|
||||
@ -111,7 +111,7 @@
|
||||
<audit-process :show="showAudit" @close="handleCloseAudit" :dataSource="auditData" />
|
||||
<check-action v-if="isLoadOK && tableKey === '1'&&isAudit==='true' " :okApi="okApi" :refuseApi="refuseApi"
|
||||
: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' @click="onTableBtnAgree">签到</button> -->
|
||||
@ -149,6 +149,46 @@
|
||||
components: {
|
||||
imageSign
|
||||
},
|
||||
// 添加 props 接收外部传入的参数
|
||||
props: {
|
||||
// 工作票ID
|
||||
id: {
|
||||
type: [String, Number],
|
||||
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() {
|
||||
return {
|
||||
OrgId: uni.getStorageSync('orgId'),
|
||||
@ -156,10 +196,10 @@
|
||||
auditData: [],
|
||||
ID: null,
|
||||
TaskID: null,
|
||||
tableKey: 0,
|
||||
okApi: '',
|
||||
refuseApi: '',
|
||||
isAudit: false,
|
||||
tableKeyLocal: 0,
|
||||
okApiLocal: '',
|
||||
refuseApiLocal: '',
|
||||
isAuditLocal: false,
|
||||
isLoadOK: false,
|
||||
userLists: [],
|
||||
certificateLists: [],
|
||||
@ -188,37 +228,90 @@
|
||||
},
|
||||
currentOperateUser: {},
|
||||
showPopup: false,
|
||||
// currentCertificate: {},
|
||||
// showPopupCertificate: false,
|
||||
}
|
||||
},
|
||||
// 页面加载时调用（仅页面模式）
|
||||
onLoad(opt) {
|
||||
this.handleGetJobGet(opt)
|
||||
// 如果是通过页面跳转打开，使用 onLoad 参数
|
||||
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()
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
// 监听 props 的 id 变化，用于弹窗模式
|
||||
id: {
|
||||
immediate: true,
|
||||
handler(val) {
|
||||
if (val && !this.ID) {
|
||||
this.handleGetJobGet({
|
||||
ID: val,
|
||||
taskID: this.taskID || '',
|
||||
tableKey: this.tableKey || '0',
|
||||
okApi: this.okApi || '',
|
||||
refuseApi: this.refuseApi || '',
|
||||
approveID: this.approveID || '',
|
||||
isAudit: this.isAudit || false
|
||||
})
|
||||
this.loadAuditData()
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
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: {
|
||||
handleGetJobGet(opt) {
|
||||
// 优先使用 props 传入的 id
|
||||
const id = opt.ID || this.id;
|
||||
if (!id) {
|
||||
console.warn('jobShow: 未获取到 ID')
|
||||
return
|
||||
}
|
||||
|
||||
const orgId = uni.getStorageSync('orgId')
|
||||
const json = initFilter(orgId, "", "")
|
||||
this.TaskID = opt.taskID ? opt.taskID : '';
|
||||
this.ID = opt.ID ? opt.ID : '';
|
||||
this.tableKey = opt.tableKey ? opt.tableKey : '0'
|
||||
this.okApi = opt.okApi
|
||||
this.refuseApi = opt.refuseApi
|
||||
this.ApproveID = opt.ApproveID
|
||||
this.isAudit = opt.isAudit
|
||||
this.auditModel = {
|
||||
this.TaskID = opt.taskID || this.taskID || '';
|
||||
this.ID = id;
|
||||
this.tableKeyLocal = opt.tableKey || this.tableKey || '0'
|
||||
this.okApiLocal = opt.okApi || this.okApi || ''
|
||||
this.refuseApiLocal = opt.refuseApi || this.refuseApi || ''
|
||||
this.ApproveID = opt.approveID || this.approveID || ''
|
||||
this.isAuditLocal = opt.isAudit || this.isAudit || false
|
||||
|
||||
if (this.isAuditLocal && this.TaskID) {
|
||||
this.$store.commit('setAuditModel', {
|
||||
...this.$store.state.auditModel,
|
||||
TaskID: opt.taskID ? opt.taskID : ''
|
||||
TaskID: this.TaskID
|
||||
})
|
||||
}
|
||||
extendRule(json, 'ID', 1, opt.ID)
|
||||
// extendInclude(json, 'Nav_OperationStep');
|
||||
// extendInclude(json, 'Nav_ApplyUser');
|
||||
// extendInclude(json, 'Nav_MonitorUser');
|
||||
// TODO: id 未获取
|
||||
|
||||
extendRule(json, 'ID', 1, id)
|
||||
|
||||
getRequest(json, "/FO/FOCrucialLicenseJob/FullGet").then(res => {
|
||||
this.dataModel = res
|
||||
//数据组装
|
||||
// 数据组装 - 作业人员
|
||||
let strUserName = ''
|
||||
if (res.Nav_CrucialLicensePerson && res.Nav_CrucialLicensePerson.length > 0) {
|
||||
for (let i = 0; i < res.Nav_CrucialLicensePerson.length; i++) {
|
||||
@ -231,10 +324,9 @@
|
||||
.Nav_CrucialLicensePerson[
|
||||
i].Nav_User.NAME;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
//数据组装
|
||||
// 数据组装 - 安全确认
|
||||
let strConfirms = ''
|
||||
if (res.Nav_SafeConfirms && res.Nav_SafeConfirms.length > 0) {
|
||||
for (let i = 0; i < res.Nav_SafeConfirms.length; i++) {
|
||||
@ -242,7 +334,7 @@
|
||||
"." + res.Nav_SafeConfirms[i].NAME;
|
||||
}
|
||||
}
|
||||
//数据组装
|
||||
// 数据组装 - 安全措施
|
||||
let strMeasures = ''
|
||||
if (res.Nav_SafeMeasures && res.Nav_SafeMeasures.length > 0) {
|
||||
for (let i = 0; i < res.Nav_SafeMeasures.length; i++) {
|
||||
@ -250,7 +342,7 @@
|
||||
"." + res.Nav_SafeMeasures[i].NAME;
|
||||
}
|
||||
}
|
||||
//数据组装
|
||||
// 数据组装 - 后处理措施
|
||||
let strDeals = ''
|
||||
if (res.Nav_DealMeasures && res.Nav_DealMeasures.length > 0) {
|
||||
for (let i = 0; i < res.Nav_DealMeasures.length; i++) {
|
||||
@ -269,6 +361,9 @@
|
||||
this.dataModel.UserMeasures = strMeasures
|
||||
this.dataModel.UserDeals = strDeals
|
||||
this.isLoadOK = true
|
||||
}).catch(err => {
|
||||
console.error('获取工作票数据失败:', err)
|
||||
uni.$showErrorInfo('获取工作票数据失败')
|
||||
})
|
||||
},
|
||||
onTableBtnAgree() {
|
||||
@ -287,19 +382,18 @@
|
||||
const json = initFilter(orgId, this.ID, "CODE", 1)
|
||||
return new Promise((resolve, reject) => {
|
||||
getRequest(json, "/PF/Approve/GetApproveInfo").then(res => {
|
||||
if (res) {
|
||||
if (res && res[0].Nav_ApproveDetails.length > 0) {
|
||||
if (res && res.length > 0) {
|
||||
if (res[0].Nav_ApproveDetails && res[0].Nav_ApproveDetails.length > 0) {
|
||||
res[0].Nav_ApproveDetails.sort((a, b) => a.NUM - b.NUM)
|
||||
resolve(res)
|
||||
}
|
||||
this.auditData = res
|
||||
resolve(res)
|
||||
} else {
|
||||
uni.showToast({
|
||||
title: '暂无审批数据',
|
||||
icon: 'none'
|
||||
})
|
||||
this.auditData = []
|
||||
resolve([])
|
||||
}
|
||||
}).catch(err => {
|
||||
console.error('获取审批数据失败:', err)
|
||||
reject(err)
|
||||
})
|
||||
})
|
||||
@ -308,11 +402,7 @@
|
||||
this.showAudit = false
|
||||
},
|
||||
async onNavigationBarButtonTap() {
|
||||
// const res = await this.loadAuditData()
|
||||
// if (res) {
|
||||
// this.auditData = res
|
||||
this.showAudit = true
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -352,4 +442,11 @@
|
||||
.page-wrap>>>.u-upload__button {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* 弹窗模式下调整内边距，隐藏底部按钮区域 */
|
||||
.page-wrap.is-popup {
|
||||
padding: 0 0 16px 0;
|
||||
}
|
||||
|
||||
|
||||
</style>
|
||||
@ -2,123 +2,66 @@
|
||||
<view class="page-wrap">
|
||||
<view class="card">
|
||||
<uni-card margin="0" :is-shadow="true">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="dataModel" :rules="rules"
|
||||
ref="wForm" errorType="border-bottom">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" :model="dataModel" :rules="rules" ref="wForm" errorType="border-bottom">
|
||||
|
||||
<u-form-item label="编号" prop="CODE" borderBottom>
|
||||
<u--input v-model="dataModel.CODE" disabled disabledColor="#ffffff" placeholder="请输入编号" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="作业名称" prop="stepName" borderBottom required>
|
||||
<u--input v-model="dataModel.Nav_OperationStep.NAME" disabled disabledColor="#ffffff" placeholder="请输入作业名称" border="none"
|
||||
inputAlign="right"></u--input>
|
||||
<u--input v-model="dataModel.Nav_OperationStep.NAME" disabled disabledColor="#ffffff" placeholder="请输入作业名称" border="none" inputAlign="right"></u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="作业地点" prop="JOB_LOCATION" borderBottom>
|
||||
<u--input v-model="dataModel.JOB_LOCATION" placeholder="请输入作业地点" border="none"
|
||||
inputAlign="right"></u--input>
|
||||
<u--input v-model="dataModel.JOB_LOCATION" placeholder="请输入作业地点" border="none" inputAlign="right"></u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="交底时间" prop="DISCLOSURE_DATE" borderBottom required
|
||||
@click="showCheckDate({ name: 'jobDate', dataIndex: index})">
|
||||
<u-form-item label="交底时间" prop="DISCLOSURE_DATE" borderBottom required @click="showCheckDate({ name: 'jobDate', dataIndex: index})">
|
||||
<u--input v-model="dataModel.DISCLOSURE_DATE" placeholder="请输入交底时间" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right"
|
||||
name="arrow-down"></u-icon>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down"></u-icon>
|
||||
</u-form-item>
|
||||
<u-form-item label="交底人" prop="disclosurePerson" borderBottom required>
|
||||
<u--input v-model="dataModel.Nav_DisclosurePerson.NAME" placeholder="请输入交底人" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
</u-form-item>
|
||||
<u-form-item label="交底内容" prop="DisclosureContent" borderBottom required class="demo-ruleForm">
|
||||
|
||||
</u-form-item>
|
||||
<u--textarea maxlength="1000" count v-model="dataModel.DisclosureContent" placeholder="请输入交底内容" border="none" inputAlign="left">
|
||||
</u--textarea>
|
||||
</u-form-item>
|
||||
|
||||
<view class="upload-title">附件：</view>
|
||||
<full-upload v-model="dataModel.Nav_Files"></full-upload>
|
||||
<u-form-item label="关联内部工作票" prop="disclosurePerson" borderBottom>
|
||||
<u--input v-model="(dataModel.Nav_JobName||{}).CODE" disabled disabledColor="#ffffff" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="info-circle" v-if="dataModel.Nav_JobName" @click="naviJob(dataModel.Nav_JobName.ID)"></u-icon>
|
||||
</u-form-item>
|
||||
<u-form-item label="关联动火工作票" prop="disclosurePerson" borderBottom>
|
||||
<u--input v-model="(dataModel.Nav_FireJob||{}).CODE" disabled disabledColor="#ffffff" border="none" inputAlign="right">
|
||||
</u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="info-circle" v-if="dataModel.Nav_FireJob" @click="naviJob(dataModel.Nav_FireJob.ID)"></u-icon>
|
||||
</u-form-item>
|
||||
</u--form>
|
||||
</uni-card>
|
||||
</view>
|
||||
<view class="sub-form" :style="{display:this.isVisble}">
|
||||
<view class="sub-form-wrap">
|
||||
<view class="sub-form-btns">
|
||||
<view class="sub-form-btn" @click="handleAddUser">
|
||||
<u-icon class="icon" name="plus-circle" color="#3c9cff" size="21"></u-icon>
|
||||
<u--text type="primary" text="新增作业人员"></u--text>
|
||||
<!-- ... 其他原有内容 ... -->
|
||||
|
||||
<!-- 使用 u-popup 弹窗展示 jobShow -->
|
||||
<u-popup :show="showJobPopup" @close="closeJobPopup" mode="center" :round="12" :closeable="true" :closeOnClickOverlay="true">
|
||||
<view class="job-popup-wrap">
|
||||
<view class="job-popup-header">
|
||||
<text class="job-popup-title">关联工作票详情</text>
|
||||
</view>
|
||||
<scroll-view class="job-popup-body" scroll-y :style="{ height: popupHeight + 'px' }">
|
||||
<!-- 使用 jobShow 组件，传入 id 属性 -->
|
||||
<job-show v-if="jobShowId&&dataModel.Nav_JobName" :id="jobShowId" ref="jobShowRef"></job-show>
|
||||
<job-fire-show :isPopupMode="true" v-if="jobShowId&&dataModel.Nav_FireJob" :id="jobShowId" ref="jobFireShowRef"></job-fire-show>
|
||||
</scroll-view>
|
||||
</view>
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
|
||||
ref="sForm1">
|
||||
<uni-collapse :border="false" accordion>
|
||||
<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
|
||||
v-for="(item, index) in dataModel.Nav_Person">
|
||||
<uni-collapse-item title-border="none" :show-arrow="false" :border="false" :open="true">
|
||||
<view slot="title" class="custom-collapse-title">
|
||||
<view class="down">
|
||||
<uni-icons type="bottom"></uni-icons>
|
||||
</view>
|
||||
<view class="text" v-if="item.Nav_User">{{index + 1 + '. ' +item.Nav_User.NAME}}</view>
|
||||
<view class="action" @click.stop>
|
||||
<u-icon @click="handleDelRowBefore(index)" class="icon" name="trash" color="#ff4d4f" size="21"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<u-form-item v-if="item.Nav_User" label="人员姓名" prop="personName" borderBottom
|
||||
@click="handleChangeUser(item['Nav_User'])">
|
||||
<u--input disabled disabledColor="#fff"
|
||||
v-model="item['Nav_User'].NAME" placeholder="请选择人员姓名"
|
||||
border="none" inputAlign="right"></u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down">
|
||||
</u-icon>
|
||||
</u-form-item>
|
||||
<u-form-item v-if="item.Nav_User" label="人员编号" prop="personNo" borderBottom>
|
||||
<u--input disabled disabledColor="#fff"
|
||||
v-model="item['Nav_User'].CODE" border="none"
|
||||
inputAlign="right"></u--input>
|
||||
</u-form-item>
|
||||
</uni-collapse-item>
|
||||
</uni-card>
|
||||
</uni-collapse>
|
||||
</u--form>
|
||||
</view>
|
||||
</view>
|
||||
<view class="sub-form" :style="{display:this.isVisbleOut}">
|
||||
<view class="sub-form-wrap">
|
||||
<u--form labelPosition="left" labelWidth="auto" labelAlign="center" errorType="border-bottom"
|
||||
ref="sForm1">
|
||||
<uni-collapse :border="false" accordion>
|
||||
<uni-card style="margin-bottom: 16px;" margin="0" spacing="0" :is-shadow="false"
|
||||
v-for="(item, index) in dataModel.Nav_Person">
|
||||
<uni-collapse-item title-border="none" :show-arrow="false" :border="false" :open="true">
|
||||
<view slot="title" class="custom-collapse-title">
|
||||
<view class="down">
|
||||
<uni-icons type="bottom"></uni-icons>
|
||||
</view>
|
||||
<view class="text" v-if="item.Nav_RelatedUser">{{index + 1 + '. ' +item.Nav_RelatedUser.NAME}}</view>
|
||||
<view class="action" @click.stop>
|
||||
<u-icon @click="handleDelRowBefore(index)" class="icon" name="trash" color="#ff4d4f" size="21"></u-icon>
|
||||
</view>
|
||||
</view>
|
||||
<u-form-item label="人员姓名" v-if="item.Nav_RelatedUser" prop="personName" borderBottom>
|
||||
<u--input disabled disabledColor="#fff"
|
||||
v-model="item['Nav_RelatedUser'].NAME" placeholder="请选择人员姓名"
|
||||
border="none" inputAlign="right"></u--input>
|
||||
<u-icon style="margin-left: 4px;" slot="right" name="arrow-down">
|
||||
</u-icon>
|
||||
</u-form-item>
|
||||
</uni-collapse-item>
|
||||
</uni-card>
|
||||
</uni-collapse>
|
||||
</u--form>
|
||||
</view>
|
||||
</view>
|
||||
<u-modal :show="showDelModalIndex >= 0" @confirm="confirmDel" title="确认删除？"></u-modal>
|
||||
<query-selector :show="showPopup" :total="curTotal" :lists="userLists" :defaultValue="currentOperateUser.NAME"
|
||||
@close="handleClosePopup" @search="handleSearchUser" @select="handleSelectedUser" />
|
||||
<u-picker :show="comPickerInfo.showSheet" :columns="comPickerInfo.columns" @confirm="onConfirmPicker"
|
||||
@close="closePicker" @cancel="closePicker" keyName="NAME"></u-picker>
|
||||
<u-datetime-picker :show="dateTimePickerInfo.showCheckDate" mode="datetime"
|
||||
v-model='dateTimePickerInfo.defaultDateTime' :formatter="formatter" @confirm="handleCheckDate"
|
||||
@close="dateTimePickerInfo.showCheckDate = false;"
|
||||
@cancel="dateTimePickerInfo.showCheckDate = false;"></u-datetime-picker>
|
||||
</u-popup>
|
||||
|
||||
<!-- ... 其他原有组件 ... -->
|
||||
|
||||
<view class="bottom-button">
|
||||
<button type="primary" @click="submit">提交</button>
|
||||
</view>
|
||||
@ -147,8 +90,16 @@
|
||||
saveTechRecord
|
||||
} from '../../../../services/apply/FOServices/FOServices.js'
|
||||
import config from '../../../../config/common'
|
||||
// 引入 jobShow 组件
|
||||
import jobShow from './jobShow.vue'
|
||||
import jobFireShow from './../FO/jobFireShow.vue'
|
||||
|
||||
export default {
|
||||
// 注册组件
|
||||
components: {
|
||||
jobShow,
|
||||
jobFireShow
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
ID: '',
|
||||
@ -161,6 +112,10 @@
|
||||
tableKey: 0,
|
||||
formatter: null,
|
||||
userLists: [],
|
||||
// 弹窗控制
|
||||
showJobPopup: false,
|
||||
jobShowId: null,
|
||||
popupHeight: 500, // 弹窗内容高度
|
||||
dataModel: {
|
||||
CODE: '',
|
||||
NAME: '',
|
||||
@ -222,8 +177,34 @@
|
||||
},
|
||||
onLoad(opt) {
|
||||
this.handleGetTechGet(opt)
|
||||
// 计算弹窗高度
|
||||
this.calcPopupHeight()
|
||||
},
|
||||
methods: {
|
||||
// 计算弹窗高度
|
||||
calcPopupHeight() {
|
||||
const systemInfo = uni.getSystemInfoSync()
|
||||
const windowHeight = systemInfo.windowHeight
|
||||
// 弹窗占屏幕高度的 70%，减去头部高度
|
||||
this.popupHeight = Math.floor(windowHeight * 0.7) - 60
|
||||
},
|
||||
// 打开工作票弹窗
|
||||
naviJob(id) {
|
||||
if (!id) {
|
||||
uni.$showErrorInfo('未找到关联的工作票')
|
||||
return
|
||||
}
|
||||
this.jobShowId = id
|
||||
this.showJobPopup = true
|
||||
},
|
||||
// 关闭弹窗
|
||||
closeJobPopup() {
|
||||
this.showJobPopup = false
|
||||
// 延迟清空 id，避免组件销毁问题
|
||||
setTimeout(() => {
|
||||
this.jobShowId = null
|
||||
}, 300)
|
||||
},
|
||||
handleGetTechGet(opt) {
|
||||
this.TaskID = opt.taskID ? opt.taskID : '';
|
||||
this.ID = opt.ID ? opt.ID : '';
|
||||
@ -244,217 +225,27 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
if(res.IS_OUTSOURCE ==true && res.RELATED_ID != null)
|
||||
{
|
||||
if (res.IS_OUTSOURCE == true && res.RELATED_ID != null) {
|
||||
this.isVisble = 'none'
|
||||
this.isVisbleOut = 'block'
|
||||
}else
|
||||
{
|
||||
} else {
|
||||
this.isVisble = 'block'
|
||||
this.isVisbleOut = 'none'
|
||||
}
|
||||
this.isLoadOK = true
|
||||
})
|
||||
},
|
||||
//显示时间控件
|
||||
showCheckDate(p) {
|
||||
if(p.name ==='jobDate')
|
||||
{
|
||||
if (this.dataModel.DISCLOSURE_DATE == null) {
|
||||
this.dataModel.DISCLOSURE_DATE = uni.$u.timeFormat(new Date(),
|
||||
'yyyy-mm-dd hh:MM')
|
||||
}
|
||||
this.dateTimePickerInfo = {
|
||||
showCheckDate: true,
|
||||
dataIndex: p.dataIndex,
|
||||
defaultDateTime: this.dataModel.DISCLOSURE_DATE,
|
||||
name:p.name
|
||||
}
|
||||
}
|
||||
},
|
||||
//隐藏控件 显示时间
|
||||
handleCheckDate(e) {
|
||||
// let v = uni.$u.timeFormat(e.value, 'yyyy-mm-dd')
|
||||
const {
|
||||
name,
|
||||
dataIndex
|
||||
} = this.dateTimePickerInfo
|
||||
if(name ==='jobDate')
|
||||
{
|
||||
// this.dataModel.jobDate = uni.$u.timeFormat(e.value,
|
||||
// 'yyyy-mm-dd')
|
||||
this.dataModel.DISCLOSURE_DATE = uni.$u.timeFormat(e.value,
|
||||
'yyyy-mm-dd hh:MM')
|
||||
}
|
||||
this.dateTimePickerInfo.showCheckDate = false
|
||||
},
|
||||
handleSearchUser(val, pageIndex) {
|
||||
const orgId = uni.getStorageSync('orgId')
|
||||
const json = initFilter(orgId, "", "NAME", '', pageIndex)
|
||||
extendInclude(json, "Nav_Department")
|
||||
extendRule(json, 'ENABLE_STATUS', 1, '0')
|
||||
if (val !== 'init') {
|
||||
const tempGroup = initFilterGroup(false);
|
||||
extendGroupRule(tempGroup, 'NAME', 9, val)
|
||||
extendFilterGroup(json, tempGroup);
|
||||
}
|
||||
json.Limit = 20
|
||||
if (pageIndex) {
|
||||
json.Start = (pageIndex - 1) * 20;
|
||||
}
|
||||
// ... 其他原有方法保持不变 ...
|
||||
|
||||
getUserLists(json).then(res => {
|
||||
if (res.IsSuccessful) {
|
||||
this.userLists = res.Data.map(i => {
|
||||
return {
|
||||
...i,
|
||||
name: i.NAME,
|
||||
code: i.CODE
|
||||
}
|
||||
})
|
||||
this.curTotal = res.TotalCount
|
||||
}
|
||||
})
|
||||
},
|
||||
handleSelectedUser(val) {
|
||||
this.showPopup = false
|
||||
this.lists = []
|
||||
const result = this.dataModel.Nav_Person.map((obj) => {
|
||||
const {
|
||||
Nav_User
|
||||
} = obj
|
||||
if (Nav_User.CODE === this.currentOperateUser.CODE) {
|
||||
return Object.assign({}, obj, {
|
||||
Nav_User: val,
|
||||
})
|
||||
}
|
||||
return obj
|
||||
})
|
||||
|
||||
this.dataModel.Nav_Person = result
|
||||
},
|
||||
handleClosePopup() {
|
||||
this.showPopup = false
|
||||
},
|
||||
handleChangeUser(user) {
|
||||
this.currentOperateUser = user
|
||||
this.showPopup = true
|
||||
this.handleSearchUser('init')
|
||||
},
|
||||
handleAddUser() {
|
||||
const identifyUser = JSON.parse(JSON.stringify(this.subDataModel.Nav_Person))
|
||||
this.dataModel.Nav_Person.unshift(identifyUser)
|
||||
// this.dataModel.Nav_Person.unshift(this.subDataModel)
|
||||
},
|
||||
handleDelRowBefore(index) {
|
||||
this.showDelModalIndex = index
|
||||
},
|
||||
confirmDel() {
|
||||
this.dataModel.Nav_Person.splice(this.showDelModalIndex, 1)
|
||||
this.showDelModalIndex = undefined
|
||||
},
|
||||
onConfirmPicker(e) {
|
||||
const {
|
||||
name,
|
||||
dataIndex,
|
||||
formIndex
|
||||
} = this.comPickerInfo
|
||||
if (formIndex === "sForm1") {
|
||||
const result = this.dataModel.Nav_Person.map((obj, index) => {
|
||||
if (index === dataIndex) {
|
||||
return Object.assign({}, obj, {
|
||||
// ATTEND_STATUS: e.value[0].ID,
|
||||
})
|
||||
}
|
||||
return obj
|
||||
})
|
||||
this.dataModel.Nav_Person = result
|
||||
} else {
|
||||
|
||||
}
|
||||
this.comPickerInfo.showSheet = false
|
||||
},
|
||||
closePicker() {
|
||||
this.comPickerInfo = {
|
||||
showSheet: false,
|
||||
columns: [],
|
||||
title: '',
|
||||
name: '',
|
||||
dataIndex: undefined,
|
||||
formIndex: undefined
|
||||
}
|
||||
},
|
||||
handleDelAction({
|
||||
name
|
||||
}) {
|
||||
uni.showModal({
|
||||
title: '是否删除数据？',
|
||||
success: (res) => {
|
||||
if (res.confirm) {
|
||||
|
||||
}
|
||||
}
|
||||
})
|
||||
},
|
||||
submit() {
|
||||
const ele = this.$refs
|
||||
this.dataModel.PUBLISH = "SaveAndNotify";
|
||||
if(this.TaskID !== null)
|
||||
{this.dataModel.TaskID = this.TaskID;}
|
||||
this.dataModel.ID = this.ID?this.ID:guid();
|
||||
this.dataModel.ORG_ID =uni.getStorageSync('orgId')
|
||||
ele['wForm'].validate().then(res => {
|
||||
saveTechRecord(this.dataModel).then(res => {
|
||||
uni.$showMsgFunc('操作成功!', () => {
|
||||
// if (this.tableKey == null || this.tableKey == 0) {
|
||||
// uni.navigateTo({
|
||||
// url: 'techRecord'
|
||||
// })
|
||||
// } else {
|
||||
uni.navigateBack()
|
||||
// }
|
||||
}, 'success', 1000)
|
||||
})
|
||||
}).catch(err => {
|
||||
uni.$showErrorInfo('请检查必填项，必填项不能为空')
|
||||
})
|
||||
},
|
||||
uploadFilePromise(url) {
|
||||
const appInfoData = uni.getStorageSync('appInfo')
|
||||
const userId = appInfoData?.User?.ID || ''
|
||||
const orgId = uni.getStorageSync('orgId')
|
||||
const tenant = uni.getStorageSync('Tenant') || ''
|
||||
const remoteUrl = config.serviceHost('/PF/File/UploadFile')
|
||||
return new Promise((resolve, reject) => {
|
||||
uni.uploadFile({
|
||||
url: remoteUrl,
|
||||
filePath: url,
|
||||
fileList: url,
|
||||
name: 'file',
|
||||
formData: {
|
||||
OrgId: orgId
|
||||
},
|
||||
header: {
|
||||
Tenant: tenant,
|
||||
userid: userId
|
||||
},
|
||||
success: (res) => {
|
||||
if (res.statusCode === 200) {
|
||||
const uploadResult = JSON.parse(res.data)
|
||||
if (uploadResult.IsSuccessful) {
|
||||
resolve(uploadResult.Data)
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
})
|
||||
},
|
||||
// 注意：原来的 naviJob 方法已被替换为弹窗版本
|
||||
// 如果还需要保留跳转功能，可以重命名为 naviJobToPage
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
@import url("../../../../style/css/editTemplate.css");
|
||||
|
||||
.page-wrap {
|
||||
padding: 16px 16px 166px;
|
||||
}
|
||||
@ -466,10 +257,12 @@
|
||||
.sub-form {
|
||||
margin-bottom: 16px;
|
||||
}
|
||||
|
||||
.demo-ruleForm>>>.u-textarea {
|
||||
padding: 9px 9px 25px 9px;
|
||||
/* padding: 6px 9px; */
|
||||
}
|
||||
|
||||
.bottom-button {
|
||||
position: fixed;
|
||||
bottom: 0;
|
||||
@ -491,4 +284,42 @@
|
||||
.page-wrap>>>.u-upload__button {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
/* 弹窗样式 */
|
||||
.job-popup-wrap {
|
||||
width: 92vw;
|
||||
max-width: 600px;
|
||||
background: #ffffff;
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.job-popup-header {
|
||||
padding: 16px 20px;
|
||||
border-bottom: 1px solid #f0f0f0;
|
||||
flex-shrink: 0;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.job-popup-title {
|
||||
font-size: 18px;
|
||||
font-weight: 600;
|
||||
color: #333333;
|
||||
}
|
||||
|
||||
.job-popup-body {
|
||||
/* padding: 0 16px 16px; */
|
||||
}
|
||||
|
||||
/* 弹窗内部滚动条样式 */
|
||||
.job-popup-body::-webkit-scrollbar {
|
||||
width: 4px;
|
||||
}
|
||||
|
||||
.job-popup-body::-webkit-scrollbar-thumb {
|
||||
background: #ddd;
|
||||
border-radius: 4px;
|
||||
}
|
||||
</style>
|
||||
Loading…
Reference in New Issue
Block a user