From 3432c3100ccb4c3b78dc0a5f7f242bdcda503a63 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期三, 18 六月 2025 10:45:49 +0800
Subject: [PATCH] 1、终端程序呼叫页面呼叫原因组件由输入框改为多行文本域 2、设备管理页面新增设备图片字段同时在新增和编辑设备时添加设备图片 3、设备监控以及设备看板页面新增故障状态同时替换设备图片为设备管理页面中维护的设备图片而不再是设备所属设备类型图片以及三色灯增加故障状态灯
---
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