栏舍配方

src/components/index.vue

@@ -906,7 +906,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.tab.chartDate[0], '{y}-{m}-{d}')

src/lang/en/langModule/dhedFormula.js

@@ -60,7 +60,24 @@ swzbl:"total feeding ratio(%)",
 apfcx:"Inquiry by Formula",
 alscx:"Inquiry by Shed",
 
+lspf:"Error Message for Pen Formula Import",
+theader1:[
+  'Pens Name', 'Actual Cattle Number', 'Coefficient (%)', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'Second Shift Proportion (%)', 'Third Shift Proportion (%)', 'Error Message'
+],
 
+theader2:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight', 'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+theader3:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight','Second Shift Proportion (%)', "Second Shift Weight",'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+theader4:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight','Second Shift Proportion (%)', "Second Shift Weight","Third Shift Proportion (%)","Third Shift Weight",'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+theader5:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight','Second Shift Proportion (%)', "Second Shift Weight","Third Shift Proportion (%)","Third Shift Weight","Fourth Shift Proportion (%)","Fourth Shift Weight",'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+theader6:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight','Second Shift Proportion (%)', "Second Shift Weight","Third Shift Proportion (%)","Third Shift Weight","Fourth Shift Proportion (%)","Fourth Shift Weight","Fifth Shift Proportion (%)","Fifth Shift Weight",'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+theader7:['Pens Name', 'Software Cattle Head Count', 'Actual Cattle Head Count', 'Coefficient (%)', 'Coefficient Head Count', 'Formula Template', 'Supplementary Feed Formula', 'First Shift Proportion (%)', 'First Shift Weight','Second Shift Proportion (%)', "Second Shift Weight","Third Shift Proportion (%)","Third Shift Weight","Fourth Shift Proportion (%)","Fourth Shift Weight","Fifth Shift Proportion (%)","Fifth Shift Weight", "Sixth Shift Proportion (%)","Sixth Shift Weight",'Total Proportion', 'Daily Feeding Amount', 'Formula Weight', 'Supplementary Feed Weight', 'Formula Dry Matter'],
+
+errMsg:"The file size must not exceed 2MB"
 
 
 

src/lang/en/langModule/driver.js

@@ -44,9 +44,9 @@ export default{
   message2: "Stall Name cannot be empty",
   message3: "Stall Number cannot be empty",
 
-  qxzjsyxx:"请选择驾驶员信息",
-  saveFail: '保存失败',
-  saveSuccess:"保存成功"
+  qxzjsyxx:"Please select driver information",
+  saveFail: 'Save failed',
+  saveSuccess:"Success saved"
 
 
 

src/lang/en/langModule/feedChart.js

@@ -59,6 +59,9 @@ zf: "Fat (%DM)",
 qxgl: "Cancel Association",
 
     
+bzdwzlqsrzs: "Please enter a positive integer for the packaging unit weight.",
+djbllwxs: "Please keep the unit price to two decimal places.",
+tzzl050: "Please enter an integer between 0 and 50 for the transfer weight range.",
   
 
 

src/lang/en/langModule/message.js

@@ -152,5 +152,18 @@ 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",
 
+msg140:"Pen Formula",
+msg141: "There is a piece of information, do you want to make it effective?",
+msg142: "Train number/formula name/TMR number/shift/mixing weight cannot be empty.",
+msg143: "Formula name/TMR number/shift/mixing weight cannot be empty.",
+msg144: "TMR number/shift/mixing weight cannot be empty.",
+msg145: "Shift/mixing weight cannot be empty.",
+msg146: "Train number cannot be empty and must be greater than 0.",
+msg147: "TMR number cannot be empty.",
+msg148: "Shift cannot be empty.",
+msg149: "Mixing weight cannot be empty.",
+msg150: "Train number cannot be duplicated.",
+msg151: "Please enter an integer for the train number.",
+
 
 }

src/lang/en/langModule/premixedPlan.js

