From acaf8ca38cd32bc474bb46b593db2a8d75b9bfdd Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期六, 12 十月 2024 08:26:23 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

---
 north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue |   33 ++++++++++++++++-----------------
 1 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
index 9371b52..51ac9fe 100644
--- a/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
+++ b/north-glass-erp/northglass-erp/src/views/pp/machine/AddMaintenanceAndRepair.vue
@@ -73,63 +73,63 @@
     showStatus: true
   },//琛ㄥご鍙傛暟
   columns: [
-    {type: 'seq', fixed: "left", title: '鑷簭', width: 50},
+    {type: 'seq', fixed: "left", title: t('basicData.Number'), width: 50},
     {
       field: 'deviceName',
-      title: '璁惧鍚嶇О',
+      title: t('machine.basicName'),
       editRender: {},
       slots: {default: 'basicCategory_default', edit: 'deviceName'}
     },
     {
       field: 'type',
-      title: '绫诲瀷',
+      title: t('machine.type'),
       editRender: {name: 'input', attrs: {placeholder: ''}},
     },
     {
       field: 'faultTime',
-      title: '鏁呴殰鏃ユ湡',
+      title: t('machine.faultTime'),
       editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
     },
     {
       field: 'faultReason',
-      title: '鏁呴殰鍘熷洜',
+      title: t('machine.faultReason'),
       editRender: {name: 'input', attrs: {placeholder: ''}},
     },
     {
       field: 'maintenanceTime',
-      title: '淇濆吇鏃ユ湡',
+      title: t('machine.maintenanceTime'),
       editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
     },
     {
       field: 'maintenanceIllustrate',
-      title: '淇濆吇璇存槑',
+      title: t('machine.maintenanceIllustrate'),
       editRender: {name: 'input', attrs: {placeholder: ''}},
     },
     {
       field: 'startTime',
-      title: '缁翠慨/淇濆吇寮�濮嬫椂闂�',
+      title: t('machine.startTime'),
       editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
     },
     {
       field: 'stopTime',
-      title: '缁翠慨/淇濆吇缁撴潫鏃堕棿',
+      title: t('machine.stopTime'),
       editRender: {name: 'input', attrs: {placeholder: '', type: 'date'}},
     },
 
     {
       field: 'process',
-      title: '鎵�鍦ㄥ伐搴�',
+      title: t('machine.process'),
       editRender: {},
       slots: {default: 'reportingDeviceSort_default', edit: 'process'}
     },
     {
       field: 'personnel',
-      title: '缁翠慨/淇濆吇浜哄憳',
+      title: t('machine.personnel'),
       editRender: {name: 'input', attrs: {placeholder: ''}},
     },
     {
       field: 'cost',
-      title: '璐圭敤',
+      title: t('machine.cost'),
       editRender: {name: 'input', attrs: {placeholder: ''}},
     },
   ],
@@ -138,7 +138,7 @@
     buttons: [
       {code: 'removeRow', name: t('basicData.delete'), status: 'primary', icon: 'vxe-icon-delete'},
       {code: 'addRow', name: t('reportingWorks.increase'), status: 'primary', icon: 'vxe-icon-square-plus'},
-      {code: 'save', name: '淇濆瓨', status: 'primary', icon: 'vxe-icon-save'},
+      {code: 'save', name: t('basicData.save'), status: 'primary', icon: 'vxe-icon-save'},
     ],
     // import: false,
     // export: true,
@@ -153,7 +153,7 @@
     return [
       columns.map((column, columnIndex) => {
         if (columnIndex === 0) {
-          return '鍚堣:'
+          return ''
         }
         if (footList.includes(column.field)) {
           return sumNum(data, column.field)
@@ -189,7 +189,7 @@
           })
           request.post("/maintenance/saveMaintenanceAndRepair", machineData.value).then((res) => {
             if (res.code == 200) {
-              ElMessage.success("淇濆瓨鎴愬姛")
+              ElMessage.success(t('basicData.msg.saveSuccess'))
               //router.push('/main/processCard/SplittingDetails?orderId=${orderId}')
               router.push({
                 path: '/main/machine/AddMaintenanceAndRepair',
@@ -232,13 +232,12 @@
         max-height="100%"
         v-bind="gridOptions"
         v-on="teamGridEvents"
-        @filter-change="filterChanged"
     >
 
       <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="text" @input="changeFilterEvent($event, option, $panel)"/>
           </div>
         </div>
       </template>

--
Gitblit v1.8.0