Shan9312 10 ماه پیش
والد
کامیت
6151bf7492
60فایلهای تغییر یافته به همراه629 افزوده شده و 438 حذف شده
  1. 3 3
      src/api/common.js
  2. 3 5
      src/i18n.js
  3. 11 5
      src/lang/en/langModule/InventoryManagement.js
  4. 2 2
      src/lang/en/langModule/dhedFormula.js
  5. 2 2
      src/lang/en/langModule/errorAnalysis.js
  6. 11 7
      src/lang/en/langModule/formulationEvaluation.js
  7. 5 5
      src/lang/en/langModule/hardwareTest.js
  8. 4 4
      src/lang/en/langModule/menus.js
  9. 71 0
      src/lang/en/langModule/message.js
  10. 2 2
      src/lang/en/langModule/premixedPlan.js
  11. 14 3
      src/lang/zn/langModule/InventoryManagement.js
  12. 6 0
      src/lang/zn/langModule/formulationEvaluation.js
  13. 6 5
      src/lang/zn/langModule/hardwareTest.js
  14. 76 0
      src/lang/zn/langModule/message.js
  15. 1 1
      src/views/basicData/equipmentTMR/index.vue
  16. 1 1
      src/views/basicData/feedClassification/index.vue
  17. 13 13
      src/views/basicData/feedTable/index.vue
  18. 1 1
      src/views/basicData/forkliftManagement/index.vue
  19. 5 5
      src/views/basicData/groupColumn/index.vue
  20. 3 3
      src/views/basicData/livestockCategory/index.vue
  21. 1 1
      src/views/basicData/managementGPS/index.vue
  22. 8 8
      src/views/basicData/standardParameters/index.vue
  23. 1 1
      src/views/basicData/supplier/index.vue
  24. 1 1
      src/views/changpwd/changpwd/index.vue
  25. 1 1
      src/views/console/apisql/index.vue
  26. 1 1
      src/views/console/role/index.vue
  27. 1 1
      src/views/console/user/index.vue
  28. 24 24
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  29. 1 1
      src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue
  30. 1 1
      src/views/formulationPlan/dailyExecutionPlan/typePage/dhedFormula.vue
  31. 15 15
      src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue
  32. 4 4
      src/views/formulationPlan/dailyExecutionPlan/typePage/premixedPlan.vue
  33. 15 15
      src/views/formulationPlan/dailyExecutionPlan/typePage/surplusMaterialPlan.vue
  34. 8 8
      src/views/formulationPlan/dhedFormula/index.vue
  35. 16 16
      src/views/formulationPlan/materialIssuancePlan/index.vue
  36. 17 17
      src/views/formulationPlan/premixedPlan/index.vue
  37. 5 5
      src/views/formulationPlan/pushMaterialPlan/index.vue
  38. 102 100
      src/views/formulationPlan/recipeTemplate/index.vue
  39. 18 18
      src/views/formulationPlan/surplusMaterialPlan/index.vue
  40. 5 5
      src/views/inventoryManagement/feedContract/index.vue
  41. 3 3
      src/views/inventoryManagement/inventoryList/index.vue
  42. 8 8
      src/views/inventoryManagement/laborConsumption/index.vue
  43. 1 1
      src/views/inventoryManagement/systemConsumption/index.vue
  44. 9 9
      src/views/inventoryManagement/warehousing/index.vue
  45. 13 13
      src/views/shedProduction/dungScores/index.vue
  46. 1 1
      src/views/shedProduction/dutyRecord/index.vue
  47. 10 10
      src/views/shedProduction/fecalScreen/index.vue
  48. 10 10
      src/views/shedProduction/formulaDryMatter/index.vue
  49. 9 9
      src/views/shedProduction/materialRemainingRecord/index.vue
  50. 12 12
      src/views/shedProduction/pennsylvaniaSieve/index.vue
  51. 7 7
      src/views/shedProduction/performance/index.vue
  52. 15 15
      src/views/shedProduction/physicalConditionScore/index.vue
  53. 3 3
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  54. 8 8
      src/views/statisticalAnalysis/formulationEvaluation/index.vue
  55. 3 3
      src/views/statisticalAnalysis/hardwareTest/index.vue
  56. 10 0
      src/views/statisticalAnalysis/inventoryManagement/group/index.vue
  57. 17 11
      src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue
  58. 3 3
      src/views/systemManagement/dataSynchronization/index.vue
  59. 1 1
      src/views/systemManagement/labelManagement/index.vue
  60. 1 1
      src/views/systemManagement/reminderSettings/index.vue

+ 3 - 3
src/api/common.js

@@ -9,7 +9,7 @@ export function checkDates(data) {
   })
 }
 
