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/reportingWorks/SelectReportingWorks.vue |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
index ae43e6c..528ffe0 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/reportingWorks/SelectReportingWorks.vue
@@ -93,7 +93,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)//榛樿缁撴潫鏃堕棿褰撳墠鏃堕棿
@@ -337,7 +337,7 @@
     {field: 'deviceName', width: 100,title: t('reportingWorks.deviceType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
     {field: 'teamsGroupsName',width: 120, title: t('reportingWorks.teamsType'),filters:[{ data: '' }],slots: { filter: 'num1_filter' } },
     {field: 'reviewedState',width: 120, title: t('processCard.reviewedState'), },
-    {field: 'reviewed',width: 120, title: '瀹℃牳浜�', },
+    {field: 'reviewed',width: 120, title: t('processCard.reviewed'), },
     {field: 'notes',width: 120, title: t('basicData.remarks'), },
 
   ],//琛ㄥご鎸夐挳
@@ -425,7 +425,7 @@
       <template #button_slot="{ row }">
 <!--        <el-button @click="getTableRow(row,'edit')" link type="primary" size="small">缂栬緫</el-button>-->
         <el-button @click="getTableRow(row,'edit')"
-                   v-if="userStore.user.permissions.indexOf('SelectReportingWorks.edit') > -1"
+                   v-if="userStore.user.permissions.indexOf('selectReportingWorks.edit') > -1"
                    link
                    type="primary"
                    size="small">
@@ -453,7 +453,9 @@
       <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 type="type" v-model="option.data"
+                   @keyup.enter.native="$panel.confirmFilter()"
+                   @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>

--
Gitblit v1.8.0