Merge branch 'master' of http://bore.pub:10439/r/ERP_override

guoyuji

2024-06-21 f3155dbfe9ca9d1d2463d030c6eccc863ac35692

Merge branch 'master' of http://bore.pub:10439/r/ERP_override

 north-glass-erp/northglass-erp/src/lang/index.js

@@ -2,10 +2,12 @@
import { createI18n}  from 'vue-i18n'
import zh from "./zh"
import en from "./en"
import ru from "./ru"

let messages = {
    zh:zh,
    en: en
    en: en,
    ru: ru
}

const i18n = createI18n({

 north-glass-erp/northglass-erp/src/lang/zh.js

@@ -708,6 +708,7 @@
        level:'类别等级',
        firstLevel:'一级类别',
        towLevel:'二级类别',
        alias:'别名',
    },
    machine:{
        basicId:'设备编号',

 north-glass-erp/northglass-erp/src/views/LoginView.vue

@@ -116,6 +116,7 @@
            style="float: right;width: 6rem">
          <el-option value="zh"  label="中文" />
          <el-option value="en"  label="English" />
          <el-option value="ru"  label="Russian" />
        </el-select>
        <h2>{{$t('login.SysName')}}</h2>
        <el-form

 north-glass-erp/northglass-erp/src/views/sd/basicData/CreateBasicData.vue

@@ -187,7 +187,7 @@
      </el-col>
    </el-row>
    <el-row>
      <el-col :span="4">{{ $t('mainBasicData.operateType') }}:</el-col>
      <el-col :span="4">{{ $t('orderBasicData.alias') }}:</el-col>
      <el-col :span="12">
        <el-input v-model="basic.nickname"/>
      </el-col>

 north-glass-erp/northglass-erp/src/views/sd/basicData/SearchBasicData.vue

@@ -44,7 +44,7 @@
    {title: t('basicData.operate'), width: 110, slots: { default: 'button_slot' },fixed:"left",},
    {type: 'seq', title: t('basicData.number'), width: 80 ,fixed:"left",},
    {field:'basicName',title: t('orderBasicData.name')},
    {field:'nickname',title: t('mainBasicData.operateType')},
    {field:'nickname',title: t('orderBasicData.alias')},
    {field:'createTime',title: t('basicData.creationTime')},