Browse Source

库存管理1

Shan9312 11 months ago
parent
commit
ee4030fb83
29 changed files with 111 additions and 100 deletions
  1. 0 0
      2020-02-19.txp
  2. 2 0
      src/lang/en/langModule/InventoryManagement.js
  3. 0 0
      src/lang/en/langModule/hardwareTest.js
  4. 3 2
      src/lang/zn/langModule/InventoryManagement.js
  5. 6 0
      src/lang/zn/langModule/hardwareTest.js
  6. 1 1
      src/views/basicData/equipmentTMR/index.vue
  7. 6 6
      src/views/basicData/feedTable/index.vue
  8. 1 1
      src/views/basicData/sapLog/index.vue
  9. 1 1
      src/views/customboard/ChartPanel/components/dataPanel.vue
  10. 1 1
      src/views/dashboard/group/index.vue
  11. 1 1
      src/views/formulationPlan/dailyExecutionPlan/historyRecord.vue
  12. 3 3
      src/views/formulationPlan/dailyExecutionPlan/index.vue
  13. 1 1
      src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue
  14. 1 1
      src/views/formulationPlan/formulaDistribution/index.vue
  15. 4 4
      src/views/formulationPlan/recipeTemplate/index.vue
  16. 1 1
      src/views/inventoryManagement/feedContract/index.vue
  17. 1 1
      src/views/inventoryManagement/inventoryList/index.vue
  18. 2 2
      src/views/inventoryManagement/laborConsumption/index.vue
  19. 2 2
      src/views/inventoryManagement/statistics/index.vue
  20. 2 2
      src/views/inventoryManagement/systemConsumption/index.vue
  21. 3 3
      src/views/inventoryManagement/warehousing/index.vue
  22. 1 1
      src/views/inventoryManagement/warning/index.vue
  23. 1 1
      src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue
  24. 3 3
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue
  25. 1 1
      src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue
  26. 1 1
      src/views/statisticalAnalysis/formulationEvaluation/index.vue
  27. 1 1
      src/views/statisticalAnalysis/formulationEvaluation/index备.vue
  28. 30 30
      src/views/statisticalAnalysis/inventoryManagement/group/index.vue
  29. 31 29
      src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

File diff suppressed because it is too large
+ 0 - 0
2020-02-19.txp


+ 2 - 0
src/lang/en/langModule/InventoryManagement.js

