src/views/eam/maintenance/EamThirdMaintenanceOrderList.vue
@@ -79,7 +79,7 @@ <eamThirdMaintenanceOrder-modal ref="modalForm" @ok="modalFormOk"/> <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectThirdMaintenanceData"/> :selectShenpiData="selectedRowData"/> <!--工单变更弹窗--> <eam-third-maintenance-change-modal ref="orderChangeModal" @ok="modalFormOk"/> @@ -93,8 +93,7 @@ import { deleteAction, getAction } from '@api/manage' import ThirdMaintenanceApprovalModal from '@views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue' import EamThirdMaintenanceChangeModal from '@views/eam/technical/modules/EamThirdMaintenanceChangeModal.vue' import EamThirdMaintenanceChangeModal from './modules/EamThirdMaintenanceChangeModal.vue' export default { name: 'EamThirdMaintenanceOrderList', @@ -115,7 +114,7 @@ return { description: '设备三级保养管理页面', disableMixinCreated: true, selectThirdMaintenanceData: {}, selectedRowData: {}, // 表头 columns: [ { @@ -285,6 +284,7 @@ dataIndex: 'action', align: 'center', fixed: 'right', width: 200, scopedSlots: { customRender: 'action' } } this.columns = [...this.columns, operationColumn] @@ -356,11 +356,11 @@ * @param record */ handleDetail(record) { this.selectThirdMaintenanceData = Object.assign({}, record) this.selectedRowData = Object.assign({}, record) this.$refs.thirdMaintenanceApprovalModal.title = '详情' this.$refs.thirdMaintenanceApprovalModal.visible = true this.$refs.thirdMaintenanceApprovalModal.disableSubmit = true this.$refs.thirdMaintenanceApprovalModal.recordDetail(record) this.$refs.thirdMaintenanceApprovalModal.handleDetail(record) }, onMaintenanceDateChange(dateString) { src/views/eam/maintenance/modules/EamThirdMaintenanceOrderModal.vue
@@ -13,7 +13,8 @@ <a-col :span="8"> <a-form-model-item prop="equipmentId" label="统一编码"> <maintenance-equipment-select placeholder="请输入统一编码或名称搜索" v-model="model.equipmentId" maintenanceCategory="THIRD_MAINTENANCE" @autocompleteForm="autocompleteForm"/> maintenanceCategory="THIRD_MAINTENANCE" @autocompleteForm="autocompleteForm"/> </a-form-model-item> </a-col> <a-col :span="8"> @@ -87,12 +88,8 @@ confirmLoading: false, spinning: false, validatorRules: { equipmentId: [ { required: true, message: '请输入统一编码或名称搜索' } ], maintenanceDate: [ { required: true, message: '请选择计划保养日期!' } ] equipmentId: [{ required: true, message: '请输入统一编码或名称搜索', trigger: 'change' }], maintenanceDate: [{ required: true, message: '请选择计划保养日期', trigger: 'change' }] }, url: { add: '/eam/thirdMaintenanceOrder/add', src/views/eam/repair/EamRepairOrderList.vue
@@ -276,7 +276,7 @@ this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = '详情' this.$refs.repairOrderApprovalModal.disableSubmit = true this.$refs.repairOrderApprovalModal.recordDetail(record) this.$refs.repairOrderApprovalModal.handleDetail(record) } } } src/views/eam/repair/modules/EamRepairOrderList/EamRepairOrderModal.vue
@@ -5,14 +5,24 @@ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-row> <a-col :span="customSpan"> <a-form-model-item label="维修开始时间" prop="actualStartTime" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-model-item label="统一编码"> <lx-search-equipment-select v-model="model.equipmentId" disabled/> </a-form-model-item> </a-col> <a-col :span="customSpan"> <a-form-model-item label="工单号"> <a-input v-model="model.repairCode" readOnly/> </a-form-model-item> </a-col> <a-col :span="customSpan"> <a-form-model-item label="维修开始时间" prop="actualStartTime"> <a-date-picker show-time v-model="model.actualStartTime" :allowClear="false" value-format="YYYY-MM-DD HH:mm:ss" style="width:100%"/> </a-form-model-item> </a-col> <a-col :span="customSpan"> <a-form-model-item label="维修结束时间" prop="actualEndTime" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-form-model-item label="维修结束时间" prop="actualEndTime"> <a-date-picker show-time v-model="model.actualEndTime" :allowClear="false" value-format="YYYY-MM-DD HH:mm:ss" style="width:100%"/> src/views/eam/technical/EamTechnicalStatusEvaluationOrderChangeList.vue
@@ -231,12 +231,12 @@ description: res.message }) that.loadData() that.loading = false } else { that.$notification.warning({ message: '消息', description: res.message }) that.loading = false } }) }, src/views/eam/technical/EamTechnicalStatusEvaluationOrderList.vue
@@ -129,6 +129,12 @@ fixed: 'left' }, { title: '鉴定状态', align: 'center', dataIndex: 'evaluationStatus_dictText', fixed: 'left' }, { title: '工单号', align: 'center', dataIndex: 'orderNum' @@ -162,11 +168,6 @@ title: '领取人', align: 'center', dataIndex: 'evaluator_dictText' }, { title: '鉴定状态', align: 'center', dataIndex: 'evaluationStatus_dictText' }, { title: '创建方式', @@ -263,7 +264,8 @@ dataIndex: 'action', align: 'center', scopedSlots: { customRender: 'action' }, fixed: 'right' fixed: 'right', width: 200 } ], url: { @@ -316,7 +318,7 @@ this.$refs.technicalStatusEvaluationApprovalModal.title = '详情' this.$refs.technicalStatusEvaluationApprovalModal.visible = true this.$refs.technicalStatusEvaluationApprovalModal.disableSubmit = true this.$refs.technicalStatusEvaluationApprovalModal.recordDetail(record) this.$refs.technicalStatusEvaluationApprovalModal.handleDetail(record) } } } src/views/flowable/workflow/FlowCompleted.vue
@@ -39,18 +39,77 @@ </span> </a-table> <!--三保工单--> <third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"/> <!--停用申请--> <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal" :selectShenpiData="selectedRowData"/> <!--技术状态鉴定申请--> <technical-status-evaluation-application-approval-modal ref="technicalStatusEvaluationApplicationApprovalModal" :selectShenpiData="selectedRowData"/> <!--技术状态变更申请--> <technical-status-change-approval-modal ref="technicalStatusChangeApprovalModal" :selectShenpiData="selectedRowData"/> <!--技术鉴定工单变更--> <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal" :selectShenpiData="selectedRowData"/> <!--技术鉴定工单--> <technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"/> <!--二保工单--> <second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"/> <!--点检工单--> <inspection-order-handle ref="inspectionOrderHandle" :selectShenpiData="selectedRowData"/> <!--维修工单--> <repair-order-approval-modal ref="repairOrderApprovalModal" :selectShenpiData="selectedRowData"/> <!--保养规范--> <maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" :selectShenpiData="selectedRowData"/> <!--三保变更--> <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal" :selectShenpiData="selectedRowData"/> </a-card> </template> <script> import { JeecgListMixin } from '@/mixins/JeecgListMixin' import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal' import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal' import TechnicalStatusEvaluationApplicationApprovalModal from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal' import TechnicalStatusChangeApprovalModal from './TechnicalStatus/TechnicalStatusChangeApprovalModal' import TechnicalStatusEvaluationApprovalModal from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal' import TechnicalStatusEvaluationOrderChangeApprovalModal from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal' import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal' import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle' import RepairOrderApprovalModal from './repairOrder/RepairOrderApprovalModal' import MaintenanceStandardApprovalModal from './MaintenanceStandard/MaintenanceStandardApprovalModal' import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal' export default { name: 'FlowCompleted', mixins: [JeecgListMixin], components: { ThirdMaintenanceOrderChangeApprovalModal, MaintenanceStandardApprovalModal, RepairOrderApprovalModal, InspectionOrderHandle, SecondMaintenanceApprovalModal, TechnicalStatusEvaluationOrderChangeApprovalModal, TechnicalStatusEvaluationApprovalModal, TechnicalStatusChangeApprovalModal, TechnicalStatusEvaluationApplicationApprovalModal, TechnicalStatusDeactivateApprovalModal, ThirdMaintenanceApprovalModal }, data() { @@ -116,19 +175,41 @@ }, methods: { handleDetail(record) { console.log('点击了详情') console.log('record----->', record) let processType = this.splitProcessType(record.category) console.log('processType--->', processType) switch (processType) { case 'third_maintenance': this.handleThirdMaintenance(record) break case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS': this.handleTechnicalStatusDeactivate(record) break case 'TECHNICAL_STATUS_EVALUATION_APPLY_PROCESS': this.handleTechnicalStatusEvaluationApply(record) break case 'TECHNICAL_STATUS_CHANGE_PROCESS': this.handleTechnicalStatusChange(record) break case 'EVALUATION_ORDER_CHANGE_PROCESS': this.handleEvaluationOrderChange(record) break case 'TECHNICAL_STATUS_EVALUATION': this.handleTechnicalStatusEvaluation(record) break case 'second_maintenance': this.handleSecondMaintenance(record) break case 'sbdjApproval': this.handInspectionOrder(record) break case 'eam_repair': case 'eam_repair_order': this.handleRepairOrder(record) break case 'third_maintenance': this.handleThirdMaintenance(record) case 'maintenance_standard': this.handleMaintenanceStandard(record) break case 'third_maintenance_change': this.handleThirdMaintenanceOrderChange(record) break default: alert('没找到该流程') @@ -148,44 +229,123 @@ }, /** * 点击点检流程详情时触发 * 点击停用加工设备申请分类流程审批时触发 * @param record */ handInspectionOrder(record) { console.log('record----->', record) this.selectInspectionOrderXqData = Object.assign({}, record) const { todoUsers_dictText, procInsId, description, taskName } = this.selectInspectionOrderXqData this.selectInspectionOrderXqData.assignee_dictText = todoUsers_dictText this.selectInspectionOrderXqData.procInstId = procInsId this.selectInspectionOrderXqData.processInstanceId = procInsId this.selectInspectionOrderXqData.title = description this.$refs.modalFormInspectionOrderXq.visible = true this.$refs.modalFormInspectionOrderXq.title = taskName this.$refs.modalFormInspectionOrderXq.disableSubmit = true this.$refs.modalFormInspectionOrderXq.getAllApproveData({ ...record, procInstId: procInsId, processInstanceId: procInsId }) this.$refs.modalFormInspectionOrderXq.getBasicInformation(record) handleTechnicalStatusDeactivate(record) { this.selectedRowData = Object.assign({}, record) this.$refs.technicalStatusDeactivateApprovalModal.visible = true this.$refs.technicalStatusDeactivateApprovalModal.title = record.name this.$refs.technicalStatusDeactivateApprovalModal.disableSubmit = true this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record) }, /** * 点击设备维修分类流程详情时触发 * 点击技术状态鉴定申请分类流程审批时触发 * @param record */ handleTechnicalStatusEvaluationApply(record) { this.selectedRowData = Object.assign({}, record) this.$refs.technicalStatusEvaluationApplicationApprovalModal.visible = true this.$refs.technicalStatusEvaluationApplicationApprovalModal.title = record.name this.$refs.technicalStatusEvaluationApplicationApprovalModal.disableSubmit = true this.$refs.technicalStatusEvaluationApplicationApprovalModal.handleApprove(record) }, /** * 点击技术状态变更分类流程审批时触发 * @param record */ handleTechnicalStatusChange(record) { this.selectedRowData = Object.assign({}, record) this.$refs.technicalStatusChangeApprovalModal.visible = true this.$refs.technicalStatusChangeApprovalModal.title = record.name this.$refs.technicalStatusChangeApprovalModal.disableSubmit = true this.$refs.technicalStatusChangeApprovalModal.handleApprove(record) }, /** * 点击技术鉴定工单变更流程执行审批时触发 * @param record */ handleEvaluationOrderChange(record) { this.selectedRowData = Object.assign({}, record) this.$refs.evaluationOrderChangeApprovalModal.visible = true this.$refs.evaluationOrderChangeApprovalModal.title = record.name this.$refs.evaluationOrderChangeApprovalModal.disableSubmit = true this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record) }, /** * 点击技术状态鉴定流程执行审批时触发 * @param record */ handleTechnicalStatusEvaluation(record) { this.selectedRowData = Object.assign({}, record) this.$refs.technicalStatusApprovalModal.visible = true this.$refs.technicalStatusApprovalModal.title = record.name this.$refs.technicalStatusApprovalModal.disableSubmit = true this.$refs.technicalStatusApprovalModal.handleApprove(record) }, /** * 点击二保流程执行审批时触发 * @param record */ handleSecondMaintenance(record) { this.selectedRowData = Object.assign({}, record) this.$refs.secondMaintenanceApprovalModal.visible = true this.$refs.secondMaintenanceApprovalModal.title = record.name this.$refs.secondMaintenanceApprovalModal.disableSubmit = true this.$refs.secondMaintenanceApprovalModal.handleApprove(record) }, /** * 点击点检工单流程执行审批时触发 * @param record */ handInspectionOrder(record) { this.selectedRowData = Object.assign({}, record) this.$refs.inspectionOrderHandle.visible = true this.$refs.inspectionOrderHandle.title = record.name this.$refs.inspectionOrderHandle.disableSubmit = true this.$refs.inspectionOrderHandle.handleApprove(record) }, /** * 点击设备维修分类流程执行审批时触发 * @param record */ handleRepairOrder(record) { this.selectRepairOrderData = Object.assign({}, record) const { procInsId, taskName } = this.selectRepairOrderData this.selectedRowData = Object.assign({}, record) this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = record.name this.$refs.repairOrderApprovalModal.disableSubmit = true this.$refs.repairOrderApprovalModal.title = taskName this.$refs.modalFormInspectionOrderXq.getAllApproveData({ ...record, procInstId: procInsId, processInstanceId: procInsId }) this.$refs.repairOrderApprovalModal.getBasicInformation(record) this.$refs.repairOrderApprovalModal.handleApprove(record) }, /** * 点击保养规范分类流程执行审批时触发 * @param record */ handleMaintenanceStandard(record) { this.selectedRowData = Object.assign({}, record) this.$refs.maintenanceStandardApprovalModal.visible = true this.$refs.maintenanceStandardApprovalModal.title = record.name this.$refs.maintenanceStandardApprovalModal.disableSubmit = true this.$refs.maintenanceStandardApprovalModal.handleApprove(record) }, /** * 点击三保变更分类流程审批时触发 * @param record */ handleThirdMaintenanceOrderChange(record) { this.selectedRowData = Object.assign({}, record) this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name this.$refs.thirdMaintenanceOrderChangeApprovalModal.disableSubmit = true this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record) }, splitProcessType(title) { src/views/flowable/workflow/FlowTodo.vue
@@ -120,6 +120,11 @@ <technical-status-deactivate-approval-modal ref="technicalStatusDeactivateApprovalModal" :selectShenpiData="selectedRowData" @modalFormOk="modalFormOk"/> <!--三保变更--> <third-maintenance-order-change-approval-modal ref="thirdMaintenanceOrderChangeApprovalModal" :selectShenpiData="selectedRowData" @modalFormOk="modalFormOk"/> </a-card> </template> @@ -139,11 +144,13 @@ import TechnicalStatusEvaluationApplicationApprovalModal from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal' import TechnicalStatusDeactivateApprovalModal from './TechnicalStatus/TechnicalStatusDeactivateApprovalModal' import ThirdMaintenanceOrderChangeApprovalModal from './thirdMaintenance/ThirdMaintenanceOrderChangeApprovalModal' export default { name: 'FlowTodo', mixins: [JeecgListMixin], components: { ThirdMaintenanceOrderChangeApprovalModal, TechnicalStatusDeactivateApprovalModal, TechnicalStatusEvaluationApplicationApprovalModal, TechnicalStatusChangeApprovalModal, @@ -266,6 +273,9 @@ case 'TECHNICAL_STATUS_DEACTIVATE_PROCESS': this.handleTechnicalStatusDeactivate(record) break case 'third_maintenance_change': this.handleThirdMaintenanceOrderChange(record) break default: alert('没找到该流程') } @@ -290,9 +300,13 @@ this.selectedRowData = Object.assign({}, record) this.$refs.technicalStatusApprovalModal.visible = true this.$refs.technicalStatusApprovalModal.title = record.name this.$refs.technicalStatusApprovalModal.handleDetail(record) this.$refs.technicalStatusApprovalModal.handleApprove(record) }, /** * 点击技术鉴定工单变更流程执行审批时触发 * @param record */ handleEvaluationOrderChange(record) { this.selectedRowData = Object.assign({}, record) this.$refs.evaluationOrderChangeApprovalModal.visible = true @@ -330,7 +344,7 @@ this.selectedRowData = Object.assign({}, record) this.$refs.thirdMaintenanceApprovalModal.visible = true this.$refs.thirdMaintenanceApprovalModal.title = record.name this.$refs.thirdMaintenanceApprovalModal.handleDetail(record) this.$refs.thirdMaintenanceApprovalModal.handleApprove(record) }, /** @@ -341,7 +355,7 @@ this.selectedRowData = Object.assign({}, record) this.$refs.repairOrderApprovalModal.visible = true this.$refs.repairOrderApprovalModal.title = record.name this.$refs.repairOrderApprovalModal.handleDetail(record) this.$refs.repairOrderApprovalModal.handleApprove(record) }, /** @@ -377,6 +391,17 @@ this.$refs.technicalStatusDeactivateApprovalModal.handleApprove(record) }, /** * 点击三保变更分类流程审批时触发 * @param record */ handleThirdMaintenanceOrderChange(record) { this.selectedRowData = Object.assign({}, record) this.$refs.thirdMaintenanceOrderChangeApprovalModal.visible = true this.$refs.thirdMaintenanceOrderChangeApprovalModal.title = record.name this.$refs.thirdMaintenanceOrderChangeApprovalModal.handleApprove(record) }, batchHandle() { const categorySet = new Set(this.selectionRows.map(item => item.category)) const nameSet = new Set(this.selectionRows.map(item => item.name)) src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApplicationApprovalModal.vue
@@ -6,7 +6,7 @@ <a-form-model ref="form" :model="model" :rules="validatorRules" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-row id="outer-row" :gutter="24"> <!--左侧基础信息列--> <a-col :span="!disableSubmit?8:14" class="scroll-col"> <a-col :span="selectShenpiData.procInstId?8:14" class="scroll-col"> <a-tabs> <a-tab-pane tab="基础信息"> <a-row> @@ -21,11 +21,6 @@ @autocompleteForm="autocompleteForm" disabled/> </a-form-model-item> </a-col> </a-row> <a-row> </a-row> <a-row> @@ -68,7 +63,7 @@ </a-col> <!--右侧审批列--> <a-col :span="!disableSubmit?6:10" class="scroll-col"> <a-col :span="selectShenpiData.procInstId?6:10" class="scroll-col"> <a-tabs v-if="displayDepartHeaderFlag"> <a-tab-pane tab="使用单位室级领导确认"> <a-row> src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -525,7 +525,7 @@ * 主页面点击执行审批时触发 * @param record 主页面列表行记录 */ async handleDetail(record) { async handleApprove(record) { this.model = {} this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = [] this.handleTabToFirstTable() @@ -537,7 +537,7 @@ * 主页面点击详情时触发 * @param record 主页面列表行记录 */ recordDetail(record) { handleDetail(record) { this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = [] this.model = Object.assign({}, record) this.handleTabToFirstTable() src/views/flowable/workflow/repairOrder/RepairOrderApprovalModal.vue
@@ -10,6 +10,16 @@ <a-tab-pane tab="基础信息"> <a-row> <a-col :span="12"> <a-form-model-item label="统一编码" :labelCol="labelCol" :wrapperCol="wrapperCol"> <lx-search-equipment-select v-model="model.equipmentId" disabled/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item label="工单号" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-input v-model="model.repairCode" readOnly/> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item label="维修开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol"> <a-input v-model="model.actualStartTime" readOnly/> </a-form-model-item> @@ -188,7 +198,7 @@ * 主页面点击执行审批时触发 * @param record 主页面列表行记录 */ async handleDetail(record) { async handleApprove(record) { this.spinning = true this.activeTabKey = '1' this.model = {} @@ -201,7 +211,7 @@ * 主页面点击详情时触发 * @param record 主页面列表行记录 */ recordDetail(record) { handleDetail(record) { this.spinning = true this.activeTabKey = '1' this.model = Object.assign({}, record) src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -66,11 +66,11 @@ </a-col> <a-col class="scroll-col" :span="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'?10:16"> :span="model.maintenanceStatus&&model.maintenanceStatus!=='WAIT_MAINTENANCE'&&model.maintenanceStatus!=='UNDER_MAINTENANCE'?10:16"> <a-tabs :active-key="activeTabKey" @change="handleTabChange"> <a-tab-pane :key="1" tab="操作工" v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task'|| (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"> v-if="(selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='operator_task')|| (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"> <j-vxe-table ref="editableDetailTable1" :rowNumber="false" rowSelection bordered alwaysEdit keep-source :dataSource="detail.operatorMaintenanceList" :columns="detail.columns" @@ -78,25 +78,25 @@ <template v-slot:maintenanceResult="props"> <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result" placeholder="请选择保养结果" :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')" :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')" @change="handleInspectionResultSelectChange($event,props.row)" style="width: 100%"/> </template> <template v-slot:exceptionDescription="props"> <a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请输入异常描述':''" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请输入异常描述':''" :disabled="disableSubmit|| (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') || (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"/> </template> <template v-slot:reportFlag="props"> <j-dict-select-tag v-model="props.row.reportFlag" dictCode="yn" style="width: 100%" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请选择异常是否报修':''" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请选择异常是否报修':''" :disabled="disableSubmit || (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') || (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"/> </template> @@ -104,8 +104,8 @@ </a-tab-pane> <a-tab-pane :key="2" tab="维修工" v-if="selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task'|| (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')"> v-if="(selectShenpiData.taskDefKey&&selectShenpiData.taskDefKey==='maintenance_task')|| (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')"> <j-vxe-table ref="editableDetailTable2" :rowNumber="false" rowSelection bordered alwaysEdit kee-source :dataSource="detail.repairerMaintenanceList" :columns="detail.columns" @@ -113,26 +113,26 @@ <template v-slot:maintenanceResult="props"> <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="maintenance_result" placeholder="请选择保养结果" :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE')" :disabled="disableSubmit||(model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE')" @change="handleInspectionResultSelectChange($event,props.row)" style="width: 100%"/> </template> <template v-slot:exceptionDescription="props"> <a-textarea :rows="1" :autoSize="false" v-model="props.row.exceptionDescription" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请输入异常描述':''" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请输入异常描述':''" :disabled="disableSubmit || (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') || (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"/> </template> <template v-slot:reportFlag="props"> <j-dict-select-tag v-model="props.row.reportFlag" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!='1'?'请选择异常是否报修':''" :placeholder="props.row.maintenanceResult&&props.row.maintenanceResult!=='1'?'请选择异常是否报修':''" dictCode="yn" style="width: 100%" :disabled="disableSubmit|| (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') || (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') || !props.row.maintenanceResult || props.row.maintenanceResult === '1'"/> </template> @@ -148,7 +148,7 @@ <a-button v-if="activeTabKey!=='3'" :disabled="disableSubmit || (model.maintenanceStatus&&model.maintenanceStatus!='UNDER_MAINTENANCE') || (model.maintenanceStatus&&model.maintenanceStatus!=='UNDER_MAINTENANCE') || (activeTabKey==='1'&&selectedOperatorMaintenanceRowKeys.length === 0)|| (activeTabKey==='2'&&selectedRepairerMaintenanceRowKeys.length === 0)" slot="tabBarExtraContent" @@ -159,7 +159,7 @@ <!--右侧审批列--> <a-col :span="6" class="scroll-col" v-if="model.maintenanceStatus&&model.maintenanceStatus!='WAIT_MAINTENANCE'&&model.maintenanceStatus!='UNDER_MAINTENANCE'"> v-if="model.maintenanceStatus&&model.maintenanceStatus!=='WAIT_MAINTENANCE'&&model.maintenanceStatus!=='UNDER_MAINTENANCE'"> <a-tabs v-if="displayAdminConfirmFlag"> <a-tab-pane tab="管理员确认"> <a-row> @@ -167,19 +167,19 @@ <a-form-model-item prop="manageUserResult" label="确认类型"> <j-dict-select-tag type='radio' v-model='model.manageUserResult' dictCode='approve_reject' placeholder="请选择确认类型" :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/> :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/> </a-form-model-item> </a-col> <a-col :span="24"> <a-form-model-item label="问题描述"> <a-textarea placeholder="请描述问题" v-model='model.problemDescription' :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/> :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/> </a-form-model-item> </a-col> <a-col :span="24"> <a-form-model-item label="处理措施描述"> <a-textarea placeholder="请描述处理措施" v-model="model.dealDescription" :disabled="disableSubmit || model.maintenanceStatus!='WAIT_ADMIN_CONFIRM'"/> :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_ADMIN_CONFIRM'"/> </a-form-model-item> </a-col> </a-row> @@ -193,13 +193,13 @@ <a-form-model-item prop="inspectorResult" label="确认类型"> <j-dict-select-tag type='radio' v-model='model.inspectorResult' dictCode='approve_reject' placeholder="请选择确认类型" :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/> :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/> </a-form-model-item> </a-col> <a-col :span="24"> <a-form-model-item label="确认意见"> <a-textarea placeholder="请输入意见" v-model="model.inspectConfirmComment" :disabled="disableSubmit || model.maintenanceStatus!='WAIT_INSPECTOR_CONFIRM'"/> :disabled="disableSubmit || model.maintenanceStatus!=='WAIT_INSPECTOR_CONFIRM'"/> </a-form-model-item> </a-col> </a-row> @@ -499,7 +499,7 @@ handleTabToFirstTable() { this.$nextTick(() => { console.log('taskDefKey', this.selectShenpiData.taskDefKey) if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey) this.activeTabKey = 1 if ((this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'operator_task') || !this.selectShenpiData.taskDefKey || (this.model.maintenanceStatus !== 'UNDER_MAINTENANCE')) this.activeTabKey = 1 else if (this.selectShenpiData.taskDefKey && this.selectShenpiData.taskDefKey === 'maintenance_task') this.activeTabKey = 2 }) }, src/views/flowable/workflow/thirdMaintenance/ThirdMaintenanceApprovalModal.vue
@@ -382,7 +382,7 @@ * 主页面点击执行审批时触发 * @param record 主页面列表行记录 */ async handleDetail(record) { async handleApprove(record) { this.model = {} this.detail.dataSource = [] this.getBasicInformationByApi(record) @@ -393,7 +393,7 @@ * 主页面点击详情时触发 * @param record 主页面列表行记录 */ recordDetail(record) { handleDetail(record) { this.spinning = true this.detail.dataSource = [] this.model = Object.assign({
