Jelajahi Sumber

校验提示语

Shan9312 9 bulan lalu
induk
melakukan
a6a3079aff
26 mengubah file dengan 389 tambahan dan 190 penghapusan
  1. 85 0
      src/lang/en/langModule/message.js
  2. 114 0
      src/lang/zn/langModule/message.js
  3. 1 1
      src/views/basicData/leftoverManagement/index.vue
  4. 4 4
      src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue
  5. 1 1
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  6. 27 27
      src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue
  7. 56 55
      src/views/formulationPlan/dhedFormula/index.vue
  8. 17 18
      src/views/formulationPlan/formulaDistribution/index.vue
  9. 2 2
      src/views/formulationPlan/materialIssuancePlan/index.vue
  10. 1 1
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  11. 1 1
      src/views/inventoryManagement/laborConsumption/index.vue
  12. 1 1
      src/views/inventoryManagement/systemConsumption/index.vue
  13. 1 1
      src/views/leftoverManagement/index.vue
  14. 1 1
      src/views/shedProduction/dungScores/index.vue
  15. 1 1
      src/views/shedProduction/fecalScreen/index.vue
  16. 4 4
      src/views/shedProduction/formulaDryMatter/historyRecord.vue
  17. 5 5
      src/views/shedProduction/formulaDryMatter/index.vue
  18. 1 1
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  19. 36 36
      src/views/shedProduction/performance/index.vue
  20. 1 1
      src/views/shedProduction/physicalConditionScore/index.vue
  21. 12 12
      src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue
  22. 1 1
      src/views/statisticalAnalysis/formulationEvaluation/index.vue
  23. 7 7
      src/views/statisticalChart/formulaStatistics/index.vue
  24. 2 2
      src/views/systemManagement/reminderSettings/index.vue
  25. 6 6
      src/views/systemManagement/role/index.vue
  26. 1 1
      src/views/systemManagement/user/index.vue

+ 85 - 0
src/lang/en/langModule/message.js

@@ -66,6 +66,91 @@ msg63: "Formula Details",
 msg64: "Weight (KG)",
 msg65: "(3.5) Feed Conversion Efficiency (kg/DM)",
 msg66: "Daily Milk Cost per Kilogram (Yuan)",
+//
+msg67: "Please select the formula to be issued",
+msg68: "The formula is not enabled and cannot be issued",
+mag69: "Please select the farm to be issued to" ,
+msg70: "Formula issued",
+msg71: "Is it the current formula",
+msg72: "Issuance record",
+msg73: "Issuance time",
+msg74: "Select the farm for issuance",
+msg75: "Yield (kg/cow)",
+msg76: "Dry matter intake (kg/cow)",
+msg77: "2.75 points (quantity, percentage)",
+msg78: "2.75 points (quantity, percentage)" , 
+msg79: "3 points (quantity, percentage)",
+msg80: "3.25 points (quantity, percentage)",
+msg81: "3.75 points (quantity, percentage)",
+msg82: "4+ points (quantity, percentage)",
+msg83: "1 point (quantity, percentage)",
+msg84: "2 points (quantity, percentage)",
+msg85: "4 points (quantity, percentage)",
+msg86: "5 points (quantity, percentage)",
+msg87: "Dry matter adjustment - formula selection",
+msg88: "Please select the pen formula",
+msg89: "Fresh weight (g)",
+msg90: "Dried weight (g)",
+msg91: "Theoretical dry matter",
+msg92: "Actual dry matter",
+msg93: "Operation date",
+msq95: "Previous step" ,
+msg96: "Next step",
+msg97: "Shift weight before adjustment",
+msg98: "Shift weight after adjustment",
+msg99: "Theoretical dry matter before adjustment",
+msg100: "Theoretical dry matter after adjustment",
+msg101: "Sampling dry matter before adjustment",
+msg102: "Sampling dry matter after adjustment",
+msg103: "Daily feeding amount before adjustment",
+msg104: "Daily feeding amount after adjustment",
+msg105: "Dry matter adjustment - sampling selection",
+msg106: "Dry matter adjustment - change details",
+msg107: "Select the formula to be adjusted",
+msg108: "Please select the corresponding dry matter ratio adjustment for the sampling content",
+msg109: "Only one sampling content can be selected for adjustment",
+msg110: "Are you sure to perform the current dry matter adjustment operation?",
+msg111: "Prompt",
+msg112: "Pen formula import template",
+msg113: "Filling specification",
+downloadList:[
+  { 'obj1': '1. The file type should be xlsx, and the corresponding table file name format should be: File Name.xlsx;' },
+  { 'obj1': '2. The bottom worksheet name cannot be changed, and the default is: Sheet1;' },
+  { 'obj1': '3. Pen name, actual cattle number, coefficient (%), coefficient head number, formula template, supplementary feed formula font are required to fill in;' },
+  { 'obj1': ' The first column pen name defaults to the pen in the system and cannot be modified;' },
+  { 'obj1': '5. The actual number of cattle should be a positive integer, the coefficient should be a positive number, and at most two decimal places should be retained;' },
+  { 'obj1': '6. The formula template name must match the feeding formula in the system formula plan - formula template; if the supplementary feed formula is enabled, it needs to match the supplementary feed formula in the formula template;' },
+  { 'obj1': '7. A maximum of 200 data entries can be imported, if more than 200 entries, please import in multiple files.' }
+],
+
+
+//
+msg114: "Cattle head count synchronization with the software has been canceled",
+msg115: "Recovery has been canceled",
+msg116: "The livestock category of the selected formula template does not match the livestock category corresponding to the pen",
+msg117: "The selected supplementary feed formula does not match the livestock category corresponding to the pen",
+msg118: "Actual cattle head count/coefficients/coefficients head count/formula template cannot be empty",
+msg119: "Coefficients/coefficients head count/formula template cannot be empty",
+msg120: "Coefficients head count/formula template cannot be empty",
+msg121: "Actual cattle head count cannot be empty",
+msg122: "Coefficient cannot be empty",
+msg123: "Coefficients head count cannot be empty",
+msg124: "Formula template cannot be empty",
+msg125: "Please enter a positive integer for the actual cattle head count",
+msg126: "Please select a pen information for nutritional assessment",
+msg127: "Start date and end date cannot be empty",
+msg128: "Cattle head count should be a positive integer",
+msg129: "Temperature environment should be kept to two decimal places",
+msg130: "Average age should be kept to two decimal places",
+msg131: "Body weight should be kept to two decimal places",
+msg132: "Daily weight gain should be kept to two decimal places",
+msg133: "Pregnancy days should be an integer greater than 0 and less than 280",
+msg134: "Parity should be an integer greater than 0 and less than 20",
+msg135: "Average days in milk should be a positive integer",
+msg136: "Milk yield should be kept to two decimal places",
+msg137: "Milk fat percentage should be kept to two decimal places",
+msg138: "Milk protein percentage should be kept to two decimal places",
+msg139: "Lactose percentage should be kept to two decimal places",
 
 
 }

+ 114 - 0
src/lang/zn/langModule/message.js

@@ -67,6 +67,120 @@ msg63:"配方详情",
 msg64:"重量(KG)",
 msg65:"(3.5)饲料转化效率(kg/DM)",
 msg66:"日公斤奶成本(元)",
