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 | 77 +++++++++++++++++++++-----------------
1 files changed, 42 insertions(+), 35 deletions(-)
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index f70bca9..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>
@@ -78,8 +78,8 @@
<a-row>
<a-form-model-item prop="imageFilesResult" label="鐐规鍥剧墖" :labelCol="{span:2}" :wrapperCol="{span:21}">
<lx-upload :returnUrl="false" :isMultiple="true" file-type="image" :number="3"
- :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='UNDER_INSPECTION'"
- v-model="tableRowRecord.imageFiles"/>
+ :disabled="isDisableOperation||!hasInspectionDateArrived"
+ v-model="tableRowRecord.fileList"/>
</a-form-model-item>
</a-row>
@@ -105,7 +105,7 @@
>
<template v-slot:inspectionResult="props">
<j-dict-select-tag v-model="props.row.inspectionResult" dictCode="eam_inspection_result"
- :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='UNDER_INSPECTION'"
+ :disabled="isDisableOperation"
placeholder="璇烽�夋嫨鐐规缁撴灉"
@change="handleInspectionResultSelectChange($event,props.row)"
style="width: 100%"/>
@@ -114,13 +114,13 @@
<template v-slot:exceptionDescription="props">
<a-textarea style="height: 32px" v-model="props.row.exceptionDescription"
:placeholder="props.row.inspectionResult==='2'?'璇疯緭鍏ュ紓甯告弿杩�':''"
- :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='UNDER_INSPECTION'||!props.row.inspectionResult||props.row.inspectionResult==='1'"/>
+ :disabled="isDisableOperation||!props.row.inspectionResult||props.row.inspectionResult==='1'"/>
</template>
<template v-slot:reportFlag="props">
<j-dict-select-tag v-model="props.row.reportFlag"
- :placeholder="props.row.inspectionResult==='2'?'璇烽�夋嫨寮傚父鏄惁淇濅慨':''"
- :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='UNDER_INSPECTION'||!props.row.inspectionResult||props.row.inspectionResult==='1'"
+ :placeholder="props.row.inspectionResult==='2'?'璇烽�夋嫨寮傚父鏄惁鎶ヤ慨':''"
+ :disabled="isDisableOperation||!props.row.inspectionResult||props.row.inspectionResult==='1'"
dictCode="yn"
style="width: 100%"/>
</template>
@@ -145,12 +145,12 @@
</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="selectedRowKeys.length>0&&!disableSubmit&&tableRowRecord.inspectionStatus==='UNDER_INSPECTION'&&hasInspectionDateArrived&&activeTabKey==='1'"
+ v-if="selectedRowKeys.length>0&&!isDisableOperation&&hasInspectionDateArrived&&activeTabKey==='1'"
slot="tabBarExtraContent" type="primary"
@click="handleSelectAllInspectionResult">鎵归噺鐐规姝ｅ父
</a-button>
@@ -175,8 +175,7 @@
<a-col :span="12">
<a-form-model-item prop="confirmDealType" label="澶勭悊绫诲瀷">
<j-dict-select-tag type='radio' v-model='tableRowRecord.confirmDealType' dictCode='approved_rejected'
- :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='WAIT_CONFIRM'"
- placeholder="璇烽�夋嫨澶勭悊绫诲瀷"/>
+ :disabled="disableSubmit||tableRowRecord.inspectionStatus!=='WAIT_CONFIRM'"/>
</a-form-model-item>
</a-col>
@@ -237,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,
@@ -305,8 +306,6 @@
}
]
},
- isDisplayBmp: false,
- showBmpButtonLoading: false,
selectedRowKeys: [],
disableSubmit: false,
activeTabKey: '1',
@@ -319,11 +318,14 @@
},
isDisplayConfirm() {
return ['WAIT_CONFIRM', 'COMPLETE'].includes(this.tableRowRecord.inspectionStatus)
+ },
+ isDisableOperation() {
+ return this.disableSubmit || this.tableRowRecord.inspectionStatus !== 'UNDER_INSPECTION'
}
},
methods: {
/**
- * 鑾峰彇娴佺▼鑺傜偣
+ * 鑾峰彇娴佺▼鑺傜偣鍜屾祦绋嬪浘
* @param record 寰呭姙璁板綍淇℃伅
*/
getAllApproveData(record) {
@@ -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]
- 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() {
@@ -392,6 +390,7 @@
flowTaskVo.values = this.selectShenpiData.variables
flowTaskVo.confirmDealType = this.tableRowRecord.confirmDealType
flowTaskVo.confirmComment = this.tableRowRecord.confirmComment
+ flowTaskVo.fileList = this.tableRowRecord.fileList
flowTaskVo.tableDetailList = this.$refs.editableDetailTable.getTableData()
const that = this
console.log('琛ㄥ崟鎻愪氦鏁版嵁', flowTaskVo)
@@ -419,7 +418,6 @@
this.$set(this.tableRowRecord, 'standardName', standardName)
this.$set(this.tableRowRecord, 'maintenancePeriod', maintenancePeriod)
this.$set(this.tableRowRecord, 'standardCode', standardCode)
- this.spinning = false
},
// 鎵归噺閫夋嫨鎵�鏈夌偣妫�缁撴灉
@@ -469,16 +467,25 @@
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>
<style scoped>
- .btn-custom {
- background-color: #4CAF50; /* 缁胯壊鑳屾櫙 */
- color: #fff; /* 鐧借壊鏂囧瓧 */
- }
-
/deep/ .ant-select-dropdown-menu {
text-align: left;
}
--
Gitblit v1.9.3