翻译基础数据

src/i18n.js

@@ -20,7 +20,7 @@ const messages= {
 }
 
 const i18n = new VueI18n({
-  locale: lang, // set locale
+  locale:'en' || lang, // set locale
   messages:messages,
   fallbackLocale: 'en', // 默认语言设置，当其他语言没有的情况下，使用en作为默认语言
 
@@ -29,15 +29,4 @@ const i18n = new VueI18n({
 // 配置elementUI 语言转换关系
 locale.i18n((key, value) => i18n.t(key, value))
 
-const vantLocales = lang => {
-
-  if (lang == 'zh') {
-    Locale.use(lang, zhlogin)
-  } else if (lang === 'en') {
-    Locale.use(lang, enlogin)
-  }
-}
-vantLocales(i18n.locale)
-
-
 export default i18n

src/lang/en/langModule/auth.js

@@ -17,4 +17,12 @@ export default {
     username: 'Username',
     rePassword: 'Remember Password',
     passwordTest:'The password must be at least 6 characters long',
+    //
+    logpMsg:'You have been logged out. You can cancel or log in again',
+   relogo:'Log in again',//重新登陆
+   conLogo:'Confirm logout', // 
+   company:" Beijing Jingpeng Huanyu Animal Husbandry TechnologyCo., Ltd",
+   companyTit:"All Rights Reserved"
+
+
   }

src/lang/en/langModule/feedChart.js

@@ -8,7 +8,57 @@ export default{
   slflno:"Feed Classification cannot be empty",
   slbhno:"Feed Classification Code cannot be empty",
   slfltszi:" Cannot contain special characters",
-  slflxx:"Please select feed classification"
+  slflxx:"Please select feed classification",
+
+  
+sllb: "Feed Type",
+slly: "Feed Source",
+sz: "Setting",
+slk: "Feed Inventory",
+hqudsl: "Acquire UD Feed",
+wllx: "Material Type",
+wybm: "Unique Code",
+slly: "Feed Source" ,
+yxwcs: "Permissible Error Weight (kg)",
+bzdwzl: "Packing Unit Weight (kg)",
+dj: "Unit Price",
+jdq: "Relay Position",
+wsy: "Without Upper Domain",
+byzd: "Spare Field",
+byzd1: "Spare Field 01",
+byzd2: "Spare Field 02",
+byzd3: "Spare Field 03",
+yes: "Yes",
+no: "No",
+yyjz: "Nutritional Value",
+gl: "Association",
+jcxx: "Basic Information",
+slmc: "Feed Name",
+jhlx: "Plan Type",
+spalh: "SAP Location",
+spabm: "SAP Code:",
+jbcs: "Mixing Parameters",
+tzzly: "Jump Weight Domain (kg):",
+tzys: "Jump Delay:",
+qrks: "Confirm Start:",
+sfqy: "Enable",
+xkc: "Minor Ingredient Scale",
+zgslh: "China Feed Number",
+price: "Price",
+ypsm: "Sample Description",
+wgz: "Dry Matter (DM%)",
+cdb: "Crude Protein (CP%DM)",
+gai: "Calcium (Ca%DM)",
+lin: "Phosphorus (P%DM)",
+cnjn: "Milk Net Energy (%DM)",
+chf: "Crude Ash (%)",
+cl: "Coarse Material",
+glzt: "Association Status",
+df: "Starch (%DM)" ,
+zf: "Fat (%DM)",
+qxgl: "Cancel Association",
+
+    
   
 
 

src/lang/zn/langModule/auth.js

@@ -17,7 +17,10 @@ export default{
   username: '用户名',
   rePassword: '记住密码',
    passwordTest:'密码不少于6位',
-   logpMsg:'You have been logged out. You can cancel or log in again',
-   relogo:'Log in again',//重新登陆
-   conLogo:'Confirm logout' //   确认注销
+   logpMsg:'您已注销。您可以取消或重新登录',
+   relogo:'重新登陆',//重新登陆
+   conLogo:'确认注销', //   确认注销
+   company:" Beijing Jingpeng Huanyu Animal Husbandry TechnologyCo., Ltd",
+   companyTit:"All Rights Reserved"
+
 }

src/lang/zn/langModule/common.js

@@ -20,8 +20,10 @@ export default {
     deleteSuccess: '删除成功',
     openGuide: '开启新手引导',
     requestMsg:'请求超时',
-    logoIcon: require('../../../assets/images/logo1.png'),
-    logoM: require('../../../assets/images/logo_u3.png'),
+    // logoIcon: require('../../../assets/images/logo1.png'),
+    // logoM: require('../../../assets/images/logo_u3.png'),
+    logoIcon: require('../../../assets/images/logo-en-i.png'),
+    logoM: require('../../../assets/images/logo-en-m.png'),
     relogo:'重新登陆',//重新登陆
      conLogo:'确认注销',
     watchMore:'查看更多',

src/lang/zn/langModule/feedChart.js

@@ -8,7 +8,91 @@ export default{
    slflno:"饲料分类不能为空",
    slbhno:"饲料分类编号不能为空",
    slfltszi:"不可输入特殊字符",
-   slflxx:"请选择饲料分类信息"
+   slflxx:"请选择饲料分类信息",
+
+   sllb:"饲料类别",
+   slly:"饲料来源",
+   sz:"设置",
+   slk:"饲料库",
+   hqudsl:"获取UD饲料",
+   wllx:"物料类型",
+   wybm:"唯一编码",
+   slly:"饲料来源",
+   yxwcs:"允许误差数(kg)",
+   bzdwzl:"包装单位重量(kg)",
+   dj:"单价",
+   jdq:"继电器位置",
+   wsy:"无上域",
+   byzd:"备用字段",
+   byzd1:"备用字段01",
+   byzd2:"备用字段02",
+   byzd3:"备用字段03",
+    yes:"是",
+    no:"否",
+    yyjz:"营养价值",
+    gl:"关联",
+    jcxx:"基础信息",
+    slmc:"饲料名称",
+    jhlx:"计划类型",
+    spalh:"SAP货位",
+    spabm:"SAP编码：",
+    jbcs:"搅拌参数",
+    tzzly:"跳转重量域（kg）：",
+    tzys:"跳转延时：",
+    qrks:"确认开始：",
+    sfqy:"是否启用",
+    xkc:"小料秤",
+    zgslh:"中国饲料号",
+    price:"价格",
+    ypsm:"样品说明",
+    wgz:"干物质(DM%)",
+    cdb:"粗蛋白(CP%DM)",
+    gai:"钙(Ca%DM)",
+    lin:"磷(P%DM)",
+    cnjn:"产奶净能(%DM)",
+    chf:"粗灰分(Ash%)",
+    cl:"粗料",
+    glzt:"关联状态",
+    df:"淀粉（%DM",
+    zf:"脂肪（%DM）",
+    qxgl:"取消关联",
+
+    // TODO:
+    bzdwzlqsrzs:"包装单位重量请输入正整数",
+    djbllwxs:"单价请保留两位小数",
+    tzzl050:"跳转重量域请输入大于等于0小于等于50的整数",
+
+
+
+    
+
+
+
+
+
+
+    
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

src/layout/components/Navbar.vue

@@ -37,8 +37,8 @@
       <el-switch
         class="swichs"
         v-model="langValue"
-        active-text="英文"
-        inactive-text="中文"
+        inactive-text="英文"
+        active-text="中文"
         @change="translate"
       ></el-switch>
       <el-dropdown class="avatar-container" trigger="click">
@@ -87,7 +87,7 @@ export default {
       sumAmount: '',
       meslist: '',
 
-      langValue: false,
+      langValue: 'en',
       lang: '',
       active_text: '',
       inactive_text: ''
@@ -105,7 +105,8 @@ export default {
     ])
   },
   created() {
-    this.setSwitch()
+    this.setSwitch();
+
     // window.setInterval(() => {
     //   setTimeout(() => {
     //     this.sumAmount = JSON.parse(sessionStorage.sumamount)
@@ -118,6 +119,7 @@ export default {
     setSwitch() {
       console.log(navigator.language,'navigator.language1')
       this.lang = navigator.language === 'zh-CN'? 'zh' :'en'
+      this.translate()
     },
     // 切换中英文的调用
     translate() {

src/views/basicData/feedTable/index.vue

@@ -2,10 +2,10 @@
   <div class="app-container">
     <div class="search" ref="search">
       <el-input v-model="table.getdataListParm.parammaps.fname":placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
-      <el-select v-model="table.getdataListParm.parammaps.fclassid" filterable placeholder="饲料类别" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.fclassid" filterable  :placeholder="$t('feedChart.sllb')" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in feedTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.source" filterable placeholder="饲料来源" class="filter-item" style="width: 120px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.source" filterable  :placeholder="$t('feedChart.slly')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in feedSourcesList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 120px;" clearable>
@@ -37,16 +37,16 @@
     </div>
     <div class="operation" ref="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">{{$t('formulationEvaluation.add')}}</el-button>
-      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleSet">设置</el-button>
+      <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleSet">{{$t('feedChart.sz')}}</el-button>
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleGetSapCode">{{$t('driver.hqspanccode')}}</el-button>
       <el-button v-if="isRoleEdit" class="danger" icon="el-icon-delete" @click="form_delete">{{$t('formulationEvaluation.del')}}</el-button>
-      <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">{{$t('formulationEvaluation.feed')}}库</el-button>
+      <el-button class="success" icon="el-icon-receiving" @click="handleFeedBank">{{$t('feedChart.slk')}}</el-button>
       <el-button v-if="isOrder && isRoleEdit" icon="el-icon-sort" class="success" @click="handleChangeOrder">{{$t('formulationEvaluation.ggsx')}}</el-button>
        <div v-else style="display: inline-block;">
         <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">{{$t('formulationEvaluation.save')}}</el-button>
         <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">{{$t('formulationEvaluation.cancel')}}</el-button>
       </div>
-      <el-button v-if="isRoleEdit && ispalyUd" class="success" icon="el-icon-plus" @click="handleGetUd">获取UD饲料</el-button>
+      <el-button v-if="isRoleEdit && ispalyUd" class="success" icon="el-icon-plus" @click="handleGetUd">{{$t('feedChart.hqudsl')}}</el-button>
       <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">{{$t('formulationEvaluation.enter')}}</el-button>
       </el-upload>
@@ -84,30 +84,30 @@
         <u-table-column :label="$t('formulationEvaluation.xh')" type="index" align="center" width="50" fixed="left"/>
         <u-table-column :label="$t('InventoryManagement.silc')"    min-width="80px" align="center" prop="fname" fixed="left"/>
         <u-table-column :label="$t('feedChart.slflmc')" min-width="80px" align="center" prop="fclass" fixed="left"/>
-        <u-table-column label="物料类型" min-width="90px" align="center" prop="sapMaterialtypeName" />
+        <u-table-column :label="$t('feedChart.wllx')" min-width="90px" align="center" prop="sapMaterialtypeName" />
         <!-- <u-table-column label="SAP货位" min-width="90px" align="center" prop="goods" /> -->
-        <u-table-column label="唯一编码" min-width="80px" align="center" prop="feedcode" />
+        <u-table-column :label="$t('feedChart.wybm')" min-width="80px" align="center" prop="feedcode" />
         <u-table-column :label="$t('driver.udname')" min-width="80px" align="center" prop="udname" />
         <!-- <u-table-column label="SAP编码" min-width="90px" align="center" prop="sapCode" /> -->
-        <u-table-column label="饲料来源" min-width="80px" align="center" prop="source" />
+        <u-table-column :label="$t('feedChart.slly')" min-width="80px" align="center" prop="source" />
         <u-table-column :label="$t('dailyExecutionPlan.jhlx')"  min-width="80px" align="center" prop="printgroup" />
-        <u-table-column v-if="isInforvalue" label="小料秤" min-width="90px" align="center" prop="smtmrname" />
-        <u-table-column label="允许误差数(kg)" min-width="80px" align="center" prop="allowratio" />
-        <u-table-column label="包装单位重量(kg)" min-width="80px" align="center" prop="unitweight" />
-        <u-table-column label="单价" min-width="80px" align="center" prop="uprice" />
-        <u-table-column :label="$t('formulationEvaluation.tzzly')"" min-width="80px" align="center" prop="autozone" />
+        <u-table-column v-if="isInforvalue" :label="$t('feedChart.xkc')" min-width="90px" align="center" prop="smtmrname" />
+        <u-table-column :label="$t('feedChart.yxwcs')" min-width="80px" align="center" prop="allowratio" />
+        <u-table-column :label="$t('feedChart.bzdwzl')" min-width="80px" align="center" prop="unitweight" />
+        <u-table-column :label="$t('feedChart.dj')" min-width="80px" align="center" prop="uprice" />
+        <u-table-column :label="$t('formulationEvaluation.tzzly')"min-width="80px" align="center" prop="autozone" />
         <u-table-column :label="$t('driver.tzys1')" min-width="80px" align="center" prop="autosecondname" />
         <u-table-column :label="$t('driver.qrks')" min-width="80px" align="center" prop="confirmstartname" />
-        <u-table-column label="继电器位置" min-width="80px" align="center" prop="trgaddress" />
-        <u-table-column label="无上域" min-width="60px" align="center">
+        <u-table-column :label="$t('feedChart.jdq')" min-width="80px" align="center" prop="trgaddress" />
+        <u-table-column :label="$t('feedChart.wsy')" min-width="60px" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.jmp == 0">否</span>
-            <span v-else>是</span>
+            <span v-if="scope.row.jmp == 0">{{$t('feedChart.no')}}</span>
+            <span v-else>{{$t('feedChart.yes')}}</span>
           </template>
         </u-table-column>
-        <u-table-column label="备用字段01" min-width="90px" align="center" prop="backup1" />
-        <u-table-column label="备用字段02" min-width="90px" align="center" prop="backup2" />
-        <u-table-column label="备用字段03" min-width="90px" align="center" prop="backup3" />
+        <u-table-column :label="$t('feedChart.byzd1')" min-width="90px" align="center" prop="backup1" />
+        <u-table-column :label="$t('feedChart.byzd2')" min-width="90px" align="center" prop="backup2" />
+        <u-table-column :label="$t('feedChart.byzd3')" min-width="90px" align="center" prop="backup3" />
         <u-table-column :label="$t('formulationEvaluation.sfqy')" min-width="80px" align="center">
           <template slot-scope="scope">
             <el-switch v-model="scope.row.enable" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
@@ -115,9 +115,9 @@
         </u-table-column>
         <u-table-column  :label="$t('errorAnalysis.cz')" align="center" width="180" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" @click="handleNutritive (row)">营养价值</a>
+            <a class="correcting" @click="handleNutritive (row)">{{$t('feedChart.yyjz')}}</a>
             <span class="centerSpan">|</span>
-            <a v-if="isRoleEdit" class="correcting" @click="handleRelation(row)">关联</a>
+            <a v-if="isRoleEdit" class="correcting" @click="handleRelation(row)">{{$t('feedChart.gl')}}</a>
             <span v-if="isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
             <span v-if="isRoleEdit" class="centerSpan">|</span>
@@ -149,71 +149,71 @@
         <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
           <el-row>
             <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">基础信息</h3>
+              <h3 style="width: 160px;text-align: right;">{{$t('feedChart.jcxx')}}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="饲料名称：" prop="fname">
-                <el-input ref="fname" v-model="create.temp.fname" class="filter-item" placeholder="请输入饲料名称" type="textarea" :autosize="{ minRows:1}" maxlength="32" />
+              <el-form-item :label="$t('feedChart.slmc')" prop="fname">
+                <el-input ref="fname" v-model="create.temp.fname" class="filter-item" :placeholder="$t('feedChart.slmc')"  type="textarea" :autosize="{ minRows:1}" maxlength="32" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="饲料类别：" prop="fclassid">
-                <el-select v-model="create.temp.fclassid" filterable placeholder="饲料类别" class="filter-item" style="width: 100%;" @change="changeFeedList">
+                <el-select v-model="create.temp.fclassid" filterable  :placeholder="$t('feedChart.sllb')" class="filter-item" style="width: 100%;" @change="changeFeedList">
                   <el-option v-for="item in feedTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select>
               </el-form-item>
               </el-col>
             <el-col :span="6">
-              <el-form-item label="唯一编码：" prop="feedcode">
-                <el-input ref="feedcode" v-model="create.temp.feedcode" class="filter-item" placeholder="请输入唯一编码" type="text" />
+              <el-form-item :label="$t('feedChart.wybm')" prop="feedcode">
+                <el-input ref="feedcode" v-model="create.temp.feedcode" class="filter-item" :placeholder="$t('feedChart.wybm')" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="饲料来源：" prop="source">
-                <el-input ref="source" v-model="create.temp.source" class="filter-item" disabled placeholder="用户自定义" type="text" />
+              <el-form-item :label="$t('feedChart.slly')" prop="source">
+                <el-input ref="source" v-model="create.temp.source" class="filter-item" disabled :placeholder="$t('feedChart.slly')" type="text" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="计划类型：" prop="printgroupid">
+              <el-form-item :label="$t('feedChart.jhlx')" prop="printgroupid">
                 <el-select v-model="create.temp.printgroupid" filterable
-:placeholder="$t('processAnalysis.planType')"class="filter-item" style="width: 100%;" @change="changePlanList">
+                    :placeholder="$t('processAnalysis.planType')" class="filter-item" style="width: 100%;" @change="changePlanList">
                   <el-option v-for="item in planTypeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="包装单位重量（kg）：" prop="unitweight">
-                <el-input ref="unitweight" v-model="create.temp.unitweight" class="filter-item" placeholder="正整数" type="number" style="width: 100%;" />
+              <el-form-item :label="$t('feedChart.bzdwzl')" prop="unitweight">
+                <el-input ref="unitweight" v-model="create.temp.unitweight" class="filter-item" :placeholder="$t('feedChart.bzdwzl')" type="number" style="width: 100%;" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="单价：" prop="uprice">
-                <el-input ref="uprice" v-model="create.temp.uprice"  class="filter-item" placeholder="最多俩位小数" type="number" step="0.01" style="width: 100%;" />
+              <el-form-item :label="$t('feedChart.dj')" prop="uprice">
+                <el-input ref="uprice" v-model="create.temp.uprice"  class="filter-item" :placeholder="$t('feedChart.dj')" type="number" step="0.01" style="width: 100%;" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="物料类型：" prop="sapMaterialtype">
+              <el-form-item :label="$t('feedChart.wllx')" prop="sapMaterialtype">
                 <el-select v-model="create.temp.sapMaterialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in materialtypeList" :key="item.id" :label="item.distName" :value="item.distCode" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="SAP货位：" prop="sapGoods">
-                <el-select v-model="create.temp.sapGoods" filterable placeholder="SAP货位" class="filter-item" style="width: 100%;">
+              <el-form-item :label="$t('feedChart.spalh')" prop="sapGoods">
+                <el-select v-model="create.temp.sapGoods" filterable :placeholder="$t('feedChart.spalh')" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in sapGoodsList" :key="item.id" :label="item.distName" :value="item.distCode" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="SAP编码：" prop="sapCode">
-                <el-input ref="sapCode" v-model="create.temp.sapCode" class="filter-item" disabled placeholder="SAP编码" type="text" />
+              <el-form-item :label="$t('feedChart.spabm')" prop="sapCode">
+                <el-input ref="sapCode" v-model="create.temp.sapCode" class="filter-item" disabled :placeholder="$t('feedChart.spabm')" type="text" />
                 <!-- <el-select v-model="create.temp.sapcode" filterable placeholder="SAP编码" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in sapCodeList" :key="item.id" :label="item.mixname" :value="item.id" />
                 </el-select> -->
@@ -222,30 +222,30 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">搅拌参数</h3>
+              <h3 style="width: 160px;text-align: right;">{{$t('feedChart.jbcs')}}</h3>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="允许误差数（kg）：" prop="allowratio">
+              <el-form-item :label="$t('feedChart.yxwcs')" prop="allowratio">
                 <el-input ref="allowratio" v-model="create.temp.allowratio" class="filter-item" placeholder="正整数" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="跳转重量域（kg）：" prop="autozone">
+              <el-form-item :label="$t('feedChart.tzzly')" prop="autozone">
                 <el-input ref="autozone" v-model="create.temp.autozone" :disabled="create.temp.autosecond=='0'" class="filter-item" placeholder="0-50之间的整数" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="跳转延时：" prop="autosecond">
+              <el-form-item :label="$t('feedChart.tzys')" prop="autosecond">
                 <el-select v-model="create.temp.autosecond" filterable :placeholder="$t('driver.tzys1')" class="filter-item" style="width: 100%;" @change="changeAutosecond">
                   <el-option v-for="item in jumpDelayList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="确认开始：" prop="confirmstart">
-                <el-select v-model="create.temp.confirmstart" filterabler placeholde="确认开始" class="filter-item" style="width: 100%;" @change="changeConfirmstart">
+              <el-form-item :label="$t('feedChart.qrks')" prop="confirmstart">
+                <el-select v-model="create.temp.confirmstart" filterabler :placeholde="$t('feedChart.qrks')" class="filter-item" style="width: 100%;" @change="changeConfirmstart">
                   <el-option v-for="item in confirmStartList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -253,27 +253,27 @@
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="是否启用：" prop="enable">
+              <el-form-item :label="$t('feedChart.sfqy')" prop="enable">
                 <el-select v-model="create.temp.enable" filterable :placeholder="$t('formulationEvaluation.sfqy')" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="继电器位置：" prop="trgaddress">
-                <el-input ref="trgaddress" v-model="create.temp.trgaddress" class="filter-item" placeholder="继电器位置" type="number" />
+              <el-form-item :label="$t('feedChart.jdq')" prop="trgaddress">
+                <el-input ref="trgaddress" v-model="create.temp.trgaddress" class="filter-item" :placeholder="$t('feedChart.jdq')" type="number" />
               </el-form-item>
             </el-col>
             <el-col v-if="isInforvalue" :span="6">
-              <el-form-item label="小料秤：" prop="smtmrid">
-                <el-select v-model="create.temp.smtmrid" filterable placeholder="小料秤" clearable class="filter-item" style="width: 100%;" @change="changeSmallMaterial">
+              <el-form-item :label="$t('feedChart.xkc')" prop="smtmrid">
+                <el-select v-model="create.temp.smtmrid" filterable :placeholder="$t('feedChart.xkc')" clearable class="filter-item" style="width: 100%;" @change="changeSmallMaterial">
                   <el-option v-for="item in smallMaterialList" :key="item.id" :label="item.tname" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="无上域：" prop="jmp">
-                <el-select v-model="create.temp.jmp" placeholder="无上域" class="filter-item" style="width: 100%;" @change="changeSmallMaterial">
+              <el-form-item :label="$t('feedChart.wsy')" prop="jmp">
+                <el-select v-model="create.temp.jmp" :placeholder="$t('feedChart.wsy')" class="filter-item" style="width: 100%;" @change="changeSmallMaterial">
                   <el-option v-for="item in jmpList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
               </el-form-item>
@@ -281,22 +281,22 @@
           </el-row>
 
           <el-row>
-            <h3 style="width: 160px;text-align: right;">备用字段</h3>
+            <h3 style="width: 160px;text-align: right;">{{$t('feedChart.byzd')}}</h3>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="备用字段01：" prop="backup1">
-                <el-input ref="backup1" v-model="create.temp.backup1" class="filter-item" placeholder="备用字段01" type="text" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" />
+              <el-form-item :label="$t('feedChart.byzd1')" prop="backup1">
+                <el-input ref="backup1" v-model="create.temp.backup1" class="filter-item" :placeholder="备用字段01" type="text" onkeyup="value=value.replace(/[^\x00-\xff]/g, '')" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="备用字段02：" prop="backup2">
-                <el-input ref="backup2" v-model="create.temp.backup2" class="filter-item" placeholder="备用字段02" type="text" />
+              <el-form-item :label="$t('feedChart.byzd2')" prop="backup2">
+                <el-input ref="backup2" v-model="create.temp.backup2" class="filter-item" :placeholder="$t('feedChart.byzd2')" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="备用字段03：" prop="backup3">
-                <el-input ref="backup3" v-model="create.temp.backup3" class="filter-item" placeholder="备用字段03" type="text" />
+              <el-form-item :label="$t('feedChart.byzd3')" prop="backup3">
+                <el-input ref="backup3" v-model="create.temp.backup3" class="filter-item" :placeholder="$t('feedChart.byzd3')" type="text" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -324,8 +324,8 @@
       </template>
       <div class="app-add">
         <div class="search">
-          <el-input v-model="feedBank.getdataListParm.parammaps.fname":placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
-          <el-select v-model="feedBank.getdataListParm.parammaps.statue" filterabler placeholder="关联状态" class="filter-item" style="width: 120px;" clearable>
+          <el-input v-model="feedBank.getdataListParm.parammaps.fname" :placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
+          <el-select v-model="feedBank.getdataListParm.parammaps.statue" filterabler :placeholder="$t('formulationEvaluation.glzt')" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in associationStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-button class="successBorder" @click="handleFeedBankSearch">{{$t('common.query')}}</el-button>
@@ -351,7 +351,7 @@
                 <span>{{ scope.row.sources }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中国饲料号" min-width="70px" align="center">
+            <el-table-column :label="$t('feedChart.zgslh')" min-width="70px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedcode }}</span>
               </template>
@@ -361,17 +361,17 @@
                 <span>{{ scope.row.fname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="价格" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.price')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="样品说明" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.ypsm')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="干物质(DM%)" min-width="65px" align="center">
+            <el-table-column :label="$t('feedChart.wgz')" min-width="65px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.dry }}</span>
               </template>
@@ -381,22 +381,22 @@
                 <span>{{ scope.row.starch }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗蛋白(CP%DM)" min-width="70px" align="center">
+            <el-table-column :label="$t('feedChart.cdb')" min-width="70px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.cp }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="钙(Ca%DM)" min-width="85px" align="center">
+            <el-table-column :label="$t('feedChart.gai')" min-width="85px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.ca }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="磷(P%DM)" min-width="85px" align="center">
+            <el-table-column :label="$t('feedChart.lin')" min-width="85px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.p }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="产奶净能(%DM)" min-width="75px" align="center">
+            <el-table-column :label="$t('feedChart.cnjn')" min-width="75px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.n }}</span>
               </template>
@@ -421,20 +421,20 @@
                 <span>{{ scope.row.ndip }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗灰分(Ash%)" min-width="65px" align="center">
+            <el-table-column :label="$t('feedChart.chf')" min-width="65px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.ash }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗料" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.cl')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.iscu }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="关联状态" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.glzt')" min-width="50px" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.statue==0">否</span>
-                <span v-if="scope.row.statue==1">是</span>
+                <span v-if="scope.row.statue==0">{{$t('feedChart.no')}}</span>
+                <span v-if="scope.row.statue==1">{{$t('feedChart.yes')}}</span>
               </template>
             </el-table-column>
           </el-table>
@@ -484,7 +484,7 @@
                 <span>{{ scope.row.sources }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="中国饲料号" min-width="80px" align="center">
+            <el-table-column :label="$t('feedChart.zgslh')" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedcode }}</span>
               </template>
@@ -494,17 +494,17 @@
                 <span>{{ scope.row.fname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="价格" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.price')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.price }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="样品说明" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.ypsm')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.remark }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="干物质(DM%)" min-width="65px" align="center">
+            <el-table-column :label="$t('feedChart.wgz')" min-width="65px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.dry }}</span>
               </template>
@@ -514,22 +514,22 @@
                 <span>{{ scope.row.starch }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗蛋白(CP%DM)" min-width="75px" align="center">
+            <el-table-column :label="$t('feedChart.cdb')" min-width="75px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.cp }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="钙(Ca%DM)" min-width="83px" align="center">
+            <el-table-column :label="$t('feedChart.gai')" min-width="83px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.ca }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="磷(P%DM)" min-width="80px" align="center">
+            <el-table-column :label="$t('feedChart.lin')" min-width="80px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.p }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="产奶净能(%DM)" min-width="75px" align="center">
+            <el-table-column :label="$t('feedChart.cnjn')" min-width="75px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.n }}</span>
               </template>
@@ -554,20 +554,20 @@
                 <span>{{ scope.row.ndip }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗灰分(Ash%)" min-width="65px" align="center">
+            <el-table-column :label="$t('feedChart.chf')" min-width="65px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.ash }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="粗料" min-width="50px" align="center">
+            <el-table-column :label="$t('feedChart.cl')" min-width="50px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.iscu }}</span>
               </template>
             </el-table-column>
             <el-table-column  :label="$t('errorAnalysis.cz')" min-width="50px" align="center" class-name="small-padding fixed-width" fixed="right">
               <template slot-scope="{row}">
-                <a v-if="row.statueRelation == '1'" class="correcting" :disabled="isokDisable" @click="disassociateData(row)">取消关联</a>
-                <a v-if="row.statueRelation == '0'" class="correcting" :disabled="isokDisable" @click="relationData(row)">关联</a>
+                <a v-if="row.statueRelation == '1'" class="correcting" :disabled="isokDisable" @click="disassociateData(row)">{{$t('feedChart.qxgl')}}</a>
+                <a v-if="row.statueRelation == '0'" class="correcting" :disabled="isokDisable" @click="relationData(row)">{{$t('feedChart.gl')}}</a>
               </template>
             </el-table-column>
           </el-table>
@@ -595,62 +595,62 @@
         <el-form ref="temp" :rules="nutritive.rules" :model="nutritive.temp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto 50px">
           <el-row>
             <el-col :span="6">
-              <el-form-item label="干物质（DM%）：" prop="dry">
-                <el-input ref="dry" v-model="nutritive.temp.dry"  :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入干物质" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.wgz')" prop="dry">
+                <el-input ref="dry" v-model="nutritive.temp.dry"  :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.wgz')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="淀粉（%DM）：" prop="starch">
-                <el-input ref="starch" v-model="nutritive.temp.starch" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入淀粉" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.df')" prop="starch">
+                <el-input ref="starch" v-model="nutritive.temp.starch" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.df')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="粗蛋白（CP%DM)：" prop="cp">
-                <el-input ref="cp" v-model="nutritive.temp.cp" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入粗蛋白" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.cdb')" prop="cp">
+                <el-input ref="cp" v-model="nutritive.temp.cp" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.cdb')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="钙（Ca%DM）：" prop="ca">
-                <el-input ref="ca" v-model="nutritive.temp.ca" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入钙" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.gai')" prop="ca">
+                <el-input ref="ca" v-model="nutritive.temp.ca" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.gai')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
-              <el-form-item label="磷（P%DM）：" prop="p">
-                <el-input ref="p" v-model="nutritive.temp.p" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入磷" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.lin')" prop="p">
+                <el-input ref="p" v-model="nutritive.temp.p" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.lin')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="产奶净能（%DM）：" prop="n">
-                <el-input ref="n" v-model="nutritive.temp.n" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入产奶净能" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.cnjn')" prop="n">
+                <el-input ref="n" v-model="nutritive.temp.n" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.cnjn')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="脂肪（%DM）：" prop="fat">
-                <el-input ref="fat" v-model="nutritive.temp.fat" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入脂肪" type="number" step="0.01" />
+              <el-form-item :label="$t('feedChart.zf')" prop="fat">
+                <el-input ref="fat" v-model="nutritive.temp.fat" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.zf')" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="ADF（%DM）：" prop="adf">
-                <el-input ref="adf" v-model="nutritive.temp.adf" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入ADF" type="number" step="0.01" />
+                <el-input ref="adf" v-model="nutritive.temp.adf" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="ADF" type="number" step="0.01" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="6">
               <el-form-item label="NDF（%DM）：" prop="ndf">
-                <el-input ref="ndf" v-model="nutritive.temp.ndf" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入NDF" type="number" step="0.01" />
+                <el-input ref="ndf" v-model="nutritive.temp.ndf" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="NDF" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
               <el-form-item label="NDIP(%)：" prop="ndip">
-                <el-input ref="ndip" v-model="nutritive.temp.ndip" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入NDIP" type="number" step="0.01" />
+                <el-input ref="ndip" v-model="nutritive.temp.ndip" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="NDIP" type="number" step="0.01" />
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="粗灰分（Ash%）：" prop="ash">
-                <el-input ref="ash" v-model="nutritive.temp.ash" v-limit :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入粗灰分" type="number" min="0.00" step="0.01" />
+              <el-form-item :label="$t('feedChart.chf')" prop="ash">
+                <el-input ref="ash" v-model="nutritive.temp.ash" v-limit :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('feedChart.chf')" type="number" min="0.00" step="0.01" />
               </el-form-item>
             </el-col>
           </el-row>
@@ -703,7 +703,7 @@
           >
             <u-table-column type="selection" align="center" width="50"/>
             <u-table-column label="物料号" min-width="80px" align="center" prop="MATNR"/>
-            <u-table-column label="物料类型" min-width="90px" align="center" prop="MTART" />
+            <u-table-column :label="$t('feedChart.wllx')" min-width="90px" align="center" prop="MTART" />
             <u-table-column label="物料组" min-width="80px" align="center" prop="MATKL"/>
             <u-table-column label="物料描述" min-width="90px" align="center" prop="MAKTX" />
             <u-table-column label="最后修改日期" min-width="80px" align="center" prop="LAEDA" />
@@ -741,7 +741,7 @@
           </el-row>
           <el-row>
             <el-col :span="18">
-              <el-form-item label="物料类型：" prop="sapMaterialtype">
+              <el-form-item :label="$t('feedChart.wllx')" prop="sapMaterialtype">
                 <el-select v-model="sapCode2.temp.sapMaterialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in materialtypeList" :key="item.id" :label="item.distName" :value="item.distCode" />
                 </el-select>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -102,8 +102,8 @@
           </el-table-column>
           <el-table-column :label="$t('dailyExecutionPlan.yzx')"  min-width="70px" align="center">
             <template slot-scope="scope">
-              <div v-if="scope.row.havebutton == 0" style="background: #009A69;color:#fff;line-height:30px;">否</div>
-              <div v-else style="background: #FC2323;color:#000 ;line-height:30px;">是</div>
+              <div v-if="scope.row.havebutton == 0" style="background: #009A69;color:#fff;line-height:30px;">{{$t('feedChart.no')}}</div>
+              <div v-else style="background: #FC2323;color:#000 ;line-height:30px;">{{$t('feedChart.yes')}}</div>
             </template>
           </el-table-column>
           <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="80px" align="center">
@@ -848,8 +848,8 @@
             <el-table-column  :label="$t('errorAnalysis.Driver')"  min-width="90px" align="center" prop="driver" />
             <el-table-column :label="$t('dailyExecutionPlan.yzx')"  min-width="70px" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.havebutton == 0">否</span>
-                <span v-else>是</span>
+                <span v-if="scope.row.havebutton == 0">{{$t('feedChart.no')}}</span>
+                <span v-else>{{$t('feedChart.yes')}}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  min-width="80px" align="center" prop="times" />

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -467,8 +467,8 @@
         <el-radio v-model="tmrNumber.radio" label="2">3、清空已分配的撒料车。</el-radio>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">否</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">是</el-button>
+        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">{{$t('feedChart.no')}}</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">{{$t('feedChart.yes')}}</el-button>
       </div>
     </el-dialog>
   </div>

src/views/formulationPlan/formulaDistribution/index.vue

@@ -38,8 +38,8 @@
         <el-table-column :label="$t('formulationEvaluation.pflx')" min-width="130px" align="center" prop="fttype" />
         <el-table-column label="是否为当前配方" min-width="130px" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.isissue == 0">否</span>
-            <span v-else>是</span>
+            <span v-if="scope.row.isissue == 0">{{$t('feedChart.no')}}</span>
+            <span v-else>{{$t('feedChart.yes')}}</span>
           </template>
         </el-table-column>
         <el-table-column label="已下发牧场" min-width="130px" align="center" prop="grouppastures" />

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -445,8 +445,8 @@
         <el-radio v-model="tmrNumber.radio" label="2">3、清空已分配的撒料车。</el-radio>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">否</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">是</el-button>
+        <el-button class="cancelClose" :disabled="isokDisable" @click="closeTmrNumber">{{$t('feedChart.no')}}</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="tmrNumberData()">{{$t('feedChart.yes')}}</el-button>
       </div>
     </el-dialog>
 

src/views/formulationPlan/recipeTemplate/index.vue

@@ -290,8 +290,8 @@
             </el-table-column>
             <el-table-column v-if="lockCount.isLockCount" :label="$t('formulationEvaluation.sfsdntbs')" min-width="80px" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.NoEdit && scope.row.islockcount == '0'">否</span>
-                <span v-if="scope.row.NoEdit && scope.row.islockcount == '1'">是</span>
+                <span v-if="scope.row.NoEdit && scope.row.islockcount == '0'">{{$t('feedChart.no')}}</span>
+                <span v-if="scope.row.NoEdit && scope.row.islockcount == '1'">{{$t('feedChart.yes')}}</span>
                 <el-select v-if="scope.row.Edit" v-model="scope.row.islockcount" placeholder="" class="filter-item" style="width:95%;padding:10px 0;">
                   <el-option v-for="item in lockBullsList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
@@ -395,8 +395,8 @@
             <!--  -->
             <el-table-column v-if="lockCount.isLockCount" :label="$t('formulationEvaluation.sfsdntbs')" min-width="80px" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.NoEdit && scope.row.islockcount == '0'">否</span>
-                <span v-if="scope.row.NoEdit && scope.row.islockcount == '1'">是</span>
+                <span v-if="scope.row.NoEdit && scope.row.islockcount == '0'">{{$t('feedChart.no')}}</span>
+                <span v-if="scope.row.NoEdit && scope.row.islockcount == '1'">{{$t('feedChart.yes')}}</span>
                 <el-select v-if="scope.row.Edit" v-model="scope.row.islockcount" placeholder="" class="filter-item" style="width:95%;padding:10px 0;">
                   <el-option v-for="item in lockBullsList" :key="item.id" :label="item.name" :value="item.id" />
                 </el-select>
@@ -641,8 +641,8 @@
               </el-table-column>
               <el-table-column :label="$t('formulationEvaluation.sfsdntbs')" min-width="130px" align="center">
                 <template slot-scope="scope">
-                  <span v-if="scope.row.islockcount == '0'">否</span>
-                  <span v-if="scope.row.islockcount == '1'">是</span>
+                  <span v-if="scope.row.islockcount == '0'">{{$t('feedChart.no')}}</span>
+                  <span v-if="scope.row.islockcount == '1'">{{$t('feedChart.yes')}}</span>
                 </template>
               </el-table-column>
               <el-table-column :label="$t('formulationEvaluation.sort')" min-width="130px" align="center">
@@ -703,8 +703,8 @@
             </el-table-column>
             <el-table-column v-if="lockCount.isLockCount" :label="$t('formulationEvaluation.sfsdntbs')" min-width="130px" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.islockcount == '0'">否</span>
-                <span v-if="scope.row.islockcount == '1'">是</span>
+                <span v-if="scope.row.islockcount == '0'">{{$t('feedChart.no')}}</span>
+                <span v-if="scope.row.islockcount == '1'">{{$t('feedChart.yes')}}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('formulationEvaluation.sort')" min-width="110px" align="center">

src/views/inventoryManagement/laborConsumption/index.vue

@@ -127,7 +127,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="饲料名称：" prop="feedname">
+              <el-form-item :label="$t('feedChart.slmc')" prop="feedname">
                 <el-autocomplete v-model="create.createTemp.feedname" :disabled="create.dialogStatus==='see'" value-key="feedname" class="inline-input" :fetch-suggestions="feedNameSearch" placeholder="请选择饲料名称" style="width:100%" @select="handleSelectFeedName" @blur="blurFeedName">
                   <template slot-scope="{ item }">
                     <span>{{ item.feedname }}</span>

src/views/inventoryManagement/systemConsumption/index.vue

@@ -91,8 +91,8 @@
         </el-table-column>
         <el-table-column label="是否审核" min-width="100px" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.ischarge == 1">是</span>
-            <span v-else>否</span>
+            <span v-if="scope.row.ischarge == 1">{{$t('feedChart.yes')}}</span>
+            <span v-else>{{$t('feedChart.no')}}</span>
           </template>
         </el-table-column>
         <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="80" class-name="small-padding fixed-width" fixed="right">

src/views/inventoryManagement/warehousing/index.vue

@@ -127,7 +127,7 @@
         <el-form ref="createTemp" :rules="create.rules" :model="create.createTemp" label-position="right" label-width="160px" style="width: 100%;margin:0 auto">
           <el-row>
             <el-col :span="24">
-              <h3 style="width: 160px;text-align: right;">基础信息</h3>
+              <h3 style="width: 160px;text-align: right;">{{$t('feedChart.jcxx')}}</h3>
             </el-col>
           </el-row>
           <el-row>

src/views/login/index.vue

@@ -41,9 +41,9 @@
     </div>
     <div style="position: absolute;bottom: 0;left: 0;right:0;color: #000;background: #fee; opacity: .7; font-size: 14px;">
       <p style="text-align:center;line-height:16px;">
-        版权所有
-        <a href="http://www.dairyinfo.com.cn" target="_blank">上海科湃腾信息科技有限公司</a>
-        <a style="margin-left: 20px;" href="https://beian.miit.gov.cn/" target="_blank">沪ICP备11008303号-3 </a>
+        {{$t('auth.companyTit')}}
+        <a href="http://www.dairyinfo.com.cn" target="_blank"> {{$t('auth.company')}}</a>
+        <!-- <a style="margin-left: 20px;" href="https://beian.miit.gov.cn/" target="_blank">沪ICP备11008303号-3 </a> -->
       </p>
 
     </div>

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -481,8 +481,8 @@
             <el-table-column :label="$t('formulationEvaluation.jbys')" min-width="100px" align="center" prop="autosecond" />
             <el-table-column :label="$t('formulationEvaluation.sfsdntbs')" min-width="100" align="center">
               <template slot-scope="scope">
-                <span v-if="scope.row.islockcount == '0'">否</span>
-                <span v-if="scope.row.islockcount == '1'">是</span>
+                <span v-if="scope.row.islockcount == '0'">{{$t('feedChart.no')}}</span>
+                <span v-if="scope.row.islockcount == '1'">{{$t('feedChart.yes')}}</span>
               </template>
             </el-table-column>
             <el-table-column :label="$t('formulationEvaluation.sort')" min-width="100" align="center">

src/views/statisticalAnalysis/pushingplan/index.vue

@@ -85,7 +85,7 @@
           prop="dates"
         />
 
-        <el-table-column
+        <!-- <el-table-column
         :label="$t('pushingplan.name')"
           align="center"
           width="80"
@@ -100,7 +100,7 @@
               >{{$t('pushingplan.watch')}}</el-button
             >
           </template>
-        </el-table-column>
+        </el-table-column> -->
       </el-table>
       <!-- <span
         v-if="listLoading == false"

src/views/systemManagement/operationManagement/group/index.vue

@@ -84,7 +84,7 @@
             <el-button v-if="row.isUpdate && isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(row)" />
             <!-- 关联 -->
             <span v-if="row.isUpdate" class="centerSpan">|</span>
-            <a v-if="row.isUpdate" class="correcting" @click="handleRelation(row)">关联</a>
+            <a v-if="row.isUpdate" class="correcting" @click="handleRelation(row)">{{$t('feedChart.gl')}}</a>
             <!-- 编辑保存 -->
             <el-button v-if="row.isUpdateSave && isRoleEdit" icon="el-icon-folder-checked" class="miniSuccess" :disabled="isokDisable" @click="updateData(row)" />
             <span v-if="row.isUpdateSave" class="centerSpan">|</span>

src/views/systemManagement/reminderSettings/index.vue

@@ -30,7 +30,7 @@
         <el-table-column label="提醒对象" min-width="130px" align="center" prop="user" />
         <el-table-column  :label="$t('errorAnalysis.cz')" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <a class="correcting" size="mini" style="width: 80px;" @click="handleSetUp(row)">设置</a>
+            <a class="correcting" size="mini" style="width: 80px;" @click="handleSetUp(row)">{{$t('feedChart.sz')}}</a>
           </template>
         </el-table-column>
       </el-table>