+//
+msg67:"请选择下发配方",
+msg68:"配方未启用不可下发",
+mag69:"请选择下发牧场",
+msg70:"配方下发",
+msg71:"是否为当前配方",
+msg70:"已下发牧场",
+msg71:"使用情况",
+msg72:"下发记录",
+msg73:"下发时间",
+msg74:"选择下发牧场",
+msg75:"单产(kg/头)",
+msg76:"干物质采食量(kg/头)",
+msg77:"2.75-分(数量、百分比)",
+msg78:"2.75分(数量、百分比)",
+msg79:"3分(数量、百分比)" ,
+msg80:"3.25分(数量、百分比)",
+msg81:"3.5分(数量、百分比)",
+msg82:"3.75分(数量、百分比)",
+msg83:"4+分(数量、百分比)",
+msg84:"1分(数量、百分比)",
+msg85:"2分(数量、百分比)",
+msg86:"4分(数量、百分比)",
+msg87:"5分(数量、百分比)",
+msg88:"干物质调节-配方选择",
+msg89:"请选择栏舍配方",
+msg90:"鲜样重量(g)",
+msg91:"烘干重量(g)",
+msg92:"理论干物质",
+msg93:"实际干物质",
+msg94:"操作日期",
+msq95:"上一步",
+msg96:"下一步",
+msg97:"调节前班次重量",
+msg98:"调节后班次重量",
+msg99:"调节前理论干物质量",
+msg100:"调节后理论干物质量",
+msg101:"调节前采样干物质量",
+msg102:"调节后采样干物质量",
+msg103:"调节前日投喂量",
+msg104:"调节后日投喂量",
+msg105:"干物质调节—采样选择",
+msg106:"干物质调节—变化详情",
+msg107:"选择需调节配方",
+msg108:'请选择采样内容对应干物质比例调节',
+msg109:'仅可选择一条采样内容进行调节',
+msg110:"是否确认进行当前干物质调节操作",
+msg111:"提示",
+msg112:"栏舍配方导入模板",
+msg113:"填写规范",
+downloadList:[
+  { 'obj1': '1、文件类型为xlsx类型,对应表格文件名格式为:文件名称.xlsx;' },
+  { 'obj1': '2、底部工作表名称不可更改,默认为:Sheet1;' },
+  { 'obj1': '3、栏舍名称,实际牛头数,系数(%),系数头数,配方模板,补料配方字体为必填;' },
+  { 'obj1': '4、第一列栏舍名称默认为系统中栏舍,不可修改;' },
+  { 'obj1': '5、实际牛头数为正整数,系数为正数,至多保留俩位小数;' },
+  { 'obj1': '6、配方模板名称必须与系统中配方计划—配方模板中的饲喂配方匹配;若补料配方开启,需与配方模板中的补料配方匹配;' },
+  { 'obj1': '7、数据最多可导入200条,超过200条请分多个文件导入。' }
+],
+
+
+//
+
+msg114:"已取消软件牛头数同步",
+msg115:"已取消恢复",
+msg116:"所选配方模板牲畜类别与栏舍对应牲畜类别不一致",
+msg117:'所选补料配方与栏舍对应牲畜类别不一致',
+msg118:'实际牛头数/系数/系数头数/配方模版不能为空',
+msg119:'系数/系数头数/配方模版不能为空',
+msg120:"系数头数/配方模版不能为空",
+msg121:'实际牛头数不能为空',
+msg122:'系数不能为空',
+msg123:'系数头数不能为空',
+msg124:"配方模版不能为空",
+msg125:"实际牛头数请输入正整数",
+msg126:'请选择一条栏舍信息进行营养评估',
+msg127:'开始日期结束日期不能为空',
+msg128:'牛头数请输入正整数',
+msg129:"温度环境请保留两位小数",
+msg130:"平均月龄请保留两位小数",
+msg131:'体重请保留两位小数',
+msg132:'日增重请保留两位小数',
+msg133:'怀孕天数请输入大于0小于280整数',
+msg134:'胎次请输入大于0小于20整数',
+msg135:'平均泌乳天数请输入正整数',
+msg136:'产奶量请保留两位小数',
+msg137:'乳脂率请保留两位小数',
+msg138:'乳蛋白率请保留两位小数',
+msg139:'乳糖率请保留两位小数',
+
+//
+msg140:"栏舍配方",
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 
 

+ 1 - 1
src/views/basicData/leftoverManagement/index.vue

