Pārlūkot izejas kodu

基础数据模块

Shan9312 9 mēneši atpakaļ
vecāks
revīzija
8c40795fec

+ 1 - 1
src/lang/en/langModule/dashboard.js

@@ -18,7 +18,7 @@ export default {
   SpreadingCR:'Spreading Correctness Rate',
   yestday:'Yesterday',
   yestday30:'Blending Accuracy of Mixed Feed in the Last 30 Days',
-  yestday30S:'Blending Accuracy of Mixed Feed in the Last 30 Days',
+  yestday30S:'Spreading Accuracy Over the Last 30 Days',
   yestday30SD:'Spreading Deviation Over the Last 30 Days',
   spreadSD:'Spreading Deviation',
   mtime:'min',

+ 55 - 0
src/lang/en/langModule/defaultParameter.js

@@ -0,0 +1,55 @@
+export default{
+
+name1:"Functional Parameters",
+name2:"Warning Parameters",
+//
+
+sfkqqytjh: "Can retrieve the previous day's plan:",
+sfkqqytjh1: "Can retrieve the next day's plan:",
+bcsl: "Number of shifts:",
+zlxsdws: "Decimal places for weight:",
+blxsdws: "Decimal places for ratio:",
+sfqyslht: "Enable feed contract:",
+qyslsdnts: "Enable feed lock for cattle head count:",
+clzzcszltxbl: "Vehicle load exceeding weight reminder ratio (%):",
+clzdzczlzzbl: "Vehicle load exceeding weight prohibition ratio (%):",
+sfqybl: "Enable supplementary feed:",
+sfqysl: "Enable leftover feed:",
+slclxx: "Leftover feed processing options:",
+slfbfs: "Leftover feed allocation method:",
+slfbzbyl: "Leftover feed allocation ratio to raw material (%):",
+xlsfcz: "Does minor feed need to be weighed:",
+sfqysjtb: "Enable data synchronization:",
+rycsl: "Any number of vehicles:",
+hlzql: "Mixing accuracy rate:",
+yxslsjwc: "Allowed error in feeding time (minutes):",
+jtymip: "Group end domain name or IP:",
+tmrrl: "TMR capacity upper limit (%):",
+tmrrl1: "TMR capacity lower limit (%):",
+yhlyxwc: "Pre-mixed feed allowable error:",
+yhtzys: "Pre-mixed feed jump delay:",
+hfmr: "Restore default",
+
+msg1: "1. Can retrieve the previous day's plan: If yes is selected, it means that after midnight on the current day, it is still possible to retrieve the feed from yesterday.",
+msg2: "2. Can retrieve the next day's plan: If yes is selected, it can be used when all the feed for the day is completed and it is necessary to prepare the feed for the next day.",
+msg3: "3. Number of shifts: Controls the number of shifts on pages such as pen formula and plan.",
+msg4: "4. Decimal places for weight: Controls the decimal places of weight on pages such as pen formula and feeding plan.",
+msg5: "5. Enable feed contract: If yes is selected, it enables the feed contract page in inventory management.",
+msg6: "6. Enable feed lock for cattle head count: After enabling, this field is displayed in the feed table of the formula template.",
+msg7: "7. Vehicle load exceeding weight reminder ratio: In the feeding plan, when the total weight allocated to the pen exceeds the vehicle's maximum weight multiplied by this ratio, a reminder is given. Only positive integers are allowed for input.",
+msg8: "8. Vehicle load exceeding weight prohibition ratio: In the feeding plan, when the total weight allocated to the pen exceeds the vehicle's maximum weight multiplied by this ratio, allocation is prohibited. Only positive integers are allowed for input.",
+msg9: "9. Enable supplementary feed: If yes is selected, this field is enabled in the pen formula.",
+msg10: "10. Enable leftover feed: If no is selected, the leftover feed plan is not available, and the amount of leftover feed does not affect the original plan.",
+msg11: "11. Leftover feed processing options: ①If converted to feed is selected, it is deducted by replacing the overall feed formula; ②If replace a certain feed is selected, this leftover feed replaces the corresponding feed in the feeding process until it is deducted; ③Do not process: No leftover feed calculation is made.",
+msg12: "12. Leftover feed allocation method: ①Top limit allocation: Calculated according to the percentage of the original feeding amount of the pen, the leftover feed is allocated to this value, and then allocated in sequence to fill the pen. If the leftover feed is not fully allocated, the remaining leftover feed is not counted.",
+msg121: "②Average allocation: The total leftover feed is allocated evenly. If the allocation value exceeds the percentage of the pen's raw material, the remaining value is accumulated to the pens that have not been fully allocated, and the final remaining leftover feed is not counted.",
+msg13: "13. Leftover feed allocation ratio to raw material: The amount of leftover feed to be allocated does not exceed the value calculated by this ratio, and is used in conjunction with the leftover feed allocation method. Only positive integers are allowed for input.",
+msg14: "14. Does minor feed need to be weighed: If yes is selected, the feed in the feed table can be selected for minor feed weighing, and the feeding plan can set whether to weigh in advance.",
+msg15: "15. Enable data synchronization: After enabling, the data synchronization button is opened on the daily execution page, which is used for data docking with third-party systems."
+
+
+
+
+
+
+}

+ 13 - 0
src/lang/en/langModule/supplier.js

@@ -58,6 +58,19 @@ ccl: "Stock",
 flsx: "Feeding Order",
 slsx: "Feed Order",
 wlzl: "Feed Weight",
+//
+zs: "Integer",
+xs1: "One decimal place",
+xs2: "Two decimal places",
+xs3: "Three decimal places",
+xs4: "Four decimal places",
+defb: "Maximum allocation",
+pfyxwczql: "Accuracy excluding allowable error margin",
+pfyxwczql1: "Accuracy including allowable error margin",
+jy: "Disable",
+cssm: "Parameter description",
+slfb: "Leftover feed allocation",
+
 
 
 

+ 93 - 0
src/lang/zn/langModule/defaultParameter.js

@@ -0,0 +1,93 @@
+export default{
+
+name1:"功能参数",
+name2:"预警参数",
+//
+sfkqqytjh:"是否可取前一天计划:",
+sfkqqytjh1:"是否可取后一天计划:",
+bcsl:"班次数量:",
+zlxsdws:"重量小数点位数:",
+blxsdws:"比例小数点位数:",
+sfqyslht:"是否启用饲料合同:",
+qyslsdnts:"启用饲料锁定牛头数:",
+clzzcszltxbl:"车辆载重超出重量提醒比例(%):",
+clzdzczlzzbl:"车辆载重超出重量禁止比例(%):",
+sfqybl:"是否启用补料:",
+sfqysl:"是否启用剩料:",
+slclxx:"剩料处理选项:",
+slfbfs:"剩料分配方式:",
+slfbzbyl:"剩料分配占比原料(%):",
+xlsfcz:"小料是否称量:",
+sfqysjtb:"是否启用数据同步:",
+rycsl:"任意车数量:",
+hlzql:"混料准确率",
+yxslsjwc:'允许撒料时间误差(分钟):',
+jtymip:"集团端域名或IP",
+tmrrl:"tmr容量上限(%):",
+tmrrl1:"tmr容量下限(%):",
+yhlyxwc:"预混料允许误差",
+yhtzys:"预混跳转延时",
+hfmr:"恢复默认",
+msg1:"1、是否可取前一天计划:若选择是,代表在当天过了凌晨12点仍可以取到昨天的料。",
+msg2:"2、是否可取后一天计划:若当天做完全部的料需要预备第二天的料的时候可以选择是。",
+msg3:"3、班次数量:控制栏舍配方,计划等页面班次数量。",
+msg4:" 4、重量小数点位数:控制栏舍配方、撒料计划等页面重量小数位数。",
+msg5:"  5、是否启用饲料合同:若选择是,则开启库存管理中饲料合同页面。",
+msg6:"  6、启用饲料锁定牛头数:开启后则配方模板中饲料表显示此字段。",
+msg7:"   7、车辆载重超出重量提醒比例:撒料计划中车次分配栏舍重量,当分配的合计重量超出车辆最大重量*此比例时,进行提示。限制输入正整数。",
+msg8:" 8、车辆载重超出重量禁止比例:撒料计划中车次分配栏舍重量,当分配的合计重量超出车辆最大重量*此比例时,禁止分配。限制输入正整数。",
+msg9:"9、是否启用补料:若选择是,则栏舍配方中启用此字段。",
+msg10:"10、是否启用剩料:若选择否则剩料计划不可用,剩料量不影响原计划。",
+msg11:" 11、剩料处理选项:①若选择转为饲料,按饲料配方整体替换扣减;②如果选择替换某饲料,则此剩料替换待饲喂中的对应饲料量,扣完为止;③不处理:不做剩料计算处理。",
+msg12:" 12、剩料分配方式:①顶额分配:按栏舍原撒料量的百分比进行计算,剩料分配为此值,依次计算分配满栏舍,若剩料量未分配完,则剩余剩料不计入内;",
+msg121:" ②平均分配,按收集的总剩料量平均分配值,若分配值超出栏舍原料量的百分比,剩余值累加到未分配满的栏舍中,最终剩余剩料不计入内。",
+msg13:"13、剩料分配占比原料:剩料应分配量不超出此比例计算出的值,与剩料分配方式关联使用。限制输入正整数。",
+msg14:" 14、小料是否称量:若选择是,则饲料表中饲料可选小料称,撒料计划中可设置是否提前称量。",
+msg15:" 15、是否启用数据同步:启用后日执行页面开启数据同步按钮,用于与第三方系统数据对接。",
+
+//
+
+jhzqlyjz:"计划准确率预警值(%):",
+slfpzb:"剩料分配占比原混料",
+pfzqlyjz:"配方准确率预警值(%):",
+nqzqlyjz:"牛群准确率预警值(%):",
+cczqlyjz:"车次准确率预警值(%):",
+hlzdtzzqlyj:"混料自动跳转准确率预警值(%):",
+hlzdtzzqlyj1:"混料手动跳转准确率预警值(%):",
+mrcapjz:"泌乳牛采食量平均值偏差预警值(kg):",
+mrcayjz:"泌乳牛产奶量平均值偏差预警值(kg):",
+slsjpccyjz:"撒料时间偏差预警值(min):",
+ccpjhlyjz:"超出平均混料时间预警值(min):",
+ccpjzhlyjz:"超出平均转化率预警值(%)",
+ccpjgjnslcb:"超出平均公斤奶饲料成本(%)",
+nlsllccyjz:"牛栏剩料率超出预警值(%):",
+kcyjts:"库存预警天数:",
+tit1:"   1、计划准确率预警值:计划准确率低于此预警值则统计在统计报告中。",
+tit2:"2、配方准确率预警值:配方准确率低于此预警值则统计在统计报告中。",
+tit3:"3、牛群准确率预警值:牛群准确率低于此预警值则统计在统计报告中。",
+tit4:"4、车次准确率预警值:车次准确率低于此预警值则统计在统计报告中。",
+tit5:"5、混料自动跳转准确率预警值:混料自动跳转准确率低于此预警值则统计在统计报告中。",
+tit6:"6、混料手动跳转准确率预警值:混料手动跳转准确率低于此预警值则统计在统计报告中。",
+tit7:"7、泌乳牛采食量平均值偏差预警值:泌乳牛采食量平均值偏差高于此预警值则统计在统计报告中。",
+tit8:"8、泌乳牛产奶量平均值偏差预警值:泌乳牛产奶量平均值偏差高于此预警值则统计在统计报告中。",
+tit9:"9、撒料时间偏差预警值:撒料时间偏差高于此预警值则统计在统计报告中。",
+tit10:" 10、超出平均混料时间预警值:平均混料时间高于此预警值则统计在统计报告中。",
+tit11:"11、超出平均转化率预警值:平均转换率高于此预警值则统计在统计报告中。",
+tit12:" 12、超出平均公斤奶饲料成本:平均公斤奶饲料成本高于此预警值则统计在统计报告中。",
+tit13:" 13、牛栏剩料率超出预警值:牛栏剩料率高于此预警值则统计在统计报告中。",
+tit14:"14、库存预警天数:库存预警模块根据设置天数进行统计。限制正整数。",
+
+//
+
+qz:"青贮",
+zrlwl:"总日粮饲喂量",
+bcl:"不处理",
+
+
+
+
+
+
+
+
+}

+ 2 - 1
src/lang/zn/langModule/driver.js

@@ -1,7 +1,8 @@
 export default{
   drivername:'驾驶员名称',
   drivercode:'驾驶员编号',
-  enableList: [{ id: 1, name: '是' }, { id: 0, name: '否' }], // 是
+  enableList: [{ id: 1, name: '是' }, { id: 0,  
+name: '否' }], // 是
   
   classname:"TMR设备类型",
   rl:"容量(m³)",

+ 14 - 0
src/lang/zn/langModule/supplier.js

@@ -59,6 +59,20 @@ flsx:"发料顺序",
 slsx:"饲料顺序",
 wlzl:"饲料重量",
 
+//
+zs:"整数",
+xs1:"一位小数",
+xs2:"两位小数",
+xs3:"三位小数",
+xs4:"四位小数",
+defb:"顶额分配",
+pfyxwczql:"排除允许误差准确率",
+pfyxwczql1:"不排除允许误差准确率",
+jy:"禁用",
+cssm:"参数说明",
+slfb:"剩料分配",
+
+
 
 
 

+ 103 - 54
src/views/basicData/defaultParameter/earlyWarning/index.vue

@@ -4,123 +4,155 @@
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="270px" style="margin-top: 40px;margin-bottom:30px;">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="计划准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model.number="createTemp.remainOptRate" type="number" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" />
+          <el-form-item  
+:label="$t('defaultParameter.jhzqlyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model.number="createTemp.remainOptRate" type="number" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="配方准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.pfzqlyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="牛群准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.nqzqlyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="车次准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.cczqlyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="混料自动跳转准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item 
+:label="$t('defaultParameter.hlzdtzzqlyj')"  prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="混料手动跳转准确率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.hlzdtzzqlyj1')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="泌乳牛采食量平均值偏差预警值(kg):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.mrcapjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="泌乳牛产奶量平均值偏差预警值(kg):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.mrcayjz')"  prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="撒料时间偏差预警值(min):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.slsjpccyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="超出平均混料时间预警值(min):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.ccpjhlyjz')"  prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="超出平均转化率预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.ccpjzhlyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="超出平均公斤奶饲料成本(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.ccpjgjnslcb')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="牛栏剩料率超出预警值(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.nlsllccyjz')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="库存预警天数:" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item  
+:label="$t('defaultParameter.kcyjts')"  prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
       <el-button v-if="isRoleEdit" class="save" :disabled="isokDisable" @click="handleSave">{{$t('formulationEvaluation.save')}}</el-button>
-      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">恢复默认</el-button>
+      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery"> 
+ 
+{{$t('defaultParameter.hfmr')}}</el-button>
     </div>
     <el-dialog :title="textMap[description.dialogStatus]" :destroy-on-close="true" :visible.sync="description.dialogFormVisible" :close-on-click-modal="false" width="70%">
       <div class="app-description dialogMinHeight">
         <div class="content">
-          1、计划准确率预警值:计划准确率低于此预警值则统计在统计报告中。
+          
+{{$t('defaultParameter.msg1')}}
           <br>
-          2、配方准确率预警值:配方准确率低于此预警值则统计在统计报告中。
+           
+{{$t('defaultParameter.msg2')}}
           <br>
-          3、牛群准确率预警值:牛群准确率低于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg3')}}
           <br>
-          4、车次准确率预警值:车次准确率低于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg4')}}
           <br>
-          5、混料自动跳转准确率预警值:混料自动跳转准确率低于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg5')}}
           <br>
-          6、混料手动跳转准确率预警值:混料手动跳转准确率低于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg6')}}
           <br>
-          7、泌乳牛采食量平均值偏差预警值:泌乳牛采食量平均值偏差高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg7')}}
           <br>
-          8、泌乳牛产奶量平均值偏差预警值:泌乳牛产奶量平均值偏差高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg8')}}
           <br>
-          9、撒料时间偏差预警值:撒料时间偏差高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg9')}}
           <br>
-          10、超出平均混料时间预警值:平均混料时间高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg10')}}
           <br>
-          11、超出平均转化率预警值:平均转换率高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg11')}}
           <br>
-          12、超出平均公斤奶饲料成本:平均公斤奶饲料成本高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg12')}}
           <br>
-          13、牛栏剩料率超出预警值:牛栏剩料率高于此预警值则统计在统计报告中。
+          {{$t('defaultParameter.msg13')}}
           <br>
-          14、库存预警天数:库存预警模块根据设置天数进行统计。限制正整数。
+          {{$t('defaultParameter.msg14')}}
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -140,24 +172,40 @@ export default {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取前一天计划
       planNextDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取后一天计划
       isSupplementList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用补料
       isLeftoverMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
-      decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用剩料
+      decimalPlacesList: [{ id: '0',  
+name:this.$t('supplier.zs') }, { id: '1',  
+name:this.$t('supplier.xs1') }, { id: '2', 
+name:this.$t('supplier.xs2') }, { id: '3', 
+name:this.$t('supplier.xs3') }], // 日计划报表小数点位数
       isLockBullsList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
-      waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
+      waterConditioningList: [{ id: '0',  
+name:this.$t('defaultParameter.qz')}, { id: '1',  
+name:this.$t('defaultParameter.bcl') }, { id: '2',  
+name:this.$t('defaultParameter.bcl') }], // 水分调节选项
       priceCalculationList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用库存管理
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用库存管理
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
       feedontractList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用饲料合同
+      leftoverMaterialList: [{ id: '0',  
+name:this.$t('supplier.defb') }, { id: '1', 
+name:this.$t('supplier.slfb') }],
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
@@ -181,7 +229,8 @@ name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料
         dialogStatus: ''
       },
       textMap: {
-        description: '参数说明'
+         
+description:this.$t('supplier.cssm')
       },
       requestParam: {}
 

+ 132 - 80
src/views/basicData/defaultParameter/function/index.vue

@@ -4,15 +4,17 @@
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="是否可取前一天计划:" prop="isGetLastPlan">
-            <el-select v-model="createTemp.isGetLastPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取前一天计划" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfkqqytjh')" prop="isGetLastPlan">
+            <el-select v-model="createTemp.isGetLastPlan" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfkqqytjh')"class="filter-item" style="width:100%">
               <el-option v-for="item in planBeforeDayList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否可取后一天计划:" prop="isGetNextPlan">
-            <el-select v-model="createTemp.isGetNextPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取后一天计划" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfkqqytjh1')" prop="isGetNextPlan">
+            <el-select v-model="createTemp.isGetNextPlan" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfkqqytjh1')"class="filter-item" style="width:100%">
               <el-option v-for="item in planNextDayList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -20,15 +22,17 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="班次数量:" prop="times">
-            <el-select v-model="createTemp.times" :disabled="isRoleEdit==false" filterable placeholder="水分调节选项" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.bcsl')" prop="times">
+            <el-select v-model="createTemp.times" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.bcsl')" class="filter-item" style="width:100%">
               <el-option v-for="item in numberList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="重量小数点位数:" prop="decimalPlaces">
-            <el-select v-model="createTemp.decimalPlaces" :disabled="isRoleEdit==false" filterable placeholder="重量小数点位数" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.zlxsdws')" prop="decimalPlaces">
+            <el-select v-model="createTemp.decimalPlaces" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.zlxsdws')" class="filter-item" style="width:100%">
               <el-option v-for="item in weightDecimalPlacesList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -36,15 +40,17 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="比例小数点位数:" prop="decimalRate">
-            <el-select v-model="createTemp.decimalRate" :disabled="isRoleEdit==false" filterable placeholder="比例小数点位数" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.blxsdws')" prop="decimalRate">
+            <el-select v-model="createTemp.decimalRate" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.blxsdws')" class="filter-item" style="width:100%">
               <el-option v-for="item in rateDecimalPlacesList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否启用饲料合同:" prop="isEnableContract">
-            <el-select v-model="createTemp.isEnableContract" :disabled="isRoleEdit==false" filterable placeholder="启用饲料合同" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfqyslht')" prop="isEnableContract">
+            <el-select v-model="createTemp.isEnableContract" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfqyslht')" class="filter-item" style="width:100%">
               <el-option v-for="item in feedontractList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -52,27 +58,31 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="启用饲料锁定牛头数:" prop="isLockCount">
-            <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable placeholder="启用饲料锁定牛头数" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.qyslsdnts')" prop="isLockCount">
+            <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.qyslsdnts')" class="filter-item" style="width:100%">
               <el-option v-for="item in isLockBullsList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="车辆载重超出重量提醒比例(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.clzzcszltxbl')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.clzzcszltxbl')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="车辆载重超出重量禁止比例(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.clzdzczlzzbl')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.clzdzczlzzbl')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否启用补料:" prop="isEnableSupplyFeed">
-            <el-select v-model="createTemp.isEnableSupplyFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用补料" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfqybl')" prop="isEnableSupplyFeed">
+            <el-select v-model="createTemp.isEnableSupplyFeed" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfqybl')" class="filter-item" style="width:100%">
               <el-option v-for="item in isSupplementList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -80,15 +90,17 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="是否启用剩料:" prop="isEnableRemainFeed">
-            <el-select v-model="createTemp.isEnableRemainFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用剩料" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfqysl')" prop="isEnableRemainFeed">
+            <el-select v-model="createTemp.isEnableRemainFeed" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfqysl')" class="filter-item" style="width:100%">
               <el-option v-for="item in isLeftoverMaterialList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="剩料处理选项:" prop="remainOpt">
-            <el-select v-model="createTemp.remainOpt" :disabled="isRoleEdit==false" filterable placeholder="剩料处理选项" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.slclxx')" prop="remainOpt">
+            <el-select v-model="createTemp.remainOpt" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.slclxx')" class="filter-item" style="width:100%">
               <el-option v-for="item in disposalList" :key="item.id" :label="item.fname" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -96,29 +108,33 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="剩料分配方式:" prop="remainOptDis">
-            <el-select v-model="createTemp.remainOptDis" :disabled="isRoleEdit==false" filterable placeholder="剩料分配方式" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.slfbfs')" prop="remainOptDis">
+            <el-select v-model="createTemp.remainOptDis" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.slfbfs')" class="filter-item" style="width:100%">
               <el-option v-for="item in leftoverMaterialList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="剩料分配占比原料(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.slfbzbyl')" prop="remainOptRate">
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.slfbzbyl')"  type="text" />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="小料是否称量:" prop="isSmallMaterial">
-            <el-select v-model="createTemp.isSmallMaterial" :disabled="isRoleEdit==false" filterable placeholder="小料是否称量" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.xlsfcz')" prop="isSmallMaterial">
+            <el-select v-model="createTemp.isSmallMaterial" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.xlsfcz')" class="filter-item" style="width:100%">
               <el-option v-for="item in smallMaterialList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否启用数据同步:" prop="isDataSync">
-            <el-select v-model="createTemp.isDataSync" :disabled="isRoleEdit==false" filterable placeholder="是否启用数据同步" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.sfqysjtb')" prop="isDataSync">
+            <el-select v-model="createTemp.isDataSync" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.sfqysjtb')" class="filter-item" style="width:100%">
               <el-option v-for="item in dataSynchronizationList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
@@ -127,16 +143,19 @@
       <el-row>
         <!-- <el-col :span="12">
           <el-form-item label="设备运转标准时间(分钟):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col> -->
         <el-col :span="12">
-          <el-form-item label="任意车数量:" prop="anyCar">
-            <el-input ref="anyCar" v-model="createTemp.anyCar" :disabled="isRoleEdit==false" class="filter-item" placeholder="任意车数量" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.rycsl')" prop="anyCar">
+            <el-input ref="anyCar" v-model="createTemp.anyCar" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.rycsl')" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="混料准确率:" prop="accuracy">
+          <el-form-item
+:label="$t('defaultParameter.hlzql')" prop="accuracy">
               <el-select v-model="createTemp.accuracy" :disabled="isRoleEdit==false" filterable :placeholder="$t('processAnalysis.hlzq')"  class="filter-item" style="width:100%">
                 <el-option v-for="item in accuracyList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
@@ -146,37 +165,44 @@
       <el-row>
         <!-- <el-col :span="12">
           <el-form-item label="设备运转标准时间(分钟):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col> -->
         <el-col :span="12">
-          <el-form-item label="允许撒料时间误差(分钟):" prop="sprinkleFeedTimeAllow">
-            <el-input ref="sprinkleFeedTimeAllow" v-model="createTemp.sprinkleFeedTimeAllow" :disabled="isRoleEdit==false" class="filter-item" placeholder="允许撒料时间误差" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.yxslsjwc')" prop="sprinkleFeedTimeAllow">
+            <el-input ref="sprinkleFeedTimeAllow" v-model="createTemp.sprinkleFeedTimeAllow" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.yxslsjwc')" type="text" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="集团端域名或IP:" prop="domain">
-            <el-input ref="domain" v-model="createTemp.domain" :disabled="isRoleEdit==false" class="filter-item" placeholder="集团端域名或IP" type="text" />
+          <el-form-item
+:label="$t('defaultParameter.jtymip')" prop="domain">
+            <el-input ref="domain" v-model="createTemp.domain" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.jtymip')" type="text" />
           </el-form-item>
           </el-col>
         <el-col :span="12">
-          <el-form-item label="tmr容量上限(%):" prop="tmrUpper">
-            <el-input ref="tmrUpper" v-model="createTemp.tmrUpper" :disabled="isRoleEdit==false" class="filter-item" placeholder="tmr容量上限(%)" type="number" />
+          <el-form-item
+:label="$t('defaultParameter.tmrrl')" prop="tmrUpper">
+            <el-input ref="tmrUpper" v-model="createTemp.tmrUpper" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.tmrrl')" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="tmr容量下限(%):" prop="tmrUnder">
-              <el-input ref="tmrUnder" v-model="createTemp.tmrUnder" :disabled="isRoleEdit==false" class="filter-item" placeholder="tmr容量下限(%)" type="number" />
+          <el-form-item
+:label="$t('defaultParameter.tmrrl1')" prop="tmrUnder">
+              <el-input ref="tmrUnder" v-model="createTemp.tmrUnder" :disabled="isRoleEdit==false" class="filter-item" :placeholder="$t('defaultParameter.tmrrl1')" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="预混料允许误差:" prop="yhfeedtemplet">
+          <el-form-item
+:label="$t('defaultParameter.yhlyxwc')" prop="yhfeedtemplet">
               <el-input ref="yhfeedtemplet" v-model="createTemp.yhfeedtemplet" :disabled="isRoleEdit==false" class="filter-item" placeholder="kg" type="number" />
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="预混跳转延时:" prop="yhautosecond">
-              <el-select v-model="createTemp.yhautosecond" :disabled="isRoleEdit==false" filterable placeholder="预混跳转延时" class="filter-item" style="width:100%">
+          <el-form-item
+:label="$t('defaultParameter.yhtzys')" prop="yhautosecond">
+              <el-select v-model="createTemp.yhautosecond" :disabled="isRoleEdit==false" filterable :placeholder="$t('defaultParameter.yhtzys')" class="filter-item" style="width:100%">
                 <el-option v-for="item in yhautosecondList" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
           </el-form-item>
@@ -185,43 +211,43 @@
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 10px;">
       <el-button v-if="isRoleEdit" class="save" :disabled="isokDisable" @click="handleSave">{{$t('formulationEvaluation.save')}}</el-button>
-      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">恢复默认</el-button>
+      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">{{$t('defaultParameter.hfmr')}}</el-button>
     </div>
 
     <el-dialog :title="textMap[description.dialogStatus]" :destroy-on-close="true" :visible.sync="description.dialogFormVisible" :close-on-click-modal="false" width="70%">
       <div class="app-description dialogMinHeight">
         <div class="content">
-          1、是否可取前一天计划:若选择是,代表在当天过了凌晨12点仍可以取到昨天的料。
+          {{$t('defaultParameter.msg1')}}
           <br>
-          2、是否可取后一天计划:若当天做完全部的料需要预备第二天的料的时候可以选择是。
+          {{$t('defaultParameter.msg2')}}
           <br>
-          3、班次数量:控制栏舍配方,计划等页面班次数量。
+          {{$t('defaultParameter.msg3')}}
           <br>
-          4、重量小数点位数:控制栏舍配方、撒料计划等页面重量小数位数。
+          {{$t('defaultParameter.msg4')}}
           <br>
-          5、是否启用饲料合同:若选择是,则开启库存管理中饲料合同页面。
+          {{$t('defaultParameter.msg5')}}
           <br>
-          6、启用饲料锁定牛头数:开启后则配方模板中饲料表显示此字段。
+          {{$t('defaultParameter.msg6')}}
           <br>
-          7、车辆载重超出重量提醒比例:撒料计划中车次分配栏舍重量,当分配的合计重量超出车辆最大重量*此比例时,进行提示。限制输入正整数。
+          {{$t('defaultParameter.msg7')}}
           <br>
-          8、车辆载重超出重量禁止比例:撒料计划中车次分配栏舍重量,当分配的合计重量超出车辆最大重量*此比例时,禁止分配。限制输入正整数。
+          {{$t('defaultParameter.msg8')}}
           <br>
-          9、是否启用补料:若选择是,则栏舍配方中启用此字段。
+          {{$t('defaultParameter.msg9')}}
           <br>
-          10、是否启用剩料:若选择否则剩料计划不可用,剩料量不影响原计划。
+          {{$t('defaultParameter.msg10')}}
           <br>
-          11、剩料处理选项:①若选择转为饲料,按饲料配方整体替换扣减;②如果选择替换某饲料,则此剩料替换待饲喂中的对应饲料量,扣完为止;③不处理:不做剩料计算处理。
+          {{$t('defaultParameter.msg11')}}
           <br>
-          12、剩料分配方式:①顶额分配:按栏舍原撒料量的百分比进行计算,剩料分配为此值,依次计算分配满栏舍,若剩料量未分配完,则剩余剩料不计入内;
+          {{$t('defaultParameter.msg12')}}
           <br>
-          ②平均分配,按收集的总剩料量平均分配值,若分配值超出栏舍原料量的百分比,剩余值累加到未分配满的栏舍中,最终剩余剩料不计入内。
+          {{$t('defaultParameter.msg121')}}
           <br>
-          13、剩料分配占比原料:剩料应分配量不超出此比例计算出的值,与剩料分配方式关联使用。限制输入正整数。
+          {{$t('defaultParameter.msg13')}}
           <br>
-          14、小料是否称量:若选择是,则饲料表中饲料可选小料称,撒料计划中可设置是否提前称量。
+          {{$t('defaultParameter.msg14')}}
           <br>
-          15、是否启用数据同步:启用后日执行页面开启数据同步按钮,用于与第三方系统数据对接。
+          {{$t('defaultParameter.msg15')}}
         </div>
       </div>
       <div slot="footer" class="dialog-footer">
@@ -241,29 +267,54 @@ export default {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取前一天计划
       planNextDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取后一天计划
       isSupplementList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用补料
       isLeftoverMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
-      decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用剩料
+      decimalPlacesList: [{ id: '0',  
+name:this.$t('supplier.zs') }, { id: '1',  
+name:this.$t('supplier.xs1') }, { id: '2', 
+name:this.$t('supplier.xs2') }, { id: '3', 
+name:this.$t('supplier.xs3') }], // 日计划报表小数点位数
       isLockBullsList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' },{ id: '4', name: '5' },{ id: '5', name: '6' }], // 班次数量
       feedontractList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '剩料分配' }],
-      weightDecimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }, { id: '4', name: '四位小数' }], // 重量小数点位数
-      rateDecimalPlacesList:  [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }],//比例小数点位数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用饲料合同
+      leftoverMaterialList: [{ id: '0',  
+name:this.$t('supplier.defb') }, { id: '1', 
+name:this.$t('supplier.slfb') }],
+      weightDecimalPlacesList: [{ id: '0',  
+name:this.$t('supplier.zs') }, { id: '1',  
+name:this.$t('supplier.xs1') }, { id: '2', 
+name:this.$t('supplier.xs2') }, { id: '3', 
+name:this.$t('supplier.xs3') }, { id: '4',  
+name:this.$t('supplier.xs4') }], // 重量小数点位数
+      rateDecimalPlacesList:  [{ id: '0',  
+name:this.$t('supplier.zs') }, { id: '1',  
+name:this.$t('supplier.xs1') }, { id: '2', 
+name:this.$t('supplier.xs2') }],//比例小数点位数
       smallMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 小料是否称量
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 小料是否称量
       dataSynchronizationList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用数据同步