@@ -8,6 +8,7 @@ export default{
    qcje:"Beginning Balance",
    yl:"Usage",
    xtckyl:"System Outward Weight(kg)",
+   rkylzl:"Inward Weight(kg)",
    rgylzl:"Manual Feed Weight(kg)",
    chzl:"Loss Weight(kg)",
    qm:'End of Period',
@@ -20,6 +21,7 @@ export default{
    rq:"Date",
    tmrsbbh:"TMR Equipment Number",
    lbxs:"List Display",
+   qhzs:"Switch Display"
    
    
    

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


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

@@ -8,7 +8,7 @@ export default{
    qcje:"期初金额(元)",
    yl:"用量",
    xtckyl:"系统出库重量(kg)",
-   xtckyl:"系统出库重量(kg)",
+   rkylzl:"入库重量(kg)",
    rgylzl:"人工用料重量(kg)",
    chzl:"损耗重量(kg)",
    qm:'期末',
@@ -22,7 +22,8 @@ export default{
    tmrsbbh:"TMR设备编号",
    lbxs:"列表显示",
    tjlx:"统计类型",
-   
+   qhzs:"切换展示"
+
    
 
 

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

@@ -0,0 +1,6 @@
+export default{
+ tmrList:""
+
+
+
+}

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-input v-model="table.getdataListParm.parammaps.eqcode" placeholder="TMR设备编号" style="width: 180px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.eqcode" :placeholder="$t('InventoryManagement.tmrsbbh')"    style="width: 180px;" class="filter-item" clearable />
       <el-select v-model="table.getdataListParm.parammaps.classname" filterable placeholder="TMR设备类型" class="filter-item" style="width: 140px;" clearable>
         <el-option v-for="item in typeList" :key="item.id" :label="item.label" :value="item.label" />
       </el-select>

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search" ref="search">
-      <el-input v-model="table.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
+      <el-input v-model="table.getdataListParm.parammaps.fname":placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
       <el-select v-model="table.getdataListParm.parammaps.fclassid" filterable placeholder="饲料类别" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in feedTypeList" :key="item.id" :label="item.mixname" :value="item.id" />
       </el-select>
@@ -82,7 +82,7 @@
       >
         <u-table-column type="selection" align="center" width="50" fixed="left" />
         <u-table-column label="序号" type="index" align="center" width="50" fixed="left"/>
-        <u-table-column label="饲料名称" min-width="80px" align="center" prop="fname" fixed="left"/>
+        <u-table-column :label="$t('InventoryManagement.silc')"    min-width="80px" align="center" prop="fname" fixed="left"/>
         <u-table-column label="饲料分类" min-width="80px" align="center" prop="fclass" fixed="left"/>
         <u-table-column label="物料类型" min-width="90px" align="center" prop="sapMaterialtypeName" />
         <!-- <u-table-column label="SAP货位" min-width="90px" align="center" prop="goods" /> -->
@@ -324,7 +324,7 @@
       </template>
       <div class="app-add">
         <div class="search">
-          <el-input v-model="feedBank.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
+          <el-input v-model="feedBank.getdataListParm.parammaps.fname":placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
           <el-select v-model="feedBank.getdataListParm.parammaps.statue" filterabler placeholder="关联状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in associationStatusList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
@@ -356,7 +356,7 @@
                 <span>{{ scope.row.feedcode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="饲料名称" min-width="80px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="80px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fname }}</span>
               </template>
@@ -461,7 +461,7 @@
       </template>
       <div class="app-add">
         <div class="search">
-          <el-input v-model="relation.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
+          <el-input v-model="relation.getdataListParm.parammaps.fname":placeholder="$t('InventoryManagement.silc')"    style="width: 130px;" class="filter-item" clearable />
           <el-button class="successBorder" @click="handleRelationSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
@@ -489,7 +489,7 @@
                 <span>{{ scope.row.feedcode }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="饲料名称" min-width="80px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="80px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fname }}</span>
               </template>

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

@@ -147,7 +147,7 @@
             <el-table-column  :label="$t('errorAnalysis.Driver')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column  :label="$t('errorAnalysis.feedName')"  min-width="90px" align="center" prop="createTime" />
             <el-table-column label="饲料顺序" min-width="90px" align="center" prop="createTime" />
-            <el-table-column label="饲料名称" min-width="90px" align="center" prop="createTime" />
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center" prop="createTime" />
             <el-table-column label="饲料重量" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="自拌料-饲料顺序" min-width="90px" align="center" prop="createTime" />
             <el-table-column label="自拌料-饲料名称" min-width="90px" align="center" prop="createTime" />

+ 1 - 1
src/views/customboard/ChartPanel/components/dataPanel.vue

@@ -13,7 +13,7 @@
       <!-- label看到的 key=id -->
       <el-form-item label="数据类型:">
         <el-radio-group v-model="selectedTable" @change="handleDataSrcChange">
-          <el-radio-button label="trainnumber">车次</el-radio-button>
+          <el-radio-button label="trainnumber">{{$t('errorAnalysis.projname')}}</el-radio-button>
           <el-radio-button label="barroport">{{$t('errorAnalysis.pen')}}</el-radio-button>
         </el-radio-group>
       </el-form-item>

+ 1 - 1
src/views/dashboard/group/index.vue

@@ -377,7 +377,7 @@
                 class="elTable table-fixed"
               >
                 <el-table-column label="序号" type="index" min-width="80px" align="center" />
-                <el-table-column label="饲料名称" min-width="80px" align="center" prop="feedname" />
+                <el-table-column :label="$t('InventoryManagement.silc')"    min-width="80px" align="center" prop="feedname" />
                 <el-table-column label="库存量(kg)" min-width="70px" align="center" prop="stockweight" />
                 <el-table-column label="剩余使用天数" min-width="80px" align="center" prop="ldays" />
               </el-table>

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

@@ -93,7 +93,7 @@
                 <span>{{ scope.row.sort }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="饲料名称" prop="fname" min-width="130px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    prop="fname" min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fname }}</span>
               </template>

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

@@ -189,7 +189,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="饲料名称" prop="fname" min-width="90px" align="center">
+                <el-table-column :label="$t('InventoryManagement.silc')"    prop="fname" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>
@@ -253,7 +253,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="饲料名称" prop="fname" min-width="90px" align="center">
+                <el-table-column :label="$t('InventoryManagement.silc')"    prop="fname" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>
@@ -453,7 +453,7 @@
                     <span>{{ scope.row.sort }}</span>
                   </template>
                 </el-table-column>
-                <el-table-column label="饲料名称" prop="fname" min-width="90px" align="center">
+                <el-table-column :label="$t('InventoryManagement.silc')"    prop="fname" min-width="90px" align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.fname }}</span>
                   </template>

+ 1 - 1
src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -44,7 +44,7 @@
       </template>
       <div class="dialogMinHeight">
         <div class="search filter-item">
-          <el-select v-model="samplingSelection.getdataListParm.parammaps.date" filterable placeholder="日期" class="filter-item" style="width: 150px;">
+          <el-select v-model="samplingSelection.getdataListParm.parammaps.date" filterable :placeholder="$t('InventoryManagement.rq')"    class="filter-item" style="width: 150px;">
             <el-option v-for="item in samplingSelection.dateList" :key="item.id" :label="item.date" :value="item.date" />
           </el-select>
           <el-select v-model="samplingSelection.getdataListParm.parammaps.barid" filterable :placeholder="$t('errorAnalysis.isHouseName')"  class="filter-item" style="width: 120px;" clearable>

+ 1 - 1
src/views/formulationPlan/formulaDistribution/index.vue

@@ -148,7 +148,7 @@
           </el-tab-pane>
           <el-tab-pane label="使用情况" name="second">
             <div class="search">
-              <el-autocomplete v-model="see.tab2.table.getdataListParm.parammaps.date" value-key="date" class="inline-input filter-item" :fetch-suggestions="dateSearch" placeholder="日期" style="width:250px" @select="handleSelectDate">
+              <el-autocomplete v-model="see.tab2.table.getdataListParm.parammaps.date" value-key="date" class="inline-input filter-item" :fetch-suggestions="dateSearch" :placeholder="$t('InventoryManagement.rq')"    style="width:250px" @select="handleSelectDate">
                 <template slot-scope="{ item }">
                   <span>{{ item.date }}</span>
                 </template>

+ 4 - 4
src/views/formulationPlan/recipeTemplate/index.vue

@@ -259,7 +259,7 @@
                 <el-input v-if="scope.row.groupEdit" v-model="scope.row.feedgroup" :disabled="scope.row.isGroupDisabled" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
               </template>
             </el-table-column>
-            <el-table-column label="饲料名称" min-width="120px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="120px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.NoEdit">{{ scope.row.fname }}</span>
                 <el-select v-if="scope.row.Edit" v-model="scope.row.fid" filterable placeholder="" class="filter-item" style="width:95%;padding:10px 0;" @change="(value)=> {changeFname(value, scope.row)}">
@@ -356,7 +356,7 @@
                 <el-input v-if="scope.row.groupEdit" v-model="scope.row.feedgroup" :disabled="scope.row.isGroupDisabled" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
               </template>
             </el-table-column>
-            <el-table-column label="饲料名称" min-width="120px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="120px" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.NoEdit">{{ scope.row.fname }}</span>
                 <el-select v-if="scope.row.Edit" v-model="scope.row.fid" filterable placeholder="" class="filter-item" style="width:95%;padding:10px 0;" @change="(value)=> {changeFname(value, scope.row)}">
@@ -622,7 +622,7 @@
                   <span>{{ scope.row.feedgroup }}</span>
                 </template>
               </el-table-column>
-              <el-table-column label="饲料名称" min-width="130px" align="center">
+              <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
                 <template slot-scope="scope">
                   <span>{{ scope.row.fname }}</span>
                 </template>
@@ -688,7 +688,7 @@
             show-summary
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
-            <el-table-column label="饲料名称" min-width="130px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fname }}</span>
               </template>

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

@@ -139,7 +139,7 @@
           :cell-style="cellStyle"
           class="elTable table-fixed"
         >
-          <el-table-column label="饲料名称" min-width="130px" align="center">
+          <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.feedname }}</span>
             </template>

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

