From dbfa630021b25516dee45ae71b4277bcf4aa6aa4 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 22 七月 2025 20:42:48 +0800
Subject: [PATCH] 1、技术状态鉴定申请功能及流程 2、技术鉴定工单审批中检查明细展示限制条件调整
---
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 33 ++++++++++++++-------------------
1 files changed, 14 insertions(+), 19 deletions(-)
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index a7a7904..20a3606 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -1,5 +1,5 @@
<template>
- <j-modal :title="title" :width="1200" :visible="visible" :confirmLoading="confirmLoading"
+ <j-modal :title="title" :visible="visible" :confirmLoading="confirmLoading"
:okButtonProps="{ class:{'jee-hidden': disableSubmit} }" fullscreen @ok="handleOk"
@cancel="handleCancel" centered cancelText="鍏抽棴">
<a-spin :spinning="spinning">
@@ -53,10 +53,10 @@
<a-tabs :active-key="activeTabKey" @change="handleTabChange">
<a-tab-pane :key="1" tab="瀹夊叏瑁呯疆妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.safetyEquipmentCheckList.length>0">
- <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source :height="300"
+ v-if="(disableSubmit&&detail.safetyEquipmentCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='safety_equipment_check'||selectShenpiData.taskDefKey=='safety_equipment_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
+ <j-vxe-table ref="editableDetailTable1" rowNumber bordered alwaysEdit keep-source
:dataSource="detail.safetyEquipmentCheckList"
:columns="detail.safetyEquipmentCheckColumns">
<template v-slot:safetyEquipmentCheckResult="props">
@@ -93,11 +93,11 @@
</a-tab-pane>
<a-tab-pane :key="2" tab="璁惧绮惧害妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.precisionCheckList.length>0">
+ v-if="(disableSubmit&&detail.precisionCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='equipment_precision_check'||selectShenpiData.taskDefKey=='equipment_precision_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
<j-vxe-table ref="editableDetailTable2" rowNumber bordered
- alwaysEdit keep-source :height="300"
+ alwaysEdit keep-source
:dataSource="detail.precisionCheckList" :columns="detail.precisionCheckColumns">
<template v-slot:precisionCheckResult="props">
<a-input-number v-model="props.row.precisionCheckResult"
@@ -132,11 +132,11 @@
</a-tab-pane>
<a-tab-pane :key="3" tab="鍏朵粬妫�鏌�" forceRender
- v-if="disableSubmit||
- selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm')||
- model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&detail.otherCheckList.length>0">
+ v-if="(disableSubmit&&detail.otherCheckList.length>0)||
+ (selectShenpiData.taskDefKey&&(selectShenpiData.taskDefKey=='other_check'||selectShenpiData.taskDefKey=='other_check_confirm'))||
+ (model.evaluationStatus&&model.evaluationStatus!='UNDER_EVALUATION'&&model.evaluationStatus!='WAIT_EVALUATION')">
<j-vxe-table ref="editableDetailTable3" rowNumber bordered
- alwaysEdit keep-source :height="300"
+ alwaysEdit keep-source
:dataSource="detail.otherCheckList" :columns="detail.otherCheckColumns">
<template v-slot:otherCheckResult="props">
<a-textarea v-model="props.row.otherCheckResult" :rows="1"
@@ -317,15 +317,13 @@
import { downFile, getAction, httpAction } from '@/api/manage'
import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
import { JVXETypes } from '@comp/jeecg/JVxeTable'
- import MaintenanceEquipmentSelect from '@views/eam/equipment/modules/MaintenanceEquipmentSelect'
import TechnicalStatusEquipmentSelect from '../../../eam/equipment/modules/TechnicalStatusEquipmentSelect'
export default {
name: 'TechnicalStatusEvaluationApprovalModal',
mixins: [JVxeTableModelMixin],
components: {
- TechnicalStatusEquipmentSelect,
- MaintenanceEquipmentSelect
+ TechnicalStatusEquipmentSelect
},
props: {
selectShenpiData: {
@@ -529,7 +527,6 @@
*/
async handleDetail(record) {
this.model = {}
- this.visible = true
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.handleTabToFirstTable()
this.getBasicInformationByApi(record)
@@ -541,7 +538,6 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
recordDetail(record) {
- this.visible = true
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.model = Object.assign({}, record)
this.handleTabToFirstTable()
@@ -695,7 +691,6 @@
this.$nextTick(() => {
for (let index = 1; index <= 3; index++) {
if (this.$refs['editableDetailTable' + index]) {
- console.log('index----------', index)
this.activeTabKey = index
break
}
--
Gitblit v1.9.3