-      accuracyList: [{ id: '1', name: '排除允许误差准确率' }, { id: '0', name: '不排除允许误差准确率' }],  //混料准确率
-      yhautosecondList:[{ id: '1', name: '禁用' }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用数据同步
+      accuracyList: [{ id: '1',  
+name:this.$t('supplier.pfyxwczql') }, { id: '0',  
+name:this.$t('supplier.pfyxwczql1') }],  //混料准确率
+      yhautosecondList:[{ id: '1',  
+name:this.$t('supplier.jy') }, { id: '2', name: '3秒' }, { id: '3', name: '6秒' }, { id: '4', name: '9秒' }],  //预混跳转延时
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],
@@ -286,7 +337,8 @@ name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用数据
         dialogStatus: ''
       },
       textMap: {
-        description: '参数说明'
+         
+description:this.$t('supplier.cssm')
       },
       isokDisable: false,
       requestParam: {}

+ 19 - 18
src/views/basicData/defaultParameter/index.vue

@@ -1,34 +1,35 @@
-<template>
+<template>
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="功能参数" name="first">
+      <el-tab-pane
+:label="$t('defaultParameter.name1')" name="first">
         <component :is="myComponent1" ref="detail1" />
       </el-tab-pane>
-      <el-tab-pane label="预警参数" name="second">
+      <el-tab-pane :label="$t('defaultParameter.name2')" name="second">
         <component :is="myComponent2" ref="detail2" />
       </el-tab-pane>
     </el-tabs>