@@ -181,7 +181,7 @@
       },
       // 点击删除
       handleDelete(index, row) {
-        this.$confirm('确定删除当前剩料信息吗?', '提示', {
+        this.$confirm('确定删除当前剩料信息吗?', this.$t('message.msg111'), {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'

+ 4 - 4
src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue

@@ -503,11 +503,11 @@ export default {
       const positiveInteger = /^[1-9]\d*$/
       if (row.ccount !== '') {
         if (!positiveInteger.test(parseFloat(row.ccount))) {
-          this.$message({ type: 'error', message: '实际牛头数请输入正整数', duration: 2000 })
+          this.$message({ type: 'error', message: this.$t('message.msg125'), duration: 2000 })
           return false
         }
       } else {
-        this.$message({ type: 'error', message: '实际牛头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg121'), duration: 2000 })
       }
       const positiveNumber = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
       if (row.ratio !== '') {
@@ -516,7 +516,7 @@ export default {
           return false
         }
       } else {
-        this.$message({ type: 'error', message: '系数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg122'), duration: 2000 })
       }
       if (row.ccountratio !== '') {
         if (!positiveNumber.test(parseFloat(row.ccountratio))) {
@@ -524,7 +524,7 @@ export default {
           return false
         }
       } else {
-        this.$message({ type: 'error', message: '系数头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg123'), duration: 2000 })
       }
 
       if (row.tratio == '') {

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue

@@ -384,7 +384,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        check: '提示'
+        check: this.$t('message.msg111')
       },
       requestParam: {},
       selectList: [],

+ 27 - 27
src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -1,12 +1,12 @@
 <template>
   <div v-if="visible">
-    <!-- 干物质调节-配方选择 -->
+    <!--{{$t('message.msg87')}} -->
     <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="visible" :close-on-click-modal="false" append-to-body :before-close="closeDialog" width="35%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
             <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            干物质调节-配方选择
+           {{$t('message.msg88')}}
           </span>
           <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
             <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
@@ -16,7 +16,7 @@
       </template>
       <div style="min-height:200px;justify-content:center;align-items:center;display:flex;">
         <div>
-          <span style="margin-right: 10px;">请选择栏舍配方:</span>
+          <span style="margin-right: 10px;">{{$t('message.msg89')}}</span>
           <el-select v-model="temp.ftid" filterable class="filter-item">
             <el-option v-for="item in balconicFormulaList" :key="item.id" :label="item.tname" :value="item.id" />
           </el-select>
@@ -24,7 +24,7 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="closeDialog()">{{$t('formulationEvaluation.cancel')}}</el-button>
-        <el-button class="save" @click="handleNextSamplingSelection()">下一步</el-button>
+        <el-button class="save" @click="handleNextSamplingSelection()">{{$t('message.msg96')}}</el-button>
       </div>
     </el-dialog>
 
@@ -74,19 +74,19 @@
             <el-table-column :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" />
             <el-table-column  :label="$t('errorAnalysis.isHouseName')"  prop="barname" min-width="110px" align="center" />
             <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="110px" align="center" />
-            <el-table-column label="鲜样重量(g)" prop="freshweight" min-width="110px" align="center" />
-            <el-table-column label="烘干重量(g)" prop="dryweight" min-width="110px" align="center" />
-            <el-table-column label="理论干物质" prop="thoweight" min-width="110px" align="center" />
-            <el-table-column label="实际干物质" prop="actweight" min-width="110px" align="center" />
+            <el-table-column :label="$t('message.msg90')" prop="freshweight" min-width="110px" align="center" />
+            <el-table-column :label="$t('message.msg91')" prop="dryweight" min-width="110px" align="center" />
+            <el-table-column :label="$t('message.msg92')" prop="thoweight" min-width="110px" align="center" />
+            <el-table-column :label="$t('message.msg93')"  prop="actweight" min-width="110px" align="center" />
             <el-table-column  :label="$t('performance.czr')" prop="emp" min-width="110px" align="center" />
-            <el-table-column label="操作日期" prop="operatetime" min-width="110px" align="center" />
+            <el-table-column :label="$t('message.msg94')"  prop="operatetime" min-width="110px" align="center" />
           </el-table>
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="closeDialog();">{{$t('formulationEvaluation.cancel')}}</el-button>
-        <el-button class="save" @click="samplingSelection.dialogFormVisible=false; samplingSelection.frequencyList = []">上一步</el-button>
-        <el-button class="save" @click="handleNextChangeDetails()">下一步</el-button>
+        <el-button class="save" @click="samplingSelection.dialogFormVisible=false; samplingSelection.frequencyList = []">{{$t('message.msg95')}}</el-button>
+        <el-button class="save" @click="handleNextChangeDetails()">{{$t('message.msg96')}}</el-button>
       </div>
     </el-dialog>
 
@@ -122,21 +122,21 @@
           >
             <el-table-column :label="$t('errorAnalysis.pen')" prop="barname" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
             <el-table-column :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="70px" align="center" class-name="small-padding fixed-width" fixed="left" />
-            <el-table-column label="调节前班次重量" prop="weight" min-width="70px" align="center" />
-            <el-table-column label="调节后班次重量" prop="weightafter" min-width="100px" align="center" />
-            <el-table-column label="调节前理论干物质量" prop="ftweight" min-width="70px" align="center" />
-            <el-table-column label="调节后理论干物质量" prop="ftweightafter" min-width="90px" align="center" />
-            <el-table-column label="调节前采样干物质量" prop="cyweight" min-width="70px" align="center" />
-            <el-table-column label="调节后采样干物质量" prop="cyweightafter" min-width="90px" align="center" />
-            <el-table-column label="调节前日投喂量" prop="totalweight" min-width="70px" align="center" />
-            <el-table-column label="调节后日投喂量" prop="totalweightafter" min-width="100px" align="center" />
+            <el-table-column :label="$t('message.msg97')"  prop="weight" min-width="70px" align="center" />
+            <el-table-column :label="$t('message.msg98')" prop="weightafter" min-width="100px" align="center" />
+            <el-table-column :label="$t('message.msg99')" prop="ftweight" min-width="70px" align="center" />
+            <el-table-column :label="$t('message.msg100')" prop="ftweightafter" min-width="90px" align="center" />
+            <el-table-column :label="$t('message.msg101')"  prop="cyweight" min-width="70px" align="center" />
+            <el-table-column :label="$t('message.msg102')" prop="cyweightafter" min-width="90px" align="center" />
+            <el-table-column :label="$t('message.msg103')" prop="totalweight" min-width="70px" align="center" />
+            <el-table-column :label="$t('message.msg104')" prop="totalweightafter" min-width="100px" align="center" />
           </el-table>
         </div>
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="closeDialog();">{{$t('formulationEvaluation.cancel')}}</el-button>
-        <el-button class="save" @click="changeDetails.dialogFormVisible=false;samplingSelection.frequencyList = []">上一步</el-button>
-        <el-button class="save" @click="handleNextLast()">下一步</el-button>
+        <el-button class="save" @click="changeDetails.dialogFormVisible=false;samplingSelection.frequencyList = []">{{$t('message.msg95')}}</el-button>
+        <el-button class="save" @click="handleNextLast()">{{$t('message.msg96')}}</el-button>
       </div>
     </el-dialog>
 
@@ -235,8 +235,8 @@ export default {
       },
 
       textMap: {
-        samplingSelection: '干物质调节—采样选择',
-        changeDetails: '干物质调节—变化详情'
+        samplingSelection: this.$t('message.msg105'),
+        changeDetails: this.$t('message.msg106'), 
       },
       selectionList: [],
       isokDisable: false,
@@ -286,7 +286,7 @@ export default {
         this.getSamplingDateList()
         this.getSamplingSelectionDownList()
       } else {
-        this.$message({ type: 'error', message: '选择需调节配方', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg107'), duration: 2000 })
       }
     },
     getSamplingSelectionDownList() {
@@ -349,9 +349,9 @@ export default {
         this.getListChangeDetails()
       } else {
         if (this.selectionList.length == 0) {
-          this.$message({ type: 'error', message: '请选择采样内容对应干物质比例调节', duration: 2000 })
+          this.$message({ type: 'error', message: this.$t('message.msg108'), duration: 2000 })
         } else {
-          this.$message({ type: 'error', message: '仅可选择一条采样内容进行调节', duration: 2000 })
+          this.$message({ type: 'error', message: this.$t('message.msg109'), duration: 2000 })
         }
       }
     },
@@ -421,7 +421,7 @@ export default {
       }
     },
     handleNextLast() {
-      MessageBox.confirm('是否确认进行当前干物质调节操作', '提示', {
+      MessageBox.confirm(this.$t('message.msg110'), this.$t('message.msg111'), {
         confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         // beforeClose: (action, instance, done) => {
         //   console.log(action, instance, done)

+ 56 - 55
src/views/formulationPlan/dhedFormula/index.vue

@@ -296,6 +296,11 @@
             :span-method="objectSpanMethod"
             :max-height="500"
           >
+           <u-table-column >
+            <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
+             </u-table-column>
             <u-table-column :key="1" :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left" />
             <!-- <u-table-column :key="1" :label="$t('formulationEvaluation.xh')" align="center" type="index" width="50px" class-name="small-padding fixed-width" fixed="left">
               <template slot-scope="scope">
@@ -631,12 +636,12 @@
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="单产(kg/头)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg75')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.product }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="干物质采食量(kg/头)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg76')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
@@ -651,37 +656,37 @@
                         <span>{{ scope.row.standardscore }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="2.75-分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg77')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score25 }}({{ scope.row.score25rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="2.75分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg78')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score275 }}({{ scope.row.score275rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="3分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg79')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score3 }}({{ scope.row.score3rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="3.25分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg80')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score325 }}({{ scope.row.score325rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="3.5分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg81')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score35 }}({{ scope.row.score35rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="3.75分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg82')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score375 }}({{ scope.row.score375rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="4+分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg83')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score4 }}({{ scope.row.score4rate }}%)</span>
                       </template>
@@ -717,12 +722,12 @@
                         <span>{{ scope.row.sumcowcount }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="单产(kg/头)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg75')"min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.product }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="干物质采食量(kg/头)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg76')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
@@ -737,27 +742,27 @@
                         <span>{{ scope.row.cowneed }}</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="1分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg84')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score1 }}({{ scope.row.score1rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="2分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg85')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score2 }}({{ scope.row.score2rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="3分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg79')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score3 }}({{ scope.row.score3rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="4分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg86')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score4 }}({{ scope.row.score4rate }}%)</span>
                       </template>
                     </el-table-column>
-                    <el-table-column label="5分(数量、百分比)" min-width="130px" align="center">
+                    <el-table-column :label="$t('message.msg87')" min-width="130px" align="center">
                       <template slot-scope="scope">
                         <span>{{ scope.row.score5 }}({{ scope.row.score5rate }}%)</span>
                       </template>
@@ -1536,7 +1541,7 @@ export default {
     changeRecipeTemplate(item, row) {
       row.myccname = this.recipeTemplateList.find(obj => obj.id == item).ccname
       if (row.bigcowclass !== row.myccname) {
-        this.$message({ type: 'warning', message: '所选配方模板牲畜类别与栏舍对应牲畜类别不一致', duration: 2000 })
+        this.$message({ type: 'warning', message: this.$t('message.msg116'), duration: 2000 })
       }
       console.log(row.supplyweight, 'row.supplyweight')
       row.ftname = this.recipeTemplateList.find(obj => obj.id == item).tname
@@ -1622,7 +1627,7 @@ export default {
       // 投喂量 = 配方重量 + 补料重量
       row.myccname = this.feedingFormulaList.find(obj => obj.id == item).ccname
       if (row.bigcowclass !== row.myccname) {
-        this.$message({ type: 'warning', message: '所选补料配方与栏舍对应牲畜类别不一致', duration: 2000 })
+        this.$message({ type: 'warning', message:this.$t('message.msg117'), duration: 2000 })
       }
       if (item !== '') {
         console.log(456)
@@ -2297,39 +2302,39 @@ export default {
         obj.data.push({'old':this.oldRowList.bw6,'new':row.bw6,times:6,'ptid':row.ftid,'ptsid':row.ptsfid})
       }
       if (this.table.temp.ccount == '' && this.table.temp.ratio == '' && this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '实际牛头数/系数/系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg118'), duration: 2000 })
         return false
       }
       if (this.table.temp.ratio == '' && this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '系数/系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg119'), duration: 2000 })
         return false
       }
       if (this.table.temp.ccountratio == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '系数头数/配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg120'), duration: 2000 })
         return false
       }
       console.log(this.table.temp.ccount, '实际牛头数不能为空')
       if (this.table.temp.ccount === '') {
-        this.$message({ type: 'error', message: '实际牛头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg121'), duration: 2000 })
         return false
       }
       if (this.table.temp.ratio === '') {
-        this.$message({ type: 'error', message: '系数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg122'), duration: 2000 })
         return false
       }
       if (this.table.temp.ccountratio === '') {
-        this.$message({ type: 'error', message: '系数头数不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg123'), duration: 2000 })
         return false
       }
       if (this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '配方模版不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg124'), duration: 2000 })
         return false
       }
       const positiveInteger = /^[0-9]\d*$/
       if (!positiveInteger.test(parseFloat(this.table.temp.ccount))) {
         this.$message({
           type: 'error',
-          message: '实际牛头数请输入正整数',
+          message: this.$t('message.msg125'),
           duration: 2000
         })
         return false
@@ -2477,7 +2482,7 @@ export default {
       console.log('点击了营养评估')
       this.dialogFull = false
       if (this.selectList.length !== 1) {
-        this.$message({ type: 'error', message: '请选择一条栏舍信息进行营养评估', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg126'), duration: 2000 })
         return false
       } else {
         console.log(this.nutritional.temp)
@@ -2684,14 +2689,14 @@ export default {
       this.$refs['temp'].validate(valid => {
         if (valid) {
           if (this.nutritional.tab1.inputDatetime == '' || this.nutritional.tab1.inputDatetime == null) {
-            this.$message({ type: 'error', message: '开始日期结束日期不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg127'), duration: 2000 })
             return false
           } else {
             // 牛头数
             const positiveInteger = /^[1-9]\d*$/
             if (this.nutritional.tab1.temp.cowsum !== '') {
               if (!positiveInteger.test(parseFloat(this.nutritional.tab1.temp.cowsum))) {
-                this.$message({ type: 'error', message: '牛头数请输入正整数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg128'), duration: 2000 })
                 return false
               }
             }
@@ -2699,28 +2704,28 @@ export default {
             // 温度环境
             if (this.nutritional.tab1.temp.tem !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.tem))) {
-                this.$message({ type: 'error', message: '温度环境请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg129'), duration: 2000 })
                 return false
               }
             }
             // 平均月龄
             if (this.nutritional.tab1.temp.avgmonthage !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.avgmonthage))) {
-                this.$message({ type: 'error', message: '平均月龄请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg130'), duration: 2000 })
                 return false
               }
             }
             // 体重
             if (this.nutritional.tab1.temp.bw !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.bw))) {
-                this.$message({ type: 'error', message: '体重请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg131'), duration: 2000 })
                 return false
               }
             }
             // 日增重
             if (this.nutritional.tab1.temp.dayw !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.dayw))) {
-                this.$message({ type: 'error', message: '日增重请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg132'), duration: 2000 })
                 return false
               }
             }
