From ffe01cb9dac3782f6f5f766a60491c12f5e42f19 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 18 四月 2025 09:58:59 +0800
Subject: [PATCH] art: 设备管理-点检工单-确认意见
---
src/views/flowable/workflow/FlowTodo.vue | 90 ++++++++++++++------------------------------
1 files changed, 29 insertions(+), 61 deletions(-)
diff --git a/src/views/flowable/workflow/FlowTodo.vue b/src/views/flowable/workflow/FlowTodo.vue
index 0929e14..24f25ba 100644
--- a/src/views/flowable/workflow/FlowTodo.vue
+++ b/src/views/flowable/workflow/FlowTodo.vue
@@ -73,7 +73,7 @@
bordered
size="middle"
rowKey="id"
- :scroll="{x:'max-content',y:465}"
+ :scroll="{x:getTableColumnsTotalWidth,y:465}"
:columns="columns"
:dataSource="dataSource"
:pagination="ipagination"
@@ -82,23 +82,17 @@
@change="handleTableChange">
<span slot="action" slot-scope="text, record">
- <a @click="handelDetial(record,text)">鏌ョ湅璇︽儏</a>
+ <a @click="handelDetail(record,text)">鎵ц/瀹℃壒</a>
</span>
</a-table>
</div>
- <AssignFileStreamHandle ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamHandle>
- <DispatchFileHandle ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"
- @searchReset="searchReset"></DispatchFileHandle>
- <DispatchFileBachHandleStyle ref="modalFormDispatchFileBatch" @searchReset="searchReset"
- @ok="modalFormOk"></DispatchFileBachHandleStyle>
<InspectionOrderHandle ref="modalFormInspectionOrder" :selectShenpiData="selectInspectionOrderData"
@searchReset="searchReset"></InspectionOrderHandle>
- <InspectionOrderHandleBzz ref="modalFormInspectionOrderBzz" :selectShenpiData="selectInspectionOrderDataBzz"
- @searchReset="searchReset"></InspectionOrderHandleBzz>
- <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal"></week-maintenance-approval-modal>
- <repair-order-approval-modal ref="repairOrderApprovalModal"
+ <week-maintenance-approval-modal ref="weekMaintenanceApprovalModal" :selectShenpiData="selectWeekMaintenanceData"
+ @searchReset="searchReset"></week-maintenance-approval-modal>
+ <repair-order-approval-modal ref="repairOrderApprovalModal" @searchReset="searchReset"
:selectShenpiData="selectRepairOrderData"></repair-order-approval-modal>
</a-card>
</template>
@@ -109,13 +103,9 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
- import AssignFileStreamHandle from '@views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue'
- import DispatchFileHandle from '@views/flowable/workflow/dispatchFile/DispatchFileHandle.vue'
- import DispatchFileBachHandleStyle from '@views/flowable/workflow/dispatchFile/DispatchFileBachHandleStyle#Drawer.vue'
import WeekMaintenanceApprovalModal from '@views/flowable/workflow/weekMaintenance/WeekMaintenanceApprovalModal'
import RepairOrderApprovalModal from '@views/flowable/workflow/repairOrder/RepairOrderApprovalModal'
import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
- import InspectionOrderHandleBzz from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue'
import { getAction } from '@api/manage'
@@ -123,14 +113,10 @@
name: 'NcDeviceCharactersList',
mixins: [JeecgListMixin, mixinDevice],
components: {
- AssignFileStreamHandle,
JDictSelectTag,
- DispatchFileHandle,
- DispatchFileBachHandleStyle,
WeekMaintenanceApprovalModal,
RepairOrderApprovalModal,
- InspectionOrderHandle,
- InspectionOrderHandleBzz
+ InspectionOrderHandle
},
data() {
return {
@@ -163,7 +149,9 @@
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
dataIndex: 'title',
- width: 500
+ width: 350,
+ ellipsis: true
+
},
{
title: '涓婁竴姝ュ鐞嗕汉',
@@ -203,10 +191,8 @@
isSameNode: '/assign/flow/isSameNode'
},
dictOptions: {},
- selectShenpiData: {},
- selectDispatchFileXqData: {},
selectInspectionOrderData: {},
- selectInspectionOrderDataBzz: {},
+ selectWeekMaintenanceData: {},
selectBachData: {},
selectRepairOrderData: {},
//涓氬姟淇℃伅ID
@@ -218,22 +204,19 @@
computed: {
importExcelUrl: function() {
return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`
+ },
+ getTableColumnsTotalWidth() {
+ return this.columns.reduce((total, item) => total + item.width, 0)
}
},
methods: {
- handelDetial(item, index) {
+ handelDetail(item, index) {
console.log('鐐瑰嚮浜嗚鎯�')
console.log('item----->', item)
console.log('index----->', index)
- let approcesstype = this.splitAprocessType(item.category)
- console.log('approcesstype--->', approcesstype)
- switch (approcesstype) {
- case 'drApproval':
- this.handDrDetial(item)
- break
- case 'ggApproval':
- this.handDispatchFileDetial(item)
- break
+ let processType = this.splitAprocessType(item.category)
+ console.log('processType--->', processType)
+ switch (processType) {
case 'sbdjApproval':
this.handInspectionOrder(item)
break
@@ -252,33 +235,16 @@
let result = parts[0]
return result
},
- handDrDetial(item) {
- this.selectShenpiData = item
- this.$refs.modalFormApproval.clearTableSource()
- this.$refs.modalFormApproval.getAllApproveData(item)
+
+ handInspectionOrder(record) {
+ console.log('record----->', record)
+ this.selectInspectionOrderData = Object.assign({}, record)
+ this.$refs.modalFormInspectionOrder.visible = true
+ this.$refs.modalFormInspectionOrder.title = record.name
+ this.$refs.modalFormInspectionOrder.getAllApproveData(record)
+ this.$refs.modalFormInspectionOrder.getBasicInformation(record)
},
- searchReset() {
- this.queryParam = {}
- this.loadData(1)
- },
- handDispatchFileDetial(item) {
- console.log('item----->', item)
- this.selectDispatchFileXqData = item
- this.$refs.modalFormDispatchFileXq.clearTableSource()
- this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
- },
- handInspectionOrder(item) {
- console.log('item----->', item)
- if (item.taskDefKey === 'Confirmed_completed') {
- this.selectInspectionOrderDataBzz = item
- this.$refs.modalFormInspectionOrderBzz.clearTableSource()
- this.$refs.modalFormInspectionOrderBzz.getAllApproveData(item)
- } else {
- this.selectInspectionOrderData = item
- this.$refs.modalFormInspectionOrder.clearTableSource()
- this.$refs.modalFormInspectionOrder.getAllApproveData(item)
- }
- },
+
batchHandle() {
if (this.selectedRowKeys.length <= 0) {
this.$notification.warning({
@@ -308,9 +274,11 @@
})
}
},
+
handleWeekMaintenance(item) {
if (item && item.dataId) {
- this.$refs.weekMaintenanceApprovalModal.handleDetail(item.dataId)
+ this.selectWeekMaintenanceData = Object.assign({}, item)
+ this.$refs.weekMaintenanceApprovalModal.handleDetail(item)
this.$refs.weekMaintenanceApprovalModal.title = item.name
this.$refs.weekMaintenanceApprovalModal.disableSubmit = false
}
--
Gitblit v1.9.3