-
+
 
 export function GetDataByName(data) {
   return request({
@@ -199,14 +199,14 @@ export function Autogeneration(data) {
 export function failproccess(data, notify) {
   if (data.data.includes('Duplicate')) {
     notify({
-      title: '失败',
+      title:this.$t('message.msg37'),
       message: '不可以录入重复数据',
       type: 'error',
       duration: 2000
     })
   } else {
     notify({
-      title: '失败',
+      title:this.$t('message.msg37'),
       message: '数据存在错误,请校验好重新录入,不可以录入数据',
       type: 'error',
       duration: 2000

+ 3 - 5
src/i18n.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import VueI18n from 'vue-i18n'
-import EN from '@/lang/en/index.js'
-import CN from '@/lang/zn/index.js'
+// import EN from '@/lang/en/index.js'
+// import CN from '@/lang/zn/index.js'
 import enLocale from 'element-ui/lib/locale/lang/en'
 import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 import enlogin from './lang/en/index.js'
@@ -11,8 +11,6 @@ import locale from 'element-ui/lib/locale'
 Vue.use(VueI18n)
 
 
-const lang = localStorage.getItem('lang') || navigator.language
-console.log('初始语言类型', lang);
 
 const messages= {
   'en': Object.assign(enlogin, enLocale),
@@ -20,7 +18,7 @@ const messages= {
 }
 
 const i18n = new VueI18n({
-  locale: lang, // set locale
+  locale:  localStorage.getItem('lang') || navigator.language || 'en', // set locale
   messages:messages,
   // fallbackLocale: 'en', // 默认语言设置,当其他语言没有的情况下,使用en作为默认语言
 

+ 11 - 5
src/lang/en/langModule/InventoryManagement.js

@@ -22,11 +22,14 @@ export default{
    tmrsbbh:"TMR Equipment Number",
    lbxs:"List Display",
    qhzs:"Switch Display",
-   tmrbcc:"TMRshif"
-   
-   
-   
+   tmrbcc:"TMRshift",
+   bcf: "Do Not Split",
+cf: "Split",
+ll: "Theory",
+sj: "Actual",
 
+multiHeader:[['Feed Name', 'Beginning of Period', '', 'Usage', '', '', '', 'End of Period', '']],
+multiHeader2 : [['', 'Initial Inventory(kg)', 'Initial Amount (Yuan)', 'Inbound Weight (kg)', 'System Outbound Weight (kg)', 'Manual Material Usage Weight (kg)', 'Waste Weight', 'Final Inventory (kg)', 'Final Amount (Yuan)']]
 
 
 
@@ -48,4 +51,7 @@ export default{
 
 
 
-}
+
+
+
+}

+ 2 - 2
src/lang/en/langModule/dhedFormula.js

@@ -10,9 +10,9 @@ xsts:"count  coefficients",
 bcbl:"Shift Ratio",
 blpf:"Supplement Formula",
 bczl:"Shift Weight",
-pfzl:"Recipe Weight",
+pfzl:"FormulaWeight",
 blzl:"Supplemental Feed Weigh",
-pfgwzzl:"Recipe Dry Matter Weigh",
+pfgwzzl:"FormulaDry Matter Weigh",
 swgwzl:"Feed Dry Matter Intake",
 cygwzl:"Sample Dry Matter Weight",
 rtwl:"daily feeding amount",

+ 2 - 2
src/lang/en/langModule/errorAnalysis.js

@@ -8,7 +8,7 @@ export default{
 
   Driver:'Driver',
   feedName:'Formula Name',
-  isHouseName:"Shelter Name",
+  isHouseName:"Pens Name",
   animelName:"Livestock Category",
   projname:'Number of Times the Vehicle Was Used ',
   isFeed:"Feed",
@@ -48,7 +48,7 @@ hlsdzdtzcs:'Manual blending transition count',
 hlzqs:'Correct number of mixed materials',
 yclczs:'The count of operations for feed that has been spread',
 
-statisticalTypeList: [{ id: '7', name: 'Unclassified' }, { id: '0', name: 'Driver' }, { id: '1', name: 'Formula Name' }, { id: '2', name: 'Shelter Name' }, { id: '3', name: 'Livestock Category' }, { id: '4', name: 'Number of Times the Vehicle Was Used ' }, { id: '5', name: 'TMR Name' }, { id: '6', name: 'Feed' }],
+statisticalTypeList: [{ id: '7', name: 'Unclassified' }, { id: '0', name: 'Driver' }, { id: '1', name: 'Formula Name' }, { id: '2', name: 'Pens Name' }, { id: '3', name: 'Livestock Category' }, { id: '4', name: 'Number of Times the Vehicle Was Used ' }, { id: '5', name: 'TMR Name' }, { id: '6', name: 'Feed' }],
 planName:"Planning Statistics",
  day:"Day",
 month:"Month",

+ 11 - 7
src/lang/en/langModule/formulationEvaluation.js

@@ -1,11 +1,11 @@
 export default{
-  qsrpfmc:"Please enter the recipe name",
+  qsrpfmc:"Please enter the formula name",
   xzls:'Please select the stall',
   pfmbzb:"Formula Template/Indicator",
   nts:"head count",
   tmrl:"TMR Feed",
   csl:"Feed Intake",
-  cnjn:"Milk Energy Yield(MJ)",
+  cnjn:"Milk production net energy ",
 
 
    nnnldw:"Dairy Cow Energy Units(NND)",
@@ -21,14 +21,14 @@ export default{
    ca:'Calcium(%DM)',
    lin:"Phosphorus(%DM)",
    jcb:"Concentrate to Forage Ratio(%)",
-   lszb:"Shelter/Indicator",
+   lszb:"Pens/Indicator",
    nnxq:"Cows Need",
    gwz:"Dry Matter(kg)",
    slzhl:"(4.0)Feed Conversion Efficiency(kg/DM)",
 
 
    rlcb:"Feed Cost(yuan)",
-   gwzcb:"Cost per Dry Matter",
+   gwzcb:"Cost per Dry Matter(yuan/kg)",
    rgjncb:"Cost per Kilogram of Milk per Day(yuan)",
    lssjjl:"History Log Time",
    pfmbb:"Formula Template Table",
@@ -40,7 +40,7 @@ export default{
 cancel:'Cancel',
 search:'Search',
 add:"Add",
-pfsc:"Recipe Upload",
+pfsc:"Formula Upload",
 enter:"Import",
 out:"Export",
 outmb:"Export Template",
@@ -70,7 +70,7 @@ jbys:"mixing delay",
 sfsdntbs:"Lock the Head Count Ratio",
 sort:"Order",
 hide:"Hide",
-fd:'Change Order',
+fd:'Zoom In',
 sx:'Zoom Out',
 jbys:"mixing delay",
 yxyspc:"Allowable Time Delay Tolerance(min)",
@@ -83,7 +83,11 @@ xgyh:"modifying user",
 slmcdw:"Feed Name(kg)",
 slzhl1:"(3.5)Feed Conversion Efficiency(kg/DM)",
 shi:'Yes',
-fou:"No"
+fou:"No",
+tHeader:['Formula Name', 'Formula Code配方编码', 'Livestock Category', 'Formula Type', 'Source', 'Remarks', 'Is Enabled', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Order'],
+tHeader1:[
+  'Formula Name', 'Livestock Category', 'Formula Type', 'Remarks', 'Feed Group', 'Feed Name', 'Weight (kg)', 'Mixing Delay (min)', 'Is the Ratio of Cattle Heads Locked', 'Error Message'
+]
 
 
 

+ 5 - 5
src/lang/en/langModule/hardwareTest.js

@@ -7,8 +7,8 @@ export default{
   kszl:"Starting Weight",
   jszl:"Ending Weight",
   lr:"Entry",
-  xx:"Information"
- 
- 
- 
- }
+  xx:"Information",
+  bt:"Required"
+
+
+ }

+ 4 - 4
src/lang/en/langModule/menus.js

@@ -24,15 +24,15 @@ export default {
     推料计划:'Feed Push Plan',
     配方评估:'Formula Evaluation',
     //
-    栏舍生产:'Shelter Production',
-    栏舍生产性能:'Shelter Production Performance',
+    栏舍生产:'Pens Production',
+    栏舍生产性能:'Pens Production Performance',
     配方干物质:'Formula Dry Matter',
     宾州筛:'Penn State Sieve',
     粪便筛:'Manure Sieve',
     粪便评分:'Manure Scoring',
     体况评分:'Body Condition Scoring',
     值班记录:'Duty Record',
-    栏舍剩料记录:"Shelter Leftover Feed Record",
+    栏舍剩料记录:"Pens Leftover Feed Record",
    //
    库存管理:'Inventory Management',
    入库管理:'Inward Stock Management',
@@ -48,7 +48,7 @@ export default {
    TMR设备:'TMR Equipment',
    其他设备管理:'Other Equipment Management',
    牲畜类别:'Livestock Category',
-   舍组栏:'Shelter Group Pen',
+   舍组栏:'Pens Group Pen',
    饲料分类:'Feed Classification',
    饲料表:'Feed Chart',
    供应商管理:'Supplier Management',

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

@@ -0,0 +1,71 @@
+export default{
+  msg1: "Copy successful",
+msg2: "Copy failed",
+msg3: "Please select a formula",
+msg4: "Are you sure to copy this information?",
+msg5: "Import successful",
+msg6: "Feed order cannot be negative or a decimal",
+msg7: "Feed name/weight/mixing delay/allowable delay deviation cannot be empty",
+msg8: "Please enter a positive number for weight, up to four decimal places",
+msg9: "Special characters are not allowed in the formula name",
+msg10: "Effective successfully",
+msg11: "Failed to take effect",
+msg12: "Please select train information",
+msg13: "Disable failed",
+msg14: "Request failed",
+msg15: "Disable successful",
+msg16: "Formula name/livestock category/formula type cannot be empty",
+msg17: "Livestock category/formula type cannot be empty",
+msg18: "Formula name cannot be empty",
+msg19: "Livestock category cannot be empty",
+msg20: "Formula type cannot be empty",
+msg21: "Special characters are not allowed in the formula code",
+msg22: "The formula code cannot be duplicated, please re-enter",
+msg23: "Please select formula details",
+msg24: "Premix formula cannot be synthesized into premix feed",
+msg25: "Cannot select premix feed",
+msg26: "Please select at least two feeds to synthesize",
+msg27: "The premix formula already exists, cannot be regenerated",
+msg28: "Formula name/livestock category cannot be empty",
+msg29: "Currently selected",
+msg30: "pieces of information, are you sure to disable?",
+msg31: "pieces of information, are you sure to delete?",
+msg32: "Formula record",
+msg33: "Synthesize premix feed",
+msg34: "Historical record",
+msg35: "Feed details",
+msg36: "Formula modification record",
+msg37: "Failed",
+msg38: "Import failed:",
+msg39: "piece!",
+msg40: "Upload failed",
+msg41: "Application cancelled",
+msg42: "Please save or cancel the current change order operation",
+msg43: "Weight/mixing delay/allowable delay deviation cannot be empty",
+msg44: "Feed name cannot be empty",
+msg45: "Weight cannot be empty",
+msg46: "Mixing delay cannot be empty",
+msg47: "Allowable delay deviation cannot be empty",
+msg48: "Allowable delay deviation cannot exceed mixing delay",
+msg49: "Feed name cannot select a premix formula",
+msg50: "Order switch successful",
+msg51: "Order switch failed",
+msg52: "Mixing delay/allowable delay deviation cannot be empty",
+
+msg53: "Formula Modification Record:",
+msg54: "Formula Template Import Template.xlsx",
+msg55: "Formula Template",
+msg56: "Formula Template Import Error Message",
+msg57: "The formula name cannot be duplicated, please re-enter",
+msg58: "Are you sure to apply the data of",
+mesg59: "to the current?",
+msg60: "Are you sure to split the current premix feed?",
+msg61: "Are you sure to upload the formula?",
+msg62: "Pens Details:",
+msg63: "Formula Details",
+msg64: "Weight (KG)",
+msg65: "(3.5) Feed Conversion Efficiency (kg/DM)",
+msg66: "Daily Milk Cost per Kilogram (Yuan)",
+
+
+}

+ 2 - 2
src/lang/en/langModule/premixedPlan.js

@@ -45,7 +45,7 @@ rjl:"Volume Capacity",
 qk:"Empty",
 tlc:"Feed Pushcart",
 status:'Status',
-ls:"Shelter",
+ls:"Pens",
 clbm:"Vehicle Code",
 tljh:"Feed Push Plan",
 
@@ -53,7 +53,7 @@ scc:"Reduce Batches",
 slclfs:"Leftover Material Disposal Method",
 ztls:"Transfer to Pens",
 cci:"batch:",
-lsname:"Shelter Name:",
+lsname:"Pens Name:",
 
 fuzhi:'Copy',
 taici:"Parity",

+ 14 - 3
src/lang/zn/langModule/InventoryManagement.js

@@ -23,10 +23,15 @@ export default{
    lbxs:"列表显示",
    tjlx:"统计类型",
    qhzs:"切换展示",
-   tmrbcc:"TMR班次"
+   tmrbcc:"TMR班次",
 
-   
+   bcf:"不拆分",
+   cf:"拆分",
+   ll:"理论",
+   sj:"实际",
 
+   multiHeader:[['饲料名称', '期初', '', '用量', '', '', '', '期末', '']],
+   multiHeader2 : [['', '期初库存(kg)', '期初金额(元)', '入库重量(kg)', '系统出库重量(kg)', '人工用料重量(kg)', '损耗重量', '期末库存(kg)', '期末金额(元)']]
 
 
 
@@ -48,4 +53,10 @@ export default{
 
 
 
-}
+
+
+
+
+
+
+}

+ 6 - 0
src/lang/zn/langModule/formulationEvaluation.js

@@ -84,6 +84,12 @@ slzhl1:"(3.5)饲料转化效率(kg/DM)",
 shi:'是',
 fou:"否",
 
+tHeader:['配方名称', '配方编码', '牲畜类别', '配方类型', '来源', '备注', '是否启用', '饲料组', '饲料名称', '重量(kg)', '搅拌延时(min)', '是否锁定牛头数比例', '顺序'],
+tHeader1:[
+  '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量(kg)', '搅拌延时(min)', '是否锁定牛头数比例', '错误信息'
+]
+
+
 
 
 

+ 6 - 5
src/lang/zn/langModule/hardwareTest.js

@@ -7,8 +7,9 @@ export default{
   kszl:"开始重量",
   jszl:"结束重量",
   lr:"录入",
-  xx:"信息"
- 
- 
- 
- }
+  xx:"信息",
+  bt:"必填"
+
+
+
+ }

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

@@ -0,0 +1,76 @@
+export default{
+msg1:"复制成功",
+msg2:"复制失败",
+msg3:"请选择配方",
+msg4:"是否确认复制此信息?",
+msg5:"导入成功",
+msg6:"饲料顺序不可为负数或小数",
+msg7:'饲料名称/重量/搅拌延时/允许延时偏差不能为空', 
+msg8:'重量请输入正数,最多保留四位小数',
+msg9:'配方名称不可输入特殊字符',
+msg10:"生效成功",
+msg11:'生效失败',
+msg12:'请选择车次信息',
+msg13:'禁用失败',
+msg14:"请求失败",
+msg15:"禁用成功",
+msg16:'配方名称/牲畜类别/配方类型不能为空',
+msg17:'牲畜类别/配方类型不能为空',
+msg18:'配方名称不能为空',
+msg19:'牲畜类别不能为空',
+msg20:'配方类型不能为空',
+msg21:'配方编码不可输入特殊字符',
+msg22:'配方编码不可重复,请重新录入',
+msg23:"请选择配方详情",
+msg24:'预混配方不可合成预混料',
+msg25:'不可选择预混料',
+msg26:'请选择俩条及以上饲料进行合成',
+msg27:'预混配方已存在,不可重复生成',
+msg28: '配方名称/牲畜类别/不能为空',
+msg29:'当前选中',
+msg30:"条信息,是否禁用?",
+msg31:"条信息,是否删除?",
+msg32:"配方记录",
+msg33:"合成预混料",
+msg34:"历史记录",
+msg35:"饲料详情",
+msg36:"配方修改记录",
+msg37:"失败",
+msg38:'导入失败:',
+msg39:"条!",
+msg40:"上传失败",
+msg41:"已取消应用",
+msg42:"请保存或取消当前更改顺序操作",
+msg43:"重量/搅拌延时/允许延时偏差不能为空",
+msg44:"饲料名称不能为空",
+msg45:"重量不能为空",
+msg46:"搅拌延时不能为空",
+msg47:"允许延时偏差不能为空",
+msg48:"允许延时偏差不可超出搅拌延时",
+msg49:"饲料名称不能选择预混配方",
+msg50:"顺序切换成功",
+msg51:"顺序切换失败",
+msg52:"搅拌延时/允许延时偏差不能为空",
+
+//
+msg53:"配方修改记录:",
+msg54:"配方模板导入模板.xlsx",
+msg55:"配方模板",
+msg56:"配方模板导入报错信息",
+msg57:"配方名称不可重复,请重新录入",
+msg58:"是否确认将",
+mesg59:"的数据应用到当前?",
+msg60:"是否确认拆分当前预混料",
+msg61:"是否上传配方?",
+msg62:"栏舍详情:",
+msg63:"配方详情",
+msg64:"重量(KG)",
+msg65:"(3.5)饲料转化效率(kg/DM)",
+msg66:"日公斤奶成本(元)",
+
+
+
+
+
+
+}

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

@@ -633,7 +633,7 @@ name:this.$t('supplier.no') }], // 是否启用
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择TMR设备信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

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

@@ -395,7 +395,7 @@ name:this.$t('supplier.no') }],
       if (this.selectList.length == 0) {
         this.$message({ type: 'error',message: this.$t('feedChart.slflxx'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

+ 13 - 13
src/views/basicData/feedTable/index.vue

@@ -884,10 +884,10 @@ name:this.$t('supplier.yes')}], // 无上域
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), fname: '', fclassid: '', fclass: '', feedcode: '', source: '用户自定义', printgroupid: '1', printgroup: '无', unitweight: '', uprice: '', allowratio: '', autozone: '', autosecond: '0', autosecondname: '禁用', confirmstart: '0', confirmstartname: '禁用', enable: '1', trgaddress: '', backup1: '', backup2: '', backup3: '',feedgroupid:'',sapMaterialtype:'',sapGoods:'',sapCode:''},
         rules: {
-          printgroupid :[{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          printgroupid :[{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          fname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          fclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          feedcode: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
 
@@ -973,8 +973,8 @@ name:this.$t('supplier.yes')}], // 无上域
           sapMaterialtype:'',
         },
         rules: {
-          inputDatetime :[{required: true, message: '必填', trigger: 'blur' }],
-          sapMaterialtype: [{ required: true, message: '必填', trigger: 'blur' }],
+          inputDatetime :[{required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          sapMaterialtype: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
         }
       },
 
@@ -1063,9 +1063,9 @@ name:this.$t('supplier.yes')}], // 无上域
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -1081,7 +1081,7 @@ name:this.$t('supplier.yes')}], // 无上域
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {
@@ -1824,7 +1824,7 @@ name:this.$t('supplier.yes')}], // 无上域
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择饲料表信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           this.requestParam = {}
@@ -1881,9 +1881,9 @@ name:this.$t('supplier.yes')}], // 无上域
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.getList()
           this.isOrder = true
         }
@@ -2015,7 +2015,7 @@ name:this.$t('supplier.yes')}], // 无上域
             this.ispalyUd = true
           }
         } else {
-          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg14'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },

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

@@ -445,7 +445,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择设备信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

+ 5 - 5
src/views/basicData/groupColumn/index.vue

@@ -238,7 +238,7 @@ name:this.$t('supplier.no') }],
           sapMaterialtype:'',
         },
         rules: {
-          inputDatetime :[{required: true, message: '必填', trigger: 'blur' }]
+          inputDatetime :[{required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
       textMap: {
@@ -623,7 +623,7 @@ name:this.$t('supplier.no') }],
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择舍组栏信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -682,9 +682,9 @@ name:this.$t('supplier.no') }],
         console.log('顺序切换保存发送参数', this.requestParam)
         this.table.listLoading = false
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.getList()
           this.isOrder = true
         }