-  </div>
-
-</template>
-
+  </div>
+
+</template>
+
 <script>
 import Function from './function/index'
-import EarlyWarning from './earlyWarning/index'
-export default {
+import EarlyWarning from './earlyWarning/index'
+export default {
   name: 'DefaultParameter',
-  components: { Function, EarlyWarning },
-  data() {
+  components: { Function, EarlyWarning },
+  data() {
     return {
       activeName: 'first',
       myComponent1: null,
       myComponent2: null
-    }
-  },
+    }
+  },
   created() {
     this.detailComponent()
-  },
-
+  },
+
   methods: {
     detailComponent() {
       if (this.activeName == 'first') {
@@ -53,9 +54,9 @@ export default {
       }
     }
 
-  }
-}
+  }
+}
 </script>
 <style lang="scss" scoped>
 
-</style>
+</style>

+ 50 - 22
src/views/basicData/defaultParameter/index2.vue

@@ -3,14 +3,16 @@
     <el-form ref="createTemp" :rules="rules" :model="createTemp" label-position="right" label-width="250px" style="margin-top: 40px;margin-bottom:30px;">
       <el-row>
         <el-col :span="12">
-          <el-form-item label="是否可取前一天计划:" prop="isGetLastPlan">
+          <el-form-item
+:label="$t('defaultParameter.sfkqqytjh')" prop="isGetLastPlan">
             <el-select v-model="createTemp.isGetLastPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取前一天计划" class="filter-item" style="width:100%">
               <el-option v-for="item in planBeforeDayList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否可取后一天计划:" prop="isGetNextPlan">
