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 | 102 +++++++++++++++++++++------------------------------
1 files changed, 42 insertions(+), 60 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 00c86cf..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,6 +62,8 @@
openDetail,
onSuccess,
onBeforeUpload,
+ onSendFlangeCode,
+ onFinishSendFlangeCode
} = usePipeAccessoryAssembly(props, ctx)
// 鏌ヨ琛ㄥ崟鏁版嵁
@@ -82,53 +84,7 @@
equipmentCode: '',
})
- const tableData = ref([
- { sequence: 1, flangeA: 'RF-200-1.6MPa', flangeB: 'WN-200-1.6MPa' },
- { sequence: 2, flangeA: 'WN-250-2.5MPa', flangeB: 'SO-250-2.5MPa' },
- { sequence: 3, flangeA: 'PL-300-1.0MPa', flangeB: 'RF-300-1.0MPa' },
- { sequence: 4, flangeA: 'SO-150-2.0MPa', flangeB: 'WN-150-2.0MPa' },
- { sequence: 5, flangeA: 'RF-400-1.6MPa', flangeB: 'PL-400-1.6MPa' },
- { sequence: 6, flangeA: 'WN-200-4.0MPa', flangeB: 'SO-200-4.0MPa' },
- { sequence: 7, flangeA: 'SO-300-1.6MPa', flangeB: 'RF-300-1.6MPa' },
- { sequence: 8, flangeA: 'PL-250-1.0MPa', flangeB: 'WN-250-1.0MPa' },
- { sequence: 9, flangeA: 'RF-150-2.5MPa', flangeB: 'SO-150-2.5MPa' },
- { sequence: 10, flangeA: 'WN-400-2.0MPa', flangeB: 'PL-400-2.0MPa' },
- ])
- const tableData2 = [
- { sequence: 1, flangeA: 'RF-200-1.6MPa', flangeB: 'WN-200-1.6MPa' },
- { sequence: 2, flangeA: 'WN-250-2.5MPa', flangeB: 'SO-250-2.5MPa' },
- { sequence: 3, flangeA: 'PL-300-1.0MPa', flangeB: 'RF-300-1.0MPa' },
- { sequence: 4, flangeA: 'SO-150-2.0MPa', flangeB: 'WN-150-2.0MPa' },
- { sequence: 5, flangeA: 'RF-400-1.6MPa', flangeB: 'PL-400-1.6MPa' },
- { sequence: 6, flangeA: 'WN-200-4.0MPa', flangeB: 'SO-200-4.0MPa' },
- { sequence: 7, flangeA: 'SO-300-1.6MPa', flangeB: 'RF-300-1.6MPa' },
- { sequence: 8, flangeA: 'PL-250-1.0MPa', flangeB: 'WN-250-1.0MPa' },
- { sequence: 9, flangeA: 'RF-150-2.5MPa', flangeB: 'SO-150-2.5MPa' },
- { sequence: 10, flangeA: 'WN-400-2.0MPa', flangeB: 'PL-400-2.0MPa' },
- ]
-
- const tableData3 = [
- {
- date: '2016-05-03',
- name: 'Tom',
- address: 'No. 189, Grove St, Los Angeles',
- },
- {
- date: '2016-05-02',
- name: 'Tom',
- address: 'No. 189, Grove St, Los Angeles',
- },
- {
- date: '2016-05-04',
- name: 'Tom',
- address: 'No. 189, Grove St, Los Angeles',
- },
- {
- date: '2016-05-01',
- name: 'Tom',
- address: 'No. 189, Grove St, Los Angeles',
- },
- ]
+
// 鏁版嵁婧�
const modelOptions = ref<Array<{ value: string; label: string }>>([])
const placeNoOptions = ref<Array<{ value: string; label: string }>>([])
@@ -183,6 +139,7 @@
console.log('杈撳叆鍐呭纭:', value) // 澶卞幓鐒︾偣鎴栧洖杞︽椂瑙﹀彂
if (value == '') {
initQueryForm()
+
return
}
// 鍦ㄦ澶勬坊鍔犱笟鍔￠�昏緫锛堝鏍￠獙銆佹彁浜ょ瓑锛�
@@ -199,6 +156,7 @@
initQueryForm()
} else {
queryForm.value = workPlan
+ refreshProcessRoute();
}
}
const initQueryForm = () => {
@@ -218,23 +176,46 @@
processName: '',
equipmentCode: '',
}
+
+ dataSource.value=[] //娓呯┖琛ㄦ牸鏁版嵁
}
//鎮ㄧ殑涓氬姟閫昏緫
const paramForProcessRoute= {
processName: '娉曞叞鍐茬爜宸ュ簭',
ProcessName_FilterMode:2,//绮惧噯鏌ヨ
- pipeSpecCode: queryForm.value.pipeSpecCode,
+ pipeSpecCode: 'XXX',//榛樿鍏堢粰涓笉瀛樺湪鐨勬暟鎹�
pipeSpecCode_FilterMode:2,//绮惧噯鏌ヨ
}
+
+let routeUrl=ref("");
// 鍒锋柊宸ヨ壓淇℃伅
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)
+ }
+ // 涓嬪彂娉曞叞鍐茬爜
+ const sendFlangeCode = () => {
+ console.log('鎵ц 涓嬪彂娉曞叞鍐茬爜')
+ if (queryForm.value.pipeSpecCode == '') {
+ ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
+ return
+ }
+ onSendFlangeCode();
+ }
+ // 瀹屽伐娉曞叞鍐茬爜
+ const finishSendFlangeCode = () => {
+ console.log('鎵ц 瀹屽伐娉曞叞鍐茬爜')
+ if (queryForm.value.pipeSpecCode == '') {
+ ElMessage.error('璇疯緭鍏ョ娈电紪鐮�')
+ return
+ }
+ onFinishSendFlangeCode();
}
// 寮�宸ヤ簨浠跺鐞�
const startWork = () => {
@@ -578,18 +559,19 @@
</div> */}
<div class="info-block">
<h2 class="block-title">宸ヨ壓淇℃伅</h2>
- <div class={styles.actionButtons}>
+ <div class={styles.actionButtons} style="margin-bottom:5px;">
<ElButton type="warning" onClick={refreshProcessRoute}>
鍒锋柊
</ElButton>
+ <ElButton type="warning" onClick={sendFlangeCode}>
+ 涓嬪彂娉曞叞鍐茬爜
+ </ElButton>
+ <ElButton type="warning" onClick={finishSendFlangeCode}>
+ 瀹屽伐娉曞叞鍐茬爜
+ </ElButton>
</div>
- {/* <el-table stripe :data="tableData3" style="width: 100%">
- <el-table-column prop="date" label="Date" width="180" />
- <el-table-column prop="name" label="Name" width="180" />
- <el-table-column prop="address" label="Address" />
- </el-table> */}
<RenderBaseTable
- url="/api/v1/PipeLineLems/workTask/page"
+ url={routeUrl.value}
dataSource={dataSource}
isChecked={true}
isDrag={true}
--
Gitblit v1.9.3