From 7f1e90c6e0a90d7036fba754c14009c01f5694e4 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期四, 17 七月 2025 11:08:43 +0800
Subject: [PATCH] 1、二保和技术鉴定工单审批 2、调整我的待办列表样式
---
src/views/eam/maintenance/EamInspectionOrderList.vue | 13 ++----
src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue | 4 +-
src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue | 3 -
src/views/flowable/workflow/FlowTodo.vue | 46 +++++++---------------
4 files changed, 22 insertions(+), 44 deletions(-)
diff --git a/src/views/eam/maintenance/EamInspectionOrderList.vue b/src/views/eam/maintenance/EamInspectionOrderList.vue
index be8ef7d..b6be1e7 100644
--- a/src/views/eam/maintenance/EamInspectionOrderList.vue
+++ b/src/views/eam/maintenance/EamInspectionOrderList.vue
@@ -85,13 +85,12 @@
<a class="ant-dropdown-link">鏇村 <a-icon type="down"/></a>
<a-menu slot="overlay">
<a-menu-item>
- <a @click="handleDetail(record)">璇︽儏</a>
- </a-menu-item>
-
- <a-menu-item>
<a-popconfirm title="纭畾浣滃簾鍚�?" @confirm="() => handleAbolish(record.id)">
<a>浣滃簾</a>
</a-popconfirm>
+ </a-menu-item>
+ <a-menu-item>
+ <a @click="handleDetail(record)">璇︽儏</a>
</a-menu-item>
</a-menu>
</a-dropdown>
@@ -217,9 +216,9 @@
dataIndex: 'confirmTime'
},
{
- title: '纭鎰忚',
+ title: 'HF缂栫爜',
align: 'center',
- dataIndex: 'confirmComment'
+ dataIndex: 'hfCode'
}
],
url: {
@@ -244,8 +243,6 @@
title: '鎿嶄綔',
dataIndex: 'action',
align: 'center',
- fixed: 'right',
- width: 200,
scopedSlots: { customRender: 'action' }
}
this.columns = [...this.columns, operationColumn]
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 0929294..e42673d 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -11,36 +11,26 @@
<a-row :gutter='24'>
<a-col :lg='6' :md='8' :sm='24' :xl='4'>
<a-form-item label='娴佺▼鍒嗙被'>
- <j-dict-select-tag
- v-model='queryParam.category'
- dictCode='flow_type'
- placeholder='璇烽�夋嫨娴佺▼鍒嗙被'
- ></j-dict-select-tag>
+ <j-dict-select-tag v-model='queryParam.category' dictCode='flow_type' placeholder='璇烽�夋嫨娴佺▼鍒嗙被'/>
</a-form-item>
</a-col>
<a-col :lg='6' :md='8' :sm='24' :xl='4'>
<a-form-item label='褰撳墠鑺傜偣'>
- <a-input
- v-model='queryParam.name'
- placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'
- ></a-input>
+ <a-input v-model='queryParam.name' placeholder='璇疯緭鍏ュ綋鍓嶈妭鐐圭簿纭煡璇�'/>
</a-form-item>
</a-col>
<a-col :lg='6' :md='8' :sm='24' :xl='4'>
<a-form-item label='绠�瑕佹弿杩�'>
- <a-input
- v-model='queryParam.title'
- placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'
- ></a-input>
+ <a-input v-model='queryParam.title' placeholder='璇疯緭鍏ョ畝瑕佹弿杩�'/>
</a-form-item>
</a-col>
<a-col :lg='8' :md='12' :sm='24' :xl='8'>
<a-form-item label='浠诲姟鏃堕棿鑼冨洿'>
<j-date v-model='queryParam.startTime' :show-time='false' class='query-group-cust'
- date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨寮�濮嬫椂闂�'></j-date>
+ date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨寮�濮嬫椂闂�'/>
<span class='query-group-split-cust'></span>
<j-date v-model='queryParam.endTime' :show-time='false' class='query-group-cust'
- date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨缁撴潫鏃堕棿'></j-date>
+ date-format='YYYY-MM-DD HH:mm:ss' placeholder='璇烽�夋嫨缁撴潫鏃堕棿'/>
</a-form-item>
</a-col>
@@ -80,7 +70,7 @@
<a-table ref='table' :columns='columns' :dataSource='dataSource' :loading='loading' :pagination='ipagination'
:rowSelection='{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}'
- :scroll="{x:'max-content',y:465}" bordered rowKey='id' size='middle'
+ :scroll="{x:'max-content'}" bordered rowKey='id' size='middle'
@change='handleTableChange'>
<span slot='action' slot-scope='text, record'>
<a @click='handelDetail(record,text)'>鎵ц/瀹℃壒</a>
@@ -116,7 +106,7 @@
import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
export default {
- name: 'NcDeviceCharactersList',
+ name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
ThirdMaintenanceApprovalModal,
@@ -144,7 +134,7 @@
title: '娴佺▼鍒嗙被',
align: 'center',
dataIndex: 'category_dictText',
- width: 150
+ width: 200
},
{
title: '娴佺▼鍚嶇О',
@@ -155,8 +145,7 @@
{
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
- dataIndex: 'description',
- ellipsis: true
+ dataIndex: 'description'
},
{
title: '涓婁竴姝ュ鐞嗕汉',
@@ -180,26 +169,21 @@
title: '褰撳墠鑺傜偣寮�濮嬫椂闂�',
align: 'center',
dataIndex: 'createTime',
- width: 150
+ width: 200
},
{
title: '鎿嶄綔',
dataIndex: 'action',
+ fixed: 'right',
scopedSlots: { customRender: 'action' },
align: 'center',
- width: 150,
- fixed: 'right'
+ width: 100
}
],
url: {
list: '/assign/flow/toTaskBySelf'
},
- selectedRowData: {},
- selectInspectionOrderData: {},
- selectWeekMaintenanceData: {},
- selectSecondMaintenanceData: {},
- selectThirdMaintenanceData: {},
- selectRepairOrderData: {}
+ selectedRowData: {}
}
},
computed: {
@@ -259,6 +243,7 @@
*/
handleTechnicalStatusEvaluation(record) {
this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusApprovalModal.visible = true
this.$refs.technicalStatusApprovalModal.title = record.name
this.$refs.technicalStatusApprovalModal.handleDetail(record)
},
@@ -279,7 +264,6 @@
* @param record
*/
handInspectionOrder(record) {
- console.log('record----->', record)
this.selectedRowData = Object.assign({}, record)
this.$refs.inspectionOrderHandle.visible = true
this.$refs.inspectionOrderHandle.title = record.name
@@ -347,4 +331,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
index a7a7904..5587c8f 100644
--- a/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
+++ b/src/views/flowable/workflow/TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal.vue
@@ -529,7 +529,6 @@
*/
async handleDetail(record) {
this.model = {}
- this.visible = true
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.handleTabToFirstTable()
this.getBasicInformationByApi(record)
@@ -541,7 +540,6 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
recordDetail(record) {
- this.visible = true
this.detail.safetyEquipmentCheckList = this.detail.precisionCheckList = this.detail.otherCheckList = []
this.model = Object.assign({}, record)
this.handleTabToFirstTable()
@@ -695,7 +693,6 @@
this.$nextTick(() => {
for (let index = 1; index <= 3; index++) {
if (this.$refs['editableDetailTable' + index]) {
- console.log('index----------', index)
this.activeTabKey = index
break
}
diff --git a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
index 906416d..9db4623 100644
--- a/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
+++ b/src/views/flowable/workflow/secondMaintenance/SecondMaintenanceApprovalModal.vue
@@ -342,6 +342,7 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
async handleDetail(record) {
+ this.spinning = true
this.model = {}
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
this.handleTabToFirstTable()
@@ -355,6 +356,7 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
recordDetail(record) {
+ this.spinning = true
this.activeTabKey = 1
this.detail.operatorMaintenanceList = this.detail.repairerMaintenanceList = []
this.model = Object.assign({}, record)
@@ -366,7 +368,6 @@
* @param record 涓婚〉闈㈠垪琛ㄨ璁板綍
*/
getBasicInformationByApi(record) {
- this.spinning = true
const that = this
getAction(this.url.queryById, { id: record.dataId })
.then(res => {
@@ -505,7 +506,6 @@
//瑙勮寖閫夋嫨鍙樺寲
loadDetail(orderId) {
- this.spinning = true
getAction(this.url.detail, { orderId })
.then(res => {
if (res.success) {
--
Gitblit v1.9.3