@@ -124,7 +124,7 @@
           :cell-style="cellStyle"
           class="elTable table-fixed"
         >
-          <el-table-column label="饲料名称" min-width="130px" align="center">
+          <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
             <template slot-scope="scope">
               <span>{{ scope.row.feedname }}</span>
             </template>

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

@@ -7,7 +7,7 @@
       <el-select v-model="table.getdataListParm.parammaps.usetype" placeholder="操作类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in operationTypeList" :key="item.id" :label="item.label" :value="item.value" />
       </el-select>
-      <el-autocomplete v-model="table.getdataListParm.parammaps.feedname" value-key="feedname" class="inline-input filter-item" :fetch-suggestions="tableFeedNameSearch" placeholder="饲料名称" style="width:250px" @select="handleSelectTableFeedName">
+      <el-autocomplete v-model="table.getdataListParm.parammaps.feedname" value-key="feedname" class="inline-input filter-item" :fetch-suggestions="tableFeedNameSearch":placeholder="$t('InventoryManagement.silc')"    style="width:250px" @select="handleSelectTableFeedName">
         <template slot-scope="{ item }">
           <span>{{ item.feedname }}</span>
         </template>
@@ -61,7 +61,7 @@
             <span>{{ scope.row.cowclass }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="饲料名称" min-width="110px" align="center">
+        <el-table-column :label="$t('InventoryManagement.silc')"    min-width="110px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.feedname }}</span>
           </template>

+ 2 - 2
src/views/inventoryManagement/statistics/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-select v-model="table.getdataListParm.parammaps.feedid" filterable placeholder="饲料名称" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.feedid" filterable:placeholder="$t('InventoryManagement.silc')"    class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
       <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
@@ -29,7 +29,7 @@
             <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="饲料名称" min-width="130px" align="center">
+        <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.feedname }}</span>
           </template>

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

