From d2547913ef2e150d8bb18bc8f7423515c7ed71d0 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 25 四月 2025 14:04:29 +0800
Subject: [PATCH] 1、调整设备台账铭牌二维码大小 2、待机停机页面功能开发
---
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index 9fb7779..c99495f 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -62,7 +62,7 @@
</a-col>
<a-col :span='span'>
<a-form-model-item label="鐐规浜�">
- <a-input v-model="tableRowRecord.operator" readOnly/>
+ <a-input v-model="tableRowRecord.operator_dictText" readOnly/>
</a-form-model-item>
</a-col>
</a-row>
@@ -119,7 +119,7 @@
<template v-slot:reportFlag="props">
<j-dict-select-tag v-model="props.row.reportFlag"
- :placeholder="props.row.inspectionResult==='2'?'璇烽�夋嫨寮傚父鏄惁淇濅慨':''"
+ :placeholder="props.row.inspectionResult==='2'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
:disabled="isDisableOperation||!props.row.inspectionResult||props.row.inspectionResult==='1'"
dictCode="yn"
style="width: 100%"/>
@@ -145,7 +145,7 @@
</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>
@@ -236,10 +236,12 @@
visible: false,
// 琛ㄥご
url: {
- queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
+ // queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
queryHisTaskList: '/assign/flow/queryHisTaskList',
- approve: '/eam/eamInspectionOrder/approval'
+ approve: '/eam/eamInspectionOrder/approval',
+ queryById: '/eam/eamInspectionOrder/queryById',
+ detailList: '/eam/eamInspectionOrderDetail/queryList'
},
detail: {
loading: false,
@@ -356,22 +358,18 @@
* 鑾峰彇寰呭姙璁板綍鐨勫熀鏈俊鎭�
* @param record 寰呭姙璁板綍淇℃伅
*/
- getBasicInformation(record) {
+ async getBasicInformation(record) {
this.activeTabKey = '1'
- this.tableRowRecord = {}
this.detail.dataSource = []
this.spinning = true
const param = { id: record.dataId }
- const that = this
- getAction(this.url.queryBomDataById, param)
- .then((res => {
- if (res.success) {
- that.tableRowRecord = { ... res.result[0], fileList: JSON.parse(res.result[0].imageFiles) }
- if (!this.hasInspectionDateArrived && !this.disableSubmit) this.title += `锛堟湭鍒扮偣妫�鏃ユ湡涓嶈兘鎻愬墠鐐规锛塦
- that.detail.dataSource = res.result[0].tableDetailList
- console.log('that.tableRowRecord----->', that.tableRowRecord)
- }
- }))
+ let res = await getAction(this.url.queryById, param);
+ this.tableRowRecord = Object.assign({}, res.result);
+ if (this.tableRowRecord.imageFiles) {
+ let obj = JSON.parse(this.tableRowRecord.imageFiles)
+ this.tableRowRecord.fileList = [...obj]
+ }
+ await this.loadDetail(record.dataId)
},
async submitForm() {
@@ -420,7 +418,6 @@
this.$set(this.tableRowRecord, 'standardName', standardName)
this.$set(this.tableRowRecord, 'maintenancePeriod', maintenancePeriod)
this.$set(this.tableRowRecord, 'standardCode', standardCode)
- this.spinning = false
},
// 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
@@ -470,7 +467,21 @@
handleCancel() {
this.selectedRowKeys = []
this.visible = false
- }
+ },
+ //鏍囧噯閫夋嫨鍙樺寲
+ loadDetail(orderId) {
+ if (orderId) {
+ getAction(this.url.detailList, { orderId: orderId })
+ .then(res => {
+ if (res.success) {
+ this.detail.dataSource = [...res.result]
+ }
+ })
+ .finally(() => {
+ this.spinning = false
+ })
+ }
+ },
}
}
</script>
--
Gitblit v1.9.3