From 0bb231490d19e16c27e373274bcb6e4feb6b400b Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 15 四月 2025 17:24:30 +0800 Subject: [PATCH] art: 设备管理-周保-列表,详情修改 --- src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 44 +++++++++++++++++++++++++++++++++----------- 1 files changed, 33 insertions(+), 11 deletions(-) diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue index ef11321..5303ee7 100644 --- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue +++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue @@ -4,6 +4,7 @@ :width="1200" :visible="visible" :confirmLoading="confirmLoading" + :okButtonProps="{ class:{'jee-hidden': disableSubmit} }" switchFullscreen @ok="handleOk" @cancel="handleCancel" @@ -89,25 +90,25 @@ <template v-slot:maintenanceResult="props"> <j-dict-select-tag v-model="props.row.maintenanceResult" dictCode="eam_inspection_result" placeholder="璇烽�夋嫨淇濆吇缁撴灉" - :disabled="confirmDisable" + :disabled="disableSubmit || confirmDisable" @change="handleInspectionResultSelectChange($event,props.row)" style="width: 100%" /> </template> <template v-slot:exceptionDescription="props"> <a-textarea style="height: 32px" v-model="props.row.exceptionDescription" - :disabled="confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'" /> + :disabled="disableSubmit || confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'" /> </template> <template v-slot:reportFlag="props"> <j-dict-select-tag v-model="props.row.reportFlag" - :disabled="confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'" + :disabled="disableSubmit || confirmDisable || !props.row.maintenanceResult || props.row.maintenanceResult === '1'" dictCode="yn" style="width: 100%" /> </template> </j-vxe-table> </a-tab-pane> - <a-tab-pane key='2' tab='娴佺▼鑺傜偣'> + <a-tab-pane v-if="!disableSubmit" key='2' tab='娴佺▼鑺傜偣'> <a-card :bordered="false"> <a-timeline> <a-timeline-item v-for="(item,index) in taskData" :key="index"> @@ -122,7 +123,7 @@ </a-timeline> </a-card> </a-tab-pane> - <a-button v-if="selectedRowKeys.length>0" slot="tabBarExtraContent" type="primary" + <a-button v-if="!disableSubmit || selectedRowKeys.length > 0" slot="tabBarExtraContent" type="primary" @click="handleSelectAllInspectionResult">淇濆吇姝e父 </a-button> </a-tabs> @@ -133,12 +134,12 @@ <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmDealType" label="纭绫诲瀷"> - <j-dict-select-tag type='radio' v-model='model.confirmDealType' dictCode='approved_rejected' placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="initialAcceptanceDisable" /> + <j-dict-select-tag type='radio' v-model='model.confirmDealType' dictCode='approved_rejected' placeholder="璇烽�夋嫨澶勭悊绫诲瀷" :disabled="disableSubmit || initialAcceptanceDisable" /> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmComment" label="纭鎰忚"> - <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment" :disabled="initialAcceptanceDisable" /> + <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.confirmComment" :disabled="disableSubmit || initialAcceptanceDisable" /> </a-form-model-item> </a-col> </a-row> @@ -149,14 +150,14 @@ <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceComment" label="鍒濋獙鏀舵剰瑙�"> - <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.initialAcceptanceComment" :disabled="finalAcceptanceDisable" /> + <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.initialAcceptanceComment" :disabled="disableSubmit || finalAcceptanceDisable" /> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult" label="鍒濋獙鏀堕檮浠�"> <lx-upload :returnUrl="false" :isMultiple="true" - :disabled="finalAcceptanceDisable" + :disabled="disableSubmit || finalAcceptanceDisable" v-model="model.initialAcceptanceFilesResult" /> </a-form-model-item> </a-col> @@ -168,14 +169,14 @@ <a-row :gutter="24"> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceComment" label="缁堥獙鏀舵剰瑙�"> - <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.finalAcceptanceComment" :disabled="completionDisable" /> + <a-textarea placeholder="璇疯緭鍏ユ剰瑙�" v-model="model.finalAcceptanceComment" :disabled="disableSubmit || completionDisable" /> </a-form-model-item> </a-col> <a-col :span="12"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult" label="缁堥獙鏀堕檮浠�"> <lx-upload :returnUrl="false" :isMultiple="true" - :disabled="completionDisable" + :disabled="disableSubmit || completionDisable" v-model="model.finalAcceptanceFilesResult" /> </a-form-model-item> </a-col> @@ -249,6 +250,7 @@ userSelect: '/eam/user_select/list', queryHisTaskList: '/assign/flow/queryHisTaskList', }, + disableSubmit: false, taskData: [], isDisplayBmp: false, showBmpButtonLoading: false, @@ -377,6 +379,26 @@ await this.loadDetail(item.dataId) this.loading = false }, + recordDetail(record) { + this.loading = true + this.visible = true + this.detail.dataSource = [] + this.model = Object.assign({}, record) + if(this.model.imageFiles) { + let obj = JSON.parse(this.model.imageFiles); + this.model.imageFilesResult = [...obj]; + } + if(this.model.initialAcceptanceFiles) { + let obj = JSON.parse(this.model.initialAcceptanceFiles); + this.model.initialAcceptanceFilesResult = [...obj]; + } + if(this.model.finalAcceptanceFiles) { + let obj = JSON.parse(this.model.finalAcceptanceFiles); + this.model.finalAcceptanceFilesResult = [...obj]; + } + this.loadDetail(record.id) + this.loading = false + }, close() { this.$emit('close') this.visible = false -- Gitblit v1.9.3