From 102c45669bad109744e9c44ddbc42b1f7e943a1e Mon Sep 17 00:00:00 2001
From: "768863620@qq.com" <768863620@qq.com>
Date: Mon, 23 Sep 2024 16:14:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/eladmin.scss         |  8 +-----
 src/components/Crud/CRUD.operation.vue | 16 +++++++-----
 src/components/Crud/RR.operation.vue   |  4 +--
 src/i18n/en.js                         | 28 ++++++++++++++++++++
 src/i18n/zh-CN.js                      | 29 +++++++++++++++++++++
 src/views/base-data/area/index.vue     | 36 ++++++++++----------------
 src/views/system/dept/index.vue        | 23 ++++++++--------
 src/views/system/menu/index.vue        |  5 ++++
 src/views/system/role/index.vue        |  8 ++++--
 9 files changed, 106 insertions(+), 51 deletions(-)

diff --git a/src/assets/styles/eladmin.scss b/src/assets/styles/eladmin.scss
index 1c876c2..917de68 100644
--- a/src/assets/styles/eladmin.scss
+++ b/src/assets/styles/eladmin.scss
@@ -25,13 +25,7 @@
   .el-select__caret.el-input__icon.el-icon-arrow-up{
     line-height: 30.5px;
   }
-  .date-item {
-    display: inline-block;
-    vertical-align: middle;
-    margin-bottom: 10px;
-    height: 30.5px !important;
-    width: 230px !important;
-  }
+
 }
 .el-avatar {
   display: inline-block;
diff --git a/src/components/Crud/CRUD.operation.vue b/src/components/Crud/CRUD.operation.vue
index db5f0eb..a83c3b9 100644
--- a/src/components/Crud/CRUD.operation.vue
+++ b/src/components/Crud/CRUD.operation.vue
@@ -12,7 +12,7 @@
         icon="el-icon-plus"
         @click="crud.toAdd"
       >
-        新增
+          {{$t('crud.add')}}
       </el-button>
       <el-button
         v-if="crud.optShow.edit"
@@ -24,7 +24,7 @@
         :disabled="crud.selections.length !== 1"
         @click="crud.toEdit(crud.selections[0])"
       >
-        修改
+         {{$t('crud.update')}}
       </el-button>
       <el-button
         v-if="crud.optShow.del"
@@ -38,7 +38,7 @@
         :disabled="crud.selections.length === 0"
         @click="toDelete(crud.selections)"
       >
-        删除
+         {{$t('crud.del')}}
       </el-button>
       <el-button
         v-if="crud.optShow.download"
@@ -49,7 +49,9 @@
         type="warning"
         icon="el-icon-download"
         @click="crud.doExport"
-      >导出</el-button>
+      >
+         {{$t('crud.export')}}
+      </el-button>
       <!--右侧-->
       <slot name="right"/>
     </span>
@@ -86,7 +88,7 @@
           :indeterminate="allColumnsSelectedIndeterminate"
           @change="handleCheckAllChange"
         >
-          全选
+          {{$t('crud.check_all')}}
         </el-checkbox>
         <el-checkbox
           v-for="item in tableColumns"
@@ -101,7 +103,9 @@
         size="mini"
         type="warning" plain
         @click="postToTableConfig()"
-      ><span>保存</span></el-button>
+      ><span>
+         {{$t('crud.save')}}
+      </span></el-button>
     </el-button-group>
   </div>
 </template>
diff --git a/src/components/Crud/RR.operation.vue b/src/components/Crud/RR.operation.vue
index df2c138..75b92ad 100644
--- a/src/components/Crud/RR.operation.vue
+++ b/src/components/Crud/RR.operation.vue
@@ -1,8 +1,8 @@
 <!--搜索与重置-->
 <template>
   <span>
-    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery">搜索</el-button>
-    <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">重置</el-button>
+    <el-button class="filter-item" size="mini" type="success" icon="el-icon-search" @click="crud.toQuery"> {{$t('crud.search')}}</el-button>
+    <el-button v-if="crud.optShow.reset" class="filter-item" size="mini" type="warning" icon="el-icon-refresh-left" @click="crud.resetQuery()">{{$t('crud.reset')}}</el-button>
   </span>
 </template>
 <script>
diff --git a/src/i18n/en.js b/src/i18n/en.js
index 044478d..41e8a52 100644
--- a/src/i18n/en.js
+++ b/src/i18n/en.js
@@ -160,5 +160,33 @@ export default {
     system2_mnt: 'IT Operation Management',
     system2_monitor: 'system monitor',
     system2_report: 'Report Management'
+  },
+  crud: {
+    add: 'Add',
+    del: 'Del',
+    update: 'Update',
+    export: 'Export',
+    check_all: 'Check All',
+    save: 'Save',
+    search: 'search',
+    reset: 'reset'
+  },
+  dept: {
+    name: 'name',
+    code: 'code',
+    staus: 'staus',
+    createdata: 'Create Data',
+    operate: 'operate',
+    checkdate: 'Check Data'
+  },
+  area: {
+    name: 'name',
+    code: 'code',
+    AreaAttributes: 'AreaA ttributes',
+    Enable: 'Enable',
+    creater: 'creater',
+    createdata: 'Create Data',
+    operate: 'operate',
+    staus: 'staus'
   }
 };