@@ -8,7 +8,7 @@
       <el-select v-model="table.getdataListParm.parammaps.cowclassid" :placeholder="$t('feedingEfficiency.cxlb')" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in livestockTypeList" :key="item.value" :label="item.label" :value="item.value" />
       </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
+      <el-select v-model="table.getdataListParm.parammaps.feedid":placeholder="$t('InventoryManagement.silc')"    class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
@@ -52,7 +52,7 @@
             <span>{{ scope.row.cowclass }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="饲料名称" min-width="100px" align="center">
+        <el-table-column :label="$t('InventoryManagement.silc')"    min-width="100px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.feedname }}</span>
           </template>

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

@@ -4,7 +4,7 @@
       <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 250px;" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-select v-model="table.getdataListParm.parammaps.feedid" filterable placeholder="饲料名称" class="filter-item" style="width: 150px;" clearable>
+      <el-select v-model="table.getdataListParm.parammaps.feedid" filterable:placeholder="$t('InventoryManagement.silc')"    class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.providerid" placeholder="供应商" class="filter-item" style="width: 150px;" clearable>
@@ -54,7 +54,7 @@
             <span>{{ scope.row.laiddate }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="饲料名称" min-width="90px" align="center">
+        <el-table-column :label="$t('InventoryManagement.silc')"    min-width="90px" align="center">
           <template slot-scope="scope">
             <span>{{ scope.row.feedname }}</span>
           </template>
@@ -296,7 +296,7 @@
             class="elTable table-fixed"
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
-            <el-table-column label="饲料名称" min-width="130px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.fname }}</span>
               </template>

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

@@ -60,7 +60,7 @@
             :row-style="rowStyle"
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
-            <el-table-column label="饲料名称" min-width="130px" align="center">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedname }}</span>
               </template>

+ 1 - 1
src/views/statisticalAnalysis/errorAnalysis/group/tab1.vue

@@ -338,7 +338,7 @@
       <div class="app-pasture">
         <div class="search">
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-select v-model="pasture.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio">
+          <el-select v-model="pasture.radio" :placeholder="$t('InventoryManagement.tjlx')"   class="filter-item" style="width: 120px;" @change="changeRadio">
             <el-option v-for="item in statisticalTypeList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-checkbox v-model="pasture.checked" style="margin-right: 10px;" @change="changeChecked">{{$t('errorAnalysis.tjBydate')}}</el-checkbox>

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

@@ -973,7 +973,7 @@
           >
             <el-table-column label="序号" align="center" type="index" width="50px" />
             <el-table-column label="饲料组" width="130px" align="center" prop="feedgroup" />