@@ -1,14 +1,14 @@
 export default{
 
-xzcc:"New Batch",
-jscc:"Reduce Batches",
+xzcc:"Add",
+jscc:"Delete",
 sx:"Take Effect",
 jy:"Disable",
 tmrbh:"TMR Number",
 sljhccgs:"Feed Distribution Plan with Batch Following",
 zdjbl:"Maximum Mixing Quantity”(KG)",
 hlzl:"Mixed Material Weight",
-fljhcsgs:"Material Issuance Plan with Batch Following",
+fljhcsgs:" Material Issuance Plan with Train Number Following",
 time:"Time",
 
 
@@ -49,7 +49,7 @@ ls:"Pens",
 clbm:"Vehicle Code",
 tljh:"Feed Push Plan",
 
-scc:"Reduce Batches",
+scc:"Delete",
 slclfs:"Leftover Material Disposal Method",
 ztls:"Transfer to Pens",
 cci:"batch:",

src/lang/zn/langModule/dhedFormula.js

@@ -60,6 +60,28 @@ swzbl:"饲喂总比例(%)",
 apfcx:"按配方查询",
 alscx:"按栏舍查询",
 
+lspf:"栏舍配方导入报错信息",
+
+theader1:['栏舍名称', '实际牛头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', '错误信息'],
+
+
+theader2:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+theader3:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+theader4:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+theader5:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+theader6:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+theader7:['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量','第六班比例(%)', '第六班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+
+errMsg:"上传文件大小不能超过 2MB",
+msg1:'是否进行软件牛头数同步?',
+msg2:'是否进行恢复?',
+
+
 
 
 

src/lang/zn/langModule/message.js

@@ -159,6 +159,23 @@ msg139:'乳糖率请保留两位小数',
 
 //
 msg140:"栏舍配方",
+msg141:'条信息，是否生效?',
+msg142:'车次/配方名称/TMR编号/班次/混料重量不能为空',
+msg143:'配方名称/TMR编号/班次/混料重量不能为空',
+msg144:'TMR编号/班次/混料重量不能为空',
+msg145:'班次/混料重量不能为空',
+msg146:'车次不能为空且大于0',
+msg147:'TMR编号不能为空',
+msg148:'班次不能为空',
+msg149:'混料重量不能为空',
+msg150:'车次不可重复',
+msg151:'车次请输入整数',
+
+
+
+
+
+
 
 
 

src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -316,7 +316,7 @@ description:this.$t('supplier.cssm')
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []

src/views/basicData/defaultParameter/function/index.vue

@@ -439,7 +439,7 @@ description:this.$t('supplier.cssm')
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []

src/views/basicData/defaultParameter/index2.vue

@@ -287,7 +287,7 @@ name:this.$t('supplier.defb') }, { id: '1', name: '平均分配' }],
         this.isokDisable = false
       }, 1000)
       MessageBox.confirm('是否确认恢复默认设置?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.common = { 'returnmap': '0' }
         this.requestParam.data = []

src/views/basicData/driver/index.vue

@@ -297,7 +297,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDriver'
@@ -326,7 +326,7 @@ export default {
         this.$message({ type: 'error', message: this.$t('driver.qxzjsyxx'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('common.delMsg') , {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/basicData/equipmentTMR/index.vue

@@ -596,7 +596,7 @@ name:this.$t('supplier.no') }], // 是否启用
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.appoinObj={};
@@ -634,7 +634,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: '请选择TMR设备信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}

src/views/basicData/feedClassification/index.vue

@@ -359,7 +359,7 @@ name:this.$t('supplier.no') }],
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -396,7 +396,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error',message: this.$t('feedChart.slflxx'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}

src/views/basicData/feedTable/index.vue

@@ -1056,7 +1056,7 @@ name:this.$t('supplier.yes')}], // 无上域
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },
@@ -1577,7 +1577,7 @@ name:this.$t('supplier.yes')}], // 无上域
     disassociateData(row) {
       console.log('点击了取消关联')
       MessageBox.confirm('是否确认取消关联?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.isokDisable = true
         setTimeout(() => {
@@ -1605,7 +1605,7 @@ name:this.$t('supplier.yes')}], // 无上域
     relationData(row) {
       console.log('点击了关联保存')
       MessageBox.confirm('是否确认关联?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.isokDisable = true
         setTimeout(() => {
@@ -1787,7 +1787,7 @@ name:this.$t('supplier.yes')}], // 无上域
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -1825,7 +1825,7 @@ name:this.$t('supplier.yes')}], // 无上域
         this.$message({ type: 'error', message: '请选择饲料表信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam = {}
           this.requestParam.common = { 'returnmap': '0' }
@@ -2021,7 +2021,7 @@ name:this.$t('supplier.yes')}], // 无上域
     },
     handleGetUd(){
       MessageBox.confirm('是否获取UD饲料?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udfeed'
         let data = {

src/views/basicData/forkliftManagement/index.vue

@@ -417,7 +417,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -446,7 +446,7 @@ export default {
         this.$message({ type: 'error', message: '请选择设备信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}

src/views/basicData/groupColumn/index.vue

@@ -587,7 +587,7 @@ name:this.$t('supplier.no') }],
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -624,7 +624,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error', message: '请选择舍组栏信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -768,7 +768,7 @@ name:this.$t('supplier.no') }],
     },
     handleGetUd(){
       MessageBox.confirm('是否获取UD栏舍?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udbar'
         let data = {

src/views/basicData/livestockCategory/index.vue

@@ -376,7 +376,7 @@ name:this.$t('supplier.no') }],
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -413,7 +413,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error', message: '请选择牲畜类别信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}

src/views/basicData/managementGPS/index.vue

@@ -356,7 +356,7 @@ name:this.$t('supplier.no') }],
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -386,7 +386,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error', message: '请选择信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/basicData/standardParameters/index.vue

@@ -893,7 +893,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },
@@ -933,7 +933,7 @@ export default {
     beforeImport2(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/basicData/supplier/index.vue

@@ -354,7 +354,7 @@ name:this.$t('supplier.no') }], // 是否启用
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -391,7 +391,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: '请选择供应商信息', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam = {}
           this.requestParam.common = { 'returnmap': '0' }

src/views/console/apisql/index.vue