diff --git a/src/i18n/zh-CN.js b/src/i18n/zh-CN.js
index cde6c40..755ad8c 100644
--- a/src/i18n/zh-CN.js
+++ b/src/i18n/zh-CN.js
@@ -160,5 +160,34 @@ export default {
     system2_mnt: '运维管理',
     system2_monitor: '系统监控',
     system2_report: '报表配置'
+  },
+  crud: {
+    add: '新增',
+    del: '删除',
+    update: '修改',
+    export: '导出',
+    check_all: '全选',
+    save: '保存',
+    search: '搜索',
+    reset: '重置'
+  },
+  dept: {
+    name: '名称',
+    code: '代码',
+    staus: '状态',
+    createdata: '创建时间',
+    operate: '操作',
+    checkdate: '选择日期'
+  },
+  area: {
+    name: '名称',
+    code: '代码',
+    AreaAttributes: '库区属性',
+    Enable: '是否启用',
+    creater: '创建人',
+    createdata: '创建时间',
+    operate: '操作',
+    staus: '状态'
   }
+
 };
diff --git a/src/views/base-data/area/index.vue b/src/views/base-data/area/index.vue
index 6729b61..43a7d2e 100644
--- a/src/views/base-data/area/index.vue
+++ b/src/views/base-data/area/index.vue
@@ -4,26 +4,16 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <label class="el-form-item-label">编号</label>
-        <el-input v-model="query.code" clearable placeholder="编号" style="width: 185px;" class="filter-item"
+        <label class="el-form-item-label">{{$t('area.code')}}</label>
+        <el-input v-model="query.code" clearable :placeholder="$t('area.code')" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"
         />
-        <label class="el-form-item-label">名称</label>
-        <el-input v-model="query.name" clearable placeholder="名称" style="width: 185px;" class="filter-item"
+        <label class="el-form-item-label">{{$t('area.name')}}</label>
+        <el-input v-model="query.name" clearable :placeholder="$t('area.name')" style="width: 185px;" class="filter-item"
                   @keyup.enter.native="crud.toQuery"
         />
-        <label class="el-form-item-label">接收工厂</label>
-        <el-select v-model="query.gcCode" clearable placeholder="请选择" style="width: 185px;" class="filter-item"
-                   @keyup.enter.native="crud.toQuery">
-          <el-option
-            v-for="baseStatus in dict.factory"
-            :key="baseStatus.id"
-            :label="baseStatus.label"
-            :value="baseStatus.value"
-          />
-        </el-select>
-        <label class="el-form-item-label">状态</label>
-        <el-select v-model="query.enabled" clearable placeholder="请选择" style="width: 185px;" class="filter-item"
+        <label class="el-form-item-label">{{$t('area.staus')}}</label>
+        <el-select v-model="query.enabled" clearable :placeholder="$t('area.staus')" style="width: 185px;" class="filter-item"
                    @keyup.enter.native="crud.toQuery">
           <el-option
             v-for="baseStatus in dict.base_staus"
@@ -98,9 +88,9 @@
                 style="width: 100%;text-align: center" @selection-change="crud.selectionChangeHandler" :height="crud.tableHeight" border
       >
         <el-table-column type="selection" width="55"/>
-        <el-table-column prop="code" label="库区编号" width="80px" align="center"/>
-        <el-table-column prop="name" label="库区名称" width="150px" align="center"/>
-        <el-table-column prop="station_type#workingStation" label="指示纳所"  width="150px">
+        <el-table-column prop="code" :label="$t('area.code')" width="80px" align="center"/>
+        <el-table-column prop="name" :label="$t('area.name')" width="150px" align="center"/>
+        <el-table-column prop="station_type#workingStation" :label="$t('area.AreaAttributes')"  width="150px">
           <template slot-scope="scope">
             {{ dict.label.station_type[scope.row.workingStation] }}
           </template>
@@ -126,7 +116,7 @@
             {{ scope.row.bezz ? '是' : '否' }}
           </template>
         </el-table-column>
-        <el-table-column prop="enabled" label="启用">
+        <el-table-column prop="enabled" :label="$t('area.Enable')">
           <template slot-scope="scope">
             <el-switch
               v-model="scope.row.enabled"
@@ -136,11 +126,11 @@
             />
           </template>
         </el-table-column>
