修改导入模版

.env.development

@@ -5,9 +5,9 @@ ENV = 'development'
 # base api
 # 测试线
 # VUE_APP_BASE_API = 'http://192.168.1.70:8082/'
-VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
+# VUE_APP_BASE_API = 'http://kpttest.kptyun.com/'
 # 白少后台本地
-# VUE_APP_BASE_API = 'http://192.168.1.56:8081/'
+VUE_APP_BASE_API = 'http://192.168.1.56:80/'
 # VUE_APP_BASE_API = 'http://192.168.1.93/'
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.

src/lang/en/langModule/message.js

@@ -58,7 +58,7 @@ 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?",
+msg59: "to the current?",
 msg60: "Are you sure to split the current premix feed?",
 msg61: "Are you sure to upload the formula?",
 msg62: "Pens Details:",
@@ -69,7 +69,7 @@ msg66: "Daily Milk Cost per Kilogram ($)",
 //
 msg67: "Please select the formula to be issued",
 msg68: "The formula is not enabled and cannot be issued",
-mag69: "Please select the farm to be issued to" ,
+msg69: "Please select the farm to be issued to" ,
 msg70: "Formula issued",
 msg71: "Is it the current formula",
 msg72: "Issuance record",
@@ -413,7 +413,19 @@ msg354:'Select Livestock Parent Category',
 msg355:"Customize",
 msg356:'Spreading Feed',
 msg357: 'Mixing Feed ',
+recipe:{
+  name: 'checkfttype,checkbigcowclass,checkFeed,insertFTUploadEnglish,insertFTdetailUpload',
+  importParams: 'Formula Name,Livestock Category,Formula Type,Note,Feed Group,Feed Name,with Weight (kg),Mixing Delay (min),Lock the Ratio of Cattle Heads',
+  requiredParams: 'Formula Name,Livestock Category,Formula Type,Feed Name,with Weight (kg),Mixing Delay (min),Lock the Ratio of Cattle Heads',
+numParams: 'with Weight (kg),Mixing Delay (min)',
+},
 
-
+dhedform:{
+  name:'checkbarname,checkftsw,checkftbl',
+  importParams: 'Pen Name,Actual Headcount,Coefficient(%), Formula Template ,Supplement Formula,First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%)',
+  requiredParams: 'Pen Name,Actual Headcount,Coefficient(%), Formula Template ,',
+  numParams: 'Actual Headcount,Coefficient(%),First Shift Ratio(%),Second Shift Ratio(%),Third Shift Ratio(%),Fourth Shift Ratio(%)',
+  theader:['Pen Name','Actual Headcount','Coefficient(%)','Formula Template','Supplement Formula',' First Shift Ratio(%)','Second Shift Ratio(%)','Third Shift Ratio(%)','Fourth Shift Ratio(%)','Fourth Shift Ratio(%)','Sixth shift Ratio(%)'],
+   },
 
 }

src/lang/zn/langModule/message.js

@@ -59,7 +59,7 @@ msg55:"配方模板",
 msg56:"配方模板导入报错信息",
 msg57:"配方名称不可重复，请重新录入",
 msg58:"是否确认将",
-mesg59:"的数据应用到当前?",
+msg59:"的数据应用到当前?",
 msg60:"是否确认拆分当前预混料",
 msg61:"是否上传配方?",
 msg62:"栏舍详情:",
@@ -70,7 +70,7 @@ msg66:"日公斤奶成本(元)",
 //
 msg67:"请选择下发配方",
 msg68:"配方未启用不可下发",
-mag69:"请选择下发牧场",
+msg69:"请选择下发牧场",
 msg70:"配方下发",
 msg71:"是否为当前配方",
 msg70:"已下发牧场",
@@ -419,6 +419,21 @@ msg354:'选择牲畜父类',
 msg355:"自定义",
 msg356:'撒料',
 msg357: '混料',