@@ -2728,7 +2733,7 @@ export default {
             // 怀孕天数
             if (this.nutritional.tab1.temp.dayspre !== '') {
               if (!dayspre.test(parseFloat(this.nutritional.tab1.temp.dayspre))) {
-                this.$message({ type: 'error', message: '怀孕天数请输入大于0小于280整数', duration: 2000 })
+                this.$message({ type: 'error', message:this.$t('message.msg133'), duration: 2000 })
                 return false
               }
             }
@@ -2736,42 +2741,42 @@ export default {
             // 胎次
             if (this.nutritional.tab1.temp.fetal !== '') {
               if (!fetal.test(parseFloat(this.nutritional.tab1.temp.fetal))) {
-                this.$message({ type: 'error', message: '胎次请输入大于0小于20整数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg134'), duration: 2000 })
                 return false
               }
             }
             // 平均泌乳
             if (this.nutritional.tab1.temp.avgdim !== '') {
               if (!positiveInteger.test(parseFloat(this.nutritional.tab1.temp.avgdim))) {
-                this.$message({ type: 'error', message: '平均泌乳天数请输入正整数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg135'), duration: 2000 })
                 return false
               }
             }
             // 产奶量
             if (this.nutritional.tab1.temp.product !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.product))) {
-                this.$message({ type: 'error', message: '产奶量请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg136'), duration: 2000 })
                 return false
               }
             }
             // 乳脂率
             if (this.nutritional.tab1.temp.fat !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.fat))) {
-                this.$message({ type: 'error', message: '乳脂率请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg137'), duration: 2000 })
                 return false
               }
             }
             // 乳蛋白率
             if (this.nutritional.tab1.temp.pro !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.pro))) {
-                this.$message({ type: 'error', message: '乳蛋白率请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg138'), duration: 2000 })
                 return false
               }
             }
             // 乳糖率
             if (this.nutritional.tab1.temp.lactose !== '') {
               if (!twoDecimalPlaces.test(parseFloat(this.nutritional.tab1.temp.lactose))) {
-                this.$message({ type: 'error', message: '乳糖率请保留两位小数', duration: 2000 })
+                this.$message({ type: 'error', message: this.$t('message.msg139'), duration: 2000 })
                 return false
               }
             }
@@ -3158,29 +3163,25 @@ export default {
           } else {
             this.download.list = []
           }
-          var downloadList = [
-            { 'obj1': '1、文件类型为xlsx类型,对应表格文件名格式为:文件名称.xlsx;' },
-            { 'obj1': '2、底部工作表名称不可更改,默认为:Sheet1;' },
-            { 'obj1': '3、栏舍名称,实际牛头数,系数(%),系数头数,配方模板,补料配方字体为必填;' },
-            { 'obj1': '4、第一列栏舍名称默认为系统中栏舍,不可修改;' },
-            { 'obj1': '5、实际牛头数为正整数,系数为正数,至多保留俩位小数;' },
-            { 'obj1': '6、配方模板名称必须与系统中配方计划—配方模板中的饲喂配方匹配;若补料配方开启,需与配方模板中的补料配方匹配;' },
-            { 'obj1': '7、数据最多可导入200条,超过200条请分多个文件导入。' }
-          ]
+          var downloadList =this.$t('message.downloadList')
+          const table = this.$refs.table;
+          const columns = table.columns;
+          const labels = columns.map(column => column.label);
+           
           var excelDatas = [
             {
-              tHeader: ['栏舍名称', '实际牛头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', '第四班比例(%)','第五班比例(%)','第六班比例(%)'],
+              tHeader: labels,
               filterVal: ['barname', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
             }, {
-              tHeader: ['填写规范:'],
+              tHeader: [this.$t('message.msg113')],
               filterVal: ['obj1'],
               tableDatas: downloadList,
               sheetName: 'Sheet2'
             }
           ]
-          json2excel(excelDatas, '栏舍配方导入模板', true, 'xlsx')
+          json2excel(excelDatas, this.$t('message.msg112'), true, 'xlsx')
         })
       } else {
         console.log('点击了导出数据')
@@ -3290,7 +3291,7 @@ export default {
               }
             ]
           }
