多语言修改

src/components/mySelect/index.vue

@@ -48,7 +48,7 @@ export default {
         this.selectOption = []
         this.selectOption.push({
           value: 'all',
-          label: '全部'
+          label: this.$t('dashboard.typeAll')
         })
         this.option.map(item => {
 

src/lang/en/langModule/message.js

@@ -370,8 +370,49 @@ msg342: "Allocation is complete: The current pens have been fully allocated.",
   msg344: "Are you sure you want to restore the default settings?",
 msg345: "Are you sure you want to synchronize the data?",
 
-msg346:'Enable'
+msg346:'Enable',
 
+msg347: 'Feed Spreading Plan-mixing', // Feed Spreading Plan-mixing
+  msg348: 'Feed Spreading Plan-Spreading Feed', //
+  msg349: '剩料计划' ,//
+
+  msg350:'Feed Code', //
+  msg351:'Feed Name',//
+feedLang:{
+  理论:'Theory ',
+  牲畜类别: 'Livestock Category',
+  理论:'Theory ' ,
+  实际: 'Actual',
+  合计: 'Total',
+  饲料名称: 'Feed Name',
+  饲料编码:'Feed Code',
+  饲料参数:'Livestock Category/Feed Parameters'
+ },
+sourceList: [{ id: '0', name: 'Customize' }, { id: '1', name: 'Unadjusted Group-Issued' }, { id: '2', name: 'Adjusted Group-Issued' }, { id: '3', name: 'Import' }],
+msg352:'(DM Weight:',
+msg353:{
+a: 'Feeding Simplified',
+b: 'Cumulative Feeding',
+c: 'Scattering Simplified',
+d: 'Feeding and Scattering Simplified',
+e: 'Packaging Simplified',
+f: 'Actual Dispatch Simplified',
+g: 'Scattering and Feeding Cumulative',
+
+
+},
+shiftObj:{
+  1:'First Shift',
+  2:"Second Shift",
+  3:'Third Shift',
+  4:'Fourth Shift',
+  5:'Fifth shift',
+  6:'Sixth shift'
+},
+msg354:'Select Livestock Parent Category',
+msg355:"Customize",
+msg356:'Spreading Feed',
+msg357: 'Mixing Feed ',
 
 
 

src/lang/zn/langModule/message.js

@@ -381,101 +381,47 @@ msg333:'是否进行恢复?',
 
   msg347: '撒料计划-混料', // Feed Spreading Plan-mixing
   msg348: '撒料计划-撒料', // Feed Spreading Plan-Spreading Feed
-  msg349: '剩料计划' //
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+  msg349: '剩料计划' ,//
+
+  msg350:'饲料编码', //Feed Code
+  msg351:'饲料名称',// Feed Name
+feedLang:{
+  理论:'理论 ',
+  牲畜类别: '牲畜类别',
+  理论:'理论 ' ,
+  实际: '实际',
+  合计: '合计',
+  饲料名称: '饲料名称',
+  饲料编码:'饲料编码',
+  饲料参数:'牲畜类别/饲料参数'
+},
+sourceList: [{ id: '0', name: '自定义' }, { id: '1', name: '集团下发未调整' }, { id: '2', name: '集团下发有调整' }, { id: '3', name: '导入' }],
+msg352:'(干物质量：',
+msg353:{
+  a:'投料简打',
+  b:'累加投料',
+  c:'撒料简打',
+  d:'投撒料简打',
+  e:'包装简打',
+  f:'实发简打',
+  g:'投撒料累加',
+},
+shiftObj:{
+  1:"第一班",
+  2:"第二班",
+  3:"第三班",
+  4:"第四班",
+  5:"第五班",
+  6:"第六班"
+
+},
+msg354:'选择牲畜父类',
+msg355:"自定义",
+msg356:'撒料',
+msg357: '混料',
 
 
+}
 
 
 
@@ -520,4 +466,3 @@ msg333:'是否进行恢复?',
 
 
 
-}

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -3336,52 +3336,52 @@ export default {
       if (this.table.getdataListParm.parammaps.plandimen == '1') {
         if (this.table.getdataListParm.parammaps.enable3 == '0') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '投料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.a')
         } else if (this.table.getdataListParm.parammaps.enable3 == '1') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLLDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '累加投料'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.b')
         } else if (this.table.getdataListParm.parammaps.enable3 == '2') {
           this.downLoad.getdataListParm.name = 'downloadPlanSLJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '撒料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.c')
         } else if (this.table.getdataListParm.parammaps.enable3 == '3') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLJDTMR'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料简打'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.d')
         } else if (this.table.getdataListParm.parammaps.enable3 == '4') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLLDTMR'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料累加'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.g')
         } else if (this.table.getdataListParm.parammaps.enable3 == '5') {
           this.downLoad.getdataListParm.name = 'downloadPlanBZJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '包装简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.e')
         } else {
           this.downLoad.getdataListParm.name = 'downloadPlanSFJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '实发简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.f')
         }
       } else {
         if (this.table.getdataListParm.parammaps.enable3 == '0') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '投料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.a')
         } else if (this.table.getdataListParm.parammaps.enable3 == '1') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLLD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '累加投料'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.b')
         } else if (this.table.getdataListParm.parammaps.enable3 == '2') {
           this.downLoad.getdataListParm.name = 'downloadPlanSLJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '撒料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.c')
         } else if (this.table.getdataListParm.parammaps.enable3 == '3') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLJD'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料简打'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.d')
         } else if (this.table.getdataListParm.parammaps.enable3 == '4') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLLD'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料累加'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.g')
         } else if (this.table.getdataListParm.parammaps.enable3 == '5') {
           this.downLoad.getdataListParm.name = 'downloadPlanBZJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '包装简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.e')
         } else {
           this.downLoad.getdataListParm.name = 'downloadPlanSFJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '实发简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.f')
         }
       }
       GetReportform(this.downLoad.getdataListParm).then((response) => {
@@ -4376,52 +4376,52 @@ export default {
       if (this.table.getdataListParm.parammaps.plandimen == '1') {
         if (this.table.getdataListParm.parammaps.enable3 == '0') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '投料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.a')
         } else if (this.table.getdataListParm.parammaps.enable3 == '1') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLLDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '累加投料'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.b')
         } else if (this.table.getdataListParm.parammaps.enable3 == '2') {
           this.downLoad.getdataListParm.name = 'downloadPlanSLJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '撒料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.c')
         } else if (this.table.getdataListParm.parammaps.enable3 == '3') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLJDTMR'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料简打'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.d')
         } else if (this.table.getdataListParm.parammaps.enable3 == '4') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLLDTMR'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料累加'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.g')
         } else if (this.table.getdataListParm.parammaps.enable3 == '5') {
           this.downLoad.getdataListParm.name = 'downloadPlanBZJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '包装简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.e')
         } else {
           this.downLoad.getdataListParm.name = 'downloadPlanSFJDTMR'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '实发简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.f')
         }
       } else {
         if (this.table.getdataListParm.parammaps.enable3 == '0') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '投料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.a')
         } else if (this.table.getdataListParm.parammaps.enable3 == '1') {
           this.downLoad.getdataListParm.name = 'downloadPlanTLLD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '累加投料'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.b')
         } else if (this.table.getdataListParm.parammaps.enable3 == '2') {
           this.downLoad.getdataListParm.name = 'downloadPlanSLJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '撒料简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.c')
         } else if (this.table.getdataListParm.parammaps.enable3 == '3') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLJD'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料简打'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.d')
         } else if (this.table.getdataListParm.parammaps.enable3 == '4') {
           this.downLoad.getdataListParm.name = 'downloadPlanTSLLD'
           exportTitle =
-            this.table.getdataListParm.parammaps.mydate + '投撒料累加'
+            this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.g')
         } else if (this.table.getdataListParm.parammaps.enable3 == '5') {
           this.downLoad.getdataListParm.name = 'downloadPlanBZJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '包装简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.e')
         } else {
           this.downLoad.getdataListParm.name = 'downloadPlanSFJD'
-          exportTitle = this.table.getdataListParm.parammaps.mydate + '实发简打'
+          exportTitle = this.table.getdataListParm.parammaps.mydate + this.$t('message.msg353.f')
         }
       }
       GetReportform(this.downLoad.getdataListParm).then((response) => {

src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -560,17 +560,17 @@ export default {
             const obj = {}
             obj.id = String(i)
             if (i == 1) {
-              obj.name = '第一班'
+              obj.name = this.$t('message.shiftObj.1')
             } else if (i == 2) {
-              obj.name = '第二班'
+              obj.name = this.$t('message.shiftObj.2')
             } else if (i == 3) {
-              obj.name = '第三班'
+              obj.name = this.$t('message.shiftObj.3')
             } else if (i == 4) {
-              obj.name = '第四班'
+              obj.name = this.$t('message.shiftObj.4')
             } else if (i == 5) {
-              obj.name = '第五班'
+              obj.name = this.$t('message.shiftObj.5')
             } else if (i == 6) {
-              obj.name = '第六班'
+              obj.name = this.$t('message.shiftObj.6')
             }
             this.samplingSelection.frequencyList.push(obj)
           }

src/views/formulationPlan/recipeTemplate/index.vue

@@ -741,7 +741,7 @@
             </el-table-column>
             <el-table-column :label="$t('errorAnalysis.sxlb')" min-width="130px" align="center">
               <template slot-scope="scope">
-                <el-select v-model="scope.row.ccid" placeholder="选择牲畜父类" class="filter-item" style="width:95%;padding:10px 0;" :disabled="detail.disabled" @change="changeLivestockType2">
+                <el-select v-model="scope.row.ccid" :placeholder="$t('message.msg354')" class="filter-item" style="width:95%;padding:10px 0;" :disabled="detail.disabled" @change="changeLivestockType2">
                   <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </template>
@@ -1039,7 +1039,7 @@ export default {
         tableKey2: 0,
         total2: 0,
         listLoading2: false,
-        list2: [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1, }],
+        list2: [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: this.$t('message.msg355'), remark: '', 'enable': 1, }],
         getdataListParm: {
           name: 'getFTDetailCompare',
           page: 1,
@@ -1119,7 +1119,7 @@ export default {
         name: 'getTcode', page: 1, offset: 1, pagecount: 10, returntype: 'Map',
         parammaps: { pastureid: '', fttypeid: '' }
       },
-      sourceList: [{ id: '0', name: '自定义' }, { id: '1', name: '集团下发未调整' }, { id: '2', name: '集团下发有调整' }, { id: '3', name: '导入' }]
+      sourceList: this.$t('message.sourceList')
     }
   },
   computed: {
@@ -1204,7 +1204,7 @@ export default {
                 return prev
               }
             }, 0)