-            <el-table-column label="饲料名称" min-width="70px" align="center"  prop="fname">
+            <el-table-column :label="$t('InventoryManagement.silc')"    min-width="70px" align="center"  prop="fname">
               <template slot-scope="{row}">
                 <span v-if="row.fweightstatus == 1" style="color: red;"> {{row.fname}} </span>
                 <span v-else>{{row.fname}}</span>
@@ -1179,7 +1179,7 @@
               :summary-method="getSummaries1"
             >
               <el-table-column label="饲料组" min-width="90px" align="center" prop="feedgroup" />
-              <el-table-column label="饲料名称" min-width="90px" align="center" prop="fname" />
+              <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="搅拌延时(min)" min-width="100px" align="center">
                 <template slot-scope="{row}">
@@ -1220,7 +1220,7 @@
               :summary-method="getSummaries2"
             >
               <el-table-column label="饲料组" min-width="90px" align="center" prop="feedgroup" />
-              <el-table-column label="饲料名称" min-width="90px" align="center" prop="fname" />
+              <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="搅拌延时(min)" min-width="100px" align="center">
                 <template slot-scope="{row}">

+ 1 - 1
src/views/statisticalAnalysis/errorAnalysis/pasture/see.vue

@@ -60,7 +60,7 @@
                   class="elTable table-fixed"
                 >
                   <el-table-column :label="$t('errorAnalysis.czNum')"  min-width="50px" align="center" prop="sort" />
-                  <el-table-column label="饲料名称" min-width="50px" align="center" prop="fname" />
+                  <el-table-column :label="$t('InventoryManagement.silc')"    min-width="50px" align="center" prop="fname" />
                   <el-table-column label="计划重量" min-width="50px" align="center" prop="lweight" />
                   <el-table-column  :label="$t('errorAnalysis.acWeight')"  min-width="50px" align="center" prop="actualweightminus" />
                   <el-table-column :label="$t('errorAnalysis.wcz')" min-width="50px" align="center" prop="diff" />

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

@@ -476,7 +476,7 @@
           >
             <el-table-column label="序号" type="index" width="50" align="center" />
             <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
-            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
+            <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="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
             <el-table-column label="是否锁定牛头数比例" min-width="100" align="center">

+ 1 - 1
src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -466,7 +466,7 @@
           >
             <el-table-column label="序号" type="index" width="50" align="center" />
             <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
-            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
+            <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="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
             <el-table-column label="是否锁定牛头数比例" min-width="100" align="center">

+ 30 - 30
src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <!-- <h1>集团</h1> -->
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="库存统计" name="first">
+      <el-tab-pane :label="$t('InventoryManagement.kctj')"   name="first">
         <div class="search">
           <el-select v-model="tab.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 150px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
@@ -10,7 +10,7 @@
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
-          <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
+          <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="width: 245px;margin-bottom:10px;" :placeholder="$t('InventoryManagement.silc')" />
           <el-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">{{$t('common.query')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport(tab1)">{{$t('dashboard.Export')}}</el-button>
         </div>
@@ -28,30 +28,30 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
-            <el-table-column sortable label="饲料名称" min-width="130px" align="center">
+            <el-table-column sortable :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="期初" min-width="130px" align="center">
-              <el-table-column sortable prop="startsum" align="center" label="期初库存(kg)" min-width="120" />
-              <el-table-column sortable prop="startprice" align="center" label="期初金额(元)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.qc')"   min-width="130px" align="center">
+              <el-table-column sortable prop="startsum" align="center" :label="$t('InventoryManagement.qckc')"    min-width="120" />
+              <el-table-column sortable prop="startprice" align="center" :label="$t('InventoryManagement.qcje')"    min-width="120" />
             </el-table-column>
-            <el-table-column label="用量" min-width="110px" align="center">
-              <el-table-column sortable prop="laidsum" align="center" label="入库重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumXT" align="center" label="系统出库重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumRG" align="center" label="人工用料重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumXH" align="center" label="损耗重量(kg)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.yl')"    min-width="110px" align="center">
+              <el-table-column sortable prop="laidsum" align="center" :label="$t('InventoryManagement.rkylzl')"    min-width="120" />
+              <el-table-column sortable prop="usesumXT" align="center" :label="$t('InventoryManagement.xtckyl')"    min-width="120" />
+              <el-table-column sortable prop="usesumRG" align="center" :label="$t('InventoryManagement.rgylzl')"    min-width="120" />
+              <el-table-column sortable prop="usesumXH" align="center" :label="$t('InventoryManagement.chzl')"    min-width="120" />
             </el-table-column>