+          <el-form-item
+:label="$t('defaultParameter.sfkqqytjh1')" prop="isGetNextPlan">
             <el-select v-model="createTemp.isGetNextPlan" :disabled="isRoleEdit==false" filterable placeholder="是否可取后一天计划" class="filter-item" style="width:100%">
               <el-option v-for="item in planNextDayList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -19,14 +21,16 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="是否启用补料:" prop="isEnableSupplyFeed">
+          <el-form-item
+:label="$t('defaultParameter.sfqybl')" prop="isEnableSupplyFeed">
             <el-select v-model="createTemp.isEnableSupplyFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用补料" class="filter-item" style="width:100%">
               <el-option v-for="item in isSupplementList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否启用剩料:" prop="isEnableRemainFeed">
+          <el-form-item
+:label="$t('defaultParameter.sfqysl')" prop="isEnableRemainFeed">
             <el-select v-model="createTemp.isEnableRemainFeed" :disabled="isRoleEdit==false" filterable placeholder="是否启用剩料" class="filter-item" style="width:100%">
               <el-option v-for="item in isLeftoverMaterialList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -42,7 +46,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="启用饲料锁定牛头数:" prop="isLockCount">
+          <el-form-item
+:label="$t('defaultParameter.qyslsdnts')" prop="isLockCount">
             <el-select v-model="createTemp.isLockCount" :disabled="isRoleEdit==false" filterable placeholder="启用饲料锁定牛头数" class="filter-item" style="width:100%">
               <el-option v-for="item in isLockBullsList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -51,7 +56,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="剩料处理选项:" prop="remainOpt">