+recipe:{
+  name:'checkfttype,checkbigcowclass,checkFeed,insertFTUpload,insertFTdetailUpload',
+importParams: '配方名称,牲畜类别,配方类型,备注,饲料组,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
+requiredParams: '配方名称,牲畜类别,配方类型,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
+numParams: '重量（kg）,搅拌延时（min）'
+},
+
+dhedform:{
+  name:'checkbarname,checkftsw,checkftbl',
+importParams: '栏舍名称,实际牛头数,系数（%）,配方模板,补料配方,第一班比例（%）,第二班比例（%）,第三班比例（%）',
+requiredParams: '栏舍名称,实际牛头数,系数（%）,配方模板,',
+numParams: '实际牛头数,系数（%）,第一班比例（%）,第二班比例（%）,第三班比例（%）,第四班比例（%）',
+theader:['栏舍名称', '实际牛头数', '系数（%）', '配方模板', '补料配方', '第一班比例（%）', '第二班比例（%）', '第三班比例（%）', '第四班比例（%）','第五班比例（%）','第六班比例（%）'],
+},
+
 
 
 }

src/views/formulationPlan/dhedFormula/index.vue

@@ -2283,18 +2283,16 @@ export default {
     uploadData() {
       return {
         name: 'checkbarname,checkftsw,checkftbl',
-        importParams:
-          '栏舍名称,实际牛头数,系数（%）,配方模板,补料配方,第一班比例（%）,第二班比例（%）,第三班比例（%）',
+        importParams:this.$t('message.dhedform.importParams'),
         sheetname: 'Sheet1',
         // 登录牧场
         pastureid: Cookies.get('pastureid'),
         // 日期参数
         dateParams: '',
         // 必填参数
-        requiredParams: '栏舍名称,实际牛头数,系数（%）,配方模板,',
+        requiredParams: this.$t('message.dhedform.requiredParams'),
         // 为数值的参数
-        numParams:
-          '实际牛头数,系数（%）,第一班比例（%）,第二班比例（%）,第三班比例（%）,,第四班比例（%）'
+        numParams:this.$t('message.dhedform.numParams')
       }
     },
     // 设置上传地址
@@ -5734,11 +5732,12 @@ export default {
           const table = this.$refs.table
           const columns = table.columns
           const labels = columns.map((column) => column.label)
-          console.log(labels,'------------');
           const labelArr = labels.splice(0,2);
+          console.log(labels,'1111------------');
+
           var excelDatas = [
             {
-              tHeader: labelArr,
+              tHeader:this.$t('message.dhedform.theader'),
               filterVal: ['barname', '', '', '', '', '', '', '', ''],
               tableDatas: this.download.list,
               sheetName: 'Sheet1'

src/views/formulationPlan/formulaDistribution/index.vue

@@ -487,7 +487,7 @@ export default {
       if (this.formulaDistribution.pasture.checkedList.length == 0) {
         this.$message({
           type: 'error',
-          message: this.$t('message.mag69'),
+          message: this.$t('message.msg69'),
           duration: 2000
         })
         return false

src/views/formulationPlan/recipeTemplate/index.vue

@@ -1131,18 +1131,19 @@ export default {
     },
     uploadData() {
       return {
-        name: 'checkfttype,checkbigcowclass,checkFeed,insertFTUpload,insertFTdetailUpload',
-        importParams: '配方名称,牲畜类别,配方类型,备注,饲料组,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
+        name: this.$t('message.recipe.name'),
+        importParams: this.$t('message.recipe.importParams'),
         sheetname: 'Sheet1',
         // 登录牧场
         pastureid: Cookies.get('pastureid'),
         // 日期参数
         dateParams: '',
         // 必填参数
-        requiredParams: '配方名称,牲畜类别,配方类型,饲料名称,重量（kg）,搅拌延时（min）,是否锁定牛头数比例',
+        requiredParams: this.$t('message.recipe.requiredParams'),
         // 为数值的参数
-        numParams: '重量（kg）,搅拌延时（min）'
+        numParams: this.$t('message.recipe.numParams'),
       }
+      
     },
     // 设置上传地址
     uploadExcelUrl() {
@@ -1957,8 +1958,9 @@ export default {
                '配方名称', '牲畜类别', '配方类型', '备注', '饲料组', '饲料名称', '重量（kg）', '搅拌延时（min）', '是否锁定牛头数比例', 'error_msg'
              ]
              const data1 = this.formatJson(filterVal, list1)
-             excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.$t('meaagae.msg56'), autoWidth: true, bookType: 'xlsx' })
+             excel.export_json_to_excel({ header: tHeader, data: data1, filename: this.$t('message.msg56'), autoWidth: true, bookType: 'xlsx' })
            })
+          
         }
       } else {
         const isRepeat = new RegExp('Duplicate entry :feedtemplet_tname')