From e50fa16b6dbc4e7c50d5fbdbc04d2a556ca01c4e Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 02 十二月 2024 11:26:36 +0800
Subject: [PATCH] 补片流程卡调整

---
 north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue |   67 +++++++++++++++++++++------------
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
index 543c221..6b7ec73 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessCardProgress.vue
@@ -46,20 +46,7 @@
     processingNote: '',
   }
 })
-const columns = [
-  // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
-  {field: 'product_name', width: 150, title: '浜у搧鍚嶇О',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'glass_child',width: 130, title: '鍗曠墖鍚嶇О' ,filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'order_type', width: 120,title: '璁㈠崟绫诲瀷',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'process_id',width: 110, title: '娴佺▼鍗″彿',filters:[{ data: '' }],slots: { filter: 'num1_filter' },filterMethod: filterChanged},
-  {field: 'order_number', width: 90,title: '璁㈠崟搴忓彿',showOverflow:"ellipsis"},
-  {field: 'technology_number', width: 90,title: '灏忕墖椤哄簭',showOverflow:"ellipsis"},
-  {field: 'quantity', width: 90,title: '鏁伴噺'},
-  {field: 'broken_num',width: 90, title: '娆＄牬鏁伴噺'},
-  {field: 'shippedQuantity',width: 120, title: '鍙戣揣鏁伴噺'},
-  {field: 'inventory',width: 120, title: '鍏ュ簱鏁伴噺'},
-  {field: 'inventoryArea',width: 120, title: '鍏ュ簱闈㈢Н'},
-]
+
 //闇�瑕佸悎骞剁殑鍒�
 let column = [1,3,8]
 //鐐瑰嚮鏌ヨ
@@ -67,10 +54,10 @@
   request.post(`/report/processCardProgress/${form.orderId}`,column).then((res) => {
     if (res.code == 200) {
       if(res.data.data.length===0){
-        ElMessage.warning('鏈煡璇㈠埌姝よ鍗曟祦绋嬪崱鏁版嵁')
+        ElMessage.warning(t('report.noDataFoundForThisOrder'))
         return
       }
-      gridOptions.columns = JSON.parse(JSON.stringify(columns))
+      //gridOptions.columns = JSON.parse(JSON.stringify(columns))
       res.data.title.forEach(item =>{
         let column = {slots: { default: 'quantitySum' }, width: 90,title: item.process}
         gridOptions.columns.push(column)
@@ -114,7 +101,7 @@
   align: 'center',//鏂囧瓧灞呬腑
   stripe:true,//鏂戦┈绾�
   rowConfig: {isCurrent: true, isHover: true,height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  id: 'ProcessCardProgress',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -126,7 +113,7 @@
     useKey: true
   },
   filterConfig: {   //绛涢�夐厤缃」
-    remote: true
+    // remote: true
   },
   customConfig: {
     storage: true
@@ -136,7 +123,37 @@
     mode: 'row',
     showStatus: true
   },//琛ㄥご鍙傛暟
-  columns:[],//琛ㄥご鎸夐挳
+   columns : [
+    // {type:'expand',fixed:"left",slots: { content:'content' },width: 50},
+    {field: 'product_name', width: 150,
+      title: t('order.product'),
+      filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glass_child',width: 130, title:  t('reportingWorks.glassChild') ,filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_type', width: 120,title: t('order.orderType'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'process_id',width: 150, title: t('processCard.processId'),filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'order_number', width: 100,title: t('order.OrderNum'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'glassNumber', width: 110,title: t('reportingWorks.glassNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'technology_number', width: 110,title: t('processCard.technologyNumber'),showOverflow:"ellipsis",filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
+    {field: 'quantity', width: 90,title: t('order.quantity')},
+    {field: 'broken_num',width: 90, title: t('reportingWorks.quantityBroken')},
+    // {field: 'shippedQuantity',width: 120, title: t('report.shippedQuantity')},
+    {field: 'inventory',width: 120, title: t('report.inventoryNum')},
+    {field: 'inventoryArea',width: 120, title: t('report.inventoryArea')},
+  ],
 
   toolbarConfig: {
     // buttons: [{
@@ -192,7 +209,7 @@
             clearable
             :disabled="props.orderId"
             :placeholder="$t('order.orderId')"
-            style="width: 130px"></el-input>
+            style="width: 140px"></el-input>
         &nbsp;&nbsp;
         <el-button
             :disabled="props.orderId"
@@ -205,8 +222,7 @@
 
     </div>
     <vxe-grid
-       height="520px"
-        @filter-change="filterChanged"
+       height="100%"
         class="mytable-scrollbar"
         ref="xGrid"
         v-bind="gridOptions"
@@ -229,7 +245,10 @@
       <template #num1_filter="{ column, $panel }">
         <div>
           <div v-for="(option, index) in column.filters" :key="index">
-            <input type="type" v-model="option.data" @input="changeFilterEvent($event, option, $panel)"/>
+            <input v-model="option.data"
+                   type="text"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>
@@ -246,7 +265,7 @@
 <style scoped>
 .main-div-customer{
   width: 99%;
-  height: 100%;
+  height: 90%;
 }
 #selectForm {
   width: 60%;

--
Gitblit v1.8.0