From 0025d492f22acf84f6db722381b4a54893f6ef29 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 19 5月 2025 18:03:30 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo

---
 PipeLineLems/pipelinelems_web/src/widgets/PipeAccessoryPick/Views/Pages/PipeAccessoryPick/PipeAccessoryPick.tsx |   47 ++++++++++++++++++++++++++++-------------------
 1 files changed, 28 insertions(+), 19 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..a7fd24b 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
@@ -51,8 +51,8 @@
 
     onMounted(() => {
       // 缁勪欢鎸傝浇鍚庤幏鍙栧瀷鍙峰垪琛ㄥ拰搴撲綅鍙峰垪琛�
-      getModelList()
-      getPlaceNoList()
+      // getModelList()
+      // getPlaceNoList()
     })
 
     // 缁勭洏鎿嶄綔
@@ -97,33 +97,22 @@
     }
     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);
       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 +120,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 +156,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