+          <el-form-item
+:label="$t('defaultParameter.slclxx')" prop="remainOpt">
             <el-select v-model="createTemp.remainOpt" :disabled="isRoleEdit==false" filterable placeholder="剩料处理选项" class="filter-item" style="width:100%">
               <el-option v-for="item in disposalList" :key="item.id" :label="item.fname" :value="item.id" />
             </el-select>
@@ -79,7 +85,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="库存预警天数:" prop="repertoryWarn">
+          <el-form-item  
+:label="$t('defaultParameter.kcyjts')"  prop="repertoryWarn">
             <el-input ref="repertoryWarn" v-model="createTemp.repertoryWarn" :disabled="isRoleEdit==false" class="filter-item" placeholder="请输入库存预警天数" type="text" />
           </el-form-item>
         </el-col>
@@ -93,14 +100,16 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="班次数量:" prop="times">
+          <el-form-item
+:label="$t('defaultParameter.bcsl')" prop="times">
             <el-select v-model="createTemp.times" :disabled="isRoleEdit==false" filterable placeholder="水分调节选项" class="filter-item" style="width:100%">
               <el-option v-for="item in numberList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="是否启用饲料合同:" prop="isEnableContract">
+          <el-form-item
+:label="$t('defaultParameter.sfqyslht')" prop="isEnableContract">
             <el-select v-model="createTemp.isEnableContract" :disabled="isRoleEdit==false" filterable placeholder="启用饲料合同" class="filter-item" style="width:100%">
               <el-option v-for="item in feedontractList" :key="item.id" :label="item.name" :value="item.id" />
             </el-select>