-          json2excel(excelDatas, '栏舍配方', true, 'xlsx')
+          json2excel(excelDatas, this.$t('message.msg140'), true, 'xlsx')
         })
       }
     },
@@ -3354,7 +3355,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消软件牛头数同步' })
+        this.$message({ type: 'info', message: this.$t('message.msg114') })
       })
     },
     handle_batchEdit(){
@@ -3484,7 +3485,7 @@ export default {
          this.isproportion = false
        })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消恢复' })
+        this.$message({ type: 'info', message: this.$t('message.msg115') })
       })
     }
 

+ 17 - 18
src/views/formulationPlan/formulaDistribution/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-button class="successBorder" @click="handleFormulaDistribution">配方下发</el-button>
+      <el-button class="successBorder" @click="handleFormulaDistribution">{{$t('message.mag70')}}</el-button>
     </div>
     <div class="search">
-      <el-input v-model="table.getdataListParm.parammaps.fname" placeholder="配方名称" style="width: 180px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.fname" :placeholder="$t('formulationEvaluation.pfmc')" style="width: 180px;" class="filter-item" clearable />
       <el-select v-model="table.getdataListParm.parammaps.ccname" :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.parentname" />
       </el-select>
@@ -36,13 +36,13 @@
         <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="130px" align="center" prop="tname" />
         <el-table-column :label="$t('errorAnalysis.sxlb')" min-width="130px" align="center" prop="ccname" />
         <el-table-column :label="$t('formulationEvaluation.pflx')" min-width="130px" align="center" prop="fttype" />
-        <el-table-column label="是否为当前配方" min-width="130px" align="center">
+        <el-table-column :label="$t('message.msg71')" min-width="130px" align="center">
           <template slot-scope="scope">
             <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" />
+        <el-table-column :label="$t('message.msg70')" min-width="130px" align="center" prop="grouppastures" />
         <el-table-column :label="$t('formulationEvaluation.remark')" min-width="130px" align="center" prop="remark" />
 
         <el-table-column  :label="$t('errorAnalysis.cz')" :show-overflow-tooltip="true" align="center" class-name="small-padding fixed-width" width="50" fixed="right">
@@ -56,8 +56,7 @@
 
     <!-- 配方下发 -->
     <el-dialog :title="textMap[formulaDistribution.dialogStatus]" :visible.sync="formulaDistribution.dialogFormVisible" :close-on-click-modal="false" width="70%">
-      <div class="app-formulaDistribution">
-        <h4>请选择下发配方:</h4>
+      <div>{{ $t('message.msg74') }}</h4>
         <div class="table">
           <el-table
             :key="formulaDistribution.table.tableKey"
@@ -89,14 +88,14 @@
       </div>
       <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" @click="formulaDistribution.dialogFormVisible = false; ">{{$t('common.closed')}}</el-button>
-        <el-button class="save" :disabled="isokDisable" @click="nextData()">下一步</el-button>
+        <el-button class="save" :disabled="isokDisable" @click="nextData()">{{$t('message.msg96')}}</el-button>
       </div>
     </el-dialog>
 
     <!-- 牧场 -->
     <el-dialog :title="textMap[formulaDistribution.pasture.dialogStatus]" :visible.sync="formulaDistribution.pasture.dialogFormVisible" :close-on-click-modal="false" width="40%">
       <div class="app-pasture">
-        <h4>选择下发牧场:</h4>
+        <h4>{{ $t('message.msg74') }}}</h4>
         <el-checkbox v-model="formulaDistribution.pasture.checkAll" :indeterminate="formulaDistribution.pasture.isIndeterminate" @change="handleCheckAllChange">全选</el-checkbox>
         <div style="margin: 15px 0;" />
         <el-checkbox-group v-model="formulaDistribution.pasture.checkedList" @change="handlePastureChange">
@@ -113,7 +112,7 @@
     <el-dialog :title="textMap[see.dialogStatus]" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="70%">
       <div class="app-see">
         <el-tabs v-model="see.activeName" @tab-click="form_seeTabClick">
-          <el-tab-pane label="下发记录" name="first">
+          <el-tab-pane :label="$t('message.msg72')" name="first">
             <div class="search">
               <el-select v-model="see.tab1.table.getdataListParm.parammaps.pasturename"
 :placeholder="$t('supplier.mc')" class="filter-item" style="width: 120px;" clearable>
@@ -141,13 +140,13 @@
                     <span>{{ scope.$index + (see.tab1.table.pageNum-1) * see.tab1.table.pageSize + 1 }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column :label="$t('feedingEfficiency.mc')"min-width="130px" align="center" prop="pasturename" />
-                <el-table-column label="下发时间" min-width="130px" align="center" prop="date" />
+                <el-table-column :label="$t('feedingEfficiency.mc')" min-width="130px" align="center" prop="pasturename" />
+                <el-table-column :label="$t('message.msg73')" min-width="130px" align="center" prop="date" />
               </el-table>
             </div>
             <pagination v-show="see.tab1.table.total>0" :total="see.tab1.table.total" :page.sync="see.tab1.table.getdataListParm.offset" :limit.sync="see.tab1.table.getdataListParm.pagecount" @pagination="getSeeTab1List" />
           </el-tab-pane>
-          <el-tab-pane label="使用情况" name="second">
+          <el-tab-pane :label="$t('message.msg71')" name="second">
             <div class="search">
               <el-autocomplete v-model="see.tab2.table.getdataListParm.parammaps.date" value-key="date" class="inline-input filter-item" :fetch-suggestions="dateSearch" :placeholder="$t('InventoryManagement.rq')"    style="width:250px" @select="handleSelectDate">
                 <template slot-scope="{ item }">
@@ -343,9 +342,9 @@ export default {
         }
       },
       textMap: {
-        formulaDistribution: '配方下发',
-        see: '查看',
-        pasture: '配方下发'
+        formulaDistribution: this.$t('message.msg70'),
+        see: this.$t('pushingplan.watch'),
+        pasture: this.$t('message.msg70')
       },
       requestParam: {},
       isokDisable: false,
