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/ProcessToBeCompleted.vue |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
index 4008393..6302977 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/report/ProcessToBeCompleted.vue
@@ -20,7 +20,7 @@
 })
 
 //宸ュ簭
-const value = ref(t('machine.edgeGrinding'))
+const value = ref()
 
 //琛ㄥ熬姹傚拰
 const sumNum = (list, field) => {
@@ -57,7 +57,7 @@
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10) //榛樿寮�濮嬫椂闂�7澶╁墠
-  const end = new Date(new Date().getTime() + 3600 * 1000 * 24)
+  const end = new Date(new Date().getTime())
       .toISOString()
       .replace('T', ' ')
       .slice(0, 10)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -198,8 +198,8 @@
   keepSource: true,//淇濇寔婧愭暟鎹�
   align: 'center',//鏂囧瓧灞呬腑
   stripe: true,//鏂戦┈绾�
-  rowConfig: {isCurrent: true, isHover: true, height: 50},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
-  id: 'CustomerList',
+  rowConfig: {isCurrent: true, isHover: true, height: 30},//榧犳爣绉诲姩鎴栭�夋嫨楂樹寒
+  id: 'ProcessToBeCompleted',
   showFooter: true,//鏄剧ず鑴�
   printConfig: {},
   importConfig: {},
@@ -257,7 +257,9 @@
     },
     {field: 'order_number', width: 100, title: t('order.OrderNum')},
     {field: 'technology_number', width: 120, title: t('processCard.technologyNumber'), showOverflow: "ellipsis"},
-    {field: 'glass_child', width: 100, title: t('reportingWorks.glassChild')},
+    {field: 'glass_child', width: 100, title: t('reportingWorks.glassChild'), filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
     {field: 'child_width', width: 120, title: t('order.width')},
     {field: 'child_height', width: 120, title: t('order.height')},
     {field: 'quantity', width: 120, title: t('order.quantity')},
@@ -267,7 +269,9 @@
     {field: 'completeArea', width: 120, title: t('report.completedArea')},
     {field: 'incompleteNum', width: 120, title: t('report.unfinishedQuantity')},
     {field: 'incompleteArea', width: 120, title: t('report.unfinishedArea')},
-    {field: 'product_name', width: 120, title: t('order.product')},
+    {field: 'product_name', width: 120, title: t('order.product'), filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -376,7 +380,7 @@
         &nbsp;&nbsp;
         <el-input v-model="form.project" clearable :placeholder="$t('order.project')" style="width: 130px"></el-input>
         &nbsp;
-        <el-select v-model="value" clearable default-value="default_city" style="width: 120px">
+        <el-select v-model="value" clearable :placeholder="$t('reportingWorks.selectProcess')" default-value="default_city" style="width: 120px">
           <el-option
               v-for="item in titleSelectJson['processType']"
               :key="item.id"
@@ -424,7 +428,9 @@
       <template #num1_filter="{ column, $panel }">
         <div>
           <div v-for="(option, index) in column.filters" :key="index">
-            <input v-model="option.data" type="type" @input="changeFilterEvent($event, option, $panel)"/>
+            <input v-model="option.data" type="type"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>
@@ -437,7 +443,7 @@
 <style scoped>
 .main-div-customer {
   width: 99%;
-  height: 100%;
+  height: 93%;
 }
 
 #selectForm {

--
Gitblit v1.8.0