@@ -109,7 +118,8 @@
       </el-row>
       <el-row>
         <el-col :span="12">
-          <el-form-item label="剩料分配方式:" prop="remainOptDis">
+          <el-form-item
+:label="$t('defaultParameter.slfbfs')" prop="remainOptDis">
             <el-select v-model="createTemp.remainOptDis" :disabled="isRoleEdit==false" filterable placeholder="剩料分配方式" class="filter-item" style="width:100%">
               <el-option v-for="item in leftoverMaterialList" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
@@ -117,14 +127,17 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="剩料分配占比原混料(%):" prop="remainOptRate">
-            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item" placeholder="剩料分配占比原混料" type="text" />
+            <el-input ref="remainOptRate" v-model="createTemp.remainOptRate" :disabled="isRoleEdit==false" class="filter-item"  
+:placeholder="$t('defaultParameter.slfpzb')" type="text" />
           </el-form-item>
         </el-col>
       </el-row>
     </el-form>
     <div slot="footer" class="dialog-footer" style="bottom: 0;">
       <el-button v-if="isRoleEdit" class="success" :disabled="isokDisable" @click="handleSave">{{$t('formulationEvaluation.save')}}</el-button>
-      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery">恢复默认</el-button>
+      <el-button v-if="isRoleEdit" class="warning" :disabled="isokDisable" @click="handleRecovery"> 
+ 
+{{$t('defaultParameter.hfmr')}}</el-button>
     </div>
   </div>
 