@@ -420,12 +419,12 @@ export default {
     },
     nextData() {
       if (this.formulaDistribution.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择下发配方', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg67'), duration: 2000 })
         return false
       } else {
         for (let i = 0; i < this.formulaDistribution.selectList.length; i++) {
           if (this.formulaDistribution.selectList[i].enable == 0) {
-            this.$message({ type: 'error', message: '配方未启用不可下发', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg68'), duration: 2000 })
             return false
           }
         }
@@ -454,7 +453,7 @@ export default {
     },
     formulaDistributionData() {
       if (this.formulaDistribution.pasture.checkedList.length == 0) {
-        this.$message({ type: 'error', message: '请选择下发牧场', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.mag69'), duration: 2000 })
         return false
       } else {
         this.isokDisable = true

+ 2 - 2
src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -546,11 +546,11 @@ export default {
         dialogStatus: ''
       },
       textMap: {
-        automaticGeneration: '提示',
+        automaticGeneration: this.$t('message.msg111'),
         historyRecord: this.$t('message.msg34'),
         create: '新增',
         update: '编辑',
-        check: '提示',
+        check: this.$t('message.msg111'),
         tmrNumber:'',
         allEmpty:'清空已分配的栏舍'
       },

+ 1 - 1
src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -511,7 +511,7 @@
           create: '新增',
           update: '编辑',
           history: this.$t('message.msg34'),
-          check: '提示'
+          check: this.$t('message.msg111')
         },
         requestParam: {},
         selectList: [],

+ 1 - 1
src/views/inventoryManagement/laborConsumption/index.vue

@@ -257,7 +257,7 @@ export default {
 
       textMap: {
         create: '新增',
-        see: '查看'
+        see: this.$t('pushingplan.watch')
       },
       requestParam: {},
       download: {

+ 1 - 1
src/views/inventoryManagement/systemConsumption/index.vue

@@ -326,7 +326,7 @@ name:this.$t('supplier.no') }], // 是否审核
             return
           }
         }
-        MessageBox.confirm('是否确认审核系统用量?', '提示', {
+        MessageBox.confirm('是否确认审核系统用量?', this.$t('message.msg111'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.common = { 'returnmap': '0' }

+ 1 - 1
src/views/leftoverManagement/index.vue

@@ -127,7 +127,7 @@
       },
       handleDelete(index, row) {
         console.log(index, row);
-        this.$confirm('确定删除当前剩料配置吗?', '提示', {
+        this.$confirm('确定删除当前剩料配置吗?', this.$t('message.msg111'), {
           confirmButtonText: '确定',
           confirmButtonText: this.$t('common.cancel'),
           type: 'warning'

+ 1 - 1
src/views/shedProduction/dungScores/index.vue

@@ -102,7 +102,7 @@
             <span>{{ scope.row.emp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作日期" min-width="90px" align="center">
+        <el-table-column :label="$t('message.msg94')"  min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>

+ 1 - 1
src/views/shedProduction/fecalScreen/index.vue

@@ -78,7 +78,7 @@
             <span>{{ scope.row.emp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作日期" min-width="90px" align="center">
+        <el-table-column :label="$t('message.msg94')"  min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>

+ 4 - 4
src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -25,8 +25,8 @@
         <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="time1" min-width="90px" align="center" />
         <el-table-column :key="4" label="鲜重重量(g)" prop="freshweight" min-width="90px" align="center" />
         <el-table-column :key="5" label="烘干重量(g)" prop="dryweight" min-width="90px" align="center" />
-        <el-table-column :key="6" label="理论干物质" prop="thoweight" min-width="90px" align="center" />
-        <el-table-column :key="7" label="实际干物质" prop="actweight" min-width="90px" align="center" />
+        <el-table-column :key="6" :label="$t('message.msg92')" prop="thoweight" min-width="90px" align="center" />
+        <el-table-column :key="7" :label="$t('message.msg93')"  prop="actweight" min-width="90px" align="center" />
         <el-table-column :key="8"  :label="$t('errorAnalysis.cz')" prop="operation" align="center" width="300" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <a class="correcting" @click="form_seeHistory (row)">{{ row.operation }}</a>
@@ -62,8 +62,8 @@
             <el-table-column :key="3" :label="$t('errorAnalysis.isTrainNumber')"  prop="times" min-width="90px" align="center" />
             <el-table-column :key="4" label="鲜重重量(g)" prop="times" min-width="90px" align="center" />
             <el-table-column :key="5" label="烘干重量(g)" prop="times" min-width="90px" align="center" />
-            <el-table-column :key="6" label="理论干物质" prop="times" min-width="90px" align="center" />
-            <el-table-column :key="7" label="实际干物质" prop="times" min-width="90px" align="center" />
+            <el-table-column :key="6" :label="$t('message.msg92')" prop="times" min-width="90px" align="center" />
+            <el-table-column :key="7" :label="$t('message.msg93')"  prop="times" min-width="90px" align="center" />
 
           </el-table>
           <pagination2 v-show="seeHistory.total>0" :total="seeHistory.total" :page.sync="seeHistory.getdataListParm.offset" :limit.sync="seeHistory.getdataListParm.pagecount" @pagination="getSeeHistoryList" />

+ 5 - 5
src/views/shedProduction/formulaDryMatter/index.vue

@@ -63,22 +63,22 @@
             <span>{{ scope.row.timesstr }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="鲜样重量(g)" min-width="100px" align="center">
+        <el-table-column :label="$t('message.msg90')"min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.freshweight }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="烘干重量(g)" min-width="100px" align="center">
+        <el-table-column :label="$t('message.msg91')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.dryweight }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="理论干物质" min-width="100px" align="center">
+        <el-table-column :label="$t('message.msg92')" min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.thoweight }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="实际干物质" min-width="100px" align="center">
+        <el-table-column :label="$t('message.msg93')"  min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.actweight }}</span>
           </template>
@@ -88,7 +88,7 @@
             <span>{{ scope.row.emp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作日期" min-width="100px" align="center">
+        <el-table-column :label="$t('message.msg94')"  min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>

+ 1 - 1
src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -89,7 +89,7 @@
             <span>{{ scope.row.emp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作日期" min-width="85px" align="center">
+        <el-table-column :label="$t('message.msg94')"  min-width="85px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>

+ 36 - 36
src/views/shedProduction/performance/index.vue

@@ -558,7 +558,7 @@ export default {
           // 牛头数
           if (this.create.temp.cowsum !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.cowsum))) {
-              this.$message({ type: 'error', message: '牛头数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg128'), duration: 2000 })
               return false
             }
           }
@@ -566,28 +566,28 @@ export default {
           // 温度环境
           if (this.create.temp.tem !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.tem))) {
-              this.$message({ type: 'error', message: '温度环境请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg129'), duration: 2000 })
               return false
             }
           }
           // 平均月龄
           if (this.create.temp.avgmonthage !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.avgmonthage))) {
-              this.$message({ type: 'error', message: '平均月龄请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg130'), duration: 2000 })
               return false
             }
           }
           // 体重
           if (this.create.temp.bw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.bw))) {
-              this.$message({ type: 'error', message: '体重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg131'), duration: 2000 })
               return false
             }
           }
           // 日增重
           if (this.create.temp.dayw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.dayw))) {
-              this.$message({ type: 'error', message: '日增重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg132'), duration: 2000 })
               return false
             }
           }
@@ -595,7 +595,7 @@ export default {
           // 怀孕天数
           if (this.create.temp.dayspre !== '') {
             if (!dayspre.test(parseFloat(this.create.temp.dayspre))) {
-              this.$message({ type: 'error', message: '怀孕天数请输入大于0小于280整数', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg133'), duration: 2000 })
               return false
             }
           }
@@ -603,42 +603,42 @@ export default {
           // 胎次
           if (this.create.temp.fetal !== '') {
             if (!fetal.test(parseFloat(this.create.temp.fetal))) {
-              this.$message({ type: 'error', message: '胎次请输入大于0小于20整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg134'), duration: 2000 })
               return false
             }
           }
           // 平均泌乳
           if (this.create.temp.avgdim !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.avgdim))) {
-              this.$message({ type: 'error', message: '平均泌乳天数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg135'), duration: 2000 })
               return false
             }
           }
           // 产奶量
           if (this.create.temp.product !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.product))) {
-              this.$message({ type: 'error', message: '产奶量请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg136'), duration: 2000 })
               return false
             }
           }
           // 乳脂率
           if (this.create.temp.fat !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.fat))) {
-              this.$message({ type: 'error', message: '乳脂率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg137'), duration: 2000 })
               return false
             }
           }
           // 乳蛋白率
           if (this.create.temp.pro !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.pro))) {
-              this.$message({ type: 'error', message: '乳蛋白率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg138'), duration: 2000 })
               return false
             }
           }
           // 乳糖率
           if (this.create.temp.lactose !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.lactose))) {
-              this.$message({ type: 'error', message: '乳糖率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg139'), duration: 2000 })
               return false
             }
           }