@@ -762,7 +762,7 @@ name:this.$t('supplier.no') }],
             this.ispalyUd = true
           }
         } else {
-          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg14'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },

+ 3 - 3
src/views/basicData/livestockCategory/index.vue

@@ -241,7 +241,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error', message: '牲畜父类不能为空', duration: 2000 })
         return false
       } else if (this.table.temp.classname == '') {
-        this.$message({ type: 'error', message: '牲畜类别不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg19'), duration: 2000 })
         return false
       } else if (this.table.temp.classcode == '') {
         this.$message({ type: 'error', message: '牲畜类别编号不能为空', duration: 2000 })
@@ -330,7 +330,7 @@ name:this.$t('supplier.no') }],
         this.$message({ type: 'error', message: '牲畜父类不能为空', duration: 2000 })
         return false
       } else if (this.table.temp.classname == '') {
-        this.$message({ type: 'error', message: '牲畜类别不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg19'), duration: 2000 })
         return false
       } else if (this.table.temp.classcode == '') {
         this.$message({ type: 'error', message: '牲畜类别编号不能为空', duration: 2000 })
@@ -412,7 +412,7 @@ name:this.$t('supplier.no') }],
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择牲畜类别信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

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

@@ -385,7 +385,7 @@ name:this.$t('supplier.no') }],
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

+ 8 - 8
src/views/basicData/standardParameters/index.vue

