From 48d85187a16a313c5244a830862db5e672e6997d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期五, 18 七月 2025 17:08:15 +0800
Subject: [PATCH] 1、点检工单预览 2、技术鉴定工单变更 3、调整样式
---
src/views/flowable/workflow/FlowTodo.vue | 94 +++++++++++++++++++++++-----------------------
1 files changed, 47 insertions(+), 47 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 0929294..78481be 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>
@@ -88,20 +78,30 @@
</a-table>
</div>
+ <!--淇濆吇瑙勮寖-->
<maintenance-standard-approval-modal ref="maintenanceStandardApprovalModal" @modalFormOk="modalFormOk"
:selectShenpiData="selectedRowData"/>
+ <!--鐐规-->
<inspection-order-handle ref="inspectionOrderHandle" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--鎶�鏈壌瀹氬伐鍗�-->
<technical-status-evaluation-approval-modal ref="technicalStatusApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--浜屼繚宸ュ崟-->
<second-maintenance-approval-modal ref="secondMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+ <!--涓変繚宸ュ崟-->
<third-maintenance-approval-modal ref="thirdMaintenanceApprovalModal" :selectShenpiData="selectedRowData"
@modalFormOk="modalFormOk"/>
+
+ <!--鎶�鏈壌瀹氬伐鍗曞彉鏇�-->
+ <technical-status-evaluation-order-change-approval-modal ref="evaluationOrderChangeApprovalModal"
+ :selectShenpiData="selectedRowData"
+ @modalFormOk="modalFormOk"/>
</a-card>
</template>
@@ -114,11 +114,14 @@
from './TechnicalStatusEvaluation/TechnicalStatusEvaluationApprovalModal'
import SecondMaintenanceApprovalModal from './secondMaintenance/SecondMaintenanceApprovalModal'
import ThirdMaintenanceApprovalModal from './thirdMaintenance/ThirdMaintenanceApprovalModal'
+ import TechnicalStatusEvaluationOrderChangeApprovalModal
+ from './TechnicalStatusEvaluation/TechnicalStatusEvaluationOrderChangeApprovalModal'
export default {
- name: 'NcDeviceCharactersList',
+ name: 'FlowTodo',
mixins: [JeecgListMixin],
components: {
+ TechnicalStatusEvaluationOrderChangeApprovalModal,
ThirdMaintenanceApprovalModal,
SecondMaintenanceApprovalModal,
TechnicalStatusEvaluationApprovalModal,
@@ -144,7 +147,7 @@
title: '娴佺▼鍒嗙被',
align: 'center',
dataIndex: 'category_dictText',
- width: 150
+ width: 200
},
{
title: '娴佺▼鍚嶇О',
@@ -155,8 +158,7 @@
{
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
- dataIndex: 'description',
- ellipsis: true
+ dataIndex: 'description'
},
{
title: '涓婁竴姝ュ鐞嗕汉',
@@ -180,26 +182,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: {
@@ -208,33 +205,30 @@
}
},
methods: {
- handelDetail(item, index) {
- let processType = this.splitProcessType(item.category)
+ handelDetail(record) {
+ let processType = this.splitProcessType(record.category)
console.log('processType', processType)
switch (processType) {
case 'maintenance_standard':
- this.handleMaintenanceStandard(item)
+ this.handleMaintenanceStandard(record)
break
case 'sbdjApproval':
- this.handInspectionOrder(item)
+ this.handInspectionOrder(record)
break
case 'eam_repair':
- this.handleRepairOrder(item)
+ this.handleRepairOrder(record)
break
case 'second_maintenance':
- this.handleSecondMaintenance(item)
+ this.handleSecondMaintenance(record)
break
case 'third_maintenance':
- this.handleThirdMaintenance(item)
+ this.handleThirdMaintenance(record)
break
case 'TECHNICAL_STATUS_EVALUATION':
- this.handleTechnicalStatusEvaluation(item)
+ this.handleTechnicalStatusEvaluation(record)
break
- case 'toolsStocktakingBound':
- this.handleToolStocktakingApproval(item)
- break
- case 'toolsLossApproval':
- this.handleToolLossApproval(item)
+ case 'EVALUATION_ORDER_CHANGE_PROCESS':
+ this.handleEvaluationOrderChange(record)
break
default:
alert('娌℃壘鍒拌娴佺▼')
@@ -259,8 +253,16 @@
*/
handleTechnicalStatusEvaluation(record) {
this.selectedRowData = Object.assign({}, record)
+ this.$refs.technicalStatusApprovalModal.visible = true
this.$refs.technicalStatusApprovalModal.title = record.name
this.$refs.technicalStatusApprovalModal.handleDetail(record)
+ },
+
+ handleEvaluationOrderChange(record) {
+ this.selectedRowData = Object.assign({}, record)
+ this.$refs.evaluationOrderChangeApprovalModal.visible = true
+ this.$refs.evaluationOrderChangeApprovalModal.title = record.name
+ this.$refs.evaluationOrderChangeApprovalModal.handleApprove(record)
},
/**
@@ -279,12 +281,10 @@
* @param record
*/
handInspectionOrder(record) {
- console.log('record----->', record)
this.selectedRowData = Object.assign({}, record)
this.$refs.inspectionOrderHandle.visible = true
this.$refs.inspectionOrderHandle.title = record.name
- this.$refs.inspectionOrderHandle.getAllApproveData(record)
- this.$refs.inspectionOrderHandle.getBasicInformation(record)
+ this.$refs.inspectionOrderHandle.handleApprove(record)
},
/**
@@ -294,8 +294,8 @@
handleThirdMaintenance(record) {
this.selectedRowData = Object.assign({}, record)
this.$refs.thirdMaintenanceApprovalModal.visible = true
- this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
this.$refs.thirdMaintenanceApprovalModal.title = record.name
+ this.$refs.thirdMaintenanceApprovalModal.handleDetail(record)
},
/**
@@ -347,4 +347,4 @@
}
}
}
-</script>
\ No newline at end of file
+</script>
--
Gitblit v1.9.3