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 |   86 +++++++++++++++++++++++--------------------
 1 files changed, 46 insertions(+), 40 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 63f1637..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('纾ㄨ竟')
+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: {},
@@ -223,51 +223,55 @@
   },//琛ㄥご鍙傛暟
   columns: [
     {type: 'expand', fixed: "left", slots: {content: 'content'}, width: 50},
-    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
-    {field: 'create_time', width: 120, title: '涓嬪崟鏃堕棿'},
-    {field: 'delivery_date', width: 120, title: '浜よ揣鏃ユ湡'},
+    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
+    {field: 'create_time', width: 120, title:  t('report.orderTime')},
+    {field: 'delivery_date', width: 120, title:  t('report.deliveryDate')},
     {
-      field: 'order_id', width: 120, title: '閿�鍞崟鍙�', filters: [{data: ''}],
+      field: 'order_id', width: 120, title: t('order.orderId'), filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
     {
       field: 'process_id',
       width: 120,
-      title: '娴佺▼鍗″彿',
+      title: t('processCard.processId'),
       showOverflow: "ellipsis",
       filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
     {
-      field: 'customer_name', width: 130, title: '瀹㈡埛鍚嶇О', filters: [{data: ''}],
+      field: 'customer_name', width: 130, title: t('customer.customerName'), filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
     {
-      field: 'project', width: 120, title: '椤圭洰鍚嶇О', filters: [{data: ''}],
+      field: 'project', width: 120, title: t('order.project'), filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
     {
-      field: 'batch', width: 100, title: '鎵规', filters: [{data: ''}],
+      field: 'batch', width: 100, title: t('order.batch'), filters: [{data: ''}],
       slots: {filter: 'num1_filter'},
       filterMethod: filterChanged
     },
-    {field: 'order_number', width: 100, title: '搴忓彿'},
-    {field: 'technology_number', width: 120, title: '灏忕墖椤哄簭', showOverflow: "ellipsis"},
-    {field: 'glass_child', width: 100, title: '鍗曠墖鍚嶇О'},
-    {field: 'child_width', width: 120, title: '瀹�'},
-    {field: 'child_height', width: 120, title: '楂�'},
-    {field: 'quantity', width: 120, title: '璁㈠崟鏁伴噺'},
-    {field: 'childArea', width: 120, title: '鍗曠墖闈㈢Н'},
-    {field: 'actualArea', width: 120, title: '瀹為檯闈㈢Н'},
-    {field: 'completeNum', width: 120, title: '宸插畬鎴愭暟閲�'},
-    {field: 'completeArea', width: 120, title: '宸插畬鎴愰潰绉�'},
-    {field: 'incompleteNum', width: 120, title: '鏈畬鎴愭暟閲�'},
-    {field: 'incompleteArea', width: 120, title: '鏈畬鎴愰潰绉�'},
-    {field: 'product_name', width: 120, title: '鎴愬搧鍚嶇О'},
+    {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'), 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')},
+    {field: 'childArea', width: 120, title: t('order.trueArea')},
+    {field: 'actualArea', width: 120, title: t('order.trueGrossArea')},
+    {field: 'completeNum', width: 120, title: t('report.completedQuantity')},
+    {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'), filters: [{data: ''}],
+      slots: {filter: 'num1_filter'},
+      filterMethod: filterChanged},
   ],//琛ㄥご鎸夐挳
 
   toolbarConfig: {
@@ -312,12 +316,12 @@
     inputProject = null
   }
   if(date===null){
-    ElMessage.warning("璇峰厛閫夋嫨鏃ユ湡")
+    ElMessage.warning(t('report.pleaseSelectADateFirst'))
     return
   }
 
   if(processes===null){
-    ElMessage.warning("璇峰厛閫夋嫨宸ュ簭")
+    ElMessage.warning(t('report.pleaseSelectAProcessFirst'))
     return
   }
 
@@ -326,7 +330,7 @@
   const timeDiff = Math.abs(date2.getTime() - date1.getTime());
   const daysDiff = timeDiff / (1000 * 3600 * 24);
   if(Math.floor(daysDiff)>180){
-    ElMessage.warning("瀵煎嚭鐨勭瓫閫夋椂闂翠笉鑳借秴杩�180澶�")
+    ElMessage.warning(t('report.theFilteringTimeForExportCannotExceed180Days'))
     return
   }
    let dataMp = ref({
@@ -364,9 +368,9 @@
 
         <el-date-picker
             v-model="form.date1"
-            end-placeholder="缁撴潫鏃堕棿"
+            :start-placeholder="$t('basicData.startDate')"
+            :end-placeholder="$t('basicData.endDate')"
             format="YYYY/MM/DD"
-            start-placeholder="寮�濮嬫椂闂�"
             style="width: 100px"
             type="daterange"
             value-format="YYYY-MM-DD"
@@ -374,9 +378,9 @@
         &nbsp;&nbsp;
         <el-input v-model="form.orderId" :placeholder="$t('order.orderId')" clearable style="width: 130px"></el-input>
         &nbsp;&nbsp;
-        <el-input v-model="form.project" clearable placeholder="椤圭洰鍚嶇О" style="width: 130px"></el-input>
+        <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"
@@ -384,7 +388,7 @@
               :value="item.basic_name"
           />
         </el-select>
-        <el-button type="primary" @click="getWorkOrder">鏌ヨ</el-button>
+        <el-button type="primary" @click="getWorkOrder">{{$t('basicData.search')}}</el-button>
       </el-row>
 
     </div>
@@ -408,23 +412,25 @@
 
       <!--宸﹁竟鍥哄畾鏄剧ず鐨勬彃妲�-->
       <template #button_slot="{ row }">
-        <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">缂栬緫</el-button>
-        <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">鍙嶅</el-button>
-        <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">鍒犻櫎</el-button>
+        <el-button link size="small" type="primary" @click="getTableRow(row,'edit')">{{$t('basicData.edit')}}</el-button>
+        <el-button link size="small" type="primary" @click="getTableRow(row,'setType')">{{$t('basicData.cancelReview')}}</el-button>
+        <el-button link size="small" type="primary" @click="getTableRow(row,'delete')">{{$t('basicData.delete')}}</el-button>
       </template>
 
       <template #toolbar_buttons>
         <vxe-button style="margin-right: 0.5rem"
                     @click="exportExcel('/report/exportProcessToBeCompleted',
-                                          '宸ュ簭寰呭畬鎴愭姤琛�',
+                                          t('report.processToBeCompleted'),
                                           form.date1)">
-          瀵煎嚭</vxe-button>
+          {{t('basicData.export')}}</vxe-button>
       </template>
 
       <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