From 15e22fc7a5b6ee006ff88e0eb0d1bd36f14d683f Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 01 四月 2025 15:21:28 +0800
Subject: [PATCH] 修改审签工作流
---
src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue | 105 +++++++++++++++++++++-------------------------------
1 files changed, 42 insertions(+), 63 deletions(-)
diff --git a/src/views/flowable/workflow/FlowXq.vue b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
similarity index 74%
copy from src/views/flowable/workflow/FlowXq.vue
copy to src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
index 2a88be5..2e20803 100644
--- a/src/views/flowable/workflow/FlowXq.vue
+++ b/src/views/flowable/workflow/dispatchFile/DispatchFileXq.vue
@@ -1,3 +1,8 @@
+<!--
+ Description: 宸ヤ綔娴�-NC瀹＄璇︽儏椤甸潰 List
+ Author: 浣滆�� liuyh
+ Date: 2025-02-27
+-->
<template>
<a-modal
:title="title"
@@ -8,14 +13,14 @@
>
<a-card :bordered="false">
<div>
- <b>{{ selectShenpiData.description }}</b>
+ <b>{{ selectShenpiData.title }}</b>
<br>
<br>
<a-tag color="blue">
- 澶勭悊浜� {{ selectShenpiData.assignee }}
+ 褰撳墠澶勭悊浜� {{ selectShenpiData.assignee_dictText }}
</a-tag>
<a-tag color="blue">
- 鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
+ 褰撳墠浠诲姟鍒涘缓鏃堕棿 {{ selectShenpiData.createTime }}
</a-tag>
<br>
<br>
@@ -26,7 +31,7 @@
<hr class="shallow-hr">
</div>
<div>
- <b>鎸囨淳璇︽儏</b>
+ <b>瀹＄璇︽儏</b>
<br>
<a-form :form='form'>
<a-spin :spinning="spinning">
@@ -35,61 +40,37 @@
<a-form-model ref='form' :model='tableRowRecord' :rules='validatorRules'>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='浜у搧鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='productName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.productName'></a-input>
+ <a-form-model-item label='鏂囨。鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input>
</a-form-model-item>
</a-col>
<a-col :span='span'>
- <a-form-model-item label='閮ㄤ欢鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='componentId'>
+ <a-form-model-item label='鏂囨。鐗堟湰' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='publishVersion'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.publishVersion'></a-input>
+ </a-form-model-item>
+ </a-col>
+ </a-row>
+ <a-row>
+ <a-col :span='span'>
+ <a-form-model-item label='鏂囨。鍚庣紑' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docSuffix'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.docSuffix'></a-input>
+ </a-form-model-item>
+ </a-col>
+ <a-col :span='span'>
+ <a-form-model-item label='绯荤粺鎸囧畾鐗堟湰' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='componentId'>
<a-input :disabled='coldisabled' v-model='tableRowRecord.componentName'></a-input>
</a-form-model-item>
</a-col>
</a-row>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='闆朵欢鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='partsName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.partsName'></a-input>
+ <a-form-model-item label='鍑哄簱鐘舵��' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullStatus_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullStatus_dictText'></a-input>
</a-form-model-item>
</a-col>
<a-col :span='span'>
- <a-form-model-item label='宸ュ簭鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='processName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.processName'></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span='span'>
- <a-form-model-item label='宸ユ鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='stepName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.stepName'></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span='span'>
- <a-form-model-item label='璁惧鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceName'></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span='span'>
- <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementCode'></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span='span'>
- <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.deviceManagementName'></a-input>
- </a-form-model-item>
- </a-col>
- </a-row>
- <a-row>
- <a-col :span='span'>
- <a-form-model-item label='鏂囨。鍚嶇О' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='docName'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.docName'></a-input>
- </a-form-model-item>
- </a-col>
- <a-col :span='span'>
- <a-form-model-item label='鏂囨。鐗堟湰' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='version'>
- <a-input :disabled='coldisabled' v-model='tableRowRecord.version'></a-input>
+ <a-form-model-item label='鍑哄簱浜�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='pullUser_dictText'>
+ <a-input :disabled='coldisabled' v-model='tableRowRecord.pullUser_dictText'></a-input>
</a-form-model-item>
</a-col>
</a-row>
@@ -100,13 +81,11 @@
<a-timeline style="padding:0 1% 0 12%" >
<a-timeline-item color='white' v-for="(item,index1) in hitaskDataSource" :key="index1">
<div class="bottom">
- <p>寮�濮嬫椂闂达細{{item.startTime}}</p>
- <p>缁撴潫鏃堕棿锛歿{item.endTime}}</p>
- <p>澶勭悊浜猴細{{item.assignee}}</p>
- <p v-if="item.name !== '鎻愪氦鐢宠'">鍔炵悊绫诲瀷锛歿{item.status_dictText}}</p>
- <p v-if="item.name === '鎻愪氦鐢宠'">鎸囨淳鍘熷洜锛歿{item.cause}}</p>
- <p v-else >澶勭悊鎰忚锛歿{item.cause}}</p>
- <div class="left_qiu"><span>{{item.name}}</span></div>
+ <p>澶勭悊浜猴細{{item.assignee_dictText}}</p>
+ <p v-if="index1 !==0">澶勭悊鏃堕暱锛歿{item.duration}}</p>
+ <p v-if="item.name !== '鎻愪氦鐢宠'">澶勭悊绫诲瀷锛歿{item.sequenceFlowName}}</p>
+ <p v-if="index1 !==0">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
</div>
</a-timeline-item>
</a-timeline>
@@ -124,9 +103,9 @@
<script>
-import '@/assets/less/TableExpand.less'
+import '@assets/less/TableExpand.less'
import { mixinDevice } from '@/utils/mixin'
-import { getAction, deleteAction, postAction, downFile, httpAction } from '@/api/manage'
+import { getAction, deleteAction, postAction, downFile, httpAction } from '@api/manage'
export default {
name: 'FlowShenPi',
mixins: [mixinDevice],
@@ -195,10 +174,10 @@
visible: false,
// 琛ㄥご
url: {
- queryBomDataById: '/nc/activit/selectVoById',
- diagramView: '/nc/assign/flow/diagramView',
- queryHisTaskList:'/nc/assign/flow/queryHisTaskList',
- approve:"/nc/activit/assign/file/approve",
+ queryBomDataById: '/dncFlow/dispatchFile/selectVoById',
+ diagramView: '/assign/flow/diagramView',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
+ approve:"/activit/assign/file/approve",
},
dictOptions: {},
superFieldList: [],
@@ -291,14 +270,14 @@
'id': item.dataId
}
let parmhis={
- 'drapprovedataId': item.dataId
+ 'procInstId': item.procInstId
}
getAction(this.url.queryHisTaskList,parmhis).then(res=>{
this.hitaskDataSource=res.result
getAction(this.url.queryBomDataById, param).then((res => {
if (res.success) {
- this.tableRowRecord = res.result
- console.log('this.tableRowRecord----->', this.tableRowRecord)
+ this.tableRowRecord = res.result[0]
+ console.log('this.tableRowRecord----->', this.tableRowRecord[0])
}
}))
}).finally(
--
Gitblit v1.9.3