-            <el-table-column label="期末" min-width="130px" align="center">
-              <el-table-column sortable prop="stopsum" align="center" label="期末库存(kg)" min-width="120" />
-              <el-table-column sortable prop="stopprice" align="center" label="期末金额(元)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.qm')"     min-width="130px" align="center">
+              <el-table-column sortable prop="stopsum" align="center" :label="$t('InventoryManagement.qmkc')"   min-width="120" />
+              <el-table-column sortable prop="stopprice" align="center" :label="$t('InventoryManagement.qmje')"    min-width="120" />
             </el-table-column>
           </el-table>
           <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getTabList" />
         </div>
       </el-tab-pane>
-      <el-tab-pane label="用料分析" name="second">
+      <el-tab-pane :label="$t('InventoryManagement.yltj')"   name="second">
         <div class="search">
           <el-select v-model="tab2.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 130px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
@@ -61,15 +61,15 @@
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
           <el-radio v-model="tab2.radio" label="1" @change="changeRadio2">{{$t('feedingEfficiency.cxlb')}}</el-radio>
-          <el-radio v-model="tab2.radio" label="2" @change="changeRadio2">栏舍名称</el-radio>
-          <el-radio v-model="tab2.radio" label="3" @change="changeRadio2">日期</el-radio>
-          <el-radio v-model="tab2.radio" label="4" @change="changeRadio2">TMR设备编号</el-radio>
-          <el-radio v-model="tab2.radio" label="5" @change="changeRadio2">班次</el-radio>
-          <el-radio v-model="tab2.radio" label="6" @change="changeRadio2">车次</el-radio>
+          <el-radio v-model="tab2.radio" label="2" @change="changeRadio2">{{$t('errorAnalysis.isHouseName')}}</el-radio>   
+          <el-radio v-model="tab2.radio" label="3" @change="changeRadio2">{{$t('errorAnalysis.date')}}</el-radio>
+          <el-radio v-model="tab2.radio" label="4" @change="changeRadio2">{{$t('InventoryManagement.tmrsbbh')}}</el-radio>
+          <el-radio v-model="tab2.radio" label="5" @change="changeRadio2">{{$t('errorAnalysis.isTrainNumber')}}</el-radio>
+          <el-radio v-model="tab2.radio" label="6" @change="changeRadio2">{{$t('errorAnalysis.projname')}}</el-radio>
           <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab2.isRadio2" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
-          <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="日期" />
-          <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="TMR设备编号" />
+          <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('InventoryManagement.rq')"    />
+          <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('InventoryManagement.tmrsbbh')"    />
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.isTrainNumber')"  />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" :placeholder="$t('errorAnalysis.projname')"  />
           <el-button class="successBorder" @click="form_search('second')">{{$t('common.query')}}</el-button>
@@ -91,15 +91,15 @@
           ref="elTable1"
         >
           <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" />
+            <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" />
             </el-table-column>
           </el-table-column>
         </el-table>
         <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">{{$t('processAnalysis.total')}}{{ tab2.table.total }}{{$t('processAnalysis.tiao')}}</span>
         <!-- <div v-if="tab2.table.list.length==0" style="text-align: center;">暂无数据</div> -->
       </el-tab-pane>
-      <el-tab-pane label="价格分析" name="third">
+      <el-tab-pane :label="$t('InventoryManagement.jgfx')"  name="third" >
         <div class="search">
           <el-select v-model="tab3.table.getdataListParm.parammaps.pastureid" style="margin-right: 10px;margin-bottom:10px;width: 150px;" filterable placeholder="牧场" class="filter-item" clearable>
             <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
@@ -109,13 +109,13 @@
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
           <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">{{$t('feedingEfficiency.cxlb')}}</el-radio>
-          <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
-          <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">日期</el-radio>
-          <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">TMR设备编号</el-radio>
+          <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">{{$t('errorAnalysis.isHouseName')}}</el-radio>   
+          <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">{{$t('errorAnalysis.date')}}</el-radio>
+          <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">{{$t('InventoryManagement.tmrsbbh')}}</el-radio>
           <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
