From c3a4f841d5499b74e9153fce421cebd1fb4ac72d Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 15 七月 2025 10:55:52 +0800
Subject: [PATCH] 1、mdc设备多选输入框优化新增点击输入框同样触发查询按钮弹出抽屉或弹窗 2、解决进入过产品结构树页面后再进入设备日志页面后设备状态分布图样式变形问题以及优化组件代码
---
src/views/flowable/workflow/FlowLedger.vue | 50 +++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 43 insertions(+), 7 deletions(-)
diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index ace988b..fe4a2f9 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -62,12 +62,16 @@
:loading="loading"
class="j-table-force-nowrap"
@change="handleTableChange">
+
<span slot="action" slot-scope="text, record">
<a @click="handelDetail(record,text)">璇︽儏</a>
</span>
</a-table>
</div>
+ <AssignFileStreamXq ref="modalFormApproval" :selectShenpiData="selectShenpiData"></AssignFileStreamXq>
+
+ <DispatchFileXq ref="modalFormDispatchFileXq" :selectShenpiData="selectDispatchFileXqData"></DispatchFileXq>
<inspection-order-handle ref="modalFormInspectionOrderXq" :selectShenpiData="selectInspectionOrderXqData"/>
</a-card>
@@ -75,16 +79,20 @@
<script>
- import '@/assets/less/TableExpand.less'
- import { mixinDevice } from '@/utils/mixin'
- import { JeecgListMixin } from '@/mixins/JeecgListMixin'
- import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
- import InspectionOrderHandle from './InspectionOrder/InspectionOrderHandle'
+import '@/assets/less/TableExpand.less'
+import { mixinDevice } from '@/utils/mixin'
+import { JeecgListMixin } from '@/mixins/JeecgListMixin'
+import JDictSelectTag from '@/components/dict/JDictSelectTag.vue'
+import AssignFileStreamXq from '@views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue'
+import DispatchFileXq from '@views/flowable/workflow/dispatchFile/DispatchFileXq.vue'
+import InspectionOrderHandle from '@views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue'
export default {
name: 'FlowLedger',
mixins: [JeecgListMixin, mixinDevice],
components: {
+ DispatchFileXq,
+ AssignFileStreamXq: AssignFileStreamXq,
InspectionOrderHandle,
JDictSelectTag
},
@@ -116,7 +124,7 @@
{
title: '娴佺▼涓氬姟绠�瑕佹弿杩�',
align: 'center',
- dataIndex: 'title'
+ dataIndex: 'description',
},
{
title: '鐢宠浜�',
@@ -191,8 +199,16 @@
let approcesstype = this.splitAprocessType(item.category)
console.log('approcesstype--->', approcesstype)
switch (approcesstype) {
+ case 'drApproval':
+ item.description=item.description
+ this.handDrDetial(item)
+ break
+ case 'ggApproval':
+ item.description=item.description
+ this.handDispatchFileDetial(item)
+ break
case 'sbdjApproval':
- item.description = item.title
+ item.description = item.description
this.handInspectionOrderDetail(item)
break
default:
@@ -204,7 +220,27 @@
let result = parts[0]
return result
},
+ handDrDetial(item) {
+ this.selectShenpiData = item
+ this.selectShenpiData.assignee_dictText=item.todoUsers_dictText
+ this.selectShenpiData.createTime=item.startTime
+ this.selectShenpiData.procInstId=item.processInstanceId
+ this.$refs.modalFormApproval.clearTableSource()
+ this.$refs.modalFormApproval.getAllApproveData(item)
+ },
+ handDispatchFileDetial(item){
+ this.selectDispatchFileXqData = item
+
+
+
+
+ this.selectDispatchFileXqData.assignee_dictText=item.todoUsers_dictText
+ this.selectDispatchFileXqData.createTime=item.startTime
+ this.selectDispatchFileXqData.procInstId=item.processInstanceId
+ this.$refs.modalFormDispatchFileXq.clearTableSource()
+ this.$refs.modalFormDispatchFileXq.getAllApproveData(item)
+ },
handInspectionOrderDetail(item) {
this.selectInspectionOrderXqData = item
this.selectInspectionOrderXqData.assignee_dictText = item.todoUsers_dictText
--
Gitblit v1.9.3