From 926a1e8b90381c7aa085d5462d78de9d2cc6034d Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 27 二月 2024 08:58:15 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue |   38 +++++++++++++++++++++++++-------------
 1 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
index 891ff5e..c257ddc 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/processCard/SelectProcessCard.vue
@@ -21,7 +21,15 @@
       break
     }
     case 'setType': {
-      alert('鎴戞帴鏀跺埌瀛愮粍浠朵紶閫佺殑鍒犻櫎淇℃伅')
+      request.post(`/processCard/updateLayoutStatus/${row.processId}`).then((res) => {
+        if (res.code == 200) {
+          ElMessage.success("鎺掔増鎴愬姛")
+          location.reload();
+        } else {
+
+          ElMessage.warning(res.msg)
+        }
+      })
       break
     }
     case 'delete': {
@@ -222,15 +230,15 @@
     {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
     {title: '鎿嶄綔', width: 140, slots: { default: 'button_slot' },fixed:"left"},
     { type: 'seq',fixed:"left", title: '鑷簭', width: 50 },
-    {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true, },
-    {field: 'processId', width: 130, title: '娴佺▼鍗″彿', sortable: true,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'orderDetail.productId', title: '浜у搧缂栧彿', sortable: true,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
-    {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, sortable: true},
-    {field: 'order.project', title: '椤圭洰鍚嶇О', sortable: true,showOverflow:"ellipsis"},
-    {field: 'binningQuantity', title: '鏁伴噺', sortable: true},
-    {field: 'orderDetail.computeGrossArea', title: '闈㈢Н', sortable: true},
-    {field: 'founder', title: '鍒嗘灦鍛�', sortable: true},
-    {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', sortable: true}
+    {field: 'orderId', title: '閿�鍞崟鍙�',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'processId', width: 130, title: '娴佺▼鍗″彿' ,showOverflow:"ellipsis" ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderDetail.productId', title: '浜у搧缂栧彿' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' }},
+    {field: 'orderDetail.productName', title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' }, },
+    {field: 'order.project', title: '椤圭洰鍚嶇О' ,showOverflow:"ellipsis"},
+    {field: 'binningQuantity', title: '鏁伴噺', },
+    {field: 'orderDetail.computeGrossArea', title: '闈㈢Н', },
+    {field: 'founder', title: '鍒嗘灦鍛�', },
+    {field: 'orderDetail.processingNote', title: '鍔犲伐瑕佹眰', }
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -238,8 +246,8 @@
     //
     // }],
     import: false,
-    export: true,
-    print: true,
+    // export: true,
+    // print: true,
     zoom: true,
     custom: true
   },
@@ -283,7 +291,11 @@
 
         />
         &nbsp;&nbsp;
-        <el-button type="primary">鏌ヨ</el-button>
+        <el-button
+            @click="getWorkOrder"
+            id="select"
+            type="primary" :icon="Search">鏌ヨ
+        </el-button>
       </el-row>
 
     </div>

--
Gitblit v1.8.0