From 02bbee1a5064031dd9b2b4f963698fe77b5f1e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Thu, 9 Feb 2023 15:00:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=A6=E9=98=9F=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E8=B7=AF=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/lang/en.js                                     | 6 +++++-
 ruoyi-ui/src/lang/zhCn.js                                   | 1 +
 ruoyi-ui/src/views/basecar/car/index.vue                    | 4 +++-
 ruoyi-ui/src/views/{carqueue => basecar}/carqueue/index.vue | 5 ++++-
 ruoyi-ui/src/views/basecar/cartype/index.vue                | 4 +++-
 ruoyi-ui/src/views/tireManagement/info/index.vue            | 4 +++-
 6 files changed, 19 insertions(+), 5 deletions(-)
 rename ruoyi-ui/src/views/{carqueue => basecar}/carqueue/index.vue (99%)

diff --git a/ruoyi-ui/src/lang/en.js b/ruoyi-ui/src/lang/en.js
index 2c7a6e0..eb85559 100644
--- a/ruoyi-ui/src/lang/en.js
+++ b/ruoyi-ui/src/lang/en.js
@@ -28,7 +28,11 @@ export default {
         search: 'Search',
         reset: 'reset',
         cancel:'cancel',
-        ok:'ok'
+        ok:'ok',
+        confirmDeletion:'Are you sure to delete the data item whose {key} is {value}?',
+        modificationSuccessful:'Modification Successful',
+        addedSuccessfully:'Added Successfully',
+        successfullyDeleted:'Successfully Deleted'
     },
     common: {
         success: 'success',
diff --git a/ruoyi-ui/src/lang/zhCn.js b/ruoyi-ui/src/lang/zhCn.js
index 18321fe..52c7b11 100644
--- a/ruoyi-ui/src/lang/zhCn.js
+++ b/ruoyi-ui/src/lang/zhCn.js
@@ -29,6 +29,7 @@ export default {
         reset: '重置',
         cancel:'取 消',
         ok:'确 定',
+        confirmDeletion:'是否确认删除%{key}为%{value}的数据项？',
         modificationSuccessful:'修改成功',
         addedSuccessfully:'新增成功',
         successfullyDeleted:'删除成功'
diff --git a/ruoyi-ui/src/views/basecar/car/index.vue b/ruoyi-ui/src/views/basecar/car/index.vue
index b6acc4d..27ccb8d 100644
--- a/ruoyi-ui/src/views/basecar/car/index.vue
+++ b/ruoyi-ui/src/views/basecar/car/index.vue
@@ -745,7 +745,9 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const postIds = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function () {
+  proxy.$modal.confirm(t('option.confirmDeletion', {
+    key: t('baseCar.car.companyCode'), value: postIds
+  })).then(function () {
     return delBaseCar(postIds);
   }).then(() => {
     getList();
diff --git a/ruoyi-ui/src/views/carqueue/carqueue/index.vue b/ruoyi-ui/src/views/basecar/carqueue/index.vue
similarity index 99%
rename from ruoyi-ui/src/views/carqueue/carqueue/index.vue
rename to ruoyi-ui/src/views/basecar/carqueue/index.vue
index 546def7..451bd65 100644
--- a/ruoyi-ui/src/views/carqueue/carqueue/index.vue
+++ b/ruoyi-ui/src/views/basecar/carqueue/index.vue
@@ -529,7 +529,9 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const postIds = row.postId || ids.value;
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function () {
+  proxy.$modal.confirm(t('option.confirmDeletion', {
+    key: t('carQueue.carQueue.tyreFacCode'), value: postIds
+  })).then(function () {
     return delCarQueue(postIds);
   }).then(() => {
     getList();
@@ -537,6 +539,7 @@ function handleDelete(row) {
   }).catch(() => {
   });
 }
+
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download("system/post/export", {
diff --git a/ruoyi-ui/src/views/basecar/cartype/index.vue b/ruoyi-ui/src/views/basecar/cartype/index.vue
index 7b836db..33f47c3 100644
--- a/ruoyi-ui/src/views/basecar/cartype/index.vue
+++ b/ruoyi-ui/src/views/basecar/cartype/index.vue
@@ -565,7 +565,9 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const postIds = row.postId || ids.value;
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function () {
+  proxy.$modal.confirm(t('option.confirmDeletion', {
+    key: t('baseCar.carType.tyreFacCode'), value: postIds
+  })).then(function () {
     return delCartype(postIds);
   }).then(() => {
     getList();
diff --git a/ruoyi-ui/src/views/tireManagement/info/index.vue b/ruoyi-ui/src/views/tireManagement/info/index.vue
index 3a19170..9c677f4 100644
--- a/ruoyi-ui/src/views/tireManagement/info/index.vue
+++ b/ruoyi-ui/src/views/tireManagement/info/index.vue
@@ -488,7 +488,9 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const postIds = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除岗位编号为"' + postIds + '"的数据项？').then(function () {
+  proxy.$modal.confirm(t('option.confirmDeletion', {
+    key: t('tireManagement.tireFactoryCode'), value: postIds
+  })).then(function () {
     return delBasetyre(postIds);
   }).then(() => {
     getList();