-            sums[index] = sums[index].toFixed(4) + '(干物质量：' + this.table2.dryweight + ')'
+            sums[index] = sums[index].toFixed(4) + this.$t('message.msg352') + this.table2.dryweight + ')'
           } else {
             sums[index] = ''
           }
@@ -1358,7 +1358,7 @@ export default {
           return false
         }
       }
-      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1,'autozone':0, 'tname': '', tcode: '', 'tcolor': '#ccc', 'ccid': '', 'ccname': '', 'fttype': '', 'fttypeid': '','volume':'', 'source': '自定义', 'remark': '','cattle':'' })
+      this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'enable': 1,'autozone':0, 'tname': '', tcode: '', 'tcolor': '#ccc', 'ccid': '', 'ccname': '', 'fttype': '', 'fttypeid': '','volume':'', 'source': this.$t('message.msg355'), 'remark': '','cattle':'' })
       console.log('点击了新增this.table.list====>', this.table.list)
       this.table.temp = this.table.list[0]
       this.getTcodeList()
@@ -1906,14 +1906,14 @@ export default {
           if (response.data.list !== null) {
             for (let i = 0; i < response.data.list.length; i++) {
               if (response.data.list[i].islockcount == 0) {
-                this.$set(response.data.list[i], 'islockcount', '否')
+                this.$set(response.data.list[i], 'islockcount', this.$t('feedChart.no'))
               } else {
-                this.$set(response.data.list[i], 'islockcount', '是')
+                this.$set(response.data.list[i], 'islockcount', this.$t('feedChart.yes'))
               }
               if (response.data.list[i].enable == 0) {
-                this.$set(response.data.list[i], 'enable', '否')
+                this.$set(response.data.list[i], 'enable', this.$t('feedChart.no'))
               } else {
-                this.$set(response.data.list[i], 'enable', '是')
+                this.$set(response.data.list[i], 'enable', this.$t('feedChart.yes'))
               }
             }
             this.download.list = response.data.list
@@ -1952,7 +1952,7 @@ export default {
           this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg38') + res.data.err_count + this.$t('message.msg39'), type: 'danger', duration: 2000 })
            import('@/vendor/Export2Excel').then(excel => {
              const list1 = res.data.result
-             const tHeader = this.$t('formulationEvaluation.tHeader1') 
+             const tHeader = this.$t('formulationEvaluation.tHeader1')
              const filterVal = [
                '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量（kg）', '搅拌延时（min）', '是否锁定牛头数比例', 'error_msg'
              ]
@@ -2202,9 +2202,9 @@ export default {
       obj.autosecondname = this.table2.getdataListParm.parammaps.autosecondname
       if (this.table2.getdataListParm.parammaps.islockcount !== '') {
         if (this.table2.getdataListParm.parammaps.islockcount == 0) {
-          this.table2.getdataListParm.parammaps.islockcount = '否'
+          this.table2.getdataListParm.parammaps.islockcount = this.$t('feedChart.no')
         } else {
-          this.table2.getdataListParm.parammaps.islockcount = '是'
+          this.table2.getdataListParm.parammaps.islockcount = this.$t('feedChart.yes')
         }
       }
       obj.islockcount = this.table2.getdataListParm.parammaps.islockcount
@@ -3054,7 +3054,7 @@ export default {
                     this.detail.dialogFormVisible = true
                     this.detail.list = this.selectList2
                     this.detail.disabled = false
-                    this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
+                    this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: this.$t('message.msg355'), remark: '', 'enable': 1,volume:'' }]
                     setTimeout(() => {
                       this.detail.listLoading = false
                     }, 100)
@@ -3064,7 +3064,7 @@ export default {
                   this.detail.dialogFormVisible = true
                   this.detail.list = this.selectList2
                   this.detail.disabled = false
-                  this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
+                  this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: this.$t('message.msg355'), remark: '', 'enable': 1,volume:'' }]
                   setTimeout(() => {
                     this.detail.listLoading = false
                   }, 100)
@@ -3075,7 +3075,7 @@ export default {
                 this.detail.dialogFormVisible = true
                 this.detail.list = this.selectList2
                 this.detail.disabled = false
-                this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
+                this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: this.$t('message.msg355'), remark: '', 'enable': 1,volume:'' }]
                 setTimeout(() => {
                   this.detail.listLoading = false
                 }, 100)
@@ -3086,7 +3086,7 @@ export default {
             this.detail.dialogFormVisible = true
             this.detail.list = this.selectList2
             this.detail.disabled = false
-            this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: '自定义', remark: '', 'enable': 1,volume:'' }]
+            this.detail.list2 = [{ tname: '', tcolor: '#ccc', ccid: '', fttype: '预混配方', fttypeid: '2', source: this.$t('message.msg355'), remark: '', 'enable': 1,volume:'' }]
             setTimeout(() => {
               this.detail.listLoading = false
             }, 100)

src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -3538,7 +3538,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -3578,7 +3578,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -3627,7 +3627,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -3667,7 +3667,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -3716,7 +3716,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -3756,7 +3756,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -3805,7 +3805,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -3845,7 +3845,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -3916,7 +3916,7 @@ export default {
                 'barname'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -3978,7 +3978,7 @@ export default {
                 'barname'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(excelDatas4, this.$t('errorAnalysis.hztjcc'), true, 'xlsx')
@@ -4028,7 +4028,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4074,7 +4074,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4123,7 +4123,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             }
           ]
           json2excel(excelDatas5, this.$t('errorAnalysis.hztjsl'), true, 'xlsx')
@@ -4165,7 +4165,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4203,7 +4203,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4252,7 +4252,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4290,7 +4290,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4337,7 +4337,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4375,7 +4375,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4422,7 +4422,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4460,7 +4460,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4507,7 +4507,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4545,7 +4545,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4616,7 +4616,7 @@ export default {
                 'barname'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4678,7 +4678,7 @@ export default {
                 'barname'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(excelDatas4, this.$t('errorAnalysis.hztjcc'), true, 'xlsx')
@@ -4726,7 +4726,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4770,7 +4770,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(
@@ -4817,7 +4817,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             }
           ]
           json2excel(excelDatas6, this.$t('errorAnalysis.hztjsl'), true, 'xlsx')
@@ -4857,7 +4857,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table.list,
-              sheetName: '混料'
+              sheetName: this.$t('message.msg357')
             },
             {
               tHeader: [
@@ -4893,7 +4893,7 @@ export default {
                 '方差'
               ],
               tableDatas: this.tab.table2.list,
-              sheetName: '撒料'
+              sheetName: this.$t('message.msg356')
             }
           ]
           json2excel(

src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -85,9 +85,9 @@
 
         <div v-if="isTable1">
         <div v-if="tab2.table.tableConfig.length > 8">
-          <u-table v-if="isDispayTable2" ref="plTable2" 
+          <u-table v-if="isDispayTable2" ref="plTable2"
   empty-text="No  Data"  v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight"
-          
+
            border class="elTable table-fixed plTable2">
             <!-- 第一个表头 -->
             <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow" >
@@ -108,7 +108,7 @@
           </u-table> -->
         </div>
         <div v-else>
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle"  :cell-style="cellStyle" :max-height="myHeight2" 
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle"  :cell-style="cellStyle" :max-height="myHeight2"
   empty-text="No Data"  use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
             <!-- 第一个表头 -->
             <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow">
@@ -617,15 +617,27 @@ export default {
               ) {
                 this.tab2.table.data = response.data.data
                 response.data.feedcode.push('')
-                response.data.feedcode.unshift('饲料编码')
+                response.data.feedcode.unshift(this.$t('message.msg350'))
                 for (let i = 0; i < response.data.list.data2.length; i++) {
-                  // console.log(response.data.list.data2[i],'===label')
+                  console.log(response.data.list.data2[i],'===label')
+
+                  if(response.data.list.data2[i].label == '饲料名称'){
+                    response.data.list.data2[i].label=this.$t('message.feedLang').饲料名称
+                  }
+                  if(response.data.list.data2[i].label == '合计'){
+                    response.data.list.data2[i].label=this.$t('message.feedLang').合计
+                  }
                   for (let j = 0; j < response.data.list.data1.length; j++) {
+                     //
+                     if(response.data.list.data1[j].A == '合计'){
+                      response.data.list.data1[j].A=this.$t('message.feedLang').合计
+                      }
                     for (
                       let a = 0;
                       a < response.data.list.data2[i].children.length;
                       a++
                     ) {
+
                       if (
                         response.data.list.data1[j][
                           response.data.list.data2[i].children[a].prop
@@ -649,22 +661,27 @@ export default {
                       j < response.data.list.data2[i].children.length;
                       j++
                     ) {
-                      if (
-                        response.data.list.data2[i].children[j].label ==
-                          '理论' ||
-                        response.data.list.data2[i].children[j].label == '实际'
-                      ) {
-                        this.$set(
-                          response.data.list.data2[i].children[j],
-                          'width',
-                          '80px'
-                        )
-                      } else {
-                        this.$set(
+                      this.$set(
                           response.data.list.data2[i].children[j],
                           'width',
                           '80px'
                         )
+                        if (
+                        response.data.list.data2[0].children[0].label ==
+                          '牲畜类别'
+                        ) {
+                          response.data.list.data2[0].children[0].label= this.$t('message.feedLang').牲畜类别
+                        }
+                      if (
+                        response.data.list.data2[i].children[j].label ==
+                          '理论'
+                      ) {
+                        response.data.list.data2[i].children[j].label= this.$t('message.feedLang').理论
+                      }
+                      if (
+                        response.data.list.data2[i].children[j].label == '实际'
+                      ) {
+                         response.data.list.data2[i].children[j].label = this.$t('message.feedLang').实际
                       }
                     }
                   } else {
@@ -861,6 +878,13 @@ export default {
             ) {
               console.log('库存统计-价格分析', response.data.list)
               for (let i = 0; i < response.data.list.data2.length; i++) {
+
+                //
+                if (
+                    response.data.list.data2[i].label =='饲料名称'
+                    ) {
+                      response.data.list.data2[i].label= this.$t('message.feedLang').饲料名称
+                    }
                 for (let j = 0; j < response.data.list.data1.length; j++) {
                   for (
                     let a = 0;
@@ -890,22 +914,46 @@ export default {
                     j < response.data.list.data2[i].children.length;
                     j++
                   ) {
-                    if (
-                      response.data.list.data2[i].children[j].label == '理论' ||
-                      response.data.list.data2[i].children[j].label == '实际'
-                    ) {
-                      this.$set(
-                        response.data.list.data2[i].children[j],
-                        'width',
-                        '80px'
-                      )
-                    } else {
-                      this.$set(
+                    this.$set(
                         response.data.list.data2[i].children[j],
                         'width',
                         '80px'
                       )
-                    }
+                    //
+                    if (
+                        response.data.list.data2[0].children[0].label ==
+                          '牲畜类别/饲料参数'
+                        ) {
+                          response.data.list.data2[0].children[0].label= this.$t('message.feedLang').饲料参数
+                        }
+                      if (
+                        response.data.list.data2[i].children[j].label ==
+                          '理论'
+                      ) {
+                        response.data.list.data2[i].children[j].label= this.$t('message.feedLang').理论
+                      }
+                      if (
+                        response.data.list.data2[i].children[j].label == '实际'
+                      ) {
+                         response.data.list.data2[i].children[j].label = this.$t('message.feedLang').实际
+                      }
+                      //
+                    // if (
+                    //   response.data.list.data2[i].children[j].label == '理论' ||
+                    //   response.data.list.data2[i].children[j].label == '实际'
+                    // ) {
+                    //   this.$set(
+                    //     response.data.list.data2[i].children[j],
+                    //     'width',
+                    //     '80px'
+                    //   )
+                    // } else {
+                    //   this.$set(
+                    //     response.data.list.data2[i].children[j],
+                    //     'width',
+                    //     '80px'
+                    //   )
+                    // }
                   }
                 } else {
                   this.$set(