@@ -442,8 +442,8 @@ export default {
         dialogStatus: '',
         temp: {},
         rules: {
-          bodystandard: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          dungstandard: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          bodystandard: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          dungstandard: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
       table2: {
@@ -900,9 +900,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -916,7 +916,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {
@@ -940,9 +940,9 @@ export default {
     handleImportSuccess2(res, file) {
       this.getList2()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg38'), 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 = [
@@ -956,7 +956,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson2(filterVal, jsonData) {

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

@@ -390,7 +390,7 @@ name:this.$t('supplier.no') }], // 是否启用
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择供应商信息', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           this.requestParam = {}

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

@@ -123,7 +123,7 @@ export default {
       //     PostDataByName(this.resetForm).then(response => {
       //       if (response.msg === 'fail') {
       //         this.$notify({
-      //           title: '失败',
+      //           title:this.$t('message.msg37'),
       //           message: '修改失败',
       //           type: 'danger',
       //           duration: 2000

+ 1 - 1
src/views/console/apisql/index.vue

@@ -579,7 +579,7 @@ export default {
         this.dialogFormVisible = false
         this.$notify({
           title: this.$t('common.succes'),
-          message: '复制成功',
+          message: this.$t('message.msg1'),
           type: 'success',
           duration: 2000
         })

+ 1 - 1
src/views/console/role/index.vue

@@ -185,7 +185,7 @@ export default {
       rules: {
         name: [{ type: 'string', required: true, message: '名称必填', trigger: 'change' }],
         sort: [{ validator: isIntegerZero, trigger: 'blur' }],
-        datarole: [{ required: true, message: '必填', trigger: 'blur' }]
+        datarole: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
       },
       dialogFormVisible: false,
       dialogMenuVisible: false,

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

@@ -314,7 +314,7 @@ export default {
                   })
                 } else {
                   this.$notify({
-                    title: '失败',
+                    title:this.$t('message.msg37'),
                     message: response.data,
                     type: 'warning',
                     duration: 2000

+ 24 - 24
src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -1026,8 +1026,8 @@ export default {
           tips:''
         },
         rules: {
-          inputDatetime: [{ type: 'array', required: true, message: '必填', trigger: 'blur' }],
-          copyInputDatetime: [{ type: 'array', required: true, message: '必填', trigger: 'blur' }]
+          inputDatetime: [{ type: 'array', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          copyInputDatetime: [{ type: 'array', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
       pickerMinDate: '',
@@ -1120,7 +1120,7 @@ export default {
       },
       textMap: {
         newGeneration: '新生成',
-        historyRecord: '历史记录',
+        historyRecord: this.$t('message.msg34'),
         revisePlan: '修改计划',
         copy: '复制计划',
         deleteRecord:'删除记录',
@@ -1188,7 +1188,7 @@ export default {
           date: parseTime(new Date(), '{y}-{m}-{d}')
         },
         rules: {
-          date: [{ required: true, message: '必填', trigger: 'blur' }],
+          date: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
         },
         getdataListParm: {
           name: 'getSysoptEnable',
@@ -1307,7 +1307,7 @@ export default {
         }
         SyncSCJH(send_data).then(response => {
            if (response.msg === 'fail') {
-              this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('message.msg40'), message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: this.$t('common.succes'), message: '上传成功', type: 'success', duration: 2000 })
 
@@ -1592,7 +1592,7 @@ export default {
       console.log(row, column, event)
       console.log('点击计划类型', row.lpplantype)
       if (this.isOrder == false) {
-        this.$message({ type: 'error', message: '请保存或取消当前更改顺序操作', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg42'), duration: 2000 })
       } else {
         if (column.label !== '操作') {
           this.isDetail = true // 点击行显示详情
@@ -2452,9 +2452,9 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.getList()
           this.isOrder = true
         }
@@ -2526,7 +2526,7 @@ export default {
         }
         postJson(url, data).then(response => {
           if (response.msg === 'fail') {
-            this.$notify({ title: '失败', message: response.data, type: 'error', duration: 2000 })
+            this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'error', duration: 2000 })
           } else {
             this.$notify({ title: this.$t('common.succes'), message: '成功', type: 'success', duration: 2000 })
             this.getList()
@@ -2616,9 +2616,9 @@ export default {
     },
     handleTakeEffect() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
           confirmButtonText: this.$t('common.confirm'),
           confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
@@ -2651,9 +2651,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('生效保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg11'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: this.$t('common.succes'), message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message:this.$t('message.msg10'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -2662,9 +2662,9 @@ export default {
     },
     handleDisable() {
       if (this.selectList.length == 0) {
-        this.$message({type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+        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'
@@ -2697,9 +2697,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('禁用保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg13'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: this.$t('common.succes'), message: '禁用成功', type: 'success', duration: 2000 })
+              this.$notify({ title: this.$t('common.succes'), message:this.$t('message.msg15'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -2805,7 +2805,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择计划', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -2851,7 +2851,7 @@ export default {
         if(response.msg == 'ok'){
           this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
         }else{
-          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg40'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -2892,7 +2892,7 @@ export default {
           this.getList2()
           this.getList3()
         }else{
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -2942,7 +2942,7 @@ export default {
           this.getList2()
           this.getList3()
         }else{
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -2969,7 +2969,7 @@ export default {
           this.$notify({ title: '', message: '修改成功', type: 'success', duration: 2000 })
           this.getList()
         }else{
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
@@ -3004,7 +3004,7 @@ export default {
               this.sapUpload.dialogFormVisible = false
               this.getList()
             }else{
-              this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
             }
           })
         }
@@ -3024,7 +3024,7 @@ export default {
             this.ispalyUd = true
           }
         } else {
-          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg14'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },

+ 1 - 1
src/views/formulationPlan/dailyExecutionPlan/revisePlan.vue

@@ -131,7 +131,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消应用' })
+        this.$message({ type: 'info', message: this.$t('message.msg41') })
       })
     },
     handleClick(item) {

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

@@ -120,7 +120,7 @@ export default {
       feedingFormulaList: [], // 补料配方
       livestockTypeList: [], // 类别
       rules: {
-        cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        cowclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
       },
       table: {
         getdataListParm: {

+ 15 - 15
src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan.vue

@@ -584,19 +584,19 @@ export default {
           tmrid2: [{
             type: 'string',
             required: true,
-            message: '必填',
+            message: this.$t('hardwareTest.bt'),
             trigger: 'blur'
           }],
           times: [{
             type: 'number',
             required: true,
-            message: '必填',
+            message: this.$t('hardwareTest.bt'),
             trigger: 'blur'
           }],
           ftid: [{
             type: 'string',
             required: true,
-            message: '必填',
+            message: this.$t('hardwareTest.bt'),
             trigger: 'blur'
           }]
         },
@@ -922,7 +922,7 @@ export default {
       }
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
           this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
@@ -964,7 +964,7 @@ export default {
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
           this.$notify({
-            title: '失败',
+            title:this.$t('message.msg37'),
             message: response.data,
             type: 'warning',
             duration: 2000
@@ -1731,7 +1731,7 @@ export default {
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
           this.$notify({
-            title: '顺序切换失败',
+            title: this.$t('message.msg51'),
             message: response.data,
             type: 'warning',
             duration: 2000
@@ -1739,7 +1739,7 @@ export default {
         } else {
           this.$notify({
             title: '',
-            message: '顺序切换成功',
+            message: this.$t('message.msg50'),
             type: 'success',
             duration: 2000
           })
@@ -1759,11 +1759,11 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',
-          message: '请选择车次信息',
+         message:this.$t('message.msg12'),
           duration: 2000
         })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
           confirmButtonText: this.$t('common.confirm'),
           confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
@@ -1796,9 +1796,9 @@ export default {
           const url = 'authdata/ExecDataByConfig'
           postJson(url, data).then(response => {
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg11'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg10'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
@@ -1810,11 +1810,11 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',
-          message: '请选择车次信息',
+         message:this.$t('message.msg12'),
           duration: 2000
         })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+        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'
@@ -1849,7 +1849,7 @@ export default {
             console.log('禁用保存发送参数', data)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '禁用失败',
+                title:this.$t('message.msg13'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1857,7 +1857,7 @@ export default {
             } else {
               this.$notify({
                 title: '禁用成功',
-                message: '禁用成功',
+                message:this.$t('message.msg15'),
                 type: 'success',
                 duration: 2000
               })

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

@@ -347,7 +347,7 @@ export default {
         this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
         return false
       } else if (row.ftid == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        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 })
@@ -459,7 +459,7 @@ export default {
         this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
         return false
       } else if (row.ftid == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        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 })
@@ -553,9 +553,9 @@ export default {
     // 减少车次
     form_delete() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

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

@@ -358,9 +358,9 @@ export default {
           sort: ''
         },
         rules: {
-          // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          // fname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          // fclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          // feedcode: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
       check: {
@@ -598,7 +598,7 @@ export default {
         console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
           this.$notify({
-            title: '顺序切换失败',
+            title: this.$t('message.msg51'),
             message: response.data,
             type: 'warning',
             duration: 2000
@@ -606,7 +606,7 @@ export default {
         } else {
           this.$notify({
             title: '',
-            message: '顺序切换成功',
+            message: this.$t('message.msg50'),
             type: 'success',
             duration: 2000
           })
@@ -1366,11 +1366,11 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',
-          message: '请选择车次信息',
+         message:this.$t('message.msg12'),
           duration: 2000
         })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
@@ -1441,11 +1441,11 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',
-          message: '请选择车次信息',
+         message:this.$t('message.msg12'),
           duration: 2000
         })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
           confirmButtonText: this.$t('common.confirm'),
           confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
@@ -1480,7 +1480,7 @@ export default {
             console.log('生效保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '生效失败',
+                title:this.$t('message.msg11'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1488,7 +1488,7 @@ export default {
             } else {
               this.$notify({
                 title: '',
-                message: '生效成功',
+                message:this.$t('message.msg10'),
                 type: 'success',
                 duration: 2000
               })
@@ -1502,11 +1502,11 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({
           type: 'error',
-          message: '请选择车次信息',
+         message:this.$t('message.msg12'),
           duration: 2000
         })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+        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'
@@ -1541,7 +1541,7 @@ export default {
             console.log('禁用保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
               this.$notify({
-                title: '禁用失败',
+                title:this.$t('message.msg13'),
                 message: response.data,
                 type: 'warning',
                 duration: 2000
@@ -1549,7 +1549,7 @@ export default {
             } else {
               this.$notify({
                 title: '',
-                message: '禁用成功',
+                message:this.$t('message.msg15'),
                 type: 'success',
                 duration: 2000
               })

+ 8 - 8
src/views/formulationPlan/dhedFormula/index.vue

@@ -846,7 +846,7 @@ export default {
       livestockTypeList: [], // 类别
       barList: [],
       rules: {
-        cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        cowclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
       },
       table: {
         getdataListParm: {
@@ -1081,7 +1081,7 @@ export default {
       },
       textMap: {
         Nutritional: '营养评估',
-        history: '历史记录'
+        history: this.$t('message.msg34')
       },
 
       requestParam: {},
@@ -2874,7 +2874,7 @@ export default {
             this.nutritional.tab1.list = []
           }
         } else {
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         }
 
         setTimeout(() => {
@@ -3127,7 +3127,7 @@ export default {
     // 应用
     handleApplication() {
       console.log('点击了应用')
-      MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
+      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'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
@@ -3144,7 +3144,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消应用' })
+        this.$message({ type: 'info', message: this.$t('message.msg41') })
       })
     },
     // 导出
@@ -3305,9 +3305,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -3321,7 +3321,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -547,7 +547,7 @@ export default {
       },
       textMap: {
         automaticGeneration: '提示',
-        historyRecord: '历史记录',
+        historyRecord: this.$t('message.msg34'),
         create: '新增',
         update: '编辑',
         check: '提示',
@@ -571,9 +571,9 @@ export default {
         dialogStatus: '',
         temp: { sel: 1, tmrid: '', tmrid2: '', maxweight: '', issplit: 1, begintime: '', sumweight: 0, display: '', times: 1, ftid: '', ftname: '', tmrname: '', maxweight: '' },
         rules: {
-          tmrid2: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'number', required: true, message: '必填', trigger: 'blur' }],
-          ftid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          tmrid2: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'number', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          ftid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         listLoadingTimes: false,
         list1: [],
@@ -955,7 +955,7 @@ export default {
       }
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
           this.create.temp.maxweight = this.TMRNumberList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
@@ -996,7 +996,7 @@ export default {
       })
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
         } else {
           this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
           this.getCreateList1()
@@ -1658,9 +1658,9 @@ export default {
       const data = sortArr
       postJson(url, data).then(response => {
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.table.getdataListParm.parammaps.refresh = 1
           this.getList()
           this.isOrder = true
@@ -1675,9 +1675,9 @@ export default {
     },
     handleTakeEffect() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
           confirmButtonText: this.$t('common.confirm'),
           confirmButtonText: this.$t('common.cancel'),
           type: 'warning'
@@ -1696,9 +1696,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('生效保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg11'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg10'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }
@@ -1708,9 +1708,9 @@ export default {
     },
     handleDisable() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+        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'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -1729,9 +1729,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('禁用保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg13'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '禁用成功', message: '禁用成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '禁用成功', message:this.$t('message.msg15'), type: 'success', duration: 2000 })
               this.table.getdataListParm.parammaps.refresh = 1
               this.getList()
             }

+ 17 - 17
src/views/formulationPlan/premixedPlan/index.vue

@@ -291,7 +291,7 @@ export default {
         }
       },
       textMap: {
-        history: '历史记录'
+        history: this.$t('message.msg34')
       },
       selectList: [],
       isokDisable: false,
@@ -436,9 +436,9 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.getList()
           this.isOrder = true
         }
@@ -514,7 +514,7 @@ export default {
         this.$message({ type: 'error', message: '车次不能为空且大于0', duration: 2000 })
         return false
       } else if (row.ftid == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        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 })
@@ -632,7 +632,7 @@ export default {
         this.$message({ type: 'error', message: '班次/混料重量不能为空', duration: 2000 })
         return false
       } else if (row.ftid == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        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 })
@@ -724,7 +724,7 @@ export default {
     // 应用
     handleApplication() {
       console.log('点击了应用')
-      MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
+      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'
       }).then(() => {
         this.requestParam.name = 'applyFPdate'
@@ -741,7 +741,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消应用' })
+        this.$message({ type: 'info', message: this.$t('message.msg41') })
       })
     },
     getHistoryList() {
@@ -789,9 +789,9 @@ export default {
     // 减少车次
     form_delete() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -817,9 +817,9 @@ export default {
     },
     handleTakeEffect() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -839,9 +839,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('生效保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg11'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg10'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -850,9 +850,9 @@ export default {
     },
     handleDisable() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+        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'
         }).then(() => {
           for (let i = 0; i < this.selectList.length; i++) {
@@ -872,9 +872,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('禁用保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg13'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '禁用成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg15'), type: 'success', duration: 2000 })
               this.getList()
             }
           })

+ 5 - 5
src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -143,11 +143,11 @@ export default {
         dialogStatus: '',
         temp: { pastureId: Cookies.get('pastureid'), tmrId: '',date: '',remark: '',barId: '',enable: ''},
         rules: {
-          tmrId: [{ required: true, message: '必填', trigger: 'blur' }],
-          date: [{ required: true, message: '必填', trigger: 'blur' }],
-          remark: [{ required: true, message: '必填', trigger: 'blur' }],
-          barId: [{ required: true, message: '必填', trigger: 'blur' }],
-          enable: [{ required: true, message: '必填', trigger: 'blur' }]
+          tmrId: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          date: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          remark: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          barId: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          enable: [{ required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
       dialogFull: false,

+ 102 - 100
src/views/formulationPlan/recipeTemplate/index.vue

@@ -447,7 +447,7 @@
             <p>{{$t('formulationEvaluation.pfmbb')}}</p>
           </div>
           <div class="operation1">
-            <el-date-picker v-model="template.table.getdataListParm.parammaps.date" type="date" :placeholder="$t('formulationEvaluation.lssjjl')":clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate" />
+            <el-date-picker v-model="template.table.getdataListParm.parammaps.date" type="date" :placeholder="$t('formulationEvaluation.lssjjl')" :clearable="false" style="width: 180px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeDate" />
             <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
           </div>
 
@@ -1062,11 +1062,11 @@ export default {
       selectList: [],
       selectList2: [],
       textMap: {
-        RecipeRecord: '配方记录',
-        SyntheticPremix: '合成预混料',
-        historyRecord: '历史记录',
-        detail: '饲料详情',
-        rowRecipeRecordTxt: '配方修改记录'
+        RecipeRecord: this.$t('message.msg32'),
+        SyntheticPremix: this.$t('message.msg33'),
+        historyRecord: this.$t('message.msg34'),
+        detail: this.$t('message.msg35'),
+        rowRecipeRecordTxt: this.$t('message.msg36')
       },
 
       requestParam: {},
@@ -1403,28 +1403,28 @@ export default {
       this.table.temp.volume = parseFloat(row.volume)
       this.table.temp.pastureid = Cookies.get('pastureid')
       if (this.table.temp.tname == '' && this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '配方名称/牲畜类别/配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg16'), duration: 2000 })
         return false
       } else if (this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '牲畜类别/配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg17'), duration: 2000 })
         return false
       } else if (this.table.temp.tname == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (this.table.temp.ccid == '') {
-        this.$message({ type: 'error', message: '牲畜类别不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg19'), duration: 2000 })
         return false
       } else if (this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg20'), duration: 2000 })
         return false
       }
       const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
       // if (pattern.test(this.table.temp.tname)) {
-      //   this.$message({ type: 'error', message: '配方名称不可输入特殊字符', duration: 2000 })
+      //   this.$message({ type: 'error', message:this.$t('message.msg9'), duration: 2000 })
       //   return false
       // }
       if (pattern.test(this.table.temp.tcode)) {
-        this.$message({ type: 'error', message: '配方编码不可输入特殊字符', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg21'), duration: 2000 })
         return false
       }
       console.log(this.table.temp)
@@ -1440,7 +1440,7 @@ export default {
         if (response.data.list[0].vmsg !== '输入非法字符') {
           this.saveCreateData()
         } else {
-          this.$notify({ type: 'error', message: '配方编码不可输入特殊字符', duration: 2000 })
+          this.$notify({ type: 'error',message:this.$t('message.msg21'), duration: 2000 })
         }
       })
     },
@@ -1466,7 +1466,7 @@ export default {
         } else {
           const isRepeat = new RegExp('Duplicate entry :feedtemplet.tCode')
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
+            this.$notify({ type: 'error',message:this.$t('message.msg22'), duration: 2000 })
           } else {
             this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
@@ -1532,28 +1532,28 @@ export default {
       }
       this.table.temp.volume = parseFloat(row.volume)
       if (this.table.temp.tname == '' && this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '配方名称/牲畜类别/配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg16'), duration: 2000 })
         return false
       } else if (this.table.temp.ccid == '' && this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '牲畜类别/配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg17'), duration: 2000 })
         return false
       } else if (this.table.temp.tname == '') {
-        this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
         return false
       } else if (this.table.temp.ccid == '') {
-        this.$message({ type: 'error', message: '牲畜类别不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg19'), duration: 2000 })
         return false
       } else if (this.table.temp.fttypeid == '') {
-        this.$message({ type: 'error', message: '配方类型不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg20'), duration: 2000 })
         return false
       }
       const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
       // if (pattern.test(this.table.temp.tname)) {
-      //   this.$message({ type: 'error', message: '配方名称不可输入特殊字符', duration: 2000 })
+      //   this.$message({ type: 'error', message:this.$t('message.msg9'), duration: 2000 })
       //   return false
       // }
       if (pattern.test(this.table.temp.tcode)) {
-        this.$message({ type: 'error', message: '配方编码不可输入特殊字符', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg21'), duration: 2000 })
         return false
       }
       console.log(this.table.temp)
@@ -1570,7 +1570,7 @@ export default {
         if (response.data.list[0].vmsg !== '输入非法字符') {
           this.saveUpdateData()
         } else {
-          this.$notify({ type: 'error', message: '配方编码不可输入特殊字符', duration: 2000 })
+          this.$notify({ type: 'error',message:this.$t('message.msg21'), duration: 2000 })
         }
       })
     },
@@ -1603,7 +1603,7 @@ export default {
             } else {
               const isRepeat = new RegExp('Duplicate entry :feedtemplet.tCode')
               if (isRepeat.test(response.data)) {
-                this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
+                this.$notify({ type: 'error',message:this.$t('message.msg22'), duration: 2000 })
               } else {
                 this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
               }
@@ -1612,7 +1612,7 @@ export default {
         } else {
           const isRepeat = new RegExp('Duplicate entry :feedtemplet.tCode')
           if (isRepeat.test(response.data)) {
-            this.$notify({ type: 'error', message: '配方编码不可重复,请重新录入', duration: 2000 })
+            this.$notify({ type: 'error',message:this.$t('message.msg22'), duration: 2000 })
           } else {
             this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
           }
@@ -1635,7 +1635,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(() => {
         const url = 'authdata/feedtemplet/del'
         const data = {
@@ -1662,10 +1662,10 @@ export default {
     form_delete() {
       console.log('点击了删除')
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择配方', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg3'), 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' }
@@ -1696,10 +1696,10 @@ export default {
     // 复制
     handleCopy() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择配方', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg3'), duration: 2000 })
       } else {
-        MessageBox.confirm('是否确认复制此信息?', {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        MessageBox.confirm(this.$t('message.msg4'), {
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           console.log(this.selectList)
           this.requestParam.common = { 'returnmap': '0' }
@@ -1713,9 +1713,9 @@ export default {
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('复制保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '复制失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title: this.$t('message.msg1'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '复制成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message: this.$t('message.msg2'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -1891,7 +1891,7 @@ export default {
           const aLink = document.createElement('a')
           aLink.style.display = 'none'
           aLink.href = url
-          const docname = '配方模板导入模板.xlsx'
+          const docname = this.$t('message.msg54')
           aLink.setAttribute('download', docname) // 下载的文件
           document.body.appendChild(aLink)
           aLink.click()
@@ -1920,15 +1920,19 @@ export default {
           } else {
             this.download.list = []
           }
+          const table = this.$refs.table1;
+          const columns = table.columns;
+          const labels = columns.map(column => column.label);
+           console.log(table,labels);
           var excelDatas = [
             {
-              tHeader: ['配方名称', '配方编码', '牲畜类别', '配方类型', '来源', '备注', '是否启用', '饲料组', '饲料名称', '重量(kg)', '搅拌延时(min)', '是否锁定牛头数比例', '顺序'],
+              tHeader:this.$t('formulationEvaluation.tHeader') ,
               filterVal: ['tname', 'tcode', 'ccname', 'fttype', 'source', 'remark', 'enable', 'feedgroup', 'fname', 'fweight', 'autosecond', 'islockcount', 'sort'],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'
             }
           ]
-          json2excel(excelDatas, '配方模板', true, 'xlsx')
+          json2excel(excelDatas, this.$t('message.msg55'), true, 'xlsx')
         })
       }
     },
@@ -1943,28 +1947,26 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
-               '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量(kg)', '搅拌延时(min)', '是否锁定牛头数比例', '错误信息'
-             ]
+             const tHeader = this.$t('formulationEvaluation.tHeader1') 
              const filterVal = [
                '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量(kg)', '搅拌延时(min)', '是否锁定牛头数比例', '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('meaagae.msg56'), autoWidth: true, bookType: 'xlsx' })
            })
         }
       } else {
         const isRepeat = new RegExp('Duplicate entry :feedtemplet_tname')
         if (isRepeat.test(res.data)) {
-          this.$notify({ type: 'error', message: '配方名称不可重复,请重新录入', duration: 2000 })
+          this.$notify({ type: 'error', message:this.$t('message.msg57'), duration: 2000 })
           return false
         }
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {
@@ -1984,8 +1986,8 @@ export default {
     // 应用
     handleApplication() {
       console.log('点击了应用')
-      MessageBox.confirm('是否确认将' + this.template.table.getdataListParm.parammaps.date + '的数据应用到当前?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      MessageBox.confirm(this.$t('message.msg58') + this.template.table.getdataListParm.parammaps.date + this.$t('message.msg59'), {
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         this.requestParam.name = 'applyFTdate'
         this.requestParam.parammaps = {}
@@ -2001,7 +2003,7 @@ export default {
           }
         })
       }).catch(() => {
-        this.$message({ type: 'info', message: '已取消应用' })
+        this.$message({ type: 'info', message: this.$t('message.msg41') })
       })
     },
     // 模板行点击
@@ -2012,7 +2014,7 @@ export default {
         }
       }
       if (this.isOrder == false) {
-        this.$message({ type: 'error', message: '请保存或取消当前更改顺序操作', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg42'), duration: 2000 })
       } else {
         if (column.label !== '操作') {
           this.isDetail = true // 点击行显示详情
@@ -2171,9 +2173,9 @@ export default {
       ExecDataByConfig(this.requestParam).then(response => {
         console.log('顺序切换保存发送参数', this.requestParam)
         if (response.msg === 'fail') {
-          this.$notify({ title: '顺序切换失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg51'), message: response.data, type: 'warning', duration: 2000 })
         } else {
-          this.$notify({ title: '', message: '顺序切换成功', type: 'success', duration: 2000 })
+          this.$notify({ title: '', message: this.$t('message.msg50'), type: 'success', duration: 2000 })
           this.getList2()
           this.getList3()
           this.isOrder = true
@@ -2350,29 +2352,29 @@ export default {
       this.table2.temp.deviation = row.deviation
       this.table2.temp.shutdown = row.shutdown
       if (this.table2.temp.fid === '' && this.table2.temp.fweight === '' && this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-        this.$message({ type: 'error', message: '饲料名称/重量/搅拌延时/允许延时偏差不能为空', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg7'), duration: 2000 })
         return false
       } else if (this.table2.temp.fweight === '' && this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-        this.$message({ type: 'error', message: '重量/搅拌延时/允许延时偏差不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg43'), duration: 2000 })
         return false
       } else if (this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-        this.$message({ type: 'error', message: '搅拌延时/允许延时偏差不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg52'), duration: 2000 })
         return false
       }else if (this.table2.temp.fid === '') {
-        this.$message({ type: 'error', message: '饲料名称不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg44'), duration: 2000 })
         return false
       }else if (this.table2.temp.fweight === '') {
-        this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg45'), duration: 2000 })
         return false
       }else if (this.table2.temp.autosecond === '') {
-        this.$message({ type: 'error', message: '搅拌延时不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg46'), duration: 2000 })
         return false
       } else if (this.table2.temp.deviation === '') {
-        this.$message({ type: 'error', message: '允许延时偏差不能为空', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg47'), duration: 2000 })
         return false
       }
       if(parseFloat(this.table2.temp.deviation) > parseFloat(this.table2.temp.autosecond)){
-        this.$message({ type: 'error', message: '允许延时偏差不可超出搅拌延时', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg48'), duration: 2000 })
         return false
       }
       if (this.table2.temp.sort !== '') {
@@ -2391,14 +2393,14 @@ export default {
       }
       if (this.table2.getdataListParm.parammaps.fttypeid == 2) {
         if (parseInt(this.table2.temp.preftid) > 0) {
-          this.$message({ type: 'error', message: '饲料名称不能选择预混配方', duration: 2000 })
+          this.$message({ type: 'error', message:this.$t('message.msg49'), duration: 2000 })
           return false
         }
       }
       // 校验顺序是否>=0
       var ruleSort = /^\d+$/
       if (!ruleSort.test(this.table2.temp.sort)) {
-        this.$message({ type: 'error', message: '饲料顺序不可为负数或小数', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg6'), duration: 2000 })
         return false
       }
       // 检验重量>0
@@ -2409,7 +2411,7 @@ export default {
 
 
       if (this.table2.temp.fweight == 0) {
-        this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg8'), duration: 2000 })
         return false
       }
       this.isokDisable = true
@@ -2583,30 +2585,30 @@ export default {
           //   status = 1
           // }
           if (this.table2.temp.fid === '' && this.table2.temp.fweight === '' && this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-            this.$message({ type: 'error', message: '饲料名称/重量/搅拌延时/允许延时偏差不能为空', duration: 2000 })
+            this.$message({ type: 'error',message:this.$t('message.msg7'), duration: 2000 })
             return false
           } else if (this.table2.temp.fweight === '' && this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-            this.$message({ type: 'error', message: '重量/搅拌延时/允许延时偏差不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg43'), duration: 2000 })
             return false
           } else if (this.table2.temp.autosecond === '' && this.table2.temp.deviation === '') {
-            this.$message({ type: 'error', message: '搅拌延时/允许延时偏差不能为空1=', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg52'), duration: 2000 })
             return false
           }else if (this.table2.temp.fid === '') {
-            this.$message({ type: 'error', message: '饲料名称不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg44'), duration: 2000 })
             return false
           }else if (this.table2.temp.fweight === '') {
-            this.$message({ type: 'error', message: '重量不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg45'), duration: 2000 })
             return false
           }
            else if (this.table2.temp.autosecond === '') {
-            this.$message({ type: 'error', message: '搅拌延时不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg46'), duration: 2000 })
             return false
           } else if (this.table2.temp.deviation === '') {
-            this.$message({ type: 'error', message: '允许延时偏差不能为空', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg47'), duration: 2000 })
             return false
           }
           if(parseFloat(this.table2.temp.deviation) > parseFloat(this.table2.temp.autosecond)){
-            this.$message({ type: 'error', message: '允许延时偏差不可超出搅拌延时', duration: 2000 })
+            this.$message({ type: 'error', message: this.$t('message.msg48'), duration: 2000 })
             return false
           }
           if (this.table2.temp.shutdown == '') {
@@ -2619,14 +2621,14 @@ export default {
           }
           if (this.table2.getdataListParm.parammaps.fttypeid == 2) {
             if (parseInt(this.table2.temp.preftid) > 0) {
-              this.$message({ type: 'error', message: '饲料名称不能选择预混配方', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg49'), duration: 2000 })
               return false
             }
           }
           // 校验顺序是否>=0
           var ruleSort = /^\d+$/
           if (!ruleSort.test(this.table2.temp.sort)) {
-            this.$message({ type: 'error', message: '饲料顺序不可为负数或小数', duration: 2000 })
+            this.$message({ type: 'error', message:this.$t('message.msg6'), duration: 2000 })
             return false
           }
           this.table2.temp.fweight = formatNum(this.table2.temp.fweight, 4) // 根据默认参数设置小数位数
@@ -2635,7 +2637,7 @@ export default {
           // var ruleWeight = /(^[1-9](\d+)?(\.\d{1,2})?$)|(^\d\.\d{1,2}$)/
 
           if (this.table2.temp.fweight == 0) {
-            this.$message({ type: 'error', message: '重量请输入正数,最多保留四位小数', duration: 2000 })
+            this.$message({ type: 'error', message:this.$t('message.msg8'), duration: 2000 })
             return false
           }
           console.log(row.fweight,'row.fweight')
@@ -2735,7 +2737,7 @@ export default {
     handleRowDelete2(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.table2.list.length)
         let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
@@ -2849,10 +2851,10 @@ export default {
     form_delete2() {
       console.log('点击了删除')
       if (this.selectList2.length == 0) {
-        this.$message({ type: 'error', message: '请选择配方详情', duration: 2000 })
+        this.$message({ type: 'error', message: this.$t('message.msg23'), 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.table2.list.length - this.selectList2.length)
           let dateTime = parseTime(new Date(), '{y}-{m}-{d} {h}:{i}:{s}')
@@ -2957,9 +2959,9 @@ export default {
     // 拆分预混料
     handleSplitPremix(row) {
       console.log('点击了拆分预混料')
-      MessageBox.confirm('是否确认拆分当前预混料?', {
+      MessageBox.confirm(this.$t('message.msg60'), {
         confirmButtonText: this.$t('common.confirm'),
-        confirmButtonText: this.$t('common.cancel'),
+        cancelButtonText: this.$t('common.cancel'),
         type: 'warning'
       }).then(() => {
         this.requestParam.name = 'splitFTpre'
@@ -2993,13 +2995,13 @@ export default {
       console.log('点击了合成预混料', this.selectList2)
       this.dialogFull = false
       if (this.table2.getdataListParm.parammaps.fttypeid == 2) {
-        this.$message({ type: 'error', message: '预混配方不可合成预混料', duration: 2000 })
+        this.$message({ type: 'error', message:this.$t('message.msg24'), duration: 2000 })
         return false
       } else {
         if (this.selectList2.length > 1) {
           for (let i = 0; i < this.selectList2.length; i++) {
             if (parseInt(this.selectList2[i].preftid) > 0) {
-              this.$message({ type: 'error', message: '不可选择预混料', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg25') , duration: 2000 })
               return false
             }
           }
@@ -3090,7 +3092,7 @@ export default {
             }, 100)
           }
         } else {
-          this.$message({ type: 'error', message: '请选择俩条及以上饲料进行合成', duration: 2000 })
+          this.$message({ type: 'error', message:this.$t('message.msg26'), duration: 2000 })
           return false
         }
       }
@@ -3139,7 +3141,7 @@ export default {
           if (response.msg === 'fail') {
             const tname = new RegExp("key 'tname'")
             if (tname.test(response.data)) {
-              this.$message({ type: 'error', message: '预混配方已存在,不可重复生成', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg27'), duration: 2000 })
             } else {
               this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
@@ -3153,18 +3155,18 @@ export default {
         })
       } else { // 现生成预混料
         if (this.detail.list2[0].tname == '' && this.detail.list2[0].ccid == '') {
-          this.$message({ type: 'error', message: '配方名称/牲畜类别/不能为空', duration: 2000 })
+          this.$message({ type: 'error', message:this.$t('message.msg28'), duration: 2000 })
           return false
         } else if (this.detail.list2[0].tname == '') {
-          this.$message({ type: 'error', message: '配方名称不能为空', duration: 2000 })
+          this.$message({ type: 'error',message:this.$t('message.msg18'), duration: 2000 })
           return false
         } else if (this.detail.list2[0].ccid == '') {
-          this.$message({ type: 'error', message: '牲畜类别不能为空', duration: 2000 })
+          this.$message({ type: 'error',message:this.$t('message.msg19'), duration: 2000 })
           return false
         }
         const pattern = new RegExp("[`~!@#$^&*()=|{}':;',\\[\\].<>/?~!@#¥……&*()——|{}【】‘;:”“'。,、?]")
         if (pattern.test(this.detail.list2[0].tname)) {
-          this.$message({ type: 'error', message: '配方名称不可输入特殊字符', duration: 2000 })
+          this.$message({ type: 'error', message:this.$t('message.msg9'), duration: 2000 })
           return false
         }
         let sumFweight = 0
@@ -3235,7 +3237,7 @@ export default {
           if (response.msg === 'fail') {
             const tname = new RegExp("key 'tname'")
             if (tname.test(response.data)) {
-              this.$message({ type: 'error', message: '预混配方已存在,不可重复生成', duration: 2000 })
+              this.$message({ type: 'error', message:this.$t('message.msg27'), duration: 2000 })
             } else {
               this.$notify({ title: this.$t('driver.saveFail'), message: response.data, type: 'warning', duration: 2000 })
             }
@@ -3269,7 +3271,7 @@ export default {
       console.log(row)
       this.rowRecipeRecord.temp = Object.assign({}, row)
       this.rowRecipeRecord.dialogFormVisible = true
-      this.textMap.rowRecipeRecordTxt = '配方修改记录——配方:' + row.tname
+      this.textMap.rowRecipeRecordTxt = this.$t('message.msg53') + row.tname
       this.rowRecipeRecord.dialogStatus = 'rowRecipeRecordTxt'
       this.rowRecipeRecord.getdataListParm.parammaps.pastureid = row.pastureid
       this.rowRecipeRecord.getdataListParm.parammaps.fitid = row.id
@@ -3338,10 +3340,10 @@ export default {
     },
     handleTakeEffect() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
-          confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+        MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           let ids = []
           for (let i = 0; i < this.selectList.length; i++) {
@@ -3355,9 +3357,9 @@ export default {
           postJson(url,data).then(response => {
             console.log('生效保存发送参数', data)
             if (response.msg === 'fail') {
-              this.$notify({ title: '生效失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg11'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '生效成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg10'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -3366,10 +3368,10 @@ export default {
     },
     handleDisable() {
       if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次信息', duration: 2000 })
+        this.$message({ type: 'error',message:this.$t('message.msg12'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + 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.msg30'), {
+          confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           let ids = []
           for (let i = 0; i < this.selectList.length; i++) {
@@ -3384,9 +3386,9 @@ export default {
           postJson(url,data).then(response => {
             console.log('禁用保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '禁用失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg13'), message: response.data, type: 'warning', duration: 2000 })
             } else {
-              this.$notify({ title: '', message: '禁用成功', type: 'success', duration: 2000 })
+              this.$notify({ title: '', message:this.$t('message.msg15'), type: 'success', duration: 2000 })
               this.getList()
             }
           })
@@ -3407,13 +3409,13 @@ export default {
             this.ispalyUd = true
           }
         } else {
-          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg14'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     },
     handleGetUd(){
-      MessageBox.confirm('是否上传配方?', {
-        confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
+      MessageBox.confirm(this.$t('message.msg61'), {
+        confirmButtonText: this.$t('common.confirm'), cancelButtonText: this.$t('common.cancel'), type: 'warning'
       }).then(() => {
         let url = 'authdata/gm/udfeedtemplet/push'
         let data = {

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

@@ -449,9 +449,9 @@
             sort: ''
           },
           rules: {
-            // fname: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-            // fclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-            // feedcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+            // fname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+            // fclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+            // feedcode: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
           }
         },
 
@@ -510,7 +510,7 @@
         textMap: {
           create: '新增',
           update: '编辑',
-          history: '历史记录',
+          history: this.$t('message.msg34'),
           check: '提示'
         },
         requestParam: {},
@@ -715,7 +715,7 @@
           console.log('顺序切换保存发送参数', this.requestParam)
           if (response.msg === 'fail') {
             this.$notify({
-              title: '顺序切换失败',
+              title: this.$t('message.msg51'),
               message: response.data,
               type: 'warning',
               duration: 2000
@@ -723,7 +723,7 @@
           } else {
             this.$notify({
               title: '',
-              message: '顺序切换成功',
+              message: this.$t('message.msg50'),
               type: 'success',
               duration: 2000
             })
@@ -2024,11 +2024,11 @@
         if (this.selectList.length == 0) {
           this.$message({
             type: 'error',
-            message: '请选择车次信息',
+           message:this.$t('message.msg12'),
             duration: 2000
           })
         } else {
-          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+          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'
@@ -2119,7 +2119,7 @@
       // 应用
       handleApplication() {
         console.log('点击了应用')
-        MessageBox.confirm('是否确认将' + this.history.getdataListParm.parammaps.date + '的数据应用到当前?', {
+        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'
@@ -2150,7 +2150,7 @@
         }).catch(() => {
           this.$message({
             type: 'info',
-            message: '已取消应用'
+            message: this.$t('message.msg41')
           })
         })
       },
@@ -2176,11 +2176,11 @@
         if (this.selectList.length == 0) {
           this.$message({
             type: 'error',
-            message: '请选择车次信息',
+           message:this.$t('message.msg12'),
             duration: 2000
           })
         } else {
-          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否生效?', {
+          MessageBox.confirm(this.$t('message.msg29')+ this.selectList.length + '条信息,是否生效?', {
             confirmButtonText: this.$t('common.confirm'),
             confirmButtonText: this.$t('common.cancel'),
             type: 'warning'
@@ -2214,7 +2214,7 @@
               console.log('生效保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
                 this.$notify({
-                  title: '生效失败',
+                  title:this.$t('message.msg11'),
                   message: response.data,
                   type: 'warning',
                   duration: 2000
@@ -2222,7 +2222,7 @@
               } else {
                 this.$notify({
                   title: '',
-                  message: '生效成功',
+                  message:this.$t('message.msg10'),
                   type: 'success',
                   duration: 2000
                 })
@@ -2236,11 +2236,11 @@
         if (this.selectList.length == 0) {
           this.$message({
             type: 'error',
-            message: '请选择车次信息',
+           message:this.$t('message.msg12'),
             duration: 2000
           })
         } else {
-          MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否禁用?', {
+          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'
@@ -2274,7 +2274,7 @@
               console.log('禁用保存发送参数', this.requestParam)
               if (response.msg === 'fail') {
                 this.$notify({
-                  title: '禁用失败',
+                  title:this.$t('message.msg13'),
                   message: response.data,
                   type: 'warning',
                   duration: 2000
@@ -2282,7 +2282,7 @@
               } else {
                 this.$notify({
                   title: '',
-                  message: '禁用成功',
+                  message:this.$t('message.msg15'),
                   type: 'success',
                   duration: 2000
                 })

+ 5 - 5
src/views/inventoryManagement/feedContract/index.vue

@@ -219,8 +219,8 @@ export default {
           pastureid: Cookies.get('pastureid'), 'providerid': '', 'providername': '', 'emp': Cookies.get('employename'), 'enable': 1, 'operatetime': parseTime(new Date(), '{y}-{m}-{d}')
         },
         rules: {
-          contractcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          providerid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          contractcode: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          providerid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         getdataListParm: {
           name: 'getContractList',
@@ -664,9 +664,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -680,7 +680,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

+ 3 - 3
src/views/inventoryManagement/inventoryList/index.vue

@@ -617,9 +617,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -633,7 +633,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -247,11 +247,11 @@ export default {
           parammaps: { pastureid: Cookies.get('pastureid') }
         },
         rules: {
-          usetype: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          usedate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
-          operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          usetype: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          usedate: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          feedname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'change' }],
+          operateweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          cowclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         }
       },
 
@@ -623,9 +623,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -639,7 +639,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -350,7 +350,7 @@ name:this.$t('supplier.no') }], // 是否审核
           ExecDataByConfig(this.requestParam).then(response => {
             console.log('审核保存发送参数', this.requestParam)
             if (response.msg === 'fail') {
-              this.$notify({ title: '失败', message: response.data, type: 'warning', duration: 2000 })
+              this.$notify({ title:this.$t('message.msg37'), message: response.data, type: 'warning', duration: 2000 })
             } else {
               this.$notify({ title: '', message: '成功', type: 'success', duration: 2000 })
               this.getList()

+ 9 - 9
src/views/inventoryManagement/warehousing/index.vue

@@ -378,10 +378,10 @@ export default {
           laiddate: '', feedid: '', feedname: '', operateweight: '', providerid: '', providername: '', startweight: '', priceold: '', contractcode: '', pricenew: '', sumprice: '', grossweight: '', tareweight: '', licence: '', pcpde: '', createemp: '', createdate: '', remark: '', 'wagonnumber': ''
         },
         rules: {
-          laiddate: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          operateweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          feedname: [{ type: 'string', required: true, message: '必填', trigger: 'change' }],
-          pricenew: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          laiddate: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          operateweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          feedname: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'change' }],
+          pricenew: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         getdataListParm: {
           name: 'getBigContractListEnable',
@@ -1113,8 +1113,8 @@ export default {
         this.$set(arr[i], 'msg', '饲料名称与系统不匹配')
       }
       console.log(sum)
-      this.$message({ title: this.$t('common.succes'), message: '导入成功:' + sum + '条!', type: 'success', duration: 2000 })
-      this.$notify({ title: '失败', message: '导入失败:' + arr.length + '条!', type: 'danger', duration: 2000 })
+      this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + sum + this.$t('message.msg39'), type: 'success', duration: 2000 })
+      this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg38') + arr.length + this.$t('message.msg39'), type: 'danger', duration: 2000 })
       if (arr.length > 0) {
         const ExcelDatas1 = [
           {
@@ -1238,9 +1238,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          this.$notify({ title:this.$t('message.msg38'), 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 = [
@@ -1254,7 +1254,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -307,13 +307,13 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', times: '', standardscore: '', cowsum: '', score1: '', score2: '', score3: '', score4: '', score5: '', remark: '', ftid: '', ftname: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score1: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score2: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score3: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score4: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score5: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score1: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score2: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score3: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score4: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score5: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         // 操作人
         getdataListParm: {
@@ -344,7 +344,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        historyRecord: '历史记录'
+        historyRecord: this.$t('message.msg34')
       },
       historyRecord: {
         dialogFormVisible: false,
@@ -743,7 +743,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -773,7 +773,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便评分', duration: 2000 })
       } else  {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
@@ -885,9 +885,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -901,7 +901,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -654,7 +654,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择值班记录', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

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

@@ -281,10 +281,10 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', times: '', oneweight: '', twoweight: '', threeweight: '', onerate: '', tworate: '', threerate: '', tworange: '', threerange: '', remark: '', ccid: '', ccname: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          oneweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          twoweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          threeweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          oneweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          twoweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          threeweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         // 操作人
         getdataListParm: {
@@ -315,7 +315,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        historyRecord: '历史记录'
+        historyRecord: this.$t('message.msg34')
       },
       historyRecord: {
         dialogFormVisible: false,
@@ -702,7 +702,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -732,7 +732,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择粪便筛', duration: 2000 })
       } else  {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
@@ -842,9 +842,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -858,7 +858,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -277,10 +277,10 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', freshweight: '', dryweight: '', thoweight: '', actweight: '', times: '',excess:1 },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          freshweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          dryweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          freshweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          dryweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         // 操作人
         getdataListParm: {
@@ -311,7 +311,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        historyRecord: '历史记录'
+        historyRecord: this.$t('message.msg34')
       },
       historyRecord: {
         dialogFormVisible: false,
@@ -713,7 +713,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -743,7 +743,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择配方干物质', duration: 2000 })
       } else  {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
@@ -861,9 +861,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = ['栏舍名称', '班次', '鲜样重量(g)', '烘干重量(g)', '操作人', '操作日期','是否剩料(是/否)', '错误信息']
@@ -873,7 +873,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

+ 9 - 9
src/views/shedProduction/materialRemainingRecord/index.vue

@@ -243,9 +243,9 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'), emp: Cookies.get('employename'), barid: '', barname: '', remain: '',dry:0, times: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          remain: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          remain: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         getdataListParm: {
           name: 'getBarfeedremainEmpHis',
@@ -652,7 +652,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -682,7 +682,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
       } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarfeedremain'
@@ -800,9 +800,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = ['栏舍名称', '剩料量(kg)', '班次', '收集时间', '操作人', '错误信息']
@@ -812,7 +812,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {
@@ -849,7 +849,7 @@ export default {
         if(response.msg == 'ok'){
           this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
         }else{
-          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+          this.$notify({ title: this.$t('message.msg40'), message: response.data, type: 'warning', duration: 2000 })
         }
       })
     }

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

@@ -310,12 +310,12 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', times: '', oneweight: '', twoweight: '', threeweight: '', fourweight: '', onerate: '', tworate: '', threerate: '', fourrate: '', tworange: '', threerange: '', fourrange: '', remark: '', ccid: '', ccname: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          oneweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          twoweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          threeweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          fourweight: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          oneweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          twoweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          threeweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          fourweight: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         // 操作人
         getdataListParm: {
@@ -346,7 +346,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        historyRecord: '历史记录'
+        historyRecord: this.$t('message.msg34')
       },
       historyRecord: {
         dialogFormVisible: false,
@@ -747,7 +747,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择宾州筛', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -777,7 +777,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择宾州筛质', duration: 2000 })
       } else  {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
@@ -888,9 +888,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -904,7 +904,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -339,8 +339,8 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), productdate: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', cowclassid: '', cowclass: '', bigcowclass: '', cowsum: '', tem: '', avgmonthage: '', bw: '', dayw: '', dayspre: '', fetal: '', avgdim: '', product: '', fat: '', pro: '', lactose: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          cowclassid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          cowclassid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         getdataListParm: {
           name: 'getBarmilkEmpHis',
@@ -1014,7 +1014,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -1044,7 +1044,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择栏舍', duration: 2000 })
       } else if (this.selectList.length == 1) {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
           this.requestParam.name = 'copybarmilk'
@@ -1144,9 +1144,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -1160,7 +1160,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

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

@@ -329,15 +329,15 @@ export default {
         dialogStatus: '',
         temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d}'), emp: Cookies.get('employename'), barid: '', barname: '', times: '', standardscore: '', cowsum: '', score25: '', score275: '', score3: '', score325: '', score35: '', score375: '', score4: '', remark: '', ftid: '', ftname: '' },
         rules: {
-          barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score25: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score275: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score3: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score325: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score35: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score375: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-          score4: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+          barid: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          times: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score25: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score275: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score3: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score325: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score35: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score375: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+          score4: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
         },
         // 操作人
         getdataListParm: {
@@ -368,7 +368,7 @@ export default {
       textMap: {
         create: '新增',
         update: '编辑',
-        historyRecord: '历史记录'
+        historyRecord: this.$t('message.msg34')
       },
       historyRecord: {
         dialogFormVisible: false,
@@ -771,7 +771,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)
@@ -801,7 +801,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: '请选择体况评分', duration: 2000 })
       } else  {
-        MessageBox.confirm('是否确认复制此信息?', {
+        MessageBox.confirm(this.$t('message.msg4'), {
           confirmButtonText: this.$t('common.confirm'), confirmButtonText: this.$t('common.cancel'), type: 'warning'
         }).then(() => {
 
@@ -912,9 +912,9 @@ export default {
     handleImportSuccess(res, file) {
       this.getList()
       if (res.msg === 'ok') {
-        this.$message({ title: this.$t('common.succes'), message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
+        this.$message({ title: this.$t('common.succes'), message:this.$t('message.msg5') + res.data.success + this.$t('message.msg39'), type: 'success', duration: 2000 })
         if (res.data.err_count > 0) {
-          this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
+          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 = [
@@ -928,7 +928,7 @@ export default {
            })
         }
       } else {
-        this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
+        this.$notify({ title:this.$t('message.msg37'), message: this.$t('message.msg40'), type: 'danger', duration: 2000 })
       }
     },
     formatJson(filterVal, jsonData) {

+ 3 - 3
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -1018,7 +1018,7 @@
                 <span v-else>{{row.fname}}</span>
               </template>
             </el-table-column>
-            <el-table-column label="重量(KG)" width="130px" align="center" prop="fweight">
+            <el-table-column :label="$t('message.msg64')" width="130px" align="center" prop="fweight">
             <template slot-scope="{row}">
                 <span v-if="row.fweight !==undefined &&row.fweight.indexOf('/') !== -1" style="color: red;">
                   {{row.fweight}}
@@ -1234,7 +1234,7 @@
               </template>
               <el-table-column :label="$t('formulationEvaluation.slz')" min-width="90px" align="center" prop="feedgroup" />
               <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center" prop="fname" />
-              <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
+              <el-table-column :label="$t('message.msg64')" min-width="100px" align="center" prop="fweight" />
               <el-table-column :label="$t('formulationEvaluation.jbys')" min-width="100px" align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.autosecond }}</span>
@@ -1279,7 +1279,7 @@
                 </template>
               <el-table-column :label="$t('formulationEvaluation.slz')" min-width="90px" align="center" prop="feedgroup" />
               <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center" prop="fname" />
-              <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
+              <el-table-column :label="$t('message.msg64')" min-width="100px" align="center" prop="fweight" />
               <el-table-column :label="$t('formulationEvaluation.jbys')" min-width="100px" align="center">
                 <template slot-scope="{row}">
                   <span>{{ row.autosecond }}</span>

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

@@ -88,7 +88,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="$t('formulationEvaluation.lin')" align="center">
+        <el-table-column :label="$t('formulationEvaluation.l')" align="center">
           <el-table-column sortable prop="p" :label="$t('formulationEvaluation.pfl')" min-width="58" align="center" />
           <el-table-column sortable :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center">
             <template slot-scope="scope">
@@ -101,7 +101,7 @@
             </template>
           </el-table-column>
         </el-table-column>
-        <el-table-column :label="$t('formulationEvaluation.cnjndm')" align="center">
+        <el-table-column :label="$t('formulationEvaluation.cnjn')" align="center">
           <el-table-column sortable prop="nmd" :label="$t('formulationEvaluation.pfl')" min-width="58" align="center" />
           <el-table-column sortable :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center">
             <template slot-scope="scope">
@@ -366,7 +366,7 @@
               <el-table-column prop="trans4f-H" :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center" />
               <el-table-column prop="trans4f-S" :label="$t('formulationEvaluation.csl')" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
+            <el-table-column :label="$t('message.msg65')" min-width="130px" align="center">
               <el-table-column prop="trans35f-nur" :label="$t('formulationEvaluation.nnxq')" min-width="70" align="center" />
               <el-table-column prop="trans35f-FT" :label="$t('formulationEvaluation.pfl')" min-width="58" align="center" />
               <el-table-column prop="trans35f-H" :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center" />
@@ -390,7 +390,7 @@
               <el-table-column prop="upriced-H" :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center" />
               <el-table-column prop="upriced-S" :label="$t('formulationEvaluation.csl')" min-width="58" align="center" />
             </el-table-column>
-            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
+            <el-table-column :label="$t('message.msg66')" min-width="130px" align="center">
               <el-table-column prop="kprice-nur" :label="$t('formulationEvaluation.nnxq')" min-width="70" align="center" />
               <el-table-column prop="kprice-FT" :label="$t('formulationEvaluation.pfl')" min-width="58" align="center" />
               <el-table-column prop="kprice-H" :label="$t('formulationEvaluation.tmrl')" min-width="65" align="center" />
@@ -477,7 +477,7 @@
             <el-table-column :label="$t('formulationEvaluation.xh')" type="index" width="50" align="center" />
             <el-table-column :label="$t('formulationEvaluation.slz')" min-width="100px" align="center" prop="feedgroup" />
             <el-table-column :label="$t('InventoryManagement.silc')"    min-width="100px" align="center" prop="fname" />
-            <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
+            <el-table-column :label="$t('message.msg64')" min-width="100px" align="center" prop="fweight" />
             <el-table-column :label="$t('formulationEvaluation.jbys')" min-width="100px" align="center" prop="autosecond" />
             <el-table-column :label="$t('formulationEvaluation.sfsdntbs')" min-width="100" align="center">
               <template slot-scope="scope">
@@ -624,7 +624,7 @@ export default {
       },
       textMap: {
         see: '',
-        details: '配方详情'
+        details: this.$t('message.msg63')
       },
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' }
@@ -636,7 +636,7 @@ export default {
       console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
       this.table.getdataListParm.parammaps.startTime = this.$route.params.startTime
       this.table.getdataListParm.parammaps.stopTime = this.$route.params.stopTime
-      this.textMap.see = '栏舍详情——' + this.$route.params.tname
+      this.textMap.see = this.$t('message.msg62') + this.$route.params.tname
       setTimeout(() => {
         this.dialogFull = false
         this.see.dialogStatus = 'see'
@@ -832,7 +832,7 @@ export default {
     form_see(row) {
       console.log('查看', row)
       this.dialogFull = false
-      this.textMap.see = '栏舍详情——' + row.tname
+      this.textMap.see = this.$t('message.msg62') + row.tname
       this.see.dialogStatus = 'see'
       this.see.dialogFormVisible = true
       this.see.table.getdataListParm.parammaps.ftid = row.ftid

+ 3 - 3
src/views/statisticalAnalysis/hardwareTest/index.vue

@@ -67,9 +67,9 @@ export default {
   data() {
     return {
       rules: {
-        eqcode: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-        startW: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
-        stopW: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
+        eqcode: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+        startW: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }],
+        stopW: [{ type: 'string', required: true, message: this.$t('hardwareTest.bt'), trigger: 'blur' }]
       },
       getTmrListParam: {
         name: 'getTMRListTest',

+ 10 - 0
src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -30,6 +30,10 @@
             class="elTable table-fixed"
             ref="elTable1"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
+
             <el-table-column sortable :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedname }}</span>
@@ -93,6 +97,9 @@
           :height="myHeight2"
           ref="elTable2"
         >
+        <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
           <el-table-column v-for="item in tab2.table.tableConfig" align="center" :label="item.label" :prop="item.prop">
             <el-table-column v-for="item1 in item.children"  v-if="item.children || item.children.length>0" align="center" :label="item1.label" :prop="item1.prop">
               <el-table-column v-for="item2 in item1.children"  v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />
@@ -138,6 +145,9 @@
           :height="myHeight2"
           ref="elTable3"
         >
+        <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
           <el-table-column v-for="item in tab3.table.tableConfig" align="center" :label="item.label" :prop="item.prop">
             <el-table-column v-for="item1 in item.children" v-if="item.children || item.children.length>0" align="center" :label="item1.label" :prop="item1.prop">
               <el-table-column v-for="item2 in item1.children" v-if="item1.children || item1.children.length>0" :label="item2.label" :prop="item2.prop" />

+ 17 - 11
src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -25,6 +25,9 @@
             class="elTable table-fixed"
             ref="table1"
           >
+          <template slot="empty">
+                    <span style="color: #969799;">No more data</span>
+                </template>
             <el-table-column sortable :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedname }}</span>
@@ -82,7 +85,9 @@
 
         <div v-if="isTable1">
         <div v-if="tab2.table.tableConfig.length > 8">
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight"
+          empty-text="No more data"
+           border class="elTable table-fixed plTable2">
             <!-- 第一个表头 -->
             <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow" >
               <!-- 第二个表头 -->
@@ -238,8 +243,8 @@ export default {
         }
       },
       fileComment: [{ 'label': '商务文件评分', 'children': [{ 'label': '1' }, { 'label': '2' }, { 'label': '管理员' }] }],
-      displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
-      isSplitsmallmaterialsList:[{id:'0',name:'拆分'},{id:'1',name:'不拆分'}],
+      displayList:[{id:'1',name:this.$t('InventoryManagement.ll') },{id:'2',name:this.$t('InventoryManagement.sj')}],//列表显示
+      isSplitsmallmaterialsList:[{id:'0',name:this.$t('InventoryManagement.cf')},{id:'1',name:this.$t('InventoryManagement.bcf')}],
       activeName: 'first',
       tab: {
         chartDate: [],
@@ -338,7 +343,7 @@ export default {
       rowHeight: 30,
       isDispayTable2:false,
       isDispayTable3:false,
-      statisticalTypeList2: [{ id: '1', name: this.$t('errorAnalysis.sxlb') }, { id: '2', name: this.$t('errorAnalysis.isHouseName') }, { id: '3', name:this.$t('errorAnalysis.date')  }, { id: '4', name: this.$t('InventoryManagement.tmrsbbh') }, { id: '5', name: 'TMR班次' }, { id: '6', name: this.$t('errorAnalysis.projname') }],
+      statisticalTypeList2: [{ id: '1', name: this.$t('errorAnalysis.sxlb') }, { id: '2', name: this.$t('errorAnalysis.isHouseName') }, { id: '3', name:this.$t('errorAnalysis.date')  }, { id: '4', name: this.$t('InventoryManagement.tmrsbbh') }, { id: '5', name: this.$t('InventoryManagement.tmrbcc') }, { id: '6', name: this.$t('errorAnalysis.projname') }],
       statisticalTypeList3: [{ id: '1', name: this.$t('errorAnalysis.sxlb') }, { id: '2', name: this.$t('errorAnalysis.isHouseName') }, { id: '3', name:this.$t('errorAnalysis.date')  }, { id: '4', name: this.$t('InventoryManagement.tmrsbbh') }],
       frequencyList: [], // 班次
       isTable1:true,
@@ -932,14 +937,15 @@ export default {
           const table = this.$refs.table1;
           const columns = table.columns;
           const labels = columns.map(column => column.label);
-
+           console.log(table,labels);
+          //  debugger
           import('@/vendor/Export5Excel').then(excel => {
-            const multiHeader = [[this.$t('InventoryManagement.silc'), , this.$t('InventoryManagement.qc'), '', this.$t('InventoryManagement.yl'), '', '', '', this.$t('InventoryManagement.qm'), '']]
-            const multiHeader2 = labels;
+            const multiHeader =  this.$t('InventoryManagement.multiHeader')
+            const multiHeader2 =  this.$t('InventoryManagement.multiHeader2')
             const filterVal = ['feedname', 'startsum', 'startprice', 'laidsum', 'usesumXT', 'usesumRG', 'usesumXH', 'stopsum', 'stopprice']
             const data = this.downLoad.list.map((v) => filterVal.map((j) => v[j]))
             const merges = ['A1:A2', 'B1:C1', 'D1:G1', 'H1:I1']
-            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: this.$t('InventoryManagement.kctj'), merges }) // kctj
+            excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: this.$t('InventoryManagement.kctj'), merges })
           })
         })
       } else if (item == 'tab2') {
@@ -1021,7 +1027,7 @@ export default {
               const data = this.tab2.table.list.map(v => filterVal.map(j => v[j]))
               // const data = []
               const merges = ['A1:A1']
-              excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析-'+startTime+'-' +stopTime , merges })
+              excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: this.$t('InventoryManagement.yltj')+startTime+'-' +stopTime , merges })
             })
           }else{
             import('@/vendor/Export3Excel').then((excel) => {
@@ -1035,7 +1041,7 @@ export default {
               // const data = []
               // const merges = ['A1:A1']
               const merges = []
-              excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
+              excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename:  this.$t('InventoryManagement.yltj'), merges })
             })
           }
         }else{
@@ -1105,7 +1111,7 @@ export default {
             // const merges = ['A1:A1', 'B1:E1','F1:J1' ];
             const merges = ['A1:A1']
 
-            excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '价格分析', merges })
+            excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename:  this.$t('InventoryManagement.jgfx'), merges })
           })
         }
       }

+ 3 - 3
src/views/systemManagement/dataSynchronization/index.vue

@@ -273,7 +273,7 @@ export default {
         if (response.msg == 'ok') {
           this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
-          this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: '保存失败', type: 'success',  duration: 2000 })
         }
       })
     },
@@ -303,7 +303,7 @@ export default {
         if (response.msg == 'ok') {
           this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
-          this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: '保存失败', type: 'success',  duration: 2000 })
         }
       })
     },
@@ -316,7 +316,7 @@ export default {
         if (response.msg == 'ok') {
           this.$notify({ title: this.$t('common.succes'), message: this.$t('driver.saveSuccess'), type: 'success',  duration: 2000 })
         } else {
-          this.$notify({ title: '失败', message: '保存失败', type: 'success',  duration: 2000 })
+          this.$notify({ title:this.$t('message.msg37'), message: '保存失败', type: 'success',  duration: 2000 })
         }
       })
     },

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

@@ -369,7 +369,7 @@ export default {
       if (this.selectList.length == 0) {
         this.$message({ type: 'error', message: this.$t('driver.qxzjsyxx'), duration: 2000 })
       } else {
-        MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
+        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'
         }).then(() => {
           console.log(this.selectList)

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

@@ -910,7 +910,7 @@
             this.setUp.dialogFormVisible = false
             this.getList()
           }else{
-            this.$notify({ title: '失败', message: response.message, type: 'warning', duration: 2000 })
+            this.$notify({ title:this.$t('message.msg37'), message: response.message, type: 'warning', duration: 2000 })
             console.log('失败')
           }
         })