fix:修改bug
This commit is contained in:
大黑
parent
94897e9265
commit
4e1b7168a5
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -315,7 +315,7 @@ export default {
|
||||
},
|
||||
//获取待办列表
|
||||
GET_TODO_LIST: {
|
||||
url: '/custom/todoTaskPojo/selectByresPersonPage',
|
||||
url: '/custom/todoTaskPojo/selectByresPersonTodoPage',
|
||||
method: 'post'
|
||||
},
|
||||
//获取创建人待办
|
||||
@ -433,4 +433,8 @@ export default {
|
||||
url: '/custom/todoTaskPojo/selectByPageByCreate',
|
||||
method: 'post'
|
||||
},
|
||||
GET_MY_DONE_LIST: {
|
||||
url: '/custom/todoTaskPojo/selectByresPersonCompletedPage',
|
||||
method: 'post'
|
||||
},
|
||||
}
|
||||
|
||||
@ -166,7 +166,7 @@
|
||||
</div>
|
||||
<div class="config-item">
|
||||
<span class="config-label">Y轴(参数):</span>
|
||||
<el-select v-model="chart.yAxisParam" multiple collapse-tags clearable @change="updateChart(index)">
|
||||
<el-select v-model="chart.yAxisParam" multiple collapse-tags clearable class="y-axis-param-select" @change="updateChart(index)">
|
||||
<el-option
|
||||
v-for="option in yAxisParamOptions"
|
||||
:key="option.value"
|
||||
@ -246,6 +246,7 @@
|
||||
:visible.sync="formulaDialogVisible"
|
||||
width="600px"
|
||||
:close-on-click-modal="true"
|
||||
:modal="false"
|
||||
class="formula-dialog"
|
||||
>
|
||||
<div class="formula-dialog-content">
|
||||
@ -939,7 +940,13 @@ export default {
|
||||
type: 'category',
|
||||
data: xAxisData,
|
||||
name: xAxisLabel,
|
||||
nameTextStyle: {
|
||||
color: '#000'
|
||||
},
|
||||
boundaryGap: false,
|
||||
axisLabel: {
|
||||
color: '#000'
|
||||
},
|
||||
axisLine: {
|
||||
lineStyle: {
|
||||
color: '#DCDFE6'
|
||||
@ -962,7 +969,8 @@ export default {
|
||||
max: chart.yAxisMax !== null && chart.yAxisMax !== '' ? chart.yAxisMax : 100,
|
||||
interval: 20,
|
||||
axisLabel: {
|
||||
formatter: '{value}%'
|
||||
formatter: '{value}%',
|
||||
color: '#606266'
|
||||
},
|
||||
axisLine: {
|
||||
lineStyle: {
|
||||
@ -1595,6 +1603,9 @@ export default {
|
||||
width: 150px;
|
||||
height: 32px;
|
||||
}
|
||||
::v-deep .y-axis-param-select {
|
||||
width: 250px;
|
||||
}
|
||||
::v-deep .el-select .el-input__inner {
|
||||
height: 32px;
|
||||
}
|
||||
|
||||
@ -18,12 +18,11 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div v-if="detail.statusDescription === '审核中'" class="header-right">
|
||||
<div v-if="shouldShowButtons" class="header-right">
|
||||
<el-button size="small" @click="handleReject">
|
||||
退回
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="detail.statusDescription === '审核中'"
|
||||
type="primary"
|
||||
size="small"
|
||||
@click="handleSubmit"
|
||||
@ -156,7 +155,7 @@
|
||||
<el-dialog
|
||||
:title="approvalDialogTitle"
|
||||
:visible.sync="approvalDialogVisible"
|
||||
width="500px"
|
||||
width="600px"
|
||||
:close-on-click-modal="false"
|
||||
append-to-body
|
||||
@close="handleApprovalDialogClose"
|
||||
@ -338,6 +337,58 @@ export default {
|
||||
|
||||
return nodes
|
||||
},
|
||||
// 判断是否应该显示操作按钮（退回、提交）
|
||||
shouldShowButtons() {
|
||||
if (!this.timelineNodes || this.timelineNodes.length === 0) {
|
||||
return false
|
||||
}
|
||||
|
||||
// 检查是否有拒绝节点（REJECT、REFUSE）
|
||||
const hasReject = this.timelineNodes.some(
|
||||
(node) =>
|
||||
node.result === 'REJECT' ||
|
||||
node.status === 'REJECT' ||
|
||||
node.result === 'REFUSE' ||
|
||||
node.status === 'REFUSE'
|
||||
)
|
||||
if (hasReject) {
|
||||
return false // 如果有拒绝，不显示按钮
|
||||
}
|
||||
|
||||
// 获取所有非 INITIATE 的节点
|
||||
const nonInitiateNodes = this.timelineNodes.filter(
|
||||
(node) => node.result !== 'INITIATE' && node.status !== 'INITIATE'
|
||||
)
|
||||
|
||||
// 如果所有非 INITIATE 节点都是 PASS 或 APPROVE，则表示已完成
|
||||
if (nonInitiateNodes.length > 0) {
|
||||
const allPassed = nonInitiateNodes.every(
|
||||
(node) =>
|
||||
node.result === 'PASS' ||
|
||||
node.status === 'PASS' ||
|
||||
node.result === 'APPROVE' ||
|
||||
node.status === 'APPROVE'
|
||||
)
|
||||
if (allPassed) {
|
||||
return false // 如果所有节点都已完成，不显示按钮
|
||||
}
|
||||
}
|
||||
|
||||
// 检查是否有进行中的节点（APPROVING、STAY、PENDING、WAITING）
|
||||
const hasApproving = this.timelineNodes.some(
|
||||
(node) =>
|
||||
node.result === 'APPROVING' ||
|
||||
node.status === 'APPROVING' ||
|
||||
node.result === 'STAY' ||
|
||||
node.status === 'STAY' ||
|
||||
node.result === 'PENDING' ||
|
||||
node.status === 'PENDING' ||
|
||||
node.result === 'WAITING' ||
|
||||
node.status === 'WAITING'
|
||||
)
|
||||
|
||||
return hasApproving // 如果有进行中的节点，显示按钮
|
||||
},
|
||||
approvalFormRules() {
|
||||
return {
|
||||
comment: [{ required: true, message: '请输入意见', trigger: 'blur' }]
|
||||
@ -666,7 +717,8 @@ export default {
|
||||
// 调用审批接口
|
||||
const request = {
|
||||
...api.HANDLE_ENGINE_CHECK,
|
||||
params: submitData
|
||||
params: submitData,
|
||||
disableSuccessMsg: true
|
||||
}
|
||||
|
||||
this.approvalSubmitting = true
|
||||
|
||||
@ -427,6 +427,10 @@ export default {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
lastUpdatedBy: {
|
||||
type: String,
|
||||
default: ''
|
||||
},
|
||||
// 机型详情信息（包含 modelName 和 projectNumber）
|
||||
detail: {
|
||||
type: Object,
|
||||
@ -2416,6 +2420,7 @@ export default {
|
||||
// 构建请求参数
|
||||
const params = {
|
||||
engineModelID: modelID,
|
||||
userID: this.lastUpdatedBy || getUserId(),
|
||||
subsystemParts: subsystemTypes // 格式：["子系统名称-参数类型"]
|
||||
}
|
||||
|
||||
|
||||
@ -321,11 +321,10 @@ export default {
|
||||
},
|
||||
loadData() {
|
||||
const request = {
|
||||
...api.GET_TODO_LIST,
|
||||
...api.GET_MY_DONE_LIST,
|
||||
params: {
|
||||
page: this.pagination.currentPage,
|
||||
size: this.pagination.pageSize,
|
||||
isFinished: 1,
|
||||
personId: getUserId()
|
||||
},
|
||||
disableSuccessMsg: true
|
||||
|
||||
@ -81,6 +81,7 @@
|
||||
:dispatch-type="dispatchType"
|
||||
:responsible-person-id="responsiblePersonId"
|
||||
:filled-by="filledBy"
|
||||
:last-updated-by="lastUpdatedBy"
|
||||
class="engine-detail-wrapper"
|
||||
@back="handleBackFromDetail"
|
||||
/>
|
||||
@ -250,6 +251,7 @@ export default {
|
||||
this.isDispatchMode = false
|
||||
this.dispatchType = 'todo'
|
||||
this.filledBy = row.ownerId || ''
|
||||
this.lastUpdatedBy = row.lastUpdatedBy || ''
|
||||
this.responsiblePersonId = ''
|
||||
} else if (isResponsibleDispatchMode) {
|
||||
this.currentEngineDetail = { ...row, id: row.modelId }
|
||||
@ -258,6 +260,7 @@ export default {
|
||||
this.dispatchType = 'update_param'
|
||||
this.responsiblePersonId = row.ownerId || ''
|
||||
this.filledBy = ''
|
||||
this.lastUpdatedBy = row.lastUpdatedBy || ''
|
||||
} else {
|
||||
// 其他分发模式：分发责任人模式（显示责任人列）
|
||||
this.isDispatchMode = true
|
||||
|
||||
@ -844,6 +844,7 @@ export default {
|
||||
}))
|
||||
// 构建提交数据
|
||||
const submitData = {
|
||||
processTitle: this.launchProcessTitle,
|
||||
reportId: reportId,
|
||||
userId: getUserId(),
|
||||
nodeList: nodeList
|
||||
|
||||
@ -70,6 +70,7 @@
|
||||
:detail="currentEngineDetail"
|
||||
:visible="showEngineCheck"
|
||||
:engine-type="engineType"
|
||||
@refresh="handleBackFromCheck"
|
||||
class="engine-check-wrapper"
|
||||
@close="handleBackFromCheck"
|
||||
/>
|
||||
@ -293,7 +294,6 @@ export default {
|
||||
params: {
|
||||
page: this.pagination.currentPage,
|
||||
size: this.pagination.pageSize,
|
||||
isFinished: 0,
|
||||
personId: getUserId()
|
||||
},
|
||||
disableSuccessMsg: true
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user