From 61a19a514eed8796ee2c6e7ab1111addf053cf67 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 28 五月 2025 15:46:18 +0800
Subject: [PATCH] 1.新增NC文件批次页签 2.批次页签新增 数控加工确认表按钮，点击按钮出现对应批次确认表 3.处理修改查询电子样板与NC文件查询页面处理文件名折叠问题
---
src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
index c9ba525..e74754c 100644
--- a/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
+++ b/src/views/flowable/workflow/assignFileStream/AssignFileStreamXq.vue
@@ -76,12 +76,12 @@
</a-row>
<a-row>
<a-col :span='span'>
- <a-form-model-item label='璁惧绫诲悕绉�' :labelCol='labelCol' :wrapperCol='wrapperCol' prop='deviceManagementCode'>
+ <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-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>
@@ -105,13 +105,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="item.description != null">澶勭悊鎰忚锛歿{item.description}}</p>
+ <div class="left_qiu"><span>{{item.taskName}}</span></div>
</div>
</a-timeline-item>
</a-timeline>
@@ -202,7 +200,7 @@
url: {
queryBomDataById: '/nc/activit/selectVoById',
diagramView: '/assign/flow/diagramView',
- queryHisTaskList:'/assign/flow/queryHisTaskList',
+ queryHisTaskList:'/dncFlow/dispatchFile/queryHisTaskList',
approve:"/activit/assign/file/approve",
},
dictOptions: {},
@@ -291,12 +289,13 @@
},
getAllApproveData(item) {
console.log('selectShenpiData----->', this.selectShenpiData)
+ console.log('item----->', item)
this.flowData = item
let param = {
'id': item.dataId
}
let parmhis={
- 'drapprovedataId': item.dataId
+ 'procInstId': item.procInstId
}
getAction(this.url.queryHisTaskList,parmhis).then(res=>{
this.hitaskDataSource=res.result
--
Gitblit v1.9.3