From f0d85fcacc87937db731327cabd7d41d77eddcda Mon Sep 17 00:00:00 2001
From: pan <antony1029@163.com>
Date: 星期六, 15 十一月 2025 09:04:00 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhongRui/ALDbanyunxiangmu

---
 项目代码/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js |   58 +++++++++++++++++++++++++++++-----------------------------
 1 files changed, 29 insertions(+), 29 deletions(-)

diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
index 664b84e..3c1e490 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WMSClient/src/extension/outbound/outboundOrder.js"
@@ -18,7 +18,7 @@
     },
     tableAction: '', //鎸囧畾鏌愬紶琛ㄧ殑鏉冮檺(杩欓噷濉啓琛ㄥ悕,榛樿涓嶇敤濉啓)
     buttons: { view: [
-       {
+       /* {
         name: '鍑哄簱',
         type: 'primary',
         value: '鍑哄簱',
@@ -42,31 +42,31 @@
             createDate: selectedRows[0].createDate || new Date().toLocaleDateString()  // 鍑哄簱鏃ユ湡
           });
         }
-      },
+      }, */
       {
   name: '绌烘墭鐩樺嚭搴�',
   type: 'primary',
   value: '绌烘墭鐩樺嚭搴�',
   onClick: function () {
     
-    // 2. 鐢熸垚3-12绔欏彴閫夐」锛堥粯璁ょ涓�涓负绔欏彴3锛�
-    const platformOptions = Array.from({ length: 10 }, (_, i) => {
-      const num = i + 3;
-      return { label: `绔欏彴${num}`, value: `PLATFORM${num.toString().padStart(3, '0')}` };
+   
+    const platformOptions = Array.from({ length: 1 }, (_, i) => {
+      const num = 1;
+      return { label: `绔欏彴${num}`, value: `1-2` };
     });
 
     const mountNode = document.createElement('div');
     document.body.appendChild(mountNode);
 
-    // 3. 琛ㄥ崟鏁版嵁锛堥粯璁ら�変腑绔欏彴3锛�
+    
     const formData = reactive({
       palletCode: '',
-      selectedPlatform: platformOptions[0].value // 榛樿缁戝畾绔欏彴3鐨剉alue
+      selectedPlatform: platformOptions[0].value 
     });
 
     const vnode = createVNode(ElDialog, {
       title: '绌烘墭鐩樺嚭搴�',
-      width: '500px', // 寰皟瀹藉害鏇村崗璋�
+      width: '500px', 
       modelValue: true,
       appendToBody: true,
       'onUpdate:modelValue': (isVisible) => {
@@ -76,8 +76,8 @@
         }
       },
       style: {
-        padding: '20px 0', // 寮圭獥鍐呬笂涓嬬暀鐧斤紝閬垮厤鍐呭绱ц创杈规
-        borderRadius: '8px' // 杞诲井鍦嗚锛屾彁鍗囪川鎰�
+        padding: '20px 0', 
+        borderRadius: '8px' 
       }
     }, {
       default: () => h(ElForm, {
@@ -91,28 +91,28 @@
           ]
         },
         ref: 'batchOutForm',
-        labelWidth: '100px', // 鍥哄畾鏍囩瀹藉害锛岀‘淇濆榻�
+        labelWidth: '100px', 
         style: {
-          padding: '0 30px', // 琛ㄥ崟宸﹀彸鐣欑櫧锛屽鍔犲懠鍚告劅
+          padding: '0 30px', 
         }
       }, [
-        // 鍑哄簱绔欏彴锛堜笂锛屼紭鍖栨牱寮忥級
+        
         h(ElFormItem, {
           label: '鍑哄簱绔欏彴',
           prop: 'selectedPlatform',
           style: {
-            marginBottom: '24px' // 琛ㄥ崟椤归棿璺濅紭鍖�
+            marginBottom: '24px' 
           }
         }, [
           h(ElSelect, {
-            placeholder: '璇烽�夋嫨鍑哄簱绔欏彴锛�3-12锛�',
+            placeholder: '璇烽�夋嫨鍑哄簱绔欏彴',
             modelValue: formData.selectedPlatform,
             'onUpdate:modelValue': (val) => {
               formData.selectedPlatform = val;
             },
             style: {
               width: '100%',
-              height: '40px', // 缁熶竴缁勪欢楂樺害
+              height: '40px', 
               borderRadius: '4px',
               borderColor: '#dcdfe6'
             }
@@ -120,12 +120,12 @@
             h(ElOption, { label: platform.label, value: platform.value })
           ))
         ]),
-        // 鎵樼洏缂栧彿锛堜笅锛屼紭鍖栨牱寮忥級
+        
         h(ElFormItem, {
           label: '鏂欑鍙�',
           prop: 'palletCode',
           style: {
-            marginBottom: '16px' // 涓庢寜閽尯鎷夊紑鍚堢悊闂磋窛
+            marginBottom: '16px' 
           }
         }, [
           h(ElInput, {
@@ -137,21 +137,21 @@
             },
             style: {
               width: '100%',
-              height: '40px', // 涓庨�夋嫨鍣ㄩ珮搴︾粺涓�
+              height: '40px', 
               borderRadius: '4px',
               borderColor: '#dcdfe6'
             },
             attrs: {
-              placeholderStyle: 'color: #909399;' // 鍗犱綅鏂囧瓧棰滆壊浼樺寲锛屾洿鏌斿拰
+              placeholderStyle: 'color: #909399;' 
             }
           })
         ]),
-        // 搴曢儴鎸夐挳鍖猴紙鏍峰紡浼樺寲锛�
+        
         h('div', {
           style: {
             textAlign: 'right',
             marginTop: '8px',
-            paddingRight: '4px' // 鎸夐挳涓庡彸渚у榻愬井璋�
+            paddingRight: '4px' 
           }
         }, [
           h(ElButton, {
@@ -163,7 +163,7 @@
             },
             style: {
               marginRight: '8px',
-              color: '#606266' // 鍙栨秷鎸夐挳棰滆壊浼樺寲
+              color: '#606266' 
             }
           }, '鍙栨秷'),
           h(ElButton, {
@@ -176,12 +176,12 @@
                 return;
               }
 
-              http.post('/api/wmsTask/BatchOutboundTask', {
-                palletCode: formData.palletCode,
-                platform: formData.selectedPlatform
+              http.post('/api/Task/PalletOutboundTask?palletCode='+formData.palletCode+'&endStation='+formData.selectedPlatform, {
+                
               }).then(({ data, status, message }) => {
                 if (status) {
-                  ElMessage.success(`鍑哄簱鎴愬姛锛屽垎閰嶇殑鎵樼洏缂栧彿锛�${data.palletCode || formData.palletCode}`);
+
+                  ElMessage.success(`鍑哄簱鎴愬姛`);
                   this.refresh();
                   render(null, mountNode);
                   document.body.removeChild(mountNode);
@@ -194,7 +194,7 @@
             },
             style: {
               borderRadius: '4px',
-              padding: '8px 20px' // 鎸夐挳鍐呰竟璺濅紭鍖栵紝鐐瑰嚮鍖哄煙鏇磋垝閫�
+              padding: '8px 20px' 
             }
           }, '纭畾')
         ])

--
Gitblit v1.9.3