From 5bab148561462efb5c725240db1a5e8c9c57abbe Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 09 四月 2025 17:54:17 +0800
Subject: [PATCH] 修改flow
---
src/views/flowable/workflow/FlowLedger.vue | 3 +++
src/views/eam/maintenance/modules/EamInspectionOrderModalXq.vue | 15 +++++++++++++++
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue | 2 +-
src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue | 2 +-
src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue | 2 +-
src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue | 2 +-
src/views/eam/maintenance/modules/EamInspectionOrderModal.vue | 19 +++++++++++++++++--
src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue | 2 +-
src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue | 2 +-
src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue | 2 +-
10 files changed, 42 insertions(+), 9 deletions(-)
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
index 49776ee..67e0612 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModal.vue
@@ -61,6 +61,21 @@
</a-col>
</a-row>
<a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item
+ label="鐓х墖鏂囦欢"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="imageFiles">
+ <lx-upload :returnUrl="false"
+ :multiple="false"
+ v-model="model.imageFiles"
+ biz="EamMaintenanceStandard">
+ </lx-upload>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24">
<a-form-model-item label="澶囨敞" :labelCol="{span:1}" :wrapperCol="{span:22}" prop="remark">
<a-textarea v-model="model.remark" rows="3" placeholder="璇疯緭鍏ュ娉�" />
@@ -193,6 +208,7 @@
this.standardId=record.standardId
this.visible = true
this.editable = true
+ this.detail.dataSource = []
if (record && record.referenceFile) {
let obj = JSON.parse(record.referenceFile)
this.model.fileList = [obj]
@@ -273,17 +289,16 @@
},
//鍔犺浇璇︽儏鏁版嵁
loadDetail(standardId) {
- this.detail.dataSource = []
if (standardId) {
getAction(this.url.detail, { standardId: standardId }).then(res => {
if (res.success) {
this.detail.dataSource = [...res.result]
+ this.standardId=undefined;
}
})
}
},
loadDetailOrder(orderId){
- this.detail.dataSource = []
if (orderId) {
getAction(this.url.detailOrder, { orderId: orderId }).then(res => {
if (res.success) {
diff --git a/src/views/eam/maintenance/modules/EamInspectionOrderModalXq.vue b/src/views/eam/maintenance/modules/EamInspectionOrderModalXq.vue
index 4d6a887..ab6bebf 100644
--- a/src/views/eam/maintenance/modules/EamInspectionOrderModalXq.vue
+++ b/src/views/eam/maintenance/modules/EamInspectionOrderModalXq.vue
@@ -86,6 +86,21 @@
</a-col>
</a-row>
<a-row :gutter="24">
+ <a-col :span="8">
+ <a-form-model-item
+ label="鐓х墖鏂囦欢"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="imageFiles">
+ <lx-upload :returnUrl="false"
+ :multiple="false"
+ v-model="model.fileList"
+ biz="EamMaintenanceStandard">
+ </lx-upload>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row :gutter="24">
<a-col :span="24">
<a-form-model-item label="澶囨敞" :labelCol="{span:1}" :wrapperCol="{span:22}" prop="remark">
<a-textarea v-model="model.remark" rows="3" placeholder="璇疯緭鍏ュ娉�" disabled/>
diff --git a/src/views/flowable/workflow/FlowLedger.vue b/src/views/flowable/workflow/FlowLedger.vue
index 20eed95..41014c0 100644
--- a/src/views/flowable/workflow/FlowLedger.vue
+++ b/src/views/flowable/workflow/FlowLedger.vue
@@ -240,6 +240,9 @@
},
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)
},
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
index 4105cc7..0fe58e5 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandle.vue
@@ -208,7 +208,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
index 4e9fc1a..a658adc 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderHandleBzz.vue
@@ -229,7 +229,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue b/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
index 498e570..4ef96af 100644
--- a/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
+++ b/src/views/flowable/workflow/InspectionOrder/InspectionOrderXq.vue
@@ -205,7 +205,7 @@
url: {
queryBomDataById: '/eam/eamInspectionOrder/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/eam/eamInspectionOrder/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
index c52df86..fc8405c 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamHandle.vue
@@ -244,7 +244,7 @@
url: {
queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/nc/activit/assign/file/approve",
},
dictOptions: {},
diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
index 5f41f0f..6b602c7 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
@@ -200,7 +200,7 @@
url: {
queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
index 037cc6d..3df4835 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileHandle.vue
@@ -185,7 +185,7 @@
url: {
queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/dncFlow/dispatchFile/approval",
saveDispatchFile:"/dncFlow/dispatchFile/saveDispatchFile"
},
diff --git a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
index 3e0c806..dfac703 100644
--- a/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
@@ -176,7 +176,7 @@
url: {
queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ queryHisTaskList:'/assign/flow/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
--
Gitblit v1.9.3