@@ -703,7 +703,7 @@ export default {
           // 牛头数
           if (this.create.temp.cowsum !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.cowsum))) {
-              this.$message({ type: 'error', message: '牛头数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg128'), duration: 2000 })
               return false
             }
           }
@@ -711,28 +711,28 @@ export default {
           // 温度环境
           if (this.create.temp.tem !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.tem))) {
-              this.$message({ type: 'error', message: '温度环境请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg129'), duration: 2000 })
               return false
             }
           }
           // 平均月龄
           if (this.create.temp.avgmonthage !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.avgmonthage))) {
-              this.$message({ type: 'error', message: '平均月龄请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg130'), duration: 2000 })
               return false
             }
           }
           // 体重
           if (this.create.temp.bw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.bw))) {
-              this.$message({ type: 'error', message: '体重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg131'), duration: 2000 })
               return false
             }
           }
           // 日增重
           if (this.create.temp.dayw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.dayw))) {
-              this.$message({ type: 'error', message: '日增重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg132'), duration: 2000 })
               return false
             }
           }
@@ -740,7 +740,7 @@ export default {
           // 怀孕天数
           if (this.create.temp.dayspre !== '') {
             if (!dayspre.test(parseFloat(this.create.temp.dayspre))) {
-              this.$message({ type: 'error', message: '怀孕天数请输入大于0小于280整数', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg133'), duration: 2000 })
               return false
             }
           }
@@ -748,42 +748,42 @@ export default {
           // 胎次
           if (this.create.temp.fetal !== '') {
             if (!fetal.test(parseFloat(this.create.temp.fetal))) {
-              this.$message({ type: 'error', message: '胎次请输入大于0小于20整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg134'), duration: 2000 })
               return false
             }
           }
           // 平均泌乳
           if (this.create.temp.avgdim !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.avgdim))) {
-              this.$message({ type: 'error', message: '平均泌乳天数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg135'), duration: 2000 })
               return false
             }
           }
           // 产奶量
           if (this.create.temp.product !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.product))) {
-              this.$message({ type: 'error', message: '产奶量请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg136'), duration: 2000 })
               return false
             }
           }
           // 乳脂率
           if (this.create.temp.fat !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.fat))) {
-              this.$message({ type: 'error', message: '乳脂率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg137'), duration: 2000 })
               return false
             }
           }
           // 乳蛋白率
           if (this.create.temp.pro !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.pro))) {
-              this.$message({ type: 'error', message: '乳蛋白率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg138'), duration: 2000 })
               return false
             }
           }
           // 乳糖率
           if (this.create.temp.lactose !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.lactose))) {
-              this.$message({ type: 'error', message: '乳糖率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg139'), duration: 2000 })
               return false
             }
           }
@@ -865,7 +865,7 @@ export default {
           // 牛头数
           if (this.create.temp.cowsum !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.cowsum))) {
-              this.$message({ type: 'error', message: '牛头数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg128'), duration: 2000 })
               return false
             }
           }
@@ -873,28 +873,28 @@ export default {
           // 温度环境
           if (this.create.temp.tem !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.tem))) {
-              this.$message({ type: 'error', message: '温度环境请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg129'), duration: 2000 })
               return false
             }
           }
           // 平均月龄
           if (this.create.temp.avgmonthage !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.avgmonthage))) {
-              this.$message({ type: 'error', message: '平均月龄请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg130'), duration: 2000 })
               return false
             }
           }
           // 体重
           if (this.create.temp.bw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.bw))) {
-              this.$message({ type: 'error', message: '体重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg131'), duration: 2000 })
               return false
             }
           }
           // 日增重
           if (this.create.temp.dayw !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.dayw))) {
-              this.$message({ type: 'error', message: '日增重请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg132'), duration: 2000 })
               return false
             }
           }
@@ -902,7 +902,7 @@ export default {
           // 怀孕天数
           if (this.create.temp.dayspre !== '') {
             if (!dayspre.test(parseFloat(this.create.temp.dayspre))) {
-              this.$message({ type: 'error', message: '怀孕天数请输入大于0小于280整数', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg133'), duration: 2000 })
               return false
             }
           }
@@ -910,42 +910,42 @@ export default {
           // 胎次
           if (this.create.temp.fetal !== '') {
             if (!fetal.test(parseFloat(this.create.temp.fetal))) {
-              this.$message({ type: 'error', message: '胎次请输入大于0小于20整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg134'), duration: 2000 })
               return false
             }
           }
           // 平均泌乳
           if (this.create.temp.avgdim !== '') {
             if (!positiveInteger.test(parseFloat(this.create.temp.avgdim))) {
-              this.$message({ type: 'error', message: '平均泌乳天数请输入正整数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg135'), duration: 2000 })
               return false
             }
           }
           // 产奶量
           if (this.create.temp.product !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.product))) {
-              this.$message({ type: 'error', message: '产奶量请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg136'), duration: 2000 })
               return false
             }
           }
           // 乳脂率
           if (this.create.temp.fat !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.fat))) {
-              this.$message({ type: 'error', message: '乳脂率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg137'), duration: 2000 })
               return false
             }
           }
           // 乳蛋白率
           if (this.create.temp.pro !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.pro))) {
-              this.$message({ type: 'error', message: '乳蛋白率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg138'), duration: 2000 })
               return false
             }
           }
           // 乳糖率
           if (this.create.temp.lactose !== '') {
             if (!twoDecimalPlaces.test(parseFloat(this.create.temp.lactose))) {
-              this.$message({ type: 'error', message: '乳糖率请保留两位小数', duration: 2000 })
+              this.$message({ type: 'error', message: this.$t('message.msg139'), duration: 2000 })
               return false
             }
           }

+ 1 - 1
src/views/shedProduction/physicalConditionScore/index.vue

