From 05c47e0a832bbd2b8bafb732fc55c1ef8e9b97e0 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周三, 21 5月 2025 11:41:47 +0800 Subject: [PATCH] 22 --- PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx | 104 +++++++++++++++++++++++++++------------------------ 1 files changed, 55 insertions(+), 49 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 11339fe..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,10 +14,7 @@ ElCol, } from 'element-plus' import { - getPlaceNoForStockList, - getMaterialModelList, - instock, - getPickRet, + getPickRet1, pick } from '@/widgets/PipeAccessoryPick/Models/Service/PipeAccessoryPick' import { Message } from '@element-plus/icons-vue/dist/types' @@ -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,51 +76,40 @@ 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 getPickRet(param); + const workPlan = await getPickRet1(param); console.log('杩斿洖:'+workPlan); if(workPlan.code!="200"){ ElMessage.error('娌℃湁鎵惧埌鏁版嵁'); - queryForm.value ={ pipeSpecCode: '', - continerNo:'', - placeNo:'', - processRouteNumber: '', - taskCode: '', - length: '', - projectNumber: '', - shipNumber: '', - material: '', - outerDiameter: '', - thickness: '', - plannedStartTime: '', - plannedEndTime: '', - workstationCode: '', - processName: '', - equipmentCode: ''} + initQueryForm(); }else{ queryForm.value=workPlan.data.workPlan; @@ -131,6 +117,25 @@ 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 = () => { @@ -148,6 +153,7 @@ ).then(async () => { //鎮ㄧ殑涓氬姟閫昏緫 const param={ + taskCode:queryForm.value.taskCode, pipeSpecCode:queryForm.value.pipeSpecCode, continerNo:queryForm.value.continerNo, placeNo:queryForm.value.placeNo -- Gitblit v1.9.3