@@ -140,24 +153,39 @@ export default {
     return {
       isRoleEdit: [],
       planBeforeDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取前一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取前一天计划
       planNextDayList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否可取后一天计划
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否可取后一天计划
       isSupplementList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用补料
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用补料
       isLeftoverMaterialList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用剩料
-      decimalPlacesList: [{ id: '0', name: '整数' }, { id: '1', name: '一位小数' }, { id: '2', name: '两位小数' }, { id: '3', name: '三位小数' }], // 日计划报表小数点位数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用剩料
+      decimalPlacesList: [{ id: '0',  
+name:this.$t('supplier.zs') }, { id: '1',  
+name:this.$t('supplier.xs1') }, { id: '2', 
+name:this.$t('supplier.xs2') }, { id: '3', 
+name:this.$t('supplier.xs3') }], // 日计划报表小数点位数
       isLockBullsList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 启用饲料锁定牛头数
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 启用饲料锁定牛头数
       disposalList: [], // 剩料处理选项
-      waterConditioningList: [{ id: '0', name: '青贮' }, { id: '1', name: '总日粮饲喂量' }, { id: '2', name: '不处理' }], // 水分调节选项
+      waterConditioningList: [{ id: '0',  
+name:this.$t('defaultParameter.qz')}, { id: '1',  
+name:this.$t('defaultParameter.bcl') }, { id: '2',  
+name:this.$t('defaultParameter.bcl') }], // 水分调节选项
       priceCalculationList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用库存管理
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用库存管理
       numberList: [{ id: '0', name: '1' }, { id: '1', name: '2' }, { id: '2', name: '3' }, { id: '3', name: '4' }], // 班次数量
       feedontractList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用饲料合同
-      leftoverMaterialList: [{ id: '0', name: '顶额分配' }, { id: '1', name: '平均分配' }],
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用饲料合同
+      leftoverMaterialList: [{ id: '0',  
+name:this.$t('supplier.defb') }, { id: '1', name: '平均分配' }],
       requestParams: [
         { name: 'getRemainFeedList', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
       ],

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

@@ -176,7 +176,8 @@ export default {
       ],
       typeList: [], // TMR设备类型
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }], // 是否启用
       jumpDelayList: [], // 跳转延时
       dataInterfaceList: [], // 数据接口
       getAppoints:{

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

@@ -101,7 +101,8 @@ export default {
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['饲料大类'] }
       ],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }],
       feedCategoryList: [],
 
       table: {

+ 8 - 4
src/views/basicData/feedTable/index.vue

@@ -831,16 +831,20 @@ export default {
         name: 'getSysoptEnable', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), inforname: 'isSmallMaterial' }
       },
       enableList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否启用
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否启用
       feedSourcesList: [{ id: '0', name: '系统内置' }, { id: '1', name: '用户自定义' }], // 饲料来源
