From ea1497cbb477825522c79cff1b7e1f2e96003ad2 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期一, 02 六月 2025 08:58:58 +0800 Subject: [PATCH] art: 工作流-待办列表调整 --- src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue | 38 ++++++++++++++++++++++++++++++-------- 1 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue index e853f82..5db633f 100644 --- a/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue +++ b/src/views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal.vue @@ -61,11 +61,12 @@ </a-form-model-item> </a-row> <a-row :gutter="24"> - <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" prop="remark" label="淇濆吇鍥剧墖"> + <a-form-model-item :labelCol="labelColLong" :wrapperCol="wrapperColLong" label="淇濆吇鍥剧墖"> <lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :disabled="confirmDisable" + :number="3" v-model="model.imageFilesResult"/> </a-form-model-item> </a-row> @@ -126,7 +127,7 @@ </a-card> </a-tab-pane> <a-tab-pane key='3' tab='娴佺▼鍥�'> - <img :src="imageSrc" alt="Fetched Image"/>--> + <img :src="imageSrc" alt="Fetched Image"/> </a-tab-pane> </template> <a-button v-if="!disableSubmit &&!confirmDisable&& selectedRowKeys.length > 0" slot="tabBarExtraContent" @@ -163,13 +164,24 @@ :disabled="disableSubmit || finalAcceptanceDisable"/> </a-form-model-item> </a-col> - <a-col :span="12"> + <a-col :span="6"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="initialAcceptanceFilesResult" label="鍒濋獙鏀堕檮浠�"> <lx-upload :returnUrl="false" :isMultiple="true" :disabled="disableSubmit || finalAcceptanceDisable" v-model="model.initialAcceptanceFilesResult"/> + </a-form-model-item> + </a-col> + <a-col :span="6"> + <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="randomInspectionFlag" + label="鎶芥鏍囪"> + <lx-switch + checked-children='鏄�' + un-checked-children='鍚�' + v-model="model.randomInspectionFlag" + :disabled="disableSubmit || finalAcceptanceDisable" + /> </a-form-model-item> </a-col> </a-row> @@ -185,13 +197,24 @@ :disabled="disableSubmit || completionDisable"/> </a-form-model-item> </a-col> - <a-col :span="12"> + <a-col :span="6"> <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalAcceptanceFilesResult" label="缁堥獙鏀堕檮浠�"> <lx-upload :returnUrl="false" :isMultiple="true" :disabled="disableSubmit || completionDisable" v-model="model.finalAcceptanceFilesResult"/> + </a-form-model-item> + </a-col> + <a-col :span="6"> + <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="finalRandomInspectionFlag" + label="鎶芥鏍囪"> + <lx-switch + checked-children='鏄�' + un-checked-children='鍚�' + v-model="model.finalRandomInspectionFlag" + :disabled="disableSubmit || completionDisable" + /> </a-form-model-item> </a-col> </a-row> @@ -428,6 +451,7 @@ }, recordDetail(record) { + console.log('record', record) this.initParams() this.model = Object.assign({}, record) if (this.model.imageFiles) { @@ -462,11 +486,9 @@ // 瑙﹀彂琛ㄥ崟楠岃瘉 this.$refs.form.validate(valid => { if (valid) { + that.confirmLoading = that.spinning = true let tableData = that.$refs.editableDetailTable.getTableData() - that.model.tableDetailList = [...tableData] - - that.confirmLoading = spinnning = true let httpurl = this.url.approval let method = 'put' @@ -479,7 +501,7 @@ that.$message.warning(res.message) } }).finally(() => { - that.confirmLoading = spinning = false + that.confirmLoading = that.spinning = false }) } else { return false -- Gitblit v1.9.3