From 5a149d626ae8bc3fa4bddbb53f8caf40f51f6da6 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 04 6月 2025 17:42:13 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
index e34a429..595e58c 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryAssembly/Views/Pages/PipeAccessoryAssembly/PipeAccessoryAssembly.tsx
@@ -62,7 +62,8 @@
openDetail,
onSuccess,
onBeforeUpload,
- onSendFlangeCode
+ onSendFlangeCode,
+ onFinishSendFlangeCode
} = usePipeAccessoryAssembly(props, ctx)
// 鏌ヨ琛ㄥ崟鏁版嵁
@@ -182,7 +183,7 @@
const paramForProcessRoute= {
processName: '娉曞叞鍐茬爜宸ュ簭',
ProcessName_FilterMode:2,//绮惧噯鏌ヨ
- pipeSpecCode: '',
+ pipeSpecCode: 'XXX',//榛樿鍏堢粰涓笉瀛樺湪鐨勬暟鎹�
pipeSpecCode_FilterMode:2,//绮惧噯鏌ヨ
}
@@ -190,10 +191,10 @@
// 鍒锋柊宸ヨ壓淇℃伅
const refreshProcessRoute = () => {
console.log('鎵ц 鍒锋柊宸ヨ壓淇℃伅')
- // if (queryForm.value.pipeSpecCode == '') {
- // ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
- // return
- // }
+ if (queryForm.value.pipeSpecCode == '') {
+ ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
+ return
+ }
routeUrl.value="/api/v1/PipeLineLems/workTask/page";
paramForProcessRoute.pipeSpecCode = queryForm.value.pipeSpecCode
tableRef.value.getList(paramForProcessRoute)
@@ -206,6 +207,15 @@
return
}
onSendFlangeCode();
+ }
+ // 瀹屽伐娉曞叞鍐茬爜
+ const finishSendFlangeCode = () => {
+ console.log('鎵ц 瀹屽伐娉曞叞鍐茬爜')
+ if (queryForm.value.pipeSpecCode == '') {
+ ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
+ return
+ }
+ onFinishSendFlangeCode();
}
// 寮�宸ヤ簨浠跺鐞�
const startWork = () => {
@@ -556,6 +566,9 @@
<ElButton type="warning" onClick={sendFlangeCode}>
涓嬪彂娉曞叞鍐茬爜
</ElButton>
+ <ElButton type="warning" onClick={finishSendFlangeCode}>
+ 瀹屽伐娉曞叞鍐茬爜
+ </ElButton>
</div>
<RenderBaseTable
url={routeUrl.value}
--
Gitblit v1.9.3