@@ -112,7 +112,7 @@
             <span>{{ scope.row.emp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作日期" min-width="90px" align="center">
+        <el-table-column :label="$t('message.msg94')"  min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>

+ 12 - 12
src/views/statisticalAnalysis/feedingEfficiency/group/tab2.vue

@@ -93,13 +93,13 @@
             <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="58px" align="center" prop="dryweight" />
             <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="58px" align="center" prop="avgdim" />
             <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="58px" align="center" prop="standardscore" />
-            <el-table-column label="2.75-分(数量、百分比)" min-width="100px" align="center" prop="score25" />
-            <el-table-column label="2.75分(数量、百分比)" min-width="100px" align="center" prop="score275" />
-            <el-table-column label="3分(数量、百分比)" min-width="100px" align="center" prop="score3" />
-            <el-table-column label="3.25分(数量、百分比)" min-width="100px" align="center" prop="score325" />
-            <el-table-column label="3.5分(数量、百分比)" min-width="100px" align="center" prop="score35" />
-            <el-table-column label="3.75分(数量、百分比)" min-width="100px" align="center" prop="score375" />
-            <el-table-column label="4+分(数量、百分比)" min-width="100px" align="center" prop="score4" />
+            <el-table-column :label="$t('message.msg77')" min-width="100px" align="center" prop="score25" />
+            <el-table-column :label="$t('message.msg78')" min-width="100px" align="center" prop="score275" />
+            <el-table-column :label="$t('message.msg79')" min-width="100px" align="center" prop="score3" />
+            <el-table-column :label="$t('message.msg80')" min-width="100px" align="center" prop="score325" />
+            <el-table-column :label="$t('message.msg81')" min-width="100px" align="center" prop="score35" />
+            <el-table-column :label="$t('message.msg82')" min-width="100px" align="center" prop="score375" />
+            <el-table-column :label="$t('message.msg83')" min-width="100px" align="center" prop="score4" />
           </el-table>
         </el-col>
         <!-- 粪便评分 -->
@@ -125,11 +125,11 @@
             <el-table-column :label="$t('feedingEfficiency.gwzcsl')"   min-width="60px" align="center" prop="dryweight" />
             <el-table-column :label="$t('feedingEfficiency.mrts')"    min-width="50px" align="center" prop="avgdim" />
             <el-table-column :label="$t('feedingEfficiency.bzfs')"   min-width="50px" align="center" prop="standardscore" />
-            <el-table-column label="1分(数量、百分比)" min-width="90px" align="center" prop="score1" />
-            <el-table-column label="2分(数量、百分比)" min-width="90px" align="center" prop="score2" />
-            <el-table-column label="3分(数量、百分比)" min-width="90px" align="center" prop="score3" />
-            <el-table-column label="4分(数量、百分比)" min-width="90px" align="center" prop="score4" />
-            <el-table-column label="5分(数量、百分比)" min-width="90px" align="center" prop="score5" />
+            <el-table-column :label="$t('message.msg84')" min-width="90px" align="center" prop="score1" />
+            <el-table-column :label="$t('message.msg85')" min-width="90px" align="center" prop="score2" />
+            <el-table-column :label="$t('message.msg79')" min-width="90px" align="center" prop="score3" />
+            <el-table-column :label="$t('message.msg86')" min-width="90px" align="center" prop="score4" />
+            <el-table-column :label="$t('message.msg87')" min-width="90px" align="center" prop="score5" />
           </el-table>
         </el-col>
       </el-row>

+ 1 - 1
src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -830,7 +830,7 @@ export default {
       this.$router.push('/formulationPlan/DhedFormula')
     },
     form_see(row) {
-      console.log('查看', row)
+      console.log(this.$t('pushingplan.watch'), row)
       this.dialogFull = false
       this.textMap.see = this.$t('message.msg62') + row.tname
       this.see.dialogStatus = 'see'

+ 7 - 7
src/views/statisticalChart/formulaStatistics/index.vue

@@ -19,7 +19,7 @@
               <el-table-column prop="name" :label="$t('role.ym')"/>
               <el-table-column :label="$t('role.ck')">
                 <template slot-scope="scope">
-                  <!-- <el-checkbox v-if="scope.row.fnList.includes('查看')" v-model="scope.row.fnCheck.see" :label="$t('role.ck')" @change="fnCheckEv(scope, 'see')" /> -->
+                  <!-- <el-checkbox v-if="scope.row.fnList.includes(this.$t('pushingplan.watch'))" v-model="scope.row.fnCheck.see" :label="$t('role.ck')" @change="fnCheckEv(scope, 'see')" /> -->
                   <el-checkbox v-model="scope.row.fnCheck.see" :label="$t('role.ck')" @change="fnCheckEv(scope, 'see')" />
                 </template>
               </el-table-column>
@@ -46,33 +46,33 @@ export default {
       tableData: [
         {
           id: 1, name: '配方计划',
-          // fnList: ['查看', '编辑'],
+          // fnList: [this.$t('pushingplan.watch'), '编辑'],
           fnCheck: { see: false, edit: false },
           childList: [
             {
               p_id: 1, id: 31, name: '配方模板',
-              // fnList: ['查看', '编辑'],
+              // fnList: [this.$t('pushingplan.watch'), '编辑'],
               fnCheck: { see: false, edit: false }
             },
             {
               p_id: 1, id: 32, name: '栏舍配方',
-              // fnList: ['查看', '编辑'],
+              // fnList: [this.$t('pushingplan.watch'), '编辑'],
               fnCheck: { see: false, edit: false }
             }
           ]
         }, {
           id: 2, name: '栏舍生产',
-          // fnList: ['查看', '编辑'],
+          // fnList: [this.$t('pushingplan.watch'), '编辑'],
           fnCheck: { see: false, edit: false },
           childList: [
             {
               p_id: 2, id: 33, name: '栏舍产奶量',
-              // fnList: ['查看', '编辑'],
+              // fnList: [this.$t('pushingplan.watch'), '编辑'],
               fnCheck: { see: false, edit: false }
             },
             {
               p_id: 2, id: 34, name: '栏舍剩料量',
-              // fnList: ['查看', '编辑'],
+              // fnList: [this.$t('pushingplan.watch'), '编辑'],
               fnCheck: { see: false, edit: false }
             }
           ]

+ 2 - 2
src/views/systemManagement/reminderSettings/index.vue

@@ -475,9 +475,9 @@
         myHeight:document.documentElement.clientHeight - 85- 150 - 45,
         textMap: {
           setup: '设置',
-          QRcode:'提示',
+          QRcode:this.$t('message.msg111'),
           add:'新增',
-          see:'查看'
+          see:this.$t('pushingplan.watch')
         },
         selectList1:[],
         selectList2:[],

+ 6 - 6
src/views/systemManagement/role/index.vue

@@ -210,19 +210,19 @@ name:this.$t('supplier.no') }], // 是否启用
       // tableData: [
       //   {
       //     id: 1, page: '配方计划', pageCheck: false,
-      //     fnList: ['查看', '编辑'],
+      //     fnList: [this.$t('pushingplan.watch'), '编辑'],
       //     fnCheck: { see: false, edit: false },
       //     childList: [
-      //       { p_id: 1, id: 31, page: '配方模板', pageCheck: false, fnList: ['查看', '编辑'], fnCheck: { see: false, edit: false }},
-      //       { p_id: 1, id: 32, page: '栏舍配方', pageCheck: false, fnList: ['查看', '编辑'], fnCheck: { see: false, edit: false }}
+      //       { p_id: 1, id: 31, page: '配方模板', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }},
+      //       { p_id: 1, id: 32, page: '栏舍配方', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }}
       //     ]
       //   }, {
       //     id: 2, page: '栏舍生产', pageCheck: false,
-      //     fnList: ['查看', '编辑'],
+      //     fnList: [this.$t('pushingplan.watch'), '编辑'],
       //     fnCheck: { see: false, edit: false },
       //     childList: [
-      //       { p_id: 2, id: 33, page: '栏舍产奶量', pageCheck: false, fnList: ['查看', '编辑'], fnCheck: { see: false, edit: false }},
-      //       { p_id: 2, id: 34, page: '栏舍剩料量', pageCheck: false, fnList: ['查看', '编辑'], fnCheck: { see: false, edit: false }}
+      //       { p_id: 2, id: 33, page: '栏舍产奶量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }},
+      //       { p_id: 2, id: 34, page: '栏舍剩料量', pageCheck: false, fnList: [this.$t('pushingplan.watch'), '编辑'], fnCheck: { see: false, edit: false }}
       //     ]
       //   }
       // ],

+ 1 - 1
src/views/systemManagement/user/index.vue

@@ -190,7 +190,7 @@ name:this.$t('supplier.no') }], // 是否启用
         dialogFormVisible:false,
       },
       textMap: {
-        QRcode:'提示'
+        QRcode:this.$t('message.msg111')
       },
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },