From ec3cfd144de6fcf5e5cbfaf02585c17805300602 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 21 5月 2025 13:35:16 +0800
Subject: [PATCH] 优化
---
PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 175 ++++++++++++++++++++++++++++++++-------------------------
1 files changed, 98 insertions(+), 77 deletions(-)
diff --git a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
index 7261c72..c7bb98c 100644
--- a/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
+++ b/PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx
@@ -14,12 +14,8 @@
ElCol,
} from 'element-plus'
import {
- getPlaceNoForStockList,
- getMaterialModelList,
- instock,
- findSingleWorkPlanByFilter,
- pick,
- finishProduction
+ getPickRet1,
+ pick
} from '@/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick'
import { Message } from '@element-plus/icons-vue/dist/types'
@@ -30,6 +26,7 @@
const queryForm = ref({
pipeSpecCode: '',
continerNo:'',
+ placeNo:'',
processRouteNumber: '',
taskCode: '',
length: '',
@@ -51,8 +48,8 @@
onMounted(() => {
// 缁勪欢鎸傝浇鍚庤幏鍙栧瀷鍙峰垪琛ㄥ拰搴撲綅鍙峰垪琛�
- getModelList()
- getPlaceNoList()
+ // getModelList()
+ // getPlaceNoList()
})
// 缁勭洏鎿嶄綔
@@ -61,16 +58,16 @@
// 杩欓噷娣诲姞缁勭洏閫昏緫
}
- // 缁勭洏鍏ュ簱鎿嶄綔
- const handlePalletizeStorage = () => {
- console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
- instock(queryForm.value), resetQueryForm()
- ElMessage.success({
- message: '缁勭洏鍏ュ簱鎴愬姛',
- type: 'success',
- })
- // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
- }
+ // // 缁勭洏鍏ュ簱鎿嶄綔
+ // const handlePalletizeStorage = () => {
+ // console.log('缁勭洏鍏ュ簱鎿嶄綔', queryForm.value)
+ // instock(queryForm.value), resetQueryForm()
+ // ElMessage.success({
+ // message: '缁勭洏鍏ュ簱鎴愬姛',
+ // type: 'success',
+ // })
+ // // 杩欓噷娣诲姞缁勭洏鍏ュ簱閫昏緫
+ // }
const resetQueryForm = () => {
queryForm.value.materialModel = ''
@@ -79,54 +76,66 @@
queryForm.value.stockNumber = ''
}
- const getModelList = async () => {
- const models = await getMaterialModelList()
- modelOptions.value = models.map((item: string) => ({
- value: item.materialModel,
- label: item.materialModelDesc,
- }))
- }
+ // const getModelList = async () => {
+ // const models = await getMaterialModelList()
+ // modelOptions.value = models.map((item: string) => ({
+ // value: item.materialModel,
+ // label: item.materialModelDesc,
+ // }))
+ // }
- const getPlaceNoList = async () => {
- const placeNos = await getPlaceNoForStockList(2)
- console.log('搴撲綅鍙峰垪琛�:', placeNos)
- placeNoOptions.value = placeNos.map((item: string) => ({
- value: item.placeNo,
- label: item.placeNoDesc,
- }))
- }
+ // const getPlaceNoList = async () => {
+ // const placeNos = await getPlaceNoForStockList(2)
+ // console.log('搴撲綅鍙峰垪琛�:', placeNos)
+ // placeNoOptions.value = placeNos.map((item: string) => ({
+ // value: item.placeNo,
+ // label: item.placeNoDesc,
+ // }))
+ // }
const handleChange =async (value) => {
console.log('杈撳叆鍐呭纭:', value); // 澶卞幓鐒︾偣鎴栧洖杞︽椂瑙﹀彂
+ if(value==''){
+ initQueryForm();
+ return;
+ }
// 鍦ㄦ澶勬坊鍔犱笟鍔￠�昏緫锛堝鏍￠獙銆佹彁浜ょ瓑锛�
const param={
pipeSpecCode:value,
pipeSpecCode_FilterMode:2,//绮惧噯鏌ヨ
- processName:'瑁呴厤宸ュ簭',
+ processName:'鍒囧壊宸ュ簭',
processName_FilterMode:2,//绮惧噯鏌ヨ
}
- const workPlan = await findSingleWorkPlanByFilter(param);
+ const workPlan = await getPickRet1(param);
console.log('杩斿洖:'+workPlan);
- if(workPlan==''){
+ if(workPlan.code!="200"){
ElMessage.error('娌℃湁鎵惧埌鏁版嵁');
- queryForm.value ={ pipeSpecCode: '',
- continerNo:'',
- processRouteNumber: '',
- taskCode: '',
- length: '',
- projectNumber: '',
- shipNumber: '',
- material: '',
- outerDiameter: '',
- thickness: '',
- plannedStartTime: '',
- plannedEndTime: '',
- workstationCode: '',
- processName: '',
- equipmentCode: ''}
+ initQueryForm();
}else{
- queryForm.value=workPlan;
+ queryForm.value=workPlan.data.workPlan;
+
+ queryForm.value.placeNo=workPlan.data.placeNo;
+ queryForm.value.continerNo=workPlan.data.continerNo;
}
};
+
+ const initQueryForm=()=>{
+ queryForm.value ={ pipeSpecCode: '',
+ continerNo:'',
+ placeNo:'',
+ processRouteNumber: '',
+ taskCode: '',
+ length: '',
+ projectNumber: '',
+ shipNumber: '',
+ material: '',
+ outerDiameter: '',
+ thickness: '',
+ plannedStartTime: '',
+ plannedEndTime: '',
+ workstationCode: '',
+ processName: '',
+ equipmentCode: ''}
+ }
// 鍒嗘嫞浜嬩欢澶勭悊
const startWork = () => {
@@ -144,42 +153,47 @@
).then(async () => {
//鎮ㄧ殑涓氬姟閫昏緫
const param={
+ taskCode:queryForm.value.taskCode,
pipeSpecCode:queryForm.value.pipeSpecCode,
continerNo:queryForm.value.continerNo,
+ placeNo:queryForm.value.placeNo
};
+
const ret = await pick(param);
console.log('杩斿洖:'+ret);
- if(ret.code="200"){
+
+ if(ret.code=="200"){
ElMessage.success('鍒嗘嫞鎴愬姛');
}else{
ElMessage.error('鍒嗘嫞澶辫触:'+ret.message);
}
})
}
- // 瀹屽伐浜嬩欢澶勭悊
- const finishWork = () => {
- console.log('鎵ц寮�宸ユ搷浣�');
- if(queryForm.value.pipeSpecCode==''){
- ElMessage.error('璇疯緭鍏ョ娈电紪鐮�');
- return
- }
- ConfirmBox(
- `纭畾瑕佸皢绠℃缂栫爜${queryForm.value.pipeSpecCode}瀹屽伐鍚梎
- ).then(async () => {
- //鎮ㄧ殑涓氬姟閫昏緫
- const param={
- pipeSpecCode:queryForm.value.pipeSpecCode,
- processName:queryForm.value.processName,
- };
- const ret = await finishProduction(param);
- console.log('杩斿洖:'+ret);
- if(ret.code="200"){
- ElMessage.success('瀹屽伐鎴愬姛');
- }else{
- ElMessage.error('瀹屽伐澶辫触:'+ret.message);
- }
- })
- }
+ // // 瀹屽伐浜嬩欢澶勭悊
+ // const finishWork = () => {
+ // console.log('鎵ц寮�宸ユ搷浣�');
+ // if(queryForm.value.pipeSpecCode==''){
+ // ElMessage.error('璇疯緭鍏ョ娈电紪鐮�');
+ // return
+ // }
+ // ConfirmBox(
+ // `纭畾瑕佸皢绠℃缂栫爜${queryForm.value.pipeSpecCode}瀹屽伐鍚梎
+ // ).then(async () => {
+ // //鎮ㄧ殑涓氬姟閫昏緫
+ // const param={
+ // pipeSpecCode:queryForm.value.pipeSpecCode,
+ // processName:queryForm.value.processName,
+
+ // };
+ // const ret = await finishProduction(param);
+ // console.log('杩斿洖:'+ret);
+ // if(ret.code="200"){
+ // ElMessage.success('瀹屽伐鎴愬姛');
+ // }else{
+ // ElMessage.error('瀹屽伐澶辫触:'+ret.message);
+ // }
+ // })
+ // }
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' },
@@ -215,6 +229,13 @@
class={styles.formInput}
/>
</ElFormItem>
+ <ElFormItem label="搴撲綅鍙� ">
+ <ElInput
+ v-model={queryForm.value.placeNo}
+ clearable
+ class={styles.formInput}
+ />
+ </ElFormItem>
<div class={styles.actionButtons}>
<ElButton type="warning" onClick={startWork}>鍒嗘嫞</ElButton>
{/* <ElButton type="warning" onClick={finishWork}>瀹屽伐</ElButton> */}
--
Gitblit v1.9.3