-      confirmStartList: [{ id: '0', name: '禁用' }, { id: '1', name: '启用' }], // 确认开始
+      confirmStartList: [{ id: '0',  
+name:this.$t('supplier.jy') }, { id: '1', name: '启用' }], // 确认开始
       associationStatusList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 关联状态
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 关联状态
       jumpDelayList: [], // 跳转延时
       feedTypeList: [], // 饲料分类
       planTypeList: [], // 计划类型
       smallMaterialList: [], // 小料秤
-      jmpList: [{ id: '0', name: '否' }, { id: '1',
+      jmpList: [{ id: '0',  
+name:this.$t('supplier.no') }, { id: '1',
 name:this.$t('supplier.yes')}], // 无上域
       materialtypeList:[],//物料类型
       sapGoodsList:[],//sap货位

+ 2 - 1
src/views/basicData/groupColumn/index.vue

@@ -200,7 +200,8 @@ export default {
         { name: 'getCattleorder', offset: 0, pagecount: 0, parammaps: {pastureid: Cookies.get('pastureid')} }
       ],
       enableList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }],
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }],
       jumpDelayList: [],
       barClassList:[],
       scopeherdList:[],

+ 2 - 1
src/views/basicData/livestockCategory/index.vue

@@ -103,7 +103,8 @@ export default {
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] }
       ],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }],
       parentList: [],
 
       table: {

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

@@ -104,7 +104,8 @@ export default {
     return {
       isRoleEdit: [],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }],
       associatedDevicesList: [{ id: 0, name: '设备001', name2: '00123', name3: '铲车' }, { id: 1, name: '设备002', name2: '00124', name3: '铲车' }, { id: 2, name: '设备003', name2: '00125', name3: '铲车' }],
 
       getDownListParm: {

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

@@ -111,7 +111,8 @@ export default {
     return {
       isRoleEdit: [],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }], // 是否启用
 
       table: {
         getdataListParm: {

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

@@ -125,7 +125,8 @@ export default {
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
       isAuditList: [{ id: '1',
-name:this.$t('supplier.yes')}, { id: '0', name: '否' }], // 是否审核
+name:this.$t('supplier.yes')}, { id: '0',  
+name:this.$t('supplier.no') }], // 是否审核
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getDictByName', offset: 0, pagecount: 0, params: ['牲畜父类'] }

+ 2 - 1
src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -500,7 +500,8 @@ export default {
       screeningFieldList1:[
         { id: '是',
 name:this.$t('supplier.yes')},
-        { id: '否', name: '否' }
+        { id: '否',  
+name:this.$t('supplier.no') }
       ],
       screeningFieldList2:[
         { id: '自动', name: '自动' },

+ 2 - 1
src/views/systemManagement/operationManagement/pasture/index.vue

@@ -131,7 +131,8 @@ export default {
       isRoleEdit: [],
       stateList: [{ id: 1, name: '启用' }, { id: 0, name: '禁止' }], // 状态
       isBelongGroupList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否归属集团
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }], // 是否归属集团
       belongGroupList: [], // 权限归属
       tab1: {
         // 页面配置

+ 2 - 1
src/views/systemManagement/ranchInformation/index.vue

@@ -105,7 +105,8 @@ export default {
     return {
       isRoleEdit: [],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }],
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }],
 
       table: {
         getdataListParm: {

+ 2 - 1
src/views/systemManagement/role/index.vue

@@ -157,7 +157,8 @@ export default {
       dialogFull: false,
       isRoleEdit: [],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }], // 是否启用
 
       table: {
         getdataListParm: {

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

@@ -154,7 +154,8 @@ export default {
         { name: 'getRoleAll', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }}
       ],
       enableList: [{ id: 1,
-name:this.$t('supplier.yes')}, { id: 0, name: '否' }], // 是否启用
+name:this.$t('supplier.yes')}, { id: 0,  
+name:this.$t('supplier.no') }], // 是否启用
       attentionStatusList: [{ id: 1, name: '已关注公众号' }, { id: 0, name: '未关注公众号' }],
       roleList: [], // 角色