-          <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="日期" />
-          <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="TMR设备编号" />
+          <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('InventoryManagement.rq')"    />
+          <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" :placeholder="$t('InventoryManagement.tmrsbbh')"    />
           <el-button class="successBorder" @click="form_search('third')">{{$t('common.query')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab3')">{{$t('dashboard.Export')}}</el-button>
         </div>

+ 31 - 29
src/views/statisticalAnalysis/inventoryManagement/pasture/index.vue

@@ -1,12 +1,12 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="库存统计" name="first">
+      <el-tab-pane :label="$t('InventoryManagement.kctj')"   name="first">
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" style="float: left;" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" style="float: left;" @click="handleNext" />
-          <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="饲料名称" />
+          <el-input v-model="tab.table.getdataListParm.parammaps.feedname" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;":placeholder="$t('InventoryManagement.silc')"    />
           <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">{{$t('common.query')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" icon="el-icon-upload2" @click="handleExport('tab1')">{{$t('dashboard.Export')}}</el-button>
         </div>
@@ -24,49 +24,49 @@
             :cell-style="cellStyle"
             class="elTable table-fixed"
           >
-            <el-table-column sortable label="饲料名称" min-width="130px" align="center">
+            <el-table-column sortable :label="$t('InventoryManagement.silc')"    min-width="130px" align="center">
               <template slot-scope="scope">
                 <span>{{ scope.row.feedname }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="期初" min-width="130px" align="center">
-              <el-table-column sortable prop="startsum" align="center" label="期初库存(kg)" min-width="120" />
-              <el-table-column sortable prop="startprice" align="center" label="期初金额(元)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.qc')"   min-width="130px" align="center">
+              <el-table-column sortable prop="startsum" align="center" :label="$t('InventoryManagement.qckc')"    min-width="120" />
+              <el-table-column sortable prop="startprice" align="center" :label="$t('InventoryManagement.qcje')"    min-width="120" />
             </el-table-column>
-            <el-table-column label="用量" min-width="110px" align="center">
-              <el-table-column sortable prop="laidsum" align="center" label="入库重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumXT" align="center" label="系统出库重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumRG" align="center" label="人工用料重量(kg)" min-width="120" />
-              <el-table-column sortable prop="usesumXH" align="center" label="损耗重量(kg)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.yl')"    min-width="110px" align="center">
+              <el-table-column sortable prop="laidsum" align="center" :label="$t('InventoryManagement.rkylzl')"    min-width="120" />
+              <el-table-column sortable prop="usesumXT" align="center" :label="$t('InventoryManagement.xtckyl')"    min-width="120" />
+              <el-table-column sortable prop="usesumRG" align="center" :label="$t('InventoryManagement.rgylzl')"    min-width="120" />
+              <el-table-column sortable prop="usesumXH" align="center" :label="$t('InventoryManagement.chzl')"    min-width="120" />
             </el-table-column>
-            <el-table-column label="期末" min-width="130px" align="center">
-              <el-table-column sortable prop="stopsum" align="center" label="期末库存(kg)" min-width="120" />
-              <el-table-column sortable prop="stopprice" align="center" label="期末金额(元)" min-width="120" />
+            <el-table-column :label="$t('InventoryManagement.qm')"     min-width="130px" align="center">
+              <el-table-column sortable prop="stopsum" align="center" :label="$t('InventoryManagement.qmkc')"   min-width="120" />
+              <el-table-column sortable prop="stopprice" align="center" :label="$t('InventoryManagement.qmje')"    min-width="120" />
             </el-table-column>
           </el-table>
           <pagination v-show="tab.table.total>=0" :total="tab.table.total" :page.sync="tab.table.getdataListParm.offset" :limit.sync="tab.table.getdataListParm.pagecount" @pagination="getTabList" />
         </div>
       </el-tab-pane>
-      <el-tab-pane label="用料分析" name="second">
+      <el-tab-pane :label="$t('InventoryManagement.yltj')"   name="second">
         <div class="search">
           <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" style="width: 245px;" :picker-options="pickerOptions2" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled2" @click="handleNext2" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-select v-model="tab2.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio2">
+          <el-select v-model="tab2.radio" :placeholder="$t('InventoryManagement.tjlx')"   class="filter-item" style="width: 120px;" @change="changeRadio2">
             <el-option v-for="item in statisticalTypeList2" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-checkbox v-model="tab2.table.getdataListParm.checked" :true-label="1" :false-label="0" style="margin-right:10px;" @change="changeChecked">误差</el-checkbox>
-          <el-select v-model="tab2.table.getdataListParm.parammaps.ftType" placeholder="是否拆分小料" class="filter-item" style="width: 130px;">
+          <el-checkbox v-model="tab2.table.getdataListParm.checked" :true-label="1" :false-label="0" style="margin-right:10px;" @change="changeChecked">{{$t('InventoryManagement.wc')}}</el-checkbox>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.ftType" :placeholder="$t('InventoryManagement.sfcfxl')"    class="filter-item" style="width: 130px;">
             <el-option v-for="item in isSplitsmallmaterialsList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-input v-if="tab2.isRadio1" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab2.isRadio2" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
-          <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="日期" />
-          <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="TMR设备编号" />
+          <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('InventoryManagement.rq')"    />
+          <el-input v-if="tab2.isRadio4" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('InventoryManagement.tmrsbbh')"    />
           <el-input v-if="tab2.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('errorAnalysis.isTrainNumber')"  />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" :placeholder="$t('errorAnalysis.projname')"  />
-          <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" class="filter-item" style="width: 120px;">
+          <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable :placeholder="$t('InventoryManagement.lbxs')"    class="filter-item" style="width: 120px;">
             <el-option v-for="item in displayList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <el-select v-model="tab2.table.getdataListParm.parammaps.times" clearable filterable :placeholder="$t('errorAnalysis.isTrainNumber')"  class="filter-item" style="width: 120px;">
@@ -74,7 +74,9 @@
           </el-select>
           <el-button class="successBorder" @click="form_search('second')">{{$t('common.query')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handleExport('tab2')">{{$t('dashboard.Export')}}</el-button>
-          <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handlesWitch()">切换展示</el-button>
+          <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handlesWitch()">{{
+            $t('InventoryManagement.qhzs')
+          }}</el-button>
         </div>
 
         <div v-if="isTable1">
@@ -128,23 +130,23 @@
           </u-table>
         </div>
       </el-tab-pane>
-      <el-tab-pane label="价格分析" name="third">
+      <el-tab-pane :label="$t('InventoryManagement.jgfx')" name="third" >
         <div class="search">
           <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')" :end-placeholder="$t('common.endTime')" :clearable="false" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled3" @click="handleNext3" />
           <span style="margin-left: 10px;">{{$t('errorAnalysis.typeName')}}</span>
-          <el-select v-model="tab3.radio" placeholder="统计类型" class="filter-item" style="width: 120px;" @change="changeRadio3">
+          <el-select v-model="tab3.radio" :placeholder="$t('InventoryManagement.tjlx')"   class="filter-item" style="width: 120px;" @change="changeRadio3">
             <el-option v-for="item in statisticalTypeList3" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
           <!-- <el-radio v-model="tab3.radio" label="1" @change="changeRadio3">{{$t('feedingEfficiency.cxlb')}}</el-radio>
-          <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">栏舍名称</el-radio>
-          <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">日期</el-radio>
-          <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">TMR设备编号</el-radio> -->
+          <el-radio v-model="tab3.radio" label="2" @change="changeRadio3">{{$t('errorAnalysis.isHouseName')}}</el-radio>   
+          <el-radio v-model="tab3.radio" label="3" @change="changeRadio3">{{$t('errorAnalysis.date')}}</el-radio>
+          <el-radio v-model="tab3.radio" label="4" @change="changeRadio3">{{$t('InventoryManagement.tmrsbbh')}}</el-radio> -->
           <el-input v-if="tab3.isRadio1" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('feedingEfficiency.cxlb')" />
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('errorAnalysis.isHouseName')"  />
-          <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="日期" />
-          <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="TMR设备编号" />
+          <el-input v-if="tab3.isRadio3" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('InventoryManagement.rq')"    />
+          <el-input v-if="tab3.isRadio4" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" :placeholder="$t('InventoryManagement.tmrsbbh')"    />
           <el-button class="successBorder" @click="form_search('third')">{{$t('common.query')}}</el-button>
           <el-button class="export filter-item1" style="float: right;margin-right: 5px;" icon="el-icon-upload2" @click="handleExport('tab3')">{{$t('dashboard.Export')}}</el-button>
         </div>

Some files were not shown because too many files changed in this diff