-        <el-table-column prop="createBy" label="创建人"/>
-        <el-table-column prop="createTime" label="创建时间">
+        <el-table-column prop="createBy" :label="$t('area.creater')"/>
+        <el-table-column prop="createTime" :label="$t('area.createdata')">
           <template slot-scope="scope">{{getFormatDate(scope.row.createTime)}} </template>
         </el-table-column>
-        <el-table-column v-if="checkPer(['admin','item:edit'])" label="操作" width="90px" align="center" fixed="right">
+        <el-table-column v-if="checkPer(['admin','item:edit'])" :label="$t('area.operate')" width="90px" align="center" fixed="right">
           <template slot-scope="scope">
             <udOperation
               :data="scope.row"
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index aba65cc..34c9090 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -4,16 +4,17 @@
     <div class="head-container">
       <div v-if="crud.props.searchToggle">
         <!-- 搜索 -->
-        <el-input v-model="query.name" clearable size="small" placeholder="输入仓库名称搜索" style="width: 200px;" class="filter-item" @keyup.enter.native="crud.toQuery" />
+        <el-input v-model="query.name" class="filter-item"  size="small" clearable  :placeholder="$t('dept.name')" style="width: 200px;" @keyup.enter.native="crud.toQuery" />
 <!--        <date-range-picker v-model="query.createTime" class="date-item" />-->
         <el-date-picker
+            size="small"
+            class="filter-item"
           v-model="query.createTime"
           type="date"
           value-format="yyyy-MM-dd HH:mm:ss"
-          placeholder="选择日期"
-          class="date-item"
+          :placeholder="$t('dept.checkdate')"
         ></el-date-picker>
-        <el-select v-model="query.enabled" clearable size="small" placeholder="状态" class="filter-item" style="width: 90px" @change="crud.toQuery">
+        <el-select v-model="query.enabled" class="filter-item" size="small" clearable   :placeholder="$t('dept.staus')" style="width: 90px" @change="crud.toQuery">
           <el-option v-for="item in enabledTypeOptions" :key="item.key" :label="item.display_name" :value="item.key" />
         </el-select>
         <rrOperation />
@@ -23,10 +24,10 @@
     <!--表单组件-->
     <el-dialog append-to-body :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
       <el-form ref="form" inline :model="form" :rules="rules" size="small" label-width="80px">
-        <el-form-item label="仓库名称" prop="name">
+        <el-form-item label="名称" prop="name">
           <el-input v-model="form.name" style="width: 370px;" />
         </el-form-item>
-        <el-form-item label="仓库代码" prop="code">
+        <el-form-item label="代码" prop="code">
           <el-input v-model="form.code" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="仓库排序" prop="deptSort">
@@ -77,9 +78,9 @@
       border
     >
       <el-table-column :selectable="checkboxT" type="selection" width="55" />
-      <el-table-column label="名称" prop="name" />
-      <el-table-column label="代码" prop="code" />
-      <el-table-column label="状态" align="center" prop="enabled">
+      <el-table-column :label="$t('dept.name')" prop="name" />
+      <el-table-column :label="$t('dept.code')" prop="code" />
+      <el-table-column :label="$t('dept.staus')" align="center" prop="enabled">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.enabled"
@@ -90,7 +91,7 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" label="创建日期" >
+      <el-table-column prop="createTime" :label="$t('dept.createdata')" >
         <template slot-scope="scope">
           {{getFormatDate(scope.row.createTime)}}
         </template>
@@ -98,7 +99,7 @@
 
       <el-table-column
         v-if="checkPer(['admin','dept:edit','dept:del'])"
-        label="操作"
+        :label="$t('dept.operate')"
         width="130px"
         align="center"
         fixed="right"
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 336c881..e8746b2 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -103,6 +103,11 @@
       border
     >
       <el-table-column type="selection" width="55" />
+      <el-table-column prop="title" label="菜单标题" align="center" width="100px">
+        <template slot-scope="scope">
+          {{$t(scope.row.title )}}
+        </template>
+      </el-table-column>
       <el-table-column :show-overflow-tooltip="true" label="菜单标题" width="200px" prop="title" />
       <el-table-column prop="icon" label="图标" align="center" width="100px">
         <template slot-scope="scope">
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 30dbb7e..fd24a56 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -105,8 +105,11 @@
             accordion
             show-checkbox
             node-key="id"
-            @check="menuChange"
-          />
+            @check="menuChange">
+             <span class="custom-tree-node" slot-scope="{ node }">
+                 <span>{{$t( node.label)}}</span>
+             </span>
+          </el-tree>
         </el-card>
       </el-col>
     </el-row>
@@ -162,6 +165,7 @@ export default {
     })
   },
   methods: {
+
     getMenuDatas(node, resolve) {
       setTimeout(() => {
         getMenusTree(node.data.id ? node.data.id : 0).then(res => {