@@ -588,7 +588,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('sql名称：' + row.sqlname, '确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteapisql'

src/views/console/dept/index.vue

@@ -419,7 +419,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('部门名称：' + row.deptname, '确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParamDel.name = 'deletedept'

src/views/console/dict/index.vue

@@ -378,7 +378,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('名称：' + row.label, '确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDictList'

src/views/console/menu/index.vue

@@ -449,7 +449,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('菜单名称：' + row.name, '确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteMenu'

src/views/console/role/index.vue

@@ -397,7 +397,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('名称：' + row.name, '确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteRole'

src/views/console/user/index.vue

@@ -419,7 +419,7 @@ export default {
     form_delete(row) {
       MessageBox.confirm('确认删除？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteUser'

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -2467,7 +2467,7 @@ export default {
     },
     handleDataSynchronization() {
       MessageBox.confirm('是否确认同步数据?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam = {}
         this.requestParam.pastureid = Cookies.get('pastureid')
@@ -2490,7 +2490,7 @@ export default {
     handleRowDelete(row) {
       console.log('删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -2514,7 +2514,7 @@ export default {
       this.$prompt('由于混料车和撒料车是一体的，插入顺序不能隔开', '排序', {
         inputPlaceholder:'请输入您要插入的位置',
         confirmButtonText: '确定',
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         inputPattern: /^\d+$/ ,
         inputErrorMessage: '请检查插入位置序号是否正确'
       }).then(({ value }) => {
@@ -2618,9 +2618,9 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -2666,7 +2666,7 @@ export default {
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -2806,7 +2806,7 @@ export default {
         this.$message({ type: 'error', message: '请选择计划', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -3103,7 +3103,7 @@ export default {
     handleRowEmpty(row,plan){
       console.log(row,'row')
       MessageBox.confirm('您确定清空该操作序号以下的所有数据，如果您清空的是搅拌车数据，将会同步清空撒料车数据?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.selectList)
         this.requestParam.common = { 'returnmap': '0' }
@@ -3142,7 +3142,7 @@ export default {
         this.$message({ type: 'error', message: '请先选择计划', duration: 2000 })
       } else {
         MessageBox.confirm('您是否确定勾选的状态改为已执行的计划?', {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           let arr = []

src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -115,7 +115,7 @@ export default {
     saveData() {
       console.log('点击了应用')
       MessageBox.confirm('是否确认将当前修改计划应用至' + this.date, {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'updatedownloadedplanDone'
         this.requestParam.parammaps = {}

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

@@ -799,7 +799,7 @@ export default {
       if (row.arrList.length == 0) {
         MessageBox.confirm( this.$t('common.delMsg'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.selectList = []
@@ -1405,21 +1405,21 @@ export default {
           if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.tmrvolume)){
             tip = '装载量已超过车辆容量' + this.create.temp.tmrvolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.maxVolume)){
             tip = '装载量不可超过车辆容量' + this.create.temp.maxVolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) < parseFloat(this.create.temp.minVolume)){
             tip = '装载量不可低于车辆容量' + this.create.temp.minVolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
@@ -1627,7 +1627,7 @@ export default {
         }
         MessageBox.confirm( this.$t('common.delMsg'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           console.log(this.selectList)
@@ -1763,9 +1763,9 @@ export default {
           duration: 2000
         })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1816,7 +1816,7 @@ export default {
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1903,7 +1903,7 @@ export default {
     },
     handleAllEmpty(){
       MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空，是否要执行该操作?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam = {}
         this.requestParam.common = { 'returnmap': '0' }

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

@@ -332,38 +332,38 @@ export default {
       console.log('点击了新增保存', row)
 
       if (row.sort == '' && row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '车次/配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg142'), duration: 2000 })
         return false
       } else if (row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg143'), duration: 2000 })
         return false
       } else if (row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg144'), duration: 2000 })
         return false
       } else if (row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg145'), duration: 2000 })
         return false
       } else if (row.sort == '' || row.sort == 0) {
-        this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
         return false
       } else if (row.ftid == '') {
         this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (row.tmrid == '') {
-        this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
         return false
       } else if (row.times == '') {
-        this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
         return false
       } else if (row.operateweight == '') {
-        this.$message({ type: 'error', message: '混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg149'), duration: 2000 })
         return false
       }
       for (let i = 0; i < this.table.list.length; i++) {
         if (row.sort !== '') {
           if (row.sort == this.table.list[i].sort) {
             if (row.myId !== this.table.list[i].myId) {
-              this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+              this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
               return false
             }
           }
@@ -372,7 +372,7 @@ export default {
       var isInteger = /^\d+$/
       if (row.sort !== '') {
         if (!isInteger.test(parseFloat(row.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+          this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
           return false
         }
       }
@@ -450,31 +450,31 @@ export default {
     updateData(row) {
       console.log('点击了编辑保存', row)
       if (row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg143'), duration: 2000 })
         return false
       } else if (row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg144'), duration: 2000 })
         return false
       } else if (row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg145'), duration: 2000 })
         return false
       } else if (row.ftid == '') {
         this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (row.tmrid == '') {
-        this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
         return false
       } else if (row.times == '') {
-        this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
         return false
       } else if (row.operateweight == '') {
-        this.$message({ type: 'error', message: '混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg149'), duration: 2000 })
         return false
       }
       for (let i = 0; i < this.table.list.length; i++) {
         if (row.sort == this.table.list[i].sort) {
           if (row.id !== this.table.list[i].id) {
-            this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+            this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
             return false
           }
         }
@@ -482,12 +482,12 @@ export default {
       var isInteger = /^\d+$/
       if (row.sort !== '') {
         if (!isInteger.test(parseFloat(row.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+          this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
           return false
         }
       }
       if (row.sort == '' || row.sort == 0) {
-        this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
         return false
       }
       this.isokDisable = true
@@ -529,7 +529,7 @@ export default {
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -556,7 +556,7 @@ export default {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

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

@@ -796,7 +796,7 @@ export default {
           } else if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
             this.$message({
               type: 'error',
-              message: '车次不能为空且大于0',
+              message:  this.$t('message.msg146'),
               duration: 2000
             })
             return false
@@ -810,14 +810,14 @@ export default {
           } else if (this.create.temp.tmrid == '') {
             this.$message({
               type: 'error',
-              message: 'TMR编号不能为空',
+              message:  this.$t('message.msg147'),
               duration: 2000
             })
             return false
           } else if (this.create.temp.times == '') {
             this.$message({
               type: 'error',
-              message: '班次不能为空',
+              message:  this.$t('message.msg148'),
               duration: 2000
             })
             return false
@@ -851,7 +851,7 @@ export default {
               if (this.create.temp.myId !== this.table.list[i].myId) {
                 this.$message({
                   type: 'error',
-                  message: '车次不可重复',
+                  message:  this.$t('message.msg150'),
                   duration: 2000
                 })
                 return false
@@ -864,7 +864,7 @@ export default {
             if (!isInteger.test(parseFloat(this.create.temp.sort))) {
               this.$message({
                 type: 'error',
-                message: '车次请输入整数',
+                message:  this.$t('message.msg151'),
                 duration: 2000
               })
               return false
@@ -1119,14 +1119,14 @@ export default {
           } else if (this.create.temp.tmrid == '') {
             this.$message({
               type: 'error',
-              message: 'TMR编号不能为空',
+              message:  this.$t('message.msg147'),
               duration: 2000
             })
             return false
           } else if (this.create.temp.times == '') {
             this.$message({
               type: 'error',
-              message: '班次不能为空',
+              message:  this.$t('message.msg148'),
               duration: 2000
             })
             return false
@@ -1159,7 +1159,7 @@ export default {
               if (this.create.temp.id !== this.table.list[i].id) {
                 this.$message({
                   type: 'error',
-                  message: '车次不可重复',
+                  message:  this.$t('message.msg150'),
                   duration: 2000
                 })
                 return false
@@ -1171,7 +1171,7 @@ export default {
             if (!isInteger.test(parseFloat(this.create.temp.sort))) {
               this.$message({
                 type: 'error',
-                message: '车次请输入整数',
+                message:  this.$t('message.msg151'),
                 duration: 2000
               })
               return false
@@ -1180,7 +1180,7 @@ export default {
           if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
             this.$message({
               type: 'error',
-              message: '车次不能为空且大于0',
+              message:  this.$t('message.msg146'),
               duration: 2000
             })
             return false
@@ -1326,7 +1326,7 @@ export default {
       console.log(row, '点击了行删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.selectList = []
@@ -1372,7 +1372,7 @@ export default {
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           console.log(this.selectList)
@@ -1445,9 +1445,9 @@ export default {
           duration: 2000
         })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1508,7 +1508,7 @@ export default {
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {

src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -422,7 +422,7 @@ export default {
     },
     handleNextLast() {
       MessageBox.confirm(this.$t('message.msg110'), this.$t('message.msg111'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         // beforeClose: (action, instance, done) => {
         //   console.log(action, instance, done)
         //   this.closeDialog()

src/views/formulationPlan/dhedFormula/index.vue

@@ -28,7 +28,7 @@
             <el-dropdown-item @click.native="handleExport(2)">{{$t('formulationEvaluation.outsj')}}</el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
-        <el-button class="export" style="float: right;margin-right: 10px;" @click="handleHistoryRecords">{{$t('dhedFormula.lsjl')}}</el-button>
+        <el-button class="export" style="margin-top: 10px;" @click="handleHistoryRecords">{{$t('dhedFormula.lsjl')}}</el-button>
       </div>
     </div>
     <div class="search" />
@@ -3133,7 +3133,7 @@ export default {
     handleApplication() {
       console.log('点击了应用')
       MessageBox.confirm(this.$t('message.msg58') + this.history.getdataListParm.parammaps.date + this.$t('message.msg59'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
         this.requestParam.parammaps = {}
@@ -3239,7 +3239,7 @@ export default {
           if (this.table.isRW1 == true && this.table.isRW2 == false && this.table.isRW3 == false && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: this.$t('dhedFormula.theader2'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3248,7 +3248,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == false && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader:this.$t('dhedFormula.theader3'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3257,7 +3257,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == false && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: this.$t('dhedFormula.theader4'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3266,7 +3266,7 @@ export default {
           } else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == false && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: this.$t('dhedFormula.theader5'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3275,7 +3275,7 @@ export default {
           }else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == true && this.table.isRW6 == false) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: this.$t('dhedFormula.theader6'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4','r5', 'w5', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3284,7 +3284,7 @@ export default {
           }else if (this.table.isRW1 == true && this.table.isRW2 == true && this.table.isRW3 == true && this.table.isRW4 == true && this.table.isRW5 == true && this.table.isRW6 == true) {
             var excelDatas = [
               {
-                tHeader: ['栏舍名称', '软件牛头数', '实际牛头数', '系数(%)', '系数头数', '配方模板', '补料配方', '第一班比例(%)', '第一班重量', '第二班比例(%)', '第二班重量', '第三班比例(%)', '第三班重量', '第四班比例(%)', '第四班重量','第五班比例(%)', '第五班重量','第六班比例(%)', '第六班重量', '总比例', '日投喂量', '配方重量', '补料重量', '配方干物质'],
+                tHeader: this.$t('dhedFormula.theader7'),
                 filterVal: ['barname', 'softccount', 'ccount', 'ratio', 'ccountratio', 'ftname', 'ptsfname', 'r1', 'w1', 'r2', 'w2', 'r3', 'w3', 'r4', 'w4','r5', 'w5','r6', 'w6', 'sumr', 'dailyWeight', 'ftweight', 'supplyweight', 'dryweight'],
                 tableDatas: this.download.list,
                 sheetName: 'Sheet1'
@@ -3299,7 +3299,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },
@@ -3311,14 +3311,12 @@ 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 = [
-               '栏舍名称', '实际牛头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', '错误信息'
-             ]
+             const tHeader = this.$t('dhedFormula.theader1')
              const filterVal = [
                '栏舍名称', '实际牛头数', '系数(%)', '配方模板', '补料配方', '第一班比例(%)', '第二班比例(%)', '第三班比例(%)', 'error_msg'
              ]
              const data1 = this.formatJson(filterVal, list1)
-             excel.export_json_to_excel({ header: tHeader, data: data1, filename: '栏舍配方导入报错信息', autoWidth: true, bookType: 'xlsx' })
+             excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.$t('dhedFormula.lspf'), autoWidth: true, bookType: 'xlsx' })
            })
         }
       } else {
@@ -3344,8 +3342,8 @@ export default {
       this.$refs.mychild.restTemp()
     },
     handleSynchronous(){
-      MessageBox.confirm('是否进行软件牛头数同步?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      MessageBox.confirm(this.$t('dhedFormula.msg1'), {
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         const url = 'authdata/ud/feedp/sync'
         const data = {}
@@ -3422,8 +3420,8 @@ export default {
     },
     handleRestore(row){
       // 恢复
-      MessageBox.confirm('是否进行恢复?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      MessageBox.confirm(this.$t('dhedFormula.msg2'), {
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
       const dataList = this.history.list
       const result = dataList.filter(obj => obj.barname === row.barname);
@@ -3495,6 +3493,7 @@ export default {
 <style lang="scss" scoped>
   .search {
     clear: both;
+    height:50px;
   }
 
   .table {

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -839,7 +839,7 @@ export default {
       console.log(row, '点击了行删除')
       if (row.arrList.length == 0) {
         MessageBox.confirm( this.$t('common.delMsg'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.selectList = []
           this.requestParam = {}
@@ -1360,21 +1360,21 @@ export default {
           if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.tmrvolume)){
             tip = '装载量已超过车辆容量' + this.create.temp.tmrvolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) > parseFloat(this.create.temp.maxVolume)){
             tip = '装载量不可超过车辆容量' + this.create.temp.maxVolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
           }else if(parseFloat(this.create.temp.volume) < parseFloat(this.create.temp.minVolume)){
             tip = '装载量不可低于车辆容量' + this.create.temp.minVolume + 'm³,请确认'
             MessageBox.confirm(tip, {
-              confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+              confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
             }).then(() => {
               this.save_updateData()
             })
@@ -1541,7 +1541,7 @@ export default {
           }
         }
         MessageBox.confirm( this.$t('common.delMsg'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam = {}
@@ -1592,7 +1592,7 @@ export default {
       } else {
         console.log('点击重新生成')
         MessageBox.confirm('重新生成计划会将原有计划清空再生成，是否确认重新生成?', {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.automaticGeneration.dialogFormVisible = false
           this.requestParam = {}
@@ -1677,9 +1677,9 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1711,7 +1711,7 @@ export default {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             this.selectList[i].sel = 0
@@ -1815,7 +1815,7 @@ export default {
       this.allEmpty.dialogFormVisible = true
 
       // MessageBox.confirm('执行该操作会将现有车次已分配的撒料栏舍全部清空，是否要执行该操作?', {
-      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //
       // })

src/views/formulationPlan/premixedPlan/index.vue

@@ -499,31 +499,31 @@ export default {
         row.ptime = ''
       }
       if (row.sort == '' && row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '车次/配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg142'), duration: 2000 })
         return false
       } else if (row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg143'), duration: 2000 })
         return false
       } else if (row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg144'), duration: 2000 })
         return false
       } else if (row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg145'), duration: 2000 })
         return false
       } else if (row.sort == '' || row.sort == 0) {
-        this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
         return false
       } else if (row.ftid == '') {
         this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (row.tmrid == '') {
-        this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
         return false
       } else if (row.times == '') {
-        this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
         return false
       } else if (row.operateweight == '') {
-        this.$message({ type: 'error', message: '混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg149'), duration: 2000 })
         return false
       }
 
@@ -531,7 +531,7 @@ export default {
         if (row.sort !== '') {
           if (row.sort == this.table.list[i].sort) {
             if (row.myId !== this.table.list[i].myId) {
-              this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+              this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
               return false
             }
           }
@@ -540,7 +540,7 @@ export default {
       var isInteger = /^\d+$/
       if (row.sort !== '') {
         if (!isInteger.test(parseFloat(row.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+          this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
           return false
         }
       }
@@ -623,31 +623,31 @@ export default {
         row.ptime = ''
       }
       if (row.ftid == '' && row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '配方名称/TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg143'), duration: 2000 })
         return false
       } else if (row.tmrid == '' && row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg144'), duration: 2000 })
         return false
       } else if (row.times == '' && row.operateweight == '') {
-        this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg145'), duration: 2000 })
         return false
       } else if (row.ftid == '') {
         this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (row.tmrid == '') {
-        this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
         return false
       } else if (row.times == '') {
-        this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
         return false
       } else if (row.operateweight == '') {
-        this.$message({ type: 'error', message: '混料重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg149'), duration: 2000 })
         return false
       }
       for (let i = 0; i < this.table.list.length; i++) {
         if (row.sort == this.table.list[i].sort) {
           if (row.id !== this.table.list[i].id) {
-            this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+            this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
             return false
           }
         }
@@ -655,12 +655,12 @@ export default {
       var isInteger = /^\d+$/
       if (row.sort !== '') {
         if (!isInteger.test(parseFloat(row.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+          this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
           return false
         }
       }
       if (row.sort == '' || row.sort == 0) {
-        this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+        this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
         return false
       }
       this.isokDisable = true
@@ -725,7 +725,7 @@ export default {
     handleApplication() {
       console.log('点击了应用')
       MessageBox.confirm(this.$t('message.msg58') + this.history.getdataListParm.parammaps.date + this.$t('message.msg59'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
         this.requestParam.parammaps = {}
@@ -766,7 +766,7 @@ export default {
     handleRowDelete(row) {
       console.log(row, '点击了行删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam = {}
@@ -792,7 +792,7 @@ export default {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -819,8 +819,8 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             // this.$set(this.selectList[i], 'enable', '1')
@@ -853,7 +853,7 @@ export default {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
             // this.$set(this.selectList[i], 'enable', '1')

src/views/formulationPlan/recipeTemplate/index.vue

@@ -1940,7 +1940,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },
@@ -3342,7 +3342,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
           confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           let ids = []

src/views/formulationPlan/surplusMaterialPlan/index.vue

@@ -989,16 +989,16 @@
       //     this.$message({ type: 'error', message: '班次/剩料处理方式不能为空', duration: 2000 })
       //     return false
       //   } else if (row.sort == '' || row.sort == 0) {
-      //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
       //     return false
       //   } else if (row.barid == '') {
       //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
       //     return false
       //   } else if (row.tmrid == '') {
-      //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
       //     return false
       //   } else if (row.times == '') {
-      //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
       //     return false
       //   } else if (row.treatmethod == '') {
       //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
@@ -1019,7 +1019,7 @@
       //   for (let i = 0; i < this.table.list.length; i++) {
       //     if (row.sort == this.table.list[i].sort) {
       //       if (row.myId !== this.table.list[i].myId) {
-      //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+      //         this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
       //         return false
       //       }
       //     }
@@ -1028,7 +1028,7 @@
       //   var isInteger = /^\d+$/
       //   if (row.sort !== '') {
       //     if (!isInteger.test(parseFloat(row.sort))) {
-      //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+      //       this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
       //       return false
       //     }
       //   }
@@ -1129,7 +1129,7 @@
             } else if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
               this.$message({
                 type: 'error',
-                message: '车次不能为空且大于0',
+                message:  this.$t('message.msg146'),
                 duration: 2000
               })
               return false
@@ -1143,14 +1143,14 @@
             } else if (this.create.temp.tmrid == '') {
               this.$message({
                 type: 'error',
-                message: 'TMR编号不能为空',
+                message:  this.$t('message.msg147'),
                 duration: 2000
               })
               return false
             } else if (this.create.temp.times == '') {
               this.$message({
                 type: 'error',
-                message: '班次不能为空',
+                message:  this.$t('message.msg148'),
                 duration: 2000
               })
               return false
@@ -1184,7 +1184,7 @@
                 if (this.create.temp.myId !== this.table.list[i].myId) {
                   this.$message({
                     type: 'error',
-                    message: '车次不可重复',
+                    message:  this.$t('message.msg150'),
                     duration: 2000
                   })
                   return false
@@ -1197,7 +1197,7 @@
               if (!isInteger.test(parseFloat(this.create.temp.sort))) {
                 this.$message({
                   type: 'error',
-                  message: '车次请输入整数',
+                  message:  this.$t('message.msg151'),
                   duration: 2000
                 })
                 return false
@@ -1574,10 +1574,10 @@
       //     this.$message({ type: 'error', message: '栏舍不能为空', duration: 2000 })
       //     return false
       //   } else if (row.tmrid == '') {
-      //     this.$message({ type: 'error', message: 'TMR编号不能为空', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg147'), duration: 2000 })
       //     return false
       //   } else if (row.times == '') {
-      //     this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg148'), duration: 2000 })
       //     return false
       //   } else if (row.treatmethod == '') {
       //     this.$message({ type: 'error', message: '剩料处理方式不能为空', duration: 2000 })
@@ -1598,7 +1598,7 @@
       //   for (let i = 0; i < this.table.list.length; i++) {
       //     if (row.sort == this.table.list[i].sort) {
       //       if (row.id !== this.table.list[i].id) {
-      //         this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
+      //         this.$message({ type: 'error', message:  this.$t('message.msg150'), duration: 2000 })
       //         return false
       //       }
       //     }
@@ -1606,12 +1606,12 @@
       //   var isInteger = /^\d+$/
       //   if (row.sort !== '') {
       //     if (!isInteger.test(parseFloat(row.sort))) {
-      //       this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
+      //       this.$message({ type: 'error', message:  this.$t('message.msg151'), duration: 2000 })
       //       return false
       //     }
       //   }
       //   if (row.sort == '' || row.sort == 0) {
-      //     this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
+      //     this.$message({ type: 'error', message:  this.$t('message.msg146'), duration: 2000 })
       //     return false
       //   }
       //   if (row.times == '第一班') {
@@ -1726,14 +1726,14 @@
             } else if (this.create.temp.tmrid == '') {
               this.$message({
                 type: 'error',
-                message: 'TMR编号不能为空',
+                message:  this.$t('message.msg147'),
                 duration: 2000
               })
               return false
             } else if (this.create.temp.times == '') {
               this.$message({
                 type: 'error',
-                message: '班次不能为空',
+                message:  this.$t('message.msg148'),
                 duration: 2000
               })
               return false
@@ -1766,7 +1766,7 @@
                 if (this.create.temp.id !== this.table.list[i].id) {
                   this.$message({
                     type: 'error',
-                    message: '车次不可重复',
+                    message:  this.$t('message.msg150'),
                     duration: 2000
                   })
                   return false
@@ -1778,7 +1778,7 @@
               if (!isInteger.test(parseFloat(this.create.temp.sort))) {
                 this.$message({
                   type: 'error',
-                  message: '车次请输入整数',
+                  message:  this.$t('message.msg151'),
                   duration: 2000
                 })
                 return false
@@ -1787,7 +1787,7 @@
             if (this.create.temp.sort == '' || this.create.temp.sort == 0) {
               this.$message({
                 type: 'error',
-                message: '车次不能为空且大于0',
+                message:  this.$t('message.msg146'),
                 duration: 2000
               })
               return false
@@ -1985,7 +1985,7 @@
         console.log(row, '点击了行删除')
         MessageBox.confirm( this.$t('common.delMsg'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.selectList = []
@@ -2030,7 +2030,7 @@
         } else {
           MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
             confirmButtonText: this.$t('common.confirm'),
-            confirmButtonText: this.$t('common.cancel'),
+            cancelButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             console.log(this.selectList)
@@ -2121,7 +2121,7 @@
         console.log('点击了应用')
         MessageBox.confirm(this.$t('message.msg58') + this.history.getdataListParm.parammaps.date + this.$t('message.msg59'), {
           confirmButtonText: this.$t('common.confirm'),
-          confirmButtonText: this.$t('common.cancel'),
+          cancelButtonText: this.$t('common.cancel'),
           type: 'warning'
         }).then(() => {
           this.requestParam.name = 'applyFPdate'
@@ -2180,9 +2180,9 @@
             duration: 2000
           })
         } else {
-          MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息，是否生效?', {
+          MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length +this.$t('message.msg141'), {
             confirmButtonText: this.$t('common.confirm'),
-            confirmButtonText: this.$t('common.cancel'),
+            cancelButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             for (let i = 0; i < this.selectList.length; i++) {
@@ -2242,7 +2242,7 @@
         } else {
           MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg30'), {
             confirmButtonText: this.$t('common.confirm'),
-            confirmButtonText: this.$t('common.cancel'),
+            cancelButtonText: this.$t('common.cancel'),
             type: 'warning'
           }).then(() => {
             for (let i = 0; i < this.selectList.length; i++) {

src/views/inventoryManagement/feedContract/index.vue

@@ -566,7 +566,7 @@ export default {
 
     handleRowDelete(row) {
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log('点击了删除')
         this.requestParam.common = { 'returnmap': '0' }
@@ -657,7 +657,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/inventoryManagement/inventoryList/index.vue

@@ -497,7 +497,7 @@ export default {
     },
     handleRowDelete(row) {
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteBigInventory'
         this.requestParam.parammaps = {}
@@ -610,7 +610,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/inventoryManagement/laborConsumption/index.vue

@@ -616,7 +616,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/inventoryManagement/systemConsumption/index.vue

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

src/views/inventoryManagement/warehousing/index.vue

@@ -827,7 +827,7 @@ export default {
             }
           }
 
-          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.isokDisable = true
             setTimeout(() => {
@@ -966,7 +966,7 @@ export default {
               }
             }
           }
-          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          MessageBox.confirm('是否确认保存当前内容', { confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.isokDisable = true
             setTimeout(() => {
@@ -1231,7 +1231,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/leftoverManagement/index.vue

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

src/views/shedProduction/dungScores/index.vue

@@ -715,7 +715,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDungscore'
@@ -744,7 +744,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -774,7 +774,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else  {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -878,7 +878,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/dutyRecord/index.vue

@@ -626,7 +626,7 @@ export default {
       console.log('点击了行内删除')
       this.selectList = []
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDutyrecord'
@@ -655,7 +655,7 @@ export default {
         this.$message({ type: 'error', message: '请选择值班记录', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/shedProduction/fecalScreen/index.vue

@@ -674,7 +674,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDungsieve'
@@ -703,7 +703,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -733,7 +733,7 @@ export default {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else  {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -835,7 +835,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/formulaDryMatter/index.vue

@@ -685,7 +685,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteFtdry'
@@ -714,7 +714,7 @@ export default {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -744,7 +744,7 @@ export default {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else  {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -854,7 +854,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/materialRemainingRecord/index.vue

@@ -624,7 +624,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBarfeedremain'
@@ -653,7 +653,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -683,7 +683,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else if (this.selectList.length == 1) {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarfeedremain'
           this.requestParam.parammaps = {}
@@ -793,7 +793,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -719,7 +719,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deletePennsieve'
@@ -748,7 +748,7 @@ export default {
         this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -778,7 +778,7 @@ export default {
         this.$message({ type: 'error', message: '请选择宾州筛质', duration: 2000 })
       } else  {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -881,7 +881,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/performance/index.vue

@@ -986,7 +986,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBarmilk'
@@ -1015,7 +1015,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -1045,7 +1045,7 @@ export default {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else if (this.selectList.length == 1) {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarmilk'
           this.requestParam.parammaps = {}
@@ -1137,7 +1137,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/shedProduction/physicalConditionScore/index.vue

@@ -743,7 +743,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteBodyscore'
@@ -772,7 +772,7 @@ export default {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -802,7 +802,7 @@ export default {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else  {
         MessageBox.confirm(this.$t('message.msg4'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
           var send_data = {
@@ -905,7 +905,7 @@ export default {
     beforeImport(file) {
       const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!')
+        this.$message.error(this.$t('dhedFormula.errMsg'))
       }
       return isLt2M
     },

src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -1309,7 +1309,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.chartDate[0], '{y}-{m}-{d}')

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

@@ -84,9 +84,11 @@
             class="elTable table-fixed"
             :max-height="myHeight2"
           >
-          <template slot="empty">
-                    <span style="color: #969799;">No more data</span>
+          <u-table-column >
+            <template slot="empty">
+                  <span style="color: #969799;">No more data</span>
                 </template>
+             </u-table-column>
             <u-table-column v-if="tab.checked && !tab.isTrainNumber" :key="0" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间" />
             <u-table-column v-if="tab.isTrainNumber" :key="117" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="计划时间1" />
             <u-table-column v-if="tab.isTrainNumber" :key="113" sortable  :label="$t('errorAnalysis.feedName')"  min-width="70px" align="center" prop="templetname" />
@@ -751,10 +753,12 @@
             class="elTable table-fixed"
             :height="myHeightSecond"
           >
-          <template slot="empty">
-                    <span style="color: #969799;">No more data</span>
+          <u-table-column >
+            <template slot="empty">
+                  <span style="color: #969799;">No more data</span>
                 </template>
-            <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
+             </u-table-column>
+            <u-table-column  :key="Math.random()" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
             <u-table-column sortable :label="$t('errorAnalysis.projname')" min-width="50px" align="center" prop="车次" />
@@ -842,10 +846,12 @@
             class="elTable table-fixed"
             :height="myHeightThird"
           >
-          <template slot="empty">
-                    <span style="color: #969799;">No more data</span>
+          <u-table-column >
+            <template slot="empty">
+                  <span style="color: #969799;">No more data</span>
                 </template>
-            <u-table-column sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
+             </u-table-column>
+            <u-table-column  :key="Math.random()" sortable :label="$t('errorAnalysis.date')" min-width="70px" align="center" prop="日期" />
             <u-table-column sortable :label="$t('errorAnalysis.tmrnames')" min-width="70px" align="center" prop="TMR名称" />
             <u-table-column sortable :label="$t('errorAnalysis.czNum')"  min-width="70px" align="center" prop="sort" />
             <u-table-column sortable :label="$t('errorAnalysis.projname')" min-width="45px" align="center" prop="车次" />
@@ -2021,7 +2027,7 @@ export default {
     handleAllDate() {
       console.log('点击了确认时间')
       MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
         var endDate = ''
@@ -2946,10 +2952,10 @@ export default {
         this.getChart4()
         this.getChart5()
         this.getChart6()
-        this.$nextTick(() => {
-          this.$refs.plTable3.doLayout()
-          this.$refs.plTable3.doLayout()
-        })
+        // this.$nextTick(() => {
+        //   this.$refs.plTable3.doLayout()
+        //   this.$refs.plTable3.doLayout()
+        // })
       } else if (this.activeName == 'second') {
         this.$nextTick(()=>{
             this.myHeightSecond = document.documentElement.clientHeight - 40 - this.$refs.myHeightSecond.offsetHeight - 150
@@ -2965,9 +2971,9 @@ export default {
             this.tab2.table.getdataListParm.parammaps.templetname = ''
             this.getTab2List()
             this.getTMRNameList2()
-            this.$nextTick(() => {
-              this.$refs.plTable3.doLayout()
-            })
+            // this.$nextTick(() => {
+            //   this.$refs.plTable3.doLayout()
+            // })
         })
       } else if (this.activeName == 'third') {
         this.$nextTick(()=>{
@@ -2985,9 +2991,9 @@ export default {
           this.tab3.table.getdataListParm.parammaps.buttontype = ''
           this.getTab3List()
           this.getTMRNameList3()
-          this.$nextTick(() => {
-            this.$refs.plTable3.doLayout()
-          })
+          // this.$nextTick(() => {
+          //   this.$refs.plTable3.doLayout()
+          // })
         })
       }
 

src/views/statisticalAnalysis/feedingEfficiency/group/tab1.vue

@@ -731,7 +731,7 @@ export default {
     handleChartDate() {
       console.log('点击了确认时间')
       MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var that = this
         var startTime = parseTime(this.tab.chartDate[0], '{y}-{m}-{d}')

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

@@ -1070,7 +1070,7 @@ export default {
     handleAllDate() {
       console.log('点击了确认时间')
       MessageBox.confirm(this.$t('errorAnalysis.msg1'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         var startDate = ''
         var endDate = ''

src/views/systemManagement/boardEchartManagement/index.vue

@@ -811,7 +811,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDashboard'
         this.requestParam.parammaps = {}
@@ -845,7 +845,7 @@ export default {
         console.log(res)
         if (res.data.list[0].cou > 0) {
           MessageBox.confirm('当前图表已被引用，是否进行删除?', {
-            confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+            confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.requestParam.name = 'deleteChart'
             this.requestParam.parammaps = {}
@@ -879,7 +879,7 @@ export default {
       })
 
       // MessageBox.confirm('当前图表已被引用，是否进行删除?', {
-      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //   this.requestParam.name = 'deleteChart'
       //   this.requestParam.parammaps = {}

src/views/systemManagement/boardEchartManagement2/index.vue

@@ -811,7 +811,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'deleteDashboard'
         this.requestParam.parammaps = {}
@@ -845,7 +845,7 @@ export default {
         console.log(res)
         if (res.data.list[0].cou > 0) {
           MessageBox.confirm('当前图表已被引用，是否进行删除?', {
-            confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+            confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
           }).then(() => {
             this.requestParam.name = 'deleteChart'
             this.requestParam.parammaps = {}
@@ -879,7 +879,7 @@ export default {
       })
 
       // MessageBox.confirm('当前图表已被引用，是否进行删除?', {
-      //   confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      //   confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       // }).then(() => {
       //   this.requestParam.name = 'deleteChart'
       //   this.requestParam.parammaps = {}

src/views/systemManagement/labelManagement/index.vue

@@ -341,7 +341,7 @@ export default {
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteDriver'
@@ -370,7 +370,7 @@ export default {
         this.$message({ type: 'error', message: this.$t('driver.qxzjsyxx'), duration: 2000 })
       } else {
         MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + this.$t('message.msg31'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/systemManagement/notificationManagement/index.vue

@@ -267,7 +267,7 @@ export default {
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })
       } else {
         MessageBox.confirm( this.$t('common.delMsg'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/systemManagement/role/index.vue

@@ -425,7 +425,7 @@ name:this.$t('supplier.no') }], // 是否启用
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         console.log(this.selectList)
         this.selectList = []
@@ -463,7 +463,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: '请选择角色信息', duration: 2000 })
       } else {
         MessageBox.confirm( this.$t('common.delMsg'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }

src/views/systemManagement/user/index.vue

@@ -419,7 +419,7 @@ name:this.$t('supplier.no') }], // 是否启用
     handleRowDelete(row) {
       console.log('点击了行内删除')
       MessageBox.confirm( this.$t('common.delMsg'), {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.selectList = []
         this.requestParam.name = 'deleteUser'
@@ -448,7 +448,7 @@ name:this.$t('supplier.no') }], // 是否启用
         this.$message({ type: 'error', message: '请选择用户信息', duration: 2000 })
       } else {
         MessageBox.confirm( this.$t('common.delMsg'), {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -474,7 +474,7 @@ name:this.$t('supplier.no') }], // 是否启用
     handleResetPassword(row) {
       MessageBox.confirm('是否确认将此用户密码重置为默认密码123456？', {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'initPassword'