全局改日期查询重置

src/components/index.vue

@@ -12,7 +12,7 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -58,7 +58,7 @@
           <el-row :gutter="10">
             <el-col :span="24" style="margin-top: 10px;">
               <span>图表查询时间:</span>
-              <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+              <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
               <el-button class="successBorder" @click="handleChartDate">确认</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
@@ -68,7 +68,7 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
-                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
                   <div class="exportTable" @click="handleExport('chart1')">导出</div>
                   <div class="exportTable" @click="handleTable('chart1')">切换表格</div>
                 </div>
@@ -104,7 +104,7 @@
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <div v-if="tab.chart2.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart2" />
-                  <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
+                  <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
                   <div class="exportTable" @click="handleExport('chart2')">导出</div>
                   <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
                 </div>
@@ -143,7 +143,7 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">混料时间统计</h4>
                 <div v-if="tab.chart3.isChart" class="button">
-                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
+                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
                   <div class="exportTable" @click="handleExport('chart3')">导出</div>
                   <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
                 </div>
@@ -179,7 +179,7 @@
                 <div v-if="tab.chart4.isChart" class="button">
                   <!-- <span>{{ tab.chart4.statisticsList }}</span> -->
                   <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
-                  <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
+                  <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
                   <div class="exportTable" @click="handleExport('chart4')">导出</div>
                   <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
                 </div>
@@ -218,7 +218,7 @@
                 <h4 style="text-align:center;">成本分析</h4>
                 <div v-if="tab.chart5.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart5" />
-                  <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
+                  <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
                   <div class="exportTable" @click="handleExport('chart5')">导出</div>
                   <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
                 </div>

src/lang/cn.js

@@ -25,7 +25,12 @@ export default {
     logoM: require('../assets/images/logo_u3.png'),
     relogo:'重新登陆',//重新登陆
      conLogo:'确认注销',
-    watchMore:'查看更多'
+    watchMore:'查看更多',
+    startTime:'开始时间',
+    endTime:'结束时间',
+    to:'至',
+    reset:'重置',
+    query:'查询'
   },
   auth: {
     useTestAccount: '不想注册？点我使用测试账号',

src/lang/en.js

@@ -25,7 +25,12 @@ export default {
     logoM: require('../assets/images/logo-en-m.png'),
     relogo:'Log in again',//重新登陆
      conLogo:'Confirm logout',
-     watchMore:'see more' //   确认注销
+     watchMore:'see more', //   确认注销
+     startTime:'Start Date',
+    endTime:'End Date',
+    to:'to',
+    reset:'Reset',
+    query:'Query'
   },
   auth: {
     useTestAccount: 'Click here to use test account',

src/views/basicData/driver/index.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/equipmentTMR/index.vue

@@ -8,8 +8,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/feedClassification/index.vue

@@ -9,8 +9,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/feedTable/index.vue

@@ -32,8 +32,8 @@
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation" ref="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -45,7 +45,7 @@
        <div v-else style="display: inline-block;">
         <el-button v-if="isRoleEdit" icon="el-icon-folder-checked" class="success" @click="saveChangeOrder">保存</el-button>
         <el-button v-if="isRoleEdit" icon="el-icon-close" class="sortCancel" @click="cancelChangeOrder">取消</el-button>
-      </div>
+      </div>
       <el-button v-if="isRoleEdit && ispalyUd" class="success" icon="el-icon-plus" @click="handleGetUd">获取UD饲料</el-button>
       <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -211,7 +211,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="6">
-              <el-form-item label="SAP编码：" prop="sapCode">
+              <el-form-item label="SAP编码：" prop="sapCode">
                 <el-input ref="sapCode" v-model="create.temp.sapCode" class="filter-item" disabled placeholder="SAP编码" type="text" />
                 <!-- <el-select v-model="create.temp.sapcode" filterable placeholder="SAP编码" class="filter-item" style="width: 100%;">
                   <el-option v-for="item in sapCodeList" :key="item.id" :label="item.mixname" :value="item.id" />
@@ -327,8 +327,8 @@
           <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>
-          <el-button class="successBorder" @click="handleFeedBankSearch">查询</el-button>
-          <el-button class="successBorder" @click="handleFeedBankRefresh">重置</el-button>
+          <el-button class="successBorder" @click="handleFeedBankSearch">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleFeedBankRefresh">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -461,7 +461,7 @@
       <div class="app-add">
         <div class="search">
           <el-input v-model="relation.getdataListParm.parammaps.fname" placeholder="饲料名称" style="width: 130px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="handleRelationSearch">查询</el-button>
+          <el-button class="successBorder" @click="handleRelationSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -677,7 +677,7 @@
       <div class="app-add">
         <div class="search" ref="search">
           <el-input v-model="sapCode.table.getdataListParm.parammaps.MAKTX" placeholder="原料名称" style="width: 130px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="handleSapCodeSearch">查询</el-button>
+          <el-button class="successBorder" @click="handleSapCodeSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <u-table
@@ -714,46 +714,46 @@
         </div>
       </div>
     </el-dialog>
-
-    <!-- 获取SAP编码 -->
-    <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode2.dialogFormVisible" :close-on-click-modal="false" width="50%">
-      <template slot="title">
-        <div class="avue-crud__dialog__header">
-          <span class="el-dialog__title">
-            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
-            {{ textMap[sapCode2.dialogStatus] }}
-          </span>
-          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
-            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
-            <svg-icon v-else icon-class="fullscreen" />
-          </div>
-        </div>
-      </template>
-      <div class="app-add">
-        <el-form ref="sapCode2" :rules="sapCode2.rules" :model="sapCode2.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
-          <el-row>
-            <el-col :span="18">
-              <el-form-item label="时间范围：" prop="inputDatetime">
-                <el-date-picker v-model="sapCode2.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%;" :clearable="false" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="18">
-              <el-form-item label="物料类型：" prop="sapMaterialtype">
-                <el-select v-model="sapCode2.temp.sapMaterialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
-                  <el-option v-for="item in materialtypeList" :key="item.id" :label="item.distName" :value="item.distCode" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer">
-          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">关闭</el-button>
-          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
-        </div>
-      </div>
-    </el-dialog>
+
+    <!-- 获取SAP编码 -->
+    <el-dialog :fullscreen="dialogFull" :visible.sync="sapCode2.dialogFormVisible" :close-on-click-modal="false" width="50%">
+      <template slot="title">
+        <div class="avue-crud__dialog__header">
+          <span class="el-dialog__title">
+            <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
+            {{ textMap[sapCode2.dialogStatus] }}
+          </span>
+          <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
+            <svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
+            <svg-icon v-else icon-class="fullscreen" />
+          </div>
+        </div>
+      </template>
+      <div class="app-add">
+        <el-form ref="sapCode2" :rules="sapCode2.rules" :model="sapCode2.temp" label-position="right" label-width="155px" style="width: 100%;margin:0 auto 50px">
+          <el-row>
+            <el-col :span="18">
+              <el-form-item label="时间范围：" prop="inputDatetime">
+                <el-date-picker v-model="sapCode2.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="18">
+              <el-form-item label="物料类型：" prop="sapMaterialtype">
+                <el-select v-model="sapCode2.temp.sapMaterialtype" filterable placeholder="物料类型" class="filter-item" style="width: 100%;">
+                  <el-option v-for="item in materialtypeList" :key="item.id" :label="item.distName" :value="item.distCode" />
+                </el-select>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div slot="footer" class="dialog-footer">
+          <el-button class="cancelClose" @click="sapCode2.dialogFormVisible = false;getList()">关闭</el-button>
+          <el-button v-if="sapCode2.dialogStatus==='sapCode2' && isRoleEdit" class="save" :disabled="isokDisable" @click="sapCodeData2()">确认</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </div>
 
 </template>
@@ -955,20 +955,20 @@ export default {
             }
           }
         }
-      },
-      sapCode2:{
-        dialogFormVisible: false,
-        dialogStatus: '',
-        materialtypeList:[],
-        temp:{
-          inputDatetime: [parseTime(new Date(), '{y}-{m}-{d}'), parseTime(new Date(), '{y}-{m}-{d}')],
-          sapMaterialtype:'',
-        },
-        rules: {
-          inputDatetime :[{required: true, message: '必填', trigger: 'blur' }],
-          sapMaterialtype: [{ required: true, message: '必填', trigger: 'blur' }],
-        }
-      },
+      },
+      sapCode2:{
+        dialogFormVisible: false,
+        dialogStatus: '',
+        materialtypeList:[],
+        temp:{
+          inputDatetime: [parseTime(new Date(), '{y}-{m}-{d}'), parseTime(new Date(), '{y}-{m}-{d}')],
+          sapMaterialtype:'',
+        },
+        rules: {
+          inputDatetime :[{required: true, message: '必填', trigger: 'blur' }],
+          sapMaterialtype: [{ required: true, message: '必填', trigger: 'blur' }],
+        }
+      },
 
       textMap: {
         create: '新增',
@@ -986,7 +986,7 @@ export default {
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
       dropState: false,
-      isOrder: true,
+      isOrder: true,
       ispalyUd: true,
       myHeight:document.documentElement.clientHeight - 85- 150
     }
@@ -1035,7 +1035,7 @@ export default {
       }
     })
   },
-  created() {
+  created() {
     this.getIspalyUd()
     this.getList()
     this.getDownList()
@@ -1345,21 +1345,21 @@ export default {
           if (this.create.temp.uprice == '') { this.create.temp.uprice = '0' }
           if (this.create.temp.unitweight == '') { this.create.temp.unitweight = '0' }
           if (this.create.temp.autozone == '') { this.create.temp.autozone = '0' }
-          if (this.create.temp.trgaddress == '') { this.create.temp.trgaddress = '0' }
-          let url = 'authdata/feedbackup/check'
-          let data = {
-            fclassid:this.create.temp.fclassid,
-            backup1:this.create.temp.backup1
-          }
-          postJson(url,data).then(response => {
-            if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-              if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
-              if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
-              if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
-              if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
-              if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
-            }else{
+          if (this.create.temp.trgaddress == '') { this.create.temp.trgaddress = '0' }
+          let url = 'authdata/feedbackup/check'
+          let data = {
+            fclassid:this.create.temp.fclassid,
+            backup1:this.create.temp.backup1
+          }
+          postJson(url,data).then(response => {
+            if(response.msg == 'fail'){
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
+              if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
+              if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
+              if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
+              if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
+            }else{
               PostDataByName(this.requestParam).then(response => {
                 console.log('新增保存发送参数', this.requestParam)
                 if (response.msg !== 'fail') {
@@ -1375,7 +1375,7 @@ export default {
                   if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
                 }
               })
-            }
+            }
           })
         }
       })
@@ -1461,20 +1461,20 @@ export default {
           if (this.create.temp.unitweight == '') { this.create.temp.unitweight = '0' }
           if (this.create.temp.autozone == '') { this.create.temp.autozone = '0' }
           if (this.create.temp.trgaddress == '') { this.create.temp.trgaddress = '0' }
-          let url = 'authdata/feedbackup/check'
-          let data = {
-            fclassid:this.create.temp.fclassid,
-            feedId:this.create.temp.id,
-            backup1:this.create.temp.backup1
-          }
-          postJson(url,data).then(response => {
-            if(response.msg == 'fail'){
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-              if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
-              if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
-              if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
-              if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
-              if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
+          let url = 'authdata/feedbackup/check'
+          let data = {
+            fclassid:this.create.temp.fclassid,
+            feedId:this.create.temp.id,
+            backup1:this.create.temp.backup1
+          }
+          postJson(url,data).then(response => {
+            if(response.msg == 'fail'){
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+              if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
+              if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
+              if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
+              if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
+              if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
             }else{
               PostDataByName(this.requestParam).then(response => {
                 console.log('新增保存发送参数', this.requestParam)
@@ -1490,8 +1490,8 @@ export default {
                   if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
                   if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
                 }
-              })
-            }
+              })
+            }
           })
         }
       })
@@ -1916,7 +1916,7 @@ export default {
         this.dialogFull = false
         this.sapCode.dialogStatus = 'sapCode'
         this.sapCode.dialogFormVisible = true
-        this.sapCode.table.getdataListParm.parammaps.MAKTX = this.selectList[0].sapCode
+        this.sapCode.table.getdataListParm.parammaps.MAKTX = this.selectList[0].sapCode
         this.getsapCodeList()
       }
     },
@@ -1930,104 +1930,104 @@ export default {
          this.$refs.saptable.reloadData(this.sapCode.table.list)
       })
     },
-    handleSapCodeSearch(){
-      this.getsapCodeList()
+    handleSapCodeSearch(){
+      this.getsapCodeList()
     },
     sapCodeData(){
-      if(this.sapCode.selectList.length>1 || this.sapCode.selectList.length == 0){
-        this.$message({ type: 'error', message: '请选择一条信息', duration: 2000 })
-      }else{
-        this.requestParam.name = 'updateFeedSapCode'
-        let data = {
-          name:'updateFeedSapCode',
-          parammaps:{
-            sapCode:this.sapCode.selectList[0].MATNR,
-            id:this.selectList[0].id
-          }
-        }
-        PostDataByName(data).then(response => {
-          console.log('新增保存发送参数', data)
-          if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.sapCode.dialogFormVisible = false
-            this.getList()
-          } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
-            if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
-            if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
-            if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
-            if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
-          }
-        })
+      if(this.sapCode.selectList.length>1 || this.sapCode.selectList.length == 0){
+        this.$message({ type: 'error', message: '请选择一条信息', duration: 2000 })
+      }else{
+        this.requestParam.name = 'updateFeedSapCode'
+        let data = {
+          name:'updateFeedSapCode',
+          parammaps:{
+            sapCode:this.sapCode.selectList[0].MATNR,
+            id:this.selectList[0].id
+          }
+        }
+        PostDataByName(data).then(response => {
+          console.log('新增保存发送参数', data)
+          if (response.msg !== 'fail') {
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.sapCode.dialogFormVisible = false
+            this.getList()
+          } else {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            if (this.create.temp.allowratio == '0') { this.create.temp.allowratio = '' }
+            if (this.create.temp.uprice == '0') { this.create.temp.uprice = '' }
+            if (this.create.temp.unitweight == '0') { this.create.temp.unitweight = '' }
+            if (this.create.temp.autozone == '0') { this.create.temp.autozone = '' }
+            if (this.create.temp.trgaddress == '0') { this.create.temp.trgaddress = '' }
+          }
+        })
       }
     },
     handleSapCodeSelectionChange(val){
       this.sapCode.selectList = val
       console.log(this.sapCode.selectList,'this.sapCode.selectList')
-    },
-    handleGetSapCode(){
-        this.dialogFull = false
-        this.sapCode2.dialogStatus = 'sapCode2'
-        this.sapCode2.dialogFormVisible = true
-    },
-    sapCodeData2(){
-      this.$refs['sapCode2'].validate(valid => {
-        if (valid) {
-          let url = 'authdata/sap/feed'
-          let data = {
-            startTime:parseTime(this.sapCode2.temp.inputDatetime[0],'{y}-{m}-{d}'),
-            endTime:parseTime(this.sapCode2.temp.inputDatetime[1],'{y}-{m}-{d}'),
-            mtart:this.sapCode2.temp.sapMaterialtype,
-            pastureId:Cookies.get('pastureid')
-          }
-          postJson(url,data).then(response => {
-            if (response.msg !== 'fail') {
-              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-              this.sapCode2.dialogFormVisible = false
-              this.getList()
-            } else {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            }
-          })
-        }
-      })
-    },
-    getIspalyUd(){
-      let url = 'authdata/GetDataByName'
-      let data = {
-        "name":"getSysoptEnable","page":1,"offset":1,"pagecount":1,"returntype":"Map",
-        "parammaps":{"pastureid":Cookies.get('pastureid'),"inforname":"gmUdSync"}
-      }
-      postJson(url,data).then(response => {
-        if (response.msg !== 'fail') {
-          if(response.data.list[0].inforvalue == 0){
-            this.ispalyUd = false
-          }else{
-            this.ispalyUd = true
-          }
-        } else {
-          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
-    },
-    handleGetUd(){
-      MessageBox.confirm('是否获取UD饲料?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-        let url = 'authdata/gm/udfeed'
-        let data = {
-          pastureId:Cookies.get('pastureid')
-        }
-        postJson(url,data).then(response => {
-          if (response.msg !== 'fail') {
-            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-            this.getList()
-          } else {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-          }
-        })
-      })
+    },
+    handleGetSapCode(){
+        this.dialogFull = false
+        this.sapCode2.dialogStatus = 'sapCode2'
+        this.sapCode2.dialogFormVisible = true
+    },
+    sapCodeData2(){
+      this.$refs['sapCode2'].validate(valid => {
+        if (valid) {
+          let url = 'authdata/sap/feed'
+          let data = {
+            startTime:parseTime(this.sapCode2.temp.inputDatetime[0],'{y}-{m}-{d}'),
+            endTime:parseTime(this.sapCode2.temp.inputDatetime[1],'{y}-{m}-{d}'),
+            mtart:this.sapCode2.temp.sapMaterialtype,
+            pastureId:Cookies.get('pastureid')
+          }
+          postJson(url,data).then(response => {
+            if (response.msg !== 'fail') {
+              this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+              this.sapCode2.dialogFormVisible = false
+              this.getList()
+            } else {
+              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+            }
+          })
+        }
+      })
+    },
+    getIspalyUd(){
+      let url = 'authdata/GetDataByName'
+      let data = {
+        "name":"getSysoptEnable","page":1,"offset":1,"pagecount":1,"returntype":"Map",
+        "parammaps":{"pastureid":Cookies.get('pastureid'),"inforname":"gmUdSync"}
+      }
+      postJson(url,data).then(response => {
+        if (response.msg !== 'fail') {
+          if(response.data.list[0].inforvalue == 0){
+            this.ispalyUd = false
+          }else{
+            this.ispalyUd = true
+          }
+        } else {
+          this.$notify({ title: '请求失败', message: response.data, type: 'warning', duration: 2000 })
+        }
+      })
+    },
+    handleGetUd(){
+      MessageBox.confirm('是否获取UD饲料?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+        let url = 'authdata/gm/udfeed'
+        let data = {
+          pastureId:Cookies.get('pastureid')
+        }
+        postJson(url,data).then(response => {
+          if (response.msg !== 'fail') {
+            this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
+            this.getList()
+          } else {
+            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+          }
+        })
+      })
     }
   }
 }

src/views/basicData/forkliftManagement/index.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/groupColumn/index.vue

@@ -27,8 +27,8 @@
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" style="float:left;" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -162,7 +162,7 @@
           <el-row>
             <el-col :span="18">
               <el-form-item label="时间范围：" prop="inputDatetime">
-                <el-date-picker v-model="sapCode2.temp.inputDatetime"  class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%;" :clearable="false" />
+                <el-date-picker v-model="sapCode2.temp.inputDatetime"  class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
               </el-form-item>
             </el-col>
           </el-row>

src/views/basicData/livestockCategory/index.vue

@@ -8,8 +8,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/managementGPS/index.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/basicData/sapLog/index.vue

@@ -1,37 +1,37 @@
-<template>
-  <div class="app-container">
-    <div class="search">
-      <el-select v-model="table.getdataListParm.parammaps.pastureId" filterable placeholder="牧场" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pastureName" :value="item.pastureid" />
-      </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.msgtype" placeholder="数据类型" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in dataTypeList" :key="item.Id" :label="item.value" :value="item.Id" />
-      </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="handleSearch">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
-    <div class="table">
-      <el-table
-        :key="table.tableKey"
-        v-loading="table.listLoading"
-        element-loading-text="给我一点时间"
-        :data="table.list"
-        border
-        fit
-        highlight-current-row
-        style="width: 100%;"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        class="elTable table-fixed"
-      >
-        <el-table-column label="牧场" min-width="90px" align="center" prop="pastureName" />
+<template>
+  <div class="app-container">
+    <div class="search">
+      <el-select v-model="table.getdataListParm.parammaps.pastureId" filterable placeholder="牧场" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pastureName" :value="item.pastureid" />
+      </el-select>
+      <el-select v-model="table.getdataListParm.parammaps.msgtype" placeholder="数据类型" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in dataTypeList" :key="item.Id" :label="item.value" :value="item.Id" />
+      </el-select>
+      <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="successBorder" @click="handleSearch">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+    </div>
+    <div class="table">
+      <el-table
+        :key="table.tableKey"
+        v-loading="table.listLoading"
+        element-loading-text="给我一点时间"
+        :data="table.list"
+        border
+        fit
+        highlight-current-row
+        style="width: 100%;"
+        :row-style="rowStyle"
+        :cell-style="cellStyle"
+        class="elTable table-fixed"
+      >
+        <el-table-column label="牧场" min-width="90px" align="center" prop="pastureName" />
         <el-table-column label="数据类型" min-width="90px" align="center"  prop="msgtypeName">
           <template slot-scope="scope">
             <span >{{scope.row.msgtypeName}}</span>
             <!-- <span @click="clickType(scope.row)">{{scope.row.msgtypeName}}</span> -->
           </template>
-        </el-table-column>
+        </el-table-column>
         <el-table-column label="请求参数" min-width="120px" align="center">
           <template slot-scope="scope">
               <el-tooltip placement="top" :open-delay="1000">
@@ -41,7 +41,7 @@
                 <div style="width: 100%;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ scope.row.request }}</div>
               </el-tooltip>
             </template>
-        </el-table-column>
+        </el-table-column>
         <el-table-column label="响应参数" min-width="120px" align="center">
           <template slot-scope="scope">
               <el-tooltip placement="top" :open-delay="1000">
@@ -51,12 +51,12 @@
                 <div style="width:100%;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;">{{ scope.row.response }}</div>
               </el-tooltip>
             </template>
-        </el-table-column>
-        <el-table-column label="返回状态" min-width="90px" align="center" prop="status" />
-        <el-table-column label="消息文本" min-width="90px" align="center" prop="msgtext" />
-        <el-table-column label="请求地址" min-width="90px" align="center" prop="url" />
-        <el-table-column label="创建时间" min-width="90px" align="center" prop="createTime" />
-      </el-table>
+        </el-table-column>
+        <el-table-column label="返回状态" min-width="90px" align="center" prop="status" />
+        <el-table-column label="消息文本" min-width="90px" align="center" prop="msgtext" />
+        <el-table-column label="请求地址" min-width="90px" align="center" prop="url" />
+        <el-table-column label="创建时间" min-width="90px" align="center" prop="createTime" />
+      </el-table>
     </div>
 
     <!-- 数据类型 -->
@@ -181,18 +181,18 @@
           <el-button class="cancelClose1" @click="type.dialogFormVisible = false;getList()">关闭</el-button>
         </div>
       </div>
-    </el-dialog>
-  </div>
-
-</template>
-
+    </el-dialog>
+  </div>
+
+</template>
+
 <script>
   import { GetDataByName,GetDataByNames  } from '@/api/common'
   import { parseTime } from '@/utils/index.js'
-  import Cookies from 'js-cookie'
-export default {
-  name: 'SapLog',
-  data() {
+  import Cookies from 'js-cookie'
+export default {
+  name: 'SapLog',
+  data() {
     return {
       table:{
         getdataListParm:{
@@ -234,14 +234,14 @@ export default {
         temp:{}
       },
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-    }
-  },
+      cellStyle: { padding: 0 + 'px' },
+    }
+  },
   created() {
-    this.getDownList()
-    this.getList()
-  },
-
+    this.getDownList()
+    this.getList()
+  },
+
   methods: {
     getDownList(){
       GetDataByNames(this.requestParams).then(response => {
@@ -265,7 +265,7 @@ export default {
           this.table.listLoading = false
         }, 100)
       })
-    },
+    },
     handleSearch(){
       if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
         this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
@@ -286,7 +286,7 @@ export default {
       this.type.temp.msgtypeName = '搅拌'
       this.type.dialogStatus = 'type'
       this.type.dialogFormVisible = true
-    }
-  }
-}
-</script>
+    }
+  }
+}
+</script>

src/views/basicData/supplier/index.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/formulationPlan/dailyExecutionPlan/index.vue

@@ -30,7 +30,7 @@
         <el-select v-model="table.getdataListParm.parammaps.iscompleted" filterable placeholder="执行状态" class="filter-item" style="width: 120px;" :clearable="false">
           <el-option v-for="item in iscompletedList" :key="item.value" :label="item.lable" :value="item.value" />
         </el-select>
-        <el-button class="successBorder" @click="form_search">查询</el-button>
+        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button class="export" icon="el-icon-upload2" @click="handleExport">导出</el-button>
         <el-button class="export" icon="el-icon-upload2" @click="handlePrint">打印</el-button>
         <el-button class="export" style="margin-left: -5px;" @click="form_deleteRecord">删除记录</el-button>
@@ -661,14 +661,14 @@
           <el-row v-if="newGeneration.dialogStatus== 'newGeneration'">
             <el-col :span="24">
               <el-form-item label="时间范围：" prop="inputDatetime">
-                <el-date-picker v-model="newGeneration.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%;" :clearable="false" :picker-options="pickerOptions2" />
+                <el-date-picker v-model="newGeneration.temp.inputDatetime" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" :picker-options="pickerOptions2" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row v-else>
             <el-col :span="24">
               <el-form-item label="时间范围：" prop="copyInputDatetime">
-                <el-date-picker v-model="newGeneration.temp.copyInputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 100%;" :clearable="false" />
+                <el-date-picker v-model="newGeneration.temp.copyInputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 100%;" :clearable="false" />
               </el-form-item>
             </el-col>
           </el-row>

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

@@ -2,7 +2,7 @@
   <div>
     <div class="search">
       <el-input v-model="table.getdataListParm.parammaps.barName" class="filter-item" style="float: left;width: 245px;margin-bottom:10px;" placeholder="栏舍名称" />
-      <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="handleSearch()">查询</el-button>
+      <el-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="handleSearch()">{{$t('common.query')}}</el-button>
     </div>
     <div class="table">
       <el-table

src/views/formulationPlan/dhedFormula/dryMatterRegulation.vue

@@ -53,7 +53,7 @@
           <el-select v-model="samplingSelection.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in samplingSelection.frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         </div>
         <div class="table" style="margin-top: 10px;">
           <el-table

src/views/formulationPlan/dhedFormula/index - 20230829备份.vue

@@ -12,7 +12,7 @@
           <el-option v-for="(item,index) in tnameList" :key="index" :label="item.tname" :value="item.tname" />
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
-        <el-button class="successBorder" @click="form_search">查询</el-button>
+        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
         <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
           <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -238,7 +238,7 @@
             <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
           </el-select>
           <el-input v-model="history.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" />
-          <el-button class="successBorder" @click="handleHistorySearch">查询</el-button> -->
+          <el-button class="successBorder" @click="handleHistorySearch">{{$t('common.query')}}</el-button> -->
           <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
         </div>
         <div class="table">
@@ -375,7 +375,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -425,7 +425,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :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: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>

src/views/formulationPlan/dhedFormula/index.vue

@@ -12,7 +12,7 @@
           <el-option v-for="(item,index) in tnameList" :key="index" :label="item.tname" :value="item.tname" />
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
-        <el-button class="successBorder" @click="form_search">查询</el-button>
+        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
         <el-button v-if="isRoleEdit && isSynchronous" class="successBorder" @click="handleSynchronous">软件牛头数同步</el-button>
         <el-button v-if="isRoleEdit && !isproportion" class="successBorder" @click="handle_batchEdit">批量编辑</el-button>
@@ -277,7 +277,7 @@
             <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
           </el-select>
           <el-input v-model="history.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" />
-          <el-button class="successBorder" @click="handleHistorySearch">查询</el-button> -->
+          <el-button class="successBorder" @click="handleHistorySearch">{{$t('common.query')}}</el-button> -->
           <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
         </div>
         <div class="table">
@@ -419,7 +419,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -469,7 +469,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :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: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>

src/views/formulationPlan/dhedFormula/index备.vue

@@ -12,7 +12,7 @@
           <el-option v-for="(item,index) in tnameList" :key="index" :label="item.tname" :value="item.tname" />
         </el-select>
         <!-- <el-input v-model="table.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" /> -->
-        <el-button class="successBorder" @click="form_search">查询</el-button>
+        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         <el-button v-if="isRoleEdit" class="successBorder" @click="handleDryMatterRegulation">干物质调节</el-button>
         <el-upload style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
           <el-button v-if="isRoleEdit" class="import" icon="el-icon-download" style="float: right;">导入</el-button>
@@ -238,7 +238,7 @@
             <el-option v-for="item in barList" :key="item.id" :label="item.bname" :value="item.id" />
           </el-select>
           <el-input v-model="history.getdataListParm.parammaps.tname" placeholder="请输入配方名称" style="width: 180px;" class="filter-item" />
-          <el-button class="successBorder" @click="handleHistorySearch">查询</el-button> -->
+          <el-button class="successBorder" @click="handleHistorySearch">{{$t('common.query')}}</el-button> -->
           <!-- <el-button class="successBorder" @click="handleApplication">应用</el-button> -->
         </div>
         <div class="table">
@@ -375,7 +375,7 @@
               </el-row>
             </el-form>
             <div style="height: 50px;">
-              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" />
+              <el-date-picker v-model="nutritional.tab1.inputDatetime" :picker-options="pickerOptions" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 10px;" />
               <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
               <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
               <el-button class="successBorder" :disabled="isokDisable" @click="assessmentData()">评估</el-button>
@@ -425,7 +425,7 @@
             </div>
           </el-tab-pane>
           <el-tab-pane label="牛群评估" name="second">
-            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" @change="changeTab2Date" />
+            <el-date-picker v-model="nutritional.tab2.inputDatetime" :picker-options="pickerOptions" :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: 250px;margin-right: 10px;" @change="changeTab2Date" />
             <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
             <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
             <el-row>

src/views/formulationPlan/formulaDistribution/index.vue

@@ -11,8 +11,8 @@
       <el-select v-model="table.getdataListParm.parammaps.fttype" placeholder="配方类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in formulaTypeList" :key="item.value" :label="item.label" :value="item.label" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -118,7 +118,7 @@
               <el-select v-model="see.tab1.table.getdataListParm.parammaps.pasturename" placeholder="牧场" class="filter-item" style="width: 120px;" clearable>
                 <el-option v-for="item in formulaDistribution.pasture.list" :key="item.id" :label="item.pasturename" :value="item.pasturename" />
               </el-select>
-              <el-button class="successBorder" @click="form_seeTab1Search">查询</el-button>
+              <el-button class="successBorder" @click="form_seeTab1Search">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">
               <el-table
@@ -153,7 +153,7 @@
                   <span>{{ item.date }}</span>
                 </template>
               </el-autocomplete>
-              <el-button class="successBorder" @click="form_seeTab2Search">查询</el-button>
+              <el-button class="successBorder" @click="form_seeTab2Search">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">
               <el-table

src/views/formulationPlan/pushMaterialPlan/index.vue

@@ -6,8 +6,8 @@
       <!-- <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select> -->
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" style="float: left;" @click="handleCreate">新增</el-button>

src/views/formulationPlan/recipeTemplate/index.vue

@@ -36,8 +36,8 @@
               </li>
             </ul>
           </div>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -223,8 +223,8 @@
               </li>
             </ul>
           </div>
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
           <el-button class="hide" @click="handleCloseTable2">隐藏</el-button>
           <el-button v-if="isEnlarge" class="hide2" @click="handleEnlarge">放大</el-button>
           <el-button v-else class="hide2" @click="handleNarrow">缩小</el-button>
@@ -475,8 +475,8 @@
                 </li>
               </ul>
             </div>
-            <el-button class="successBorder" @click="handleDialogSearch" style="margin-left:10px;">查询</el-button>
-            <el-button class="successBorder" @click="handleDialogRefresh" style="margin-left:10px;">重置</el-button>
+            <el-button class="successBorder" @click="handleDialogSearch" style="margin-left:10px;">{{$t('common.query')}}</el-button>
+            <el-button class="successBorder" @click="handleDialogRefresh" style="margin-left:10px;">{{$t('common.reset')}}</el-button>
           </div>
 
           <div class="table">
@@ -594,8 +594,8 @@
                 </li>
               </ul>
             </div>
-            <el-button class="successBorder" @click="handleDialogSearch2">查询</el-button>
-            <el-button class="successBorder" @click="handleDialogRefresh2">重置</el-button>
+            <el-button class="successBorder" @click="handleDialogSearch2">{{$t('common.query')}}</el-button>
+            <el-button class="successBorder" @click="handleDialogRefresh2">{{$t('common.reset')}}</el-button>
             <el-button class="hide" @click="handleDialogCloseTable2">隐藏</el-button>
           </div>
 
@@ -793,8 +793,8 @@
     <el-dialog :title="textMap[rowRecipeRecord.dialogStatus]" :destroy-on-close="true" :visible.sync="rowRecipeRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="rowRecipeRecord">
         <div class="search">
-          <el-date-picker ref="inputDatetime" v-model="rowRecipeRecord.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-          <el-button class="successBorder" @click="handleRowRecipeRecordSearch">查询</el-button>
+          <el-date-picker ref="inputDatetime" v-model="rowRecipeRecord.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-button class="successBorder" @click="handleRowRecipeRecordSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/inventoryManagement/feedContract/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.providerid" filterable placeholder="请选择供应商" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in supplierList" :key="item.id" :label="item.providerName" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增合同</el-button>

src/views/inventoryManagement/inventoryList/index.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增盘点单</el-button>

src/views/inventoryManagement/laborConsumption/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.usetype" placeholder="操作类型" class="filter-item" style="width: 120px;" clearable>
@@ -15,8 +15,8 @@
       <el-select v-model="table.getdataListParm.parammaps.cowclassid" filterable placeholder="请选择牲畜类别" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/inventoryManagement/statistics/index.vue

@@ -4,8 +4,8 @@
       <el-select v-model="table.getdataListParm.parammaps.feedid" filterable placeholder="饲料名称" 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">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
       <el-button class="export" icon="el-icon-upload2" style="float: right;margin-right: 10px;" @click="handleExport">导出</el-button>
     </div>
 
@@ -75,8 +75,8 @@
         <el-tabs v-model="see.activeName" @tab-click="handleTabClick">
           <el-tab-pane label="入库记录" name="first">
             <div class="search">
-              <el-date-picker v-model="see.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-              <el-button class="successBorder" @click="form_search1">查询</el-button>
+              <el-date-picker v-model="see.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="successBorder" @click="form_search1">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">
               <el-table
@@ -126,8 +126,8 @@
               <el-select v-model="see.getdataListParm2.parammaps.usetype" placeholder="出库类型" class="filter-item" style="width: 150px;" clearable>
                 <el-option v-for="item in deliveryTypeList" :key="item.id" :label="item.label" :value="item.value" />
               </el-select>
-              <el-date-picker v-model="see.getdataListParm2.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-              <el-button class="successBorder" @click="form_search2">查询</el-button>
+              <el-date-picker v-model="see.getdataListParm2.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
             </div>
             <div class="table">
               <el-table

src/views/inventoryManagement/systemConsumption/index.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
 
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.cowclassid" placeholder="牲畜类别" class="filter-item" style="width: 150px;" clearable>
@@ -14,8 +14,8 @@
       <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否审核" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in isAuditList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-document-checked" @click="handleExamine">审核</el-button>

src/views/inventoryManagement/warehousing/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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>
@@ -13,8 +13,8 @@
       <el-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in islaidList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增入库单</el-button>

src/views/shedProduction/dungScores/historyRecord.vue

@@ -2,8 +2,8 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item " type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -41,9 +41,9 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-date-picker v-model="seeHistory.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/shedProduction/dungScores/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>

src/views/shedProduction/dutyRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
@@ -12,8 +12,8 @@
       </el-select>
       <el-input ref="eqcode" v-model="table.getdataListParm.parammaps.eqcode" class="filter-item" placeholder="设备编号" style="width: 120px;" />
       <el-input ref="driver" v-model="table.getdataListParm.parammaps.driver" class="filter-item" placeholder="驾驶员" style="width: 120px;" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus"  @click="handleCreate">分配</el-button>

src/views/shedProduction/fecalScreen/historyRecord.vue

@@ -2,8 +2,8 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" :clearable="true" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -44,9 +44,9 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-date-picker v-model="seeHistory.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/shedProduction/fecalScreen/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
 
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>

src/views/shedProduction/formulaDryMatter/historyRecord.vue

@@ -2,8 +2,8 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changeTime" :clearable="true" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日" @change="changeTime" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -38,9 +38,9 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-date-picker v-model="seeHistory.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/shedProduction/formulaDryMatter/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
@@ -10,8 +10,8 @@
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
@@ -92,12 +92,12 @@
           <template slot-scope="scope">
             <span>{{ scope.row.operatetime }}</span>
           </template>
-        </el-table-column>
-        <el-table-column label="是否剩料" min-width="100px" align="center">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.excess" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
-          </template>
-        </el-table-column>
+        </el-table-column>
+        <el-table-column label="是否剩料" min-width="100px" align="center">
+          <template slot-scope="scope">
+            <el-switch v-model="scope.row.excess" disabled active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+          </template>
+        </el-table-column>
 
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
@@ -185,11 +185,11 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <el-row>
-            <el-col :span="12">
-              <el-form-item label="是否剩料：" prop="excess">
-                <el-switch v-model="create.temp.excess"  active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
-              </el-form-item>
+          <el-row>
+            <el-col :span="12">
+              <el-form-item label="是否剩料：" prop="excess">
+                <el-switch v-model="create.temp.excess"  active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" />
+              </el-form-item>
             </el-col>
           </el-row>
         </el-form>

src/views/shedProduction/materialRemainingRecord/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
@@ -13,14 +13,14 @@
       <el-select v-if="record== '1'" v-model="table.getdataListParm.parammaps.eqcode" filterable placeholder="TMR编号" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.tname" :value="item.eqcode" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-    </div>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+    </div>
     <div class="operation" v-if="record== '0'">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>
       <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger"  @click="form_delete">删除</el-button>
       <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy"  @click="handleCopy">复制</el-button>
-      <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
+      <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
       <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
         <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
       </el-upload>
@@ -32,7 +32,7 @@
         </el-dropdown-menu>
       </el-dropdown>
     </div>
-    <div class="operation" v-else>
+    <div class="operation" v-else>
       <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
         <el-button style="float: right;margin-right: 10px;" class="export" icon="el-icon-upload2" @click="handleExport(3)">导出</el-button>
     </div>
@@ -143,13 +143,13 @@
                 <el-input ref="remain" v-model="create.temp.remain" class="filter-item" placeholder="剩料量" type="number" />
               </el-form-item>
             </el-col>
-          </el-row>
-          <el-row>
-            <el-col :span="20">
-              <el-form-item label="干物质：" prop="dry">
-                <el-input ref="dry" v-model="create.temp.dry" class="filter-item" placeholder="干物质" type="number"  />
-              </el-form-item>
-            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="20">
+              <el-form-item label="干物质：" prop="dry">
+                <el-input ref="dry" v-model="create.temp.dry" class="filter-item" placeholder="干物质" type="number"  />
+              </el-form-item>
+            </el-col>
           </el-row>
           <el-row>
             <el-col :span="20">
@@ -281,28 +281,28 @@ export default {
           }
         },
         list: []
-      },
-      dataSynchronization: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        getdataListParm: {
-          name: 'getSysoptEnable',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'wgSap'
-          }
-        },
-        isDataSynchronization: false
+      },
+      dataSynchronization: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        getdataListParm: {
+          name: 'getSysoptEnable',
+          page: 1,
+          offset: 1,
+          pagecount: 1,
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            inforname: 'wgSap'
+          }
+        },
+        isDataSynchronization: false
       },
       isokDisable: false,
       selectList: [],
       rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
       cellStyle: { padding: 0 + 'px' },
-      myHeight:document.documentElement.clientHeight - 85- 150 - 45,
+      myHeight:document.documentElement.clientHeight - 85- 150 - 45,
       url:'authdata/ImportExcel'
     }
   },
@@ -330,30 +330,30 @@ export default {
     },
     // 设置上传地址
     uploadExcelUrl() {
-      // return Cookies.get('url') + 'authdata/ImportExcel'
+      // return Cookies.get('url') + 'authdata/ImportExcel'
       return Cookies.get('url') + 'authdata/ImportExcel'
-    }
-    // let url = 'authdata/ImportExcel';
+    }
+    // let url = 'authdata/ImportExcel';
 
   },
-  created() {
-    console.log(document.querySelector("html").getAttribute("domain"),'7777')
+  created() {
+    console.log(document.querySelector("html").getAttribute("domain"),'7777')
     this.getDataSynchronization()
     this.getList()
     this.getDownList()
     this.getButtons()
   },
 
-  methods: {
-    getDataSynchronization() {
-      GetDataByName(this.dataSynchronization.getdataListParm).then(response => {
-        // console.log(response.data.list[0])
-        if (response.data.list[0].inforvalue == 0) {
-          this.dataSynchronization.isDataSynchronization = false
-        } else {
-          this.dataSynchronization.isDataSynchronization = true
-        }
-      })
+  methods: {
+    getDataSynchronization() {
+      GetDataByName(this.dataSynchronization.getdataListParm).then(response => {
+        // console.log(response.data.list[0])
+        if (response.data.list[0].inforvalue == 0) {
+          this.dataSynchronization.isDataSynchronization = false
+        } else {
+          this.dataSynchronization.isDataSynchronization = true
+        }
+      })
     },
     getButtons() {
       const Edit = 'MaterialRemainingRecord'
@@ -496,10 +496,10 @@ export default {
             this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
             return false
           }
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          if(this.create.temp.dry){
+            this.create.temp.dry = parseFloat(this.create.temp.dry)
+          }else{
+            this.create.temp.dry = 0
           }
           this.requestParam.name = 'insertBarfeedremain'
           this.requestParam.parammaps = this.create.temp
@@ -540,10 +540,10 @@ export default {
             this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
             return false
           }
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          if(this.create.temp.dry){
+            this.create.temp.dry = parseFloat(this.create.temp.dry)
+          }else{
+            this.create.temp.dry = 0
           }
           this.requestParam.name = 'insertBarfeedremain'
           this.requestParam.parammaps = this.create.temp
@@ -598,11 +598,11 @@ export default {
             return false
           }
 
-          this.requestParam.name = 'updateBarfeedremain'
-          if(this.create.temp.dry){
-            this.create.temp.dry = parseFloat(this.create.temp.dry)
-          }else{
-            this.create.temp.dry = 0
+          this.requestParam.name = 'updateBarfeedremain'
+          if(this.create.temp.dry){
+            this.create.temp.dry = parseFloat(this.create.temp.dry)
+          }else{
+            this.create.temp.dry = 0
           }
           this.requestParam.parammaps = this.create.temp
           if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
@@ -826,32 +826,32 @@ export default {
         })
       )
     },
-    handleDataUpload(){
-      let a = Cookies.get('url')
-      let b = a.search(8081)
-      let c = a.substring(0,a.search(8081)) + '8082'
-      let d = a.substring(0,a.lastIndexOf('/'))
-      console.log(d)
-      let url = ''
-      if(b == -1){
-        url = d + ':8082'
-      }else{
-        url = c
-      }
-      console.log(url,'url')
-      let _url = url + '/authdata/surplus/push'
-      let data = {
-        date:parseTime(new Date(), '{y}-{m}-{d}'),
-        pastureId:Cookies.get('pastureid')
-      }
-      console.log(_url,'_url')
-      postJson2(_url, data).then(response => {
-        if(response.msg == 'ok'){
-          this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
-        }else{
-          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
+    handleDataUpload(){
+      let a = Cookies.get('url')
+      let b = a.search(8081)
+      let c = a.substring(0,a.search(8081)) + '8082'
+      let d = a.substring(0,a.lastIndexOf('/'))
+      console.log(d)
+      let url = ''
+      if(b == -1){
+        url = d + ':8082'
+      }else{
+        url = c
+      }
+      console.log(url,'url')
+      let _url = url + '/authdata/surplus/push'
+      let data = {
+        date:parseTime(new Date(), '{y}-{m}-{d}'),
+        pastureId:Cookies.get('pastureid')
+      }
+      console.log(_url,'_url')
+      postJson2(_url, data).then(response => {
+        if(response.msg == 'ok'){
+          this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
+        }else{
+          this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
+        }
+      })
     }
   }
 }

src/views/shedProduction/pennsylvaniaSieve/historyRecord.vue

@@ -2,8 +2,8 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.operatetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :clearable="true"  placeholder="年/月/日" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -50,9 +50,9 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-date-picker v-model="seeHistory.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/shedProduction/pennsylvaniaSieve/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
@@ -10,8 +10,8 @@
       <el-select v-model="table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>

src/views/shedProduction/performance/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
@@ -10,8 +10,8 @@
       <el-select v-model="table.getdataListParm.parammaps.cowclass" filterable placeholder="牲畜类别" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in livestockList" :key="item.id" :label="item.mixname" :value="item.classname" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>

src/views/shedProduction/physicalConditionScore/historyRecord.vue

@@ -2,8 +2,8 @@
   <div class="app-table">
     <div class="search">
       <el-date-picker v-model="table.getdataListParm.parammaps.changetime" class="filter-item" type="date" style="width: 250px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="年/月/日"  :clearable="true"/>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table
@@ -41,9 +41,9 @@
     <el-dialog :visible.sync="seeHistory.dialogFormVisible" append-to-body :title="textMap[seeHistory.dialogStatus]" :close-on-click-modal="false" width="90%">
       <div class="seeHistory">
         <div class="search">
-          <el-date-picker v-model="seeHistory.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-date-picker v-model="seeHistory.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="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="table">
           <el-table

src/views/shedProduction/physicalConditionScore/index.vue

@@ -1,14 +1,14 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success"  @click="handleCreate">新增</el-button>

src/views/statisticalAnalysis/equipmentRunningTrack/index - 副本.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="设备类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <el-row :gutter="20">
       <el-col :span="8">

src/views/statisticalAnalysis/equipmentRunningTrack/index.vue

@@ -6,8 +6,8 @@
       <el-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="设备类型" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in equipmentTypeList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <el-row :gutter="20">
       <el-col :span="8">

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

@@ -7,9 +7,9 @@
         :clearable="false"
         class="inputDatetime filter-item"
         type="daterange"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
+        :range-separator="$t('common.to')"
+         :start-placeholder="$t('common.startTime')""
+        :end-placeholder="$t('common.endTime')"
         style="width: 250px;"
         :picker-options="pickerOptions"
         @change="changeDate"
@@ -90,7 +90,7 @@
       <el-row :gutter="10">
         <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
           <span>图表查询时间:</span>
-          <el-date-picker v-model="chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+          <el-date-picker v-model="chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
           <el-button class="successBorder" @click="handleChartDate">确认</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
@@ -101,7 +101,7 @@
           <div class="grid-content">
             <h4>计划统计</h4>
             <div v-if="chart1.isChart" class="button">
-              <el-date-picker v-model="chart1.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <el-date-picker v-model="chart1.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
               <div class="exportTable" @click="handleExport('chart1')">导出</div>
               <div class="exportTable" @click="handleTable('chart1')">切换表格</div>
             </div>
@@ -143,7 +143,7 @@
           <div class="grid-content">
             <h4>牛群准确率</h4>
             <div v-if="chart2.isChart" class="button">
-              <el-date-picker v-model="chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime filter-item" :clearable="false" type="daterange" range-separator="至" start-placeholder="开始日期" :picker-options="pickerOptions" end-placeholder="结束日期" @change="changeChartDate('chart2')" />
+              <el-date-picker v-model="chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime filter-item" :clearable="false" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart2')" />
               <div class="exportTable" @click="handleExport('chart2')">导出</div>
               <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
             </div>
@@ -183,7 +183,7 @@
           <div class="grid-content">
             <h4>混料次数统计</h4>
             <div v-if="chart3.isChart" class="button">
-              <el-date-picker v-model="chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" :picker-options="pickerOptions" end-placeholder="结束日期" @change="changeChartDate('chart3')" />
+              <el-date-picker v-model="chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart3')" />
               <div class="exportTable" @click="handleExport('chart3')">导出</div>
               <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
             </div>
@@ -220,7 +220,7 @@
           <div class="grid-content">
             <h4>混料准确率统计</h4>
             <div v-if="chart4.isChart" class="button">
-              <el-date-picker v-model="chart4.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" :picker-options="pickerOptions" end-placeholder="结束日期" @change="changeChartDate('chart4')" />
+              <el-date-picker v-model="chart4.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart4')" />
               <div class="exportTable" @click="handleExport('chart4')">导出</div>
               <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
             </div>
@@ -265,7 +265,7 @@
           <div class="grid-content">
             <h4>栏舍平均撒料时间统计</h4>
             <div v-if="chart5.isChart" class="button">
-              <el-date-picker v-model="chart5.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" :picker-options="pickerOptions" end-placeholder="结束日期" @change="changeChartDate('chart5')" />
+              <el-date-picker v-model="chart5.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart5')" />
               <div class="exportTable" @click="handleExport('chart5')">导出</div>
               <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
             </div>
@@ -300,7 +300,7 @@
           <div class="grid-content">
             <h4>混料计划取消次数</h4>
             <div v-if="chart6.isChart" class="button">
-              <el-date-picker v-model="chart6.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" :picker-options="pickerOptions" end-placeholder="结束日期" @change="changeChartDate('chart6')" />
+              <el-date-picker v-model="chart6.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :picker-options="pickerOptions" :end-placeholder="$t('common.endTime')" @change="changeChartDate('chart6')" />
               <div class="exportTable" @click="handleExport('chart6')">导出</div>
               <div class="exportTable" @click="handleTable('chart6')">切换表格</div>
             </div>
@@ -349,7 +349,7 @@
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.sort" class="filter-item" style="width: 150px;" placeholder="车次" />
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.times" class="filter-item" style="width: 150px;" placeholder="班次" />
           <el-input v-if="pasture.isTrainNumber" v-model="pasture.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 150px;" placeholder="TMR名称" />
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <h4>混料</h4>

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

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
         <el-button style="float: left;margin-bottom: 10px;" class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
         <el-button style="float: left;margin-bottom: 10px;" class="el-icon-arrow-right elIconArrowRight" :disabled="Nextdisabled" @click="handleNext" />
       </div>
@@ -22,8 +22,8 @@
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 120px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
           <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-        <el-button class="successBorder" @click="form_search">查询</el-button>
-        <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+        <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+        <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
         <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">导出</el-button>
       </div>
     </div>

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

@@ -2,7 +2,7 @@
   <div class="app-content">
     <div class="search">
       <div>
-        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+        <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" style="width: 250px;float: left;margin-bottom: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
         <el-button style="float: left;margin-bottom: 10px;" :disabled="Beforedisabled" class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
         <el-button style="float: left;margin-bottom: 10px;" :disabled="Nextdisabled" class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
       </div>
@@ -23,8 +23,8 @@
         <el-select v-model="table.getdataListParm.parammaps.isuse" style="width: 110px;float: left;" filterable placeholder="上传状态" class="filter-item" clearable>
           <el-option v-for="item in isuseList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
-        <el-button class="successBorder" style="float:left;" @click="form_search">查询</el-button>
-        <el-button class="successBorder" style="float:left;" @click="handleRefresh">重置</el-button>
+        <el-button class="successBorder" style="float:left;" @click="form_search">{{$t('common.query')}}</el-button>
+        <el-button class="successBorder" style="float:left;" @click="handleRefresh">{{$t('common.reset')}}</el-button>
         <el-button class="export" style="float: right;margin-right: 10px;margin-bottom:10px;" @click="handleExport">导出</el-button>
       </div>
     </div>

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

@@ -4,7 +4,7 @@
       <el-tab-pane label="汇总统计" name="first">
       <div ref="scrollContainer" @scroll="handleScroll" :style="{ height: myHeight1+'px', overflowY: 'auto', overflowX: 'hidden' }">
         <div class="search">
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
+          <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="width: 250px;" :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" />
           <span style="margin-left: 10px;">统计类型：</span>
@@ -62,8 +62,8 @@
             <el-input-number :controls="false" :precision="0" v-model="tab.table.getdataListParm.parammaps.enddate" placeholder="混料结束时间" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
           <el-checkbox v-model="tab.table.getdataListParm.parammaps.error" style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh1">重置</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh1">{{$t('common.reset')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -210,7 +210,7 @@
                 <el-radio-button label="3" border>月</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
               </div>
               <div v-show="tab.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                 <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" placeholder="请选择年份" @change="changeAllYear">
@@ -221,7 +221,7 @@
                 </el-select>
               </div>
               <div v-show="tab.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
               </div>
               <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">确认</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
@@ -238,7 +238,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart2')">
@@ -249,7 +249,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" format="yyyy-MM" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" format="yyyy-MM" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart2')">确认</el-button>
                   </div>
@@ -302,7 +302,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart1')">
@@ -313,7 +313,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">确认</el-button>
                   </div>
@@ -364,7 +364,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart3')">
@@ -375,7 +375,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart3')">确认</el-button>
                   </div>
@@ -424,7 +424,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart4')">
@@ -435,7 +435,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart4')">确认</el-button>
                   </div>
@@ -486,7 +486,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart5')">
@@ -497,7 +497,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart5')">确认</el-button>
                   </div>
@@ -549,7 +549,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart6.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart6')">
@@ -560,7 +560,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart6.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart6.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart6')">确认</el-button>
                   </div>
@@ -617,7 +617,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart7.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart7')">
@@ -628,7 +628,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart7.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart7.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart7')">确认</el-button>
                   </div>
@@ -670,7 +670,7 @@
       </el-tab-pane>
       <el-tab-pane label="混料统计" name="second">
         <div class="search" ref="myHeightSecond">
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions3" />
+          <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: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="display:inline-block;margin-top: 5px;" :disabled="Beforedisabled2" @click="handleBefore2" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="display:inline-block;margin-top: 5px;" :disabled="Nextdisabled2" @click="handleNext2" />
@@ -705,8 +705,8 @@
           </el-select>
           <el-checkbox v-model="tab2.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
 
-          <el-button class="successBorder" style="margin-top: 5px;" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">重置</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
           <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport2">导出</el-button>
         </div>
         <div class="table">
@@ -761,7 +761,7 @@
       </el-tab-pane>
       <el-tab-pane label="撒料统计" name="third">
         <div class="search" ref="myHeightThird">
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions3" />
+          <el-date-picker v-model="tab3.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: 250px;" :picker-options="pickerOptions3" />
           <!-- <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime2" :clearable="false" style="margin-top: 5px;width:140px;" type="date" placeholder="选择日期"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled3" @click="handleBefore3" />
           <el-button class="el-icon-arrow-right elIconArrowRight" style="dispaly:inline-block;margin-top: 5px;" :disabled="Nextdisabled3" @click="handleNext3" />
@@ -793,8 +793,8 @@
             <el-input-number :controls="false" :precision="2" v-model="tab3.table.getdataListParm.parammaps.slzql2" placeholder="撒料正确率" :min="0" :max="100" style="width: 120px;" class="filter-item" clearable />
           </div>
           <el-checkbox v-model="tab3.table.getdataListParm.parammaps.error" style="margin-right: 10px;">只看超出预设值数据</el-checkbox>
-          <el-button class="successBorder" style="margin-top: 5px;" @click="form_search3">查询</el-button>
-          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">重置</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="form_search3">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" style="margin-top: 5px;" @click="handleRefresh3">{{$t('common.reset')}}</el-button>
           <el-button style="float: right;margin-right: 10px;margin-bottom:10px;margin-top: 5px;" class="export" icon="el-icon-upload2" @click="handleExport3">导出</el-button>
         </div>
         <div class="table">
@@ -848,7 +848,7 @@
     <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
     <div>
       <span>导出时间范围：</span>
-      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions2" />
+      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions2" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">关闭</el-button>
@@ -863,8 +863,8 @@
     <el-dialog :title="textMap[recipeNameTemp2.dialogStatus]" :visible.sync="recipeNameTemp2.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="recipeNameTemp2">
         <div class="search">
-          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-          <el-button class="successBorder" @click="handleRecipeNameSearch2">查询</el-button>
+          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-button class="successBorder" @click="handleRecipeNameSearch2">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -954,8 +954,8 @@
     <el-dialog :title="textMap[recipeNameTemp3.dialogStatus]" :visible.sync="recipeNameTemp3.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <div class="recipeNameTemp3">
         <!-- <div class="search">
-          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp3.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-          <el-button class="successBorder" @click="handleRecipeNameSearch3">查询</el-button>
+          <el-date-picker ref="inputDatetime" :clearable="false" v-model="recipeNameTemp3.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-button class="successBorder" @click="handleRecipeNameSearch3">{{$t('common.query')}}</el-button>
         </div> -->
         <div class="table">
           <el-table
@@ -1000,8 +1000,8 @@
     <el-dialog :title="textMap[feedTemp.dialogStatus]" :visible.sync="feedTemp.dialogFormVisible" :close-on-click-modal="false" width="98%">
       <div class="feedTemp">
         <div class="search">
-          <el-date-picker ref="inputDatetime" v-model="feedTemp.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-          <el-button class="successBorder" @click="handleFeedSearch">查询</el-button>
+          <el-date-picker ref="inputDatetime" v-model="feedTemp.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+          <el-button class="successBorder" @click="handleFeedSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <el-table
@@ -1046,8 +1046,8 @@
         <el-tabs v-model="fenceTemp.activeName" @tab-click="handleFenceTabClick">
           <el-tab-pane label="班次重量" name="first">
               <div class="search">
-                <el-date-picker ref="inputDatetime" v-model="fenceTemp.tab1.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-                <el-button class="successBorder" @click="handleFenceSearch">查询</el-button>
+                <el-date-picker ref="inputDatetime" v-model="fenceTemp.tab1.getdataListParm.parammaps.inputDatetime" :clearable="false" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+                <el-button class="successBorder" @click="handleFenceSearch">{{$t('common.query')}}</el-button>
               </div>
               <div class="table">
                 <u-table
@@ -1108,8 +1108,8 @@
           </el-tab-pane>
           <el-tab-pane label="车次重量" name="second">
               <div class="search">
-                <el-date-picker ref="inputDatetime" :clearable="false" v-model="fenceTemp.tab2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" />
-                <el-button class="successBorder" @click="handleFenceSearch">查询</el-button>
+                <el-date-picker ref="inputDatetime" :clearable="false" v-model="fenceTemp.tab2.getdataListParm.parammaps.inputDatetime" class="filter-item inputDatetime" type="daterange" style="width: 250px;top:-3px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" />
+                <el-button class="successBorder" @click="handleFenceSearch">{{$t('common.query')}}</el-button>
               </div>
               <div class="table">
                 <u-table

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

@@ -4,7 +4,7 @@
       <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
       <el-button class="export" @click="handleDownload">导出</el-button>
       <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
     </div>
@@ -51,7 +51,7 @@
       <el-row :gutter="10">
         <el-col :span="24" style="margin-bottom: 10px;margin-top: 10px;">
           <span>图表查询时间:</span>
-          <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+          <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
           <el-button class="successBorder" @click="handleChartDate">确认</el-button>
           <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
         </el-col>
@@ -62,7 +62,7 @@
           <div class="grid-content">
             <h4>泌乳牛干物质采食量</h4>
             <div v-if="tab.chart1.isChart" class="button">
-              <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
               <div class="exportTable" @click="handleExport('chart1')">导出</div>
               <div class="exportTable" @click="handleTable('chart1')">切换表格</div>
             </div>
@@ -98,7 +98,7 @@
           <div class="grid-content">
             <h4>剩料率</h4>
             <div v-if="tab.chart2.isChart" class="button">
-              <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
+              <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
               <div class="exportTable" @click="handleExport('chart2')">导出</div>
               <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
             </div>
@@ -139,7 +139,7 @@
           <div class="grid-content">
             <h4>混料时间统计</h4>
             <div v-if="tab.chart3.isChart" class="button">
-              <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
               <div class="exportTable" @click="handleExport('chart3')">导出</div>
               <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
             </div>
@@ -175,7 +175,7 @@
           <div class="grid-content">
             <h4>转化率</h4>
             <div v-if="tab.chart4.isChart" class="button">
-              <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+              <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
               <div class="exportTable" @click="handleExport('chart4')">导出</div>
               <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
             </div>
@@ -214,7 +214,7 @@
           <div class="grid-content">
             <h4>成本分析</h4>
             <div v-if="tab.chart5.isChart" class="button">
-              <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
+              <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
               <div class="exportTable" @click="handleExport('chart5')">导出</div>
               <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
             </div>
@@ -259,7 +259,7 @@
           <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
           <el-input v-if="pasture.isHouseName" v-model="pasture.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="pasture.isLivestockType" v-model="pasture.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
-          <el-button class="successBorder" @click="handlePastureSearch">查询</el-button>
+          <el-button class="successBorder" @click="handlePastureSearch">{{$t('common.query')}}</el-button>
         </div>
         <div class="table">
           <el-table

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

@@ -3,7 +3,7 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="效率统计" 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="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="changeTab1Date" />
+          <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="width: 250px;" :picker-options="pickerOptions" @change="changeTab1Date" />
           <!-- <el-date-picker v-model="tab2.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" @change="changeTab2Date" /> -->
           <!-- <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" style="width: 140px;margin-top: 5px;" type="date" placeholder="选择日期" @change="changeTab1Date"> </el-date-picker> -->
           <el-button class="el-icon-arrow-left elIconArrowLeft" style="dispaly:inline-block;margin-top: 5px;" :disabled="Beforedisabled1" @click="handleBefore" />
@@ -19,7 +19,7 @@
           <el-select v-model="tab.table.getdataListParm.parammaps.times" filterable placeholder="班次" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -73,7 +73,7 @@
                 <el-radio-button label="3" border>月</el-radio-button>
               </el-radio-group>
               <div v-show="tab.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                <el-date-picker v-model="tab.chartDate" :clearable="false" class="inputDatetime filter-item" style="width:250px;" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
               </div>
               <div v-show="tab.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                 <el-select v-model="tab.selectYear" class="filter-item" style="width:130px;margin-right:10px;" placeholder="请选择年份" @change="changeAllYear">
@@ -84,7 +84,7 @@
                 </el-select>
               </div>
               <div v-show="tab.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                <el-date-picker v-model="tab.chartMonth" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" style="width:250px;" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
               </div>
               <el-button class="successBorder" style="margin-left:10px;" @click="handleAllDate">确认</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
@@ -107,7 +107,7 @@
                     </el-radio-group>
                     <!-- <br/> -->
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-top: 5px;">
-                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;">
                       <el-select v-model="tab.chart1.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;margin-top: 5px;" placeholder="年份" @change="changeChartYear('chart1')">
@@ -118,7 +118,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart1.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;">
-                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart1')">确认</el-button>
                   </div>
@@ -166,7 +166,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart2.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart2')">
@@ -177,7 +177,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart2.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart2')">确认</el-button>
                   </div>
@@ -229,7 +229,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart3.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart3')">
@@ -240,7 +240,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart3.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart3')">确认</el-button>
                   </div>
@@ -288,7 +288,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart4.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart4')">
@@ -299,7 +299,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart4.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart4')">确认</el-button>
                   </div>
@@ -349,7 +349,7 @@
                       <el-radio-button label="3" border>月</el-radio-button>
                     </el-radio-group>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '1'" class="day" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptionsDate" />
+                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width:220px;" :clearable="false" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptionsDate" />
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '2'" class="week" style="display: inline-block; clear: both;margin-left:10px;">
                       <el-select v-model="tab.chart5.getdataListParm.parammaps.selectYear" class="filter-item" style="width:80px;margin-right:10px;" placeholder="年份" @change="changeChartYear('chart5')">
@@ -360,7 +360,7 @@
                       </el-select>
                     </div>
                     <div v-show="tab.chart5.getdataListParm.parammaps.specificDate == '3'" class="month" style="display: inline-block;margin-left:10px;">
-                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" range-separator="至" :picker-options="pickerOptionsMonth" />
+                      <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.chartMonth" style="width:220px;" :clearable="false" value-format="yyyy-MM-dd" type="monthrange" class="inputDatetime filter-item" :range-separator="$t('common.to')" :picker-options="pickerOptionsMonth" />
                     </div>
                     <el-button class="successBorder" style="margin-left:10px;" @click="handleChartDate('chart5')">确认</el-button>
                   </div>
@@ -533,7 +533,7 @@
     <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
     <div>
       <span>导出时间范围：</span>
-      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+      <el-date-picker v-model="exportList.inputDatetime" :clearable="false" style="width: 230px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">关闭</el-button>

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

@@ -4,7 +4,7 @@
       <el-tab-pane label="效率统计" name="first">
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.date" :clearable="false" type="date" placeholder="选择日期" style="width: 150px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" v-if="false"/>
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+          <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="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
           <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
           <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
           <span style="margin-left: 10px;">统计类型：</span>
@@ -15,7 +15,7 @@
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.barname" class="filter-item" style="width: 150px;" placeholder="栏舍" />
           <el-input v-if="tab.isHouseName" v-model="tab.table.getdataListParm.parammaps.ftname" class="filter-item" style="width: 150px;" placeholder="配方模板" />
           <el-input v-if="tab.isLivestockType" v-model="tab.table.getdataListParm.parammaps.cowclass" class="filter-item" style="width: 150px;" placeholder="牲畜类别" />
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
           <el-button class="export" icon="el-icon-upload2" @click="handleDownload">导出</el-button>
           <svg-icon icon-class="Up" class="down" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpChart" />
         </div>
@@ -63,7 +63,7 @@
           <el-row :gutter="10">
             <el-col :span="24" style="margin-top: 10px;">
               <span>图表查询时间:</span>
-              <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions" />
+              <el-date-picker v-model="tab.chartDate" :clearable="false" style="margin-left: 10px;width: 250px;margin-right: 10px;" class="inputDatetime filter-item" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :picker-options="pickerOptions" />
               <el-button class="successBorder" @click="handleChartDate">确认</el-button>
               <svg-icon icon-class="Up" style="width: 40px;height: 40px;float: right;" @click="handleQuickJumpTop" />
             </el-col>
@@ -73,7 +73,7 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">泌乳牛干物质采食量</h4>
                 <div v-if="tab.chart1.isChart" class="button">
-                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
+                  <el-date-picker v-model="tab.chart1.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart1')" />
                   <div class="exportTable" @click="handleExport('chart1')">导出</div>
                   <div class="exportTable" @click="handleTable('chart1')">切换表格</div>
                 </div>
@@ -109,7 +109,7 @@
                 <h4 style="text-align:center;">牛栏剩料率</h4>
                 <div v-if="tab.chart2.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart2.getdataListParm.parammaps.statisticsList" :option="tab.chart2.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart2" />
-                  <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
+                  <el-date-picker v-model="tab.chart2.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart2')" />
                   <div class="exportTable" @click="handleExport('chart2')">导出</div>
                   <div class="exportTable" @click="handleTable('chart2')">切换表格</div>
                 </div>
@@ -148,7 +148,7 @@
               <div class="grid-content">
                 <h4 style="text-align:center;">混料时间统计</h4>
                 <div v-if="tab.chart3.isChart" class="button">
-                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
+                  <el-date-picker v-model="tab.chart3.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart3')" />
                   <div class="exportTable" @click="handleExport('chart3')">导出</div>
                   <div class="exportTable" @click="handleTable('chart3')">切换表格</div>
                 </div>
@@ -183,7 +183,7 @@
                 <h4 style="text-align:center;">转化率</h4>
                 <div v-if="tab.chart4.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart4.getdataListParm.parammaps.statisticsList" :option="tab.chart4.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart4" />
-                  <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
+                  <el-date-picker v-model="tab.chart4.getdataListParm.parammaps.inputDatetime" style="width: 245px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart4')" />
                   <div class="exportTable" @click="handleExport('chart4')">导出</div>
                   <div class="exportTable" @click="handleTable('chart4')">切换表格</div>
                 </div>
@@ -222,7 +222,7 @@
                 <h4 style="text-align:center;">成本分析</h4>
                 <div v-if="tab.chart5.isChart" class="button">
                   <my-select ref="tenantselect" :model="tab.chart5.getdataListParm.parammaps.statisticsList" :option="tab.chart5.statisticsList" :value="'name'" :label="'name'" style="width: 150px;margin-right: 5px;float: left;" placeholder="请选择统计参数" @searchSelect="changeStatisticChart5" />
-                  <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
+                  <el-date-picker v-model="tab.chart5.getdataListParm.parammaps.inputDatetime" style="width: 250px;" class="inputDatetime" type="daterange" :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" :clearable="false" :picker-options="pickerOptions" @change="changeChartDate('chart5')" />
                   <div class="exportTable" @click="handleExport('chart5')">导出</div>
                   <div class="exportTable" @click="handleTable('chart5')">切换表格</div>
                 </div>

src/views/statisticalAnalysis/formulaStatistics/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="app-container" ref="searchBar">
     <el-date-picker v-model="inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange"
-      range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;"
+      :range-separator="$t('common.to')"  :start-placeholder="$t('common.startTime')"" :end-placeholder="$t('common.endTime')" style="width: 250px;margin-right: 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-button class="successBorder" @click="form_search">查询</el-button>
+    <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
     <h3 style="text-align: center;">每日拌料车次</h3>
     <div id="chartLine1" :style="{height:height,width:width}" />
   </div>
@@ -95,16 +95,16 @@
       this.getChart1()
     },
 
-    methods: {
-      getTimeFn() {
-        const that = this
-        const start = new Date()
-        const end = new Date()
-        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
-        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
-        that.startTime = parseTime(start, '{y}-{m}-{d}')
-        that.endTime = parseTime(end, '{y}-{m}-{d}')
-        that.inputDatetime = [start, end]
+    methods: {
+      getTimeFn() {
+        const that = this
+        const start = new Date()
+        const end = new Date()
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+        end.setTime(end.getTime() - 3600 * 1000 * 24 * 1)
+        that.startTime = parseTime(start, '{y}-{m}-{d}')
+        that.endTime = parseTime(end, '{y}-{m}-{d}')
+        that.inputDatetime = [start, end]
       },
       handleBefore() {
         if (this.inputDatetime !== '' && this.inputDatetime !== null) {
@@ -181,15 +181,15 @@
           this.chart1.chartLine.dispose()
         }
         this.chart1.chartLine = echarts.init(document.getElementById('chartLine1'))
-        var option = {
-          tooltip:{
-            // trigger: 'axis'
-            formatter: (param, ticket, callback) => {
-              var str = ''
-              str +=  param.name + '<br>' + param.marker + ' ' + param.seriesName +':' +param.value
-              console.log(ticket,'ticket')
-              return str
-            }
+        var option = {
+          tooltip:{
+            // trigger: 'axis'
+            formatter: (param, ticket, callback) => {
+              var str = ''
+              str +=  param.name + '<br>' + param.marker + ' ' + param.seriesName +':' +param.value
+              console.log(ticket,'ticket')
+              return str
+            }
           },
           grid: {
             top: '30%',
@@ -198,8 +198,8 @@
             // bottom: '3%',
             containLabel: true
           },
-          legend: {
-            data:chartLine_data.data1
+          legend: {
+            data:chartLine_data.data1
           },
           xAxis: {
             data: chartLine_data.xdata,
@@ -209,9 +209,9 @@
             }
           },
           yAxis: {
-            type: 'value',
-            max: function(value) {
-              return (value.max+1)
+            type: 'value',
+            max: function(value) {
+              return (value.max+1)
             }
           },
           series: (function() {
@@ -223,15 +223,15 @@
                   type: 'bar',
                   stack: '总量',
                   label: {
-                    show: true,
-                    formatter: function(params) {
-                      const a = params.value
-                      if (a > 0) {
-                        return a
-                      } else {
-                        return ''
-                      }
-                    },
+                    show: true,
+                    formatter: function(params) {
+                      const a = params.value
+                      if (a > 0) {
+                        return a
+                      } else {
+                        return ''
+                      }
+                    },
                     color: 'black'
                   },
                   emphasis: {
@@ -240,28 +240,28 @@
                   data: chartLine_data.data2[i]
                 }
                 serie.push(item)
-              }
-              var item2 = {
-                name: '',
-                type: 'bar',
-                stack: '总量',
-                label: {
-                  show: true,
-                  position: 'top',
-                  formatter: function(params) {
-                    const a = params.value
-                    if (a > 0) {
-                      return a
-                    } else {
-                      return ''
-                    }
-                  }
-                },
-                emphasis: {
-                  focus: 'series'
-                },
-                data: chartLine_data.data2[chartLine_data.data2.length -1]
-              }
+              }
+              var item2 = {
+                name: '',
+                type: 'bar',
+                stack: '总量',
+                label: {
+                  show: true,
+                  position: 'top',
+                  formatter: function(params) {
+                    const a = params.value
+                    if (a > 0) {
+                      return a
+                    } else {
+                      return ''
+                    }
+                  }
+                },
+                emphasis: {
+                  focus: 'series'
+                },
+                data: chartLine_data.data2[chartLine_data.data2.length -1]
+              }
               serie.push(item2)
             }
             return serie
@@ -277,23 +277,23 @@
           return datavalue
         }
         series[series.length - 1].label.formatter = getSum
-        this.chart1.chartLine.setOption(option, true);
+        this.chart1.chartLine.setOption(option, true);
 
-        this.chart1.chartLine.on('legendselectchanged', (obj) => {
-               function getSum (params) {
-                 var datavalue = 0
-                 for (var i = 0; i < series.length; i++) {
-                   if (obj.selected[series[i].name]) {
-                     datavalue += series[i].data[params.dataIndex]
-                   }
-                 }
-                 return datavalue
-               }
-               series[series.length - 1].label.formatter = getSum
-               this.chart1.chartLine.setOption(option)
-             })
+        this.chart1.chartLine.on('legendselectchanged', (obj) => {
+               function getSum (params) {
+                 var datavalue = 0
+                 for (var i = 0; i < series.length; i++) {
+                   if (obj.selected[series[i].name]) {
+                     datavalue += series[i].data[params.dataIndex]
+                   }
+                 }
+                 return datavalue
+               }
+               series[series.length - 1].label.formatter = getSum
+               this.chart1.chartLine.setOption(option)
+             })
         // this.chart1.chartLine.setOption(option, true);
       },
     }
   }
-</script>
+</script>

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;float: left;" @change="changeDate" />
+      <el-date-picker v-model="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: 250px;margin-right: 10px;float: left;" @change="changeDate" />
       <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.search" placeholder="查询" class="filter-item" style="width: 120px;margin-right: 10px;">
@@ -13,7 +13,7 @@
       <el-select v-else v-model="table.getdataListParm.parammaps.barid" clearable filterable placeholder="请选择栏舍" style="width: 180px;" class="filter-item">
         <el-option v-for="item in formulaList" :key="item.id" :label="item.bname" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" style="margin-left:10px;" @click="form_search">查询</el-button>
+      <el-button class="successBorder" style="margin-left:10px;" @click="form_search">{{$t('common.query')}}</el-button>
     </div>
     <div class="search" />
     <div class="table">

src/views/statisticalAnalysis/formulationEvaluation/index备.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="operation">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;margin-right: 10px;" @change="changeDate" />
+      <el-date-picker v-model="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: 250px;margin-right: 10px;" @change="changeDate" />
       <el-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
     </div>

src/views/statisticalAnalysis/inventoryManagement/group/index.vue

@@ -7,11 +7,11 @@
           <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" />
           </el-select>
-          <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
+          <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-button class="successBorder" style="margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">查询</el-button>
+          <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)">导出</el-button>
         </div>
         <div class="table">
@@ -56,7 +56,7 @@
           <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" />
           </el-select>
-          <el-date-picker v-model="tab2.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
+          <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: 250px;" :picker-options="pickerOptions" />
           <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;">统计类型：</span>
@@ -72,7 +72,7 @@
           <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.isRadio5" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="班次" />
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 170px;" placeholder="车次" />
-          <el-button class="successBorder" @click="form_search('second')">查询</el-button>
+          <el-button class="successBorder" @click="form_search('second')">{{$t('common.query')}}</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;" @click="handleExport('tab2')">导出</el-button>
         </div>
         <el-table
@@ -104,7 +104,7 @@
           <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" />
           </el-select>
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
+          <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')" 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;">统计类型：</span>
@@ -116,7 +116,7 @@
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 180px;" placeholder="栏舍名称" />
           <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-button class="successBorder" @click="form_search('third')">查询</el-button>
+          <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')">导出</el-button>
         </div>
         <el-table

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

@@ -3,11 +3,11 @@
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="库存统计" 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="至" start-placeholder="开始日期" end-placeholder="结束日期" style="float: left;width: 250px;margin-bottom:10px;" :picker-options="pickerOptions" />
+          <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-button class="successBorder" style="float: left;margin-left: 10px;margin-bottom:10px;" @click="form_search('first')">查询</el-button>
+          <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')">导出</el-button>
         </div>
         <div class="table">
@@ -49,7 +49,7 @@
       </el-tab-pane>
       <el-tab-pane label="用料分析" 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="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 245px;" :picker-options="pickerOptions2" />
+          <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;">统计类型：</span>
@@ -57,9 +57,9 @@
             <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-option v-for="item in isSplitsmallmaterialsList" :key="item.id" :label="item.name" :value="item.id" />
-          </el-select>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.ftType" placeholder="是否拆分小料" 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="牲畜类别" />
           <el-input v-if="tab2.isRadio2" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="栏舍名称" />
           <el-input v-if="tab2.isRadio3" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="日期" />
@@ -68,27 +68,27 @@
           <el-input v-if="tab2.isRadio6" v-model="tab2.table.getdataListParm.parammaps.fname" class="filter-item filter-item1" style="width: 200px;" placeholder="车次" />
           <el-select v-model="tab2.table.getdataListParm.parammaps.typea" clearable placeholder="列表显示" 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="班次" class="filter-item" style="width: 120px;">
-            <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search('second')">查询</el-button>
+          <el-select v-model="tab2.table.getdataListParm.parammaps.times" clearable filterable placeholder="班次" class="filter-item" style="width: 120px;">
+            <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
+          </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')">导出</el-button>
           <el-button class="export" style="float: right;margin-right: 5px;margin-top:10px;" icon="el-icon-upload2" @click="handlesWitch()">切换展示</el-button>
-        </div>
-
+        </div>
+
         <div v-if="isTable1">
-        <div v-if="tab2.table.tableConfig.length > 8">
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
-            <!-- 第一个表头 -->
-            <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow" >
-              <!-- 第二个表头 -->
-              <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
-                <!-- 第三个表头 -->
-                <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
-                </u-table-column>
-              </u-table-column>
-            </u-table-column>
+        <div v-if="tab2.table.tableConfig.length > 8">
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+            <!-- 第一个表头 -->
+            <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow" >
+              <!-- 第二个表头 -->
+              <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
+                <!-- 第三个表头 -->
+                <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
+                </u-table-column>
+              </u-table-column>
+            </u-table-column>
           </u-table>
           <!-- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
             <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center" :fixed="index==0">
@@ -98,17 +98,17 @@
             </u-table-column>
           </u-table> -->
         </div>
-        <div v-else>
-          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
-            <!-- 第一个表头 -->
-            <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow">
-              <!-- 第二个表头 -->
-              <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
-                <!-- 第三个表头 -->
-                <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
-                </u-table-column>
-              </u-table-column>
-            </u-table-column>
+        <div v-else>
+          <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+            <!-- 第一个表头 -->
+            <u-table-column v-for="(header1, index1) in tab2.table.tableConfig" :key="'header1-' + index1" :label="header1.label" align="center" :fixed="index1==0" :show-overflow-tooltip="header1.showOverflow">
+              <!-- 第二个表头 -->
+              <u-table-column v-for="(header2, index2) in header1.children" :key="'header2-' + index2" :label="header2.label" align="center" :fixed="index2==0" :show-overflow-tooltip="header2.showOverflow">
+                <!-- 第三个表头 -->
+                <u-table-column v-for="(header3, index3) in header2.children" :key="'header3-' + index3" :label="header3.label" :prop="header3.prop" align="center">
+                </u-table-column>
+              </u-table-column>
+            </u-table-column>
           </u-table>
           <!-- <u-table v-if="isDispayTable2" ref="plTable2" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
             <u-table-column v-for="(item,index) in tab2.table.tableConfig" :key="index" :label="item.label" :show-overflow-tooltip="item.showOverflow"  :prop="item.prop" align="center">
@@ -120,17 +120,17 @@
         </div>
 
         <span v-if="tab2.table.listLoading == false && tab2.table.list.length>0" style="margin-right: 30px;margin-top: 10px;font-size: 14px;">共{{ tab2.table.total }}条</span>
-        </div>
-        <div v-else>
-          <!-- 新展示 -->
-          <u-table :span-method="objectSpanMethod" ref="plTable22" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
-            <u-table-column v-for="(column, index) in tableColumns" :key="index" :prop="column.prop" :label="column.label" align="center"></u-table-column>
-          </u-table>
-        </div>
+        </div>
+        <div v-else>
+          <!-- 新展示 -->
+          <u-table :span-method="objectSpanMethod" ref="plTable22" v-loading="tab2.table.listLoading" :row-style="rowStyle" :cell-style="cellStyle" :max-height="myHeight2" use-virtual :row-height="rowHeight" border class="elTable table-fixed plTable2">
+            <u-table-column v-for="(column, index) in tableColumns" :key="index" :prop="column.prop" :label="column.label" align="center"></u-table-column>
+          </u-table>
+        </div>
       </el-tab-pane>
       <el-tab-pane label="价格分析" name="third">
         <div class="search">
-          <el-date-picker v-model="tab3.table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :clearable="false" style="width: 250px;" :picker-options="pickerOptions" />
+          <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;">统计类型：</span>
@@ -145,7 +145,7 @@
           <el-input v-if="tab3.isRadio2" v-model="tab3.table.getdataListParm.parammaps.fname" class="filter-item" style="width: 185px;" placeholder="栏舍名称" />
           <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-button class="successBorder" @click="form_search('third')">查询</el-button>
+          <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')">导出</el-button>
         </div>
         <div v-if="tab3.table.tableConfig.length>2">
@@ -212,30 +212,30 @@ export default {
           }
           return time.getTime() > Date.now()
         }
-      },
-      pickerOptions2: {
-        onPick: ({ maxDate, minDate }) => {
-          this.pickerMinDate = minDate.getTime()
-          if (maxDate) {
-            this.pickerMinDate = ''
-          }
-        },
-        // 限制不能选择今天之后的日期
-        disabledDate: (time) => {
-          if (this.pickerMinDate !== '') {
-            const one = 31 * 24 * 3600 * 1000
-            const minTime = this.pickerMinDate - one
-            let maxTime = this.pickerMinDate + one
-            // if (maxTime > new Date()) {
-            //   maxTime = new Date()
-            // }
-            return time.getTime() < minTime || time.getTime() > maxTime
-          }
-          // return time.getTime() > Date.now()
-        }
+      },
+      pickerOptions2: {
+        onPick: ({ maxDate, minDate }) => {
+          this.pickerMinDate = minDate.getTime()
+          if (maxDate) {
+            this.pickerMinDate = ''
+          }
+        },
+        // 限制不能选择今天之后的日期
+        disabledDate: (time) => {
+          if (this.pickerMinDate !== '') {
+            const one = 31 * 24 * 3600 * 1000
+            const minTime = this.pickerMinDate - one
+            let maxTime = this.pickerMinDate + one
+            // if (maxTime > new Date()) {
+            //   maxTime = new Date()
+            // }
+            return time.getTime() < minTime || time.getTime() > maxTime
+          }
+          // return time.getTime() > Date.now()
+        }
       },
       fileComment: [{ 'label': '商务文件评分', 'children': [{ 'label': '1' }, { 'label': '2' }, { 'label': '管理员' }] }],
-      displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
+      displayList:[{id:'1',name:'理论'},{id:'2',name:'实际'}],//列表显示
       isSplitsmallmaterialsList:[{id:'0',name:'拆分'},{id:'1',name:'不拆分'}],
       activeName: 'first',
       tab: {
@@ -279,8 +279,8 @@ export default {
               stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
               inputDatetime: [new Date(), new Date()],
               fname: '',
-              typea:'',
-              times:'',
+              typea:'',
+              times:'',
               ftType:'1'
             }
           },
@@ -337,22 +337,22 @@ export default {
       isDispayTable3:false,
       statisticalTypeList2: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }, { id: '5', name: 'TMR班次' }, { id: '6', name: '车次' }],
       statisticalTypeList3: [{ id: '1', name: '牲畜类别' }, { id: '2', name: '栏舍名称' }, { id: '3', name: '日期' }, { id: '4', name: 'TMR设备编号' }],
-      frequencyList: [], // 班次
-      isTable1:true,
-      spanObj: {},
-      mergekeys: ['A', 'B'],
-      tableColumns:[],
-      myData:{},
-      columnsToTotal: ['10-配种']
+      frequencyList: [], // 班次
+      isTable1:true,
+      spanObj: {},
+      mergekeys: ['A', 'B'],
+      tableColumns:[],
+      myData:{},
+      columnsToTotal: ['10-配种']
     }
   },
   created() {
-    this.getTimeFn()
+    this.getTimeFn()
     this.getIsDisplay()
   },
-  methods: {
-    getIsDisplay() {
-      const url = 'authdata/GetDataByName'
+  methods: {
+    getIsDisplay() {
+      const url = 'authdata/GetDataByName'
       const data = {
         name: 'getSysoptEnable',
         page: 1,
@@ -363,33 +363,33 @@ export default {
           pastureid: Cookies.get('pastureid'),
           inforname: 'times'
         }
-      }
-      postJson(url, data).then(response => {
-        console.log(response.data.list[0].inforvalue)
-        if (response.data.list[0].inforvalue == 1) {
-          this.frequencyList = [{ id: 1, name: '第一班' }]
-        } else if (response.data.list[0].inforvalue == 2) {
-          this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }
-          ]
-        } else if (response.data.list[0].inforvalue == 3) {
-          this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }
-          ]
-        } else if (response.data.list[0].inforvalue == 4) {
-          this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }
-          ]
-        }else if (response.data.list[0].inforvalue == 5) {
-          this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }
-          ]
-        }else if (response.data.list[0].inforvalue == 6) {
-          this.frequencyList = [
-            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }, { id: 6, name: '第六班' },
-          ]
-        }
-      })
+      }
+      postJson(url, data).then(response => {
+        console.log(response.data.list[0].inforvalue)
+        if (response.data.list[0].inforvalue == 1) {
+          this.frequencyList = [{ id: 1, name: '第一班' }]
+        } else if (response.data.list[0].inforvalue == 2) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }
+          ]
+        } else if (response.data.list[0].inforvalue == 3) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }
+          ]
+        } else if (response.data.list[0].inforvalue == 4) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }
+          ]
+        }else if (response.data.list[0].inforvalue == 5) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }
+          ]
+        }else if (response.data.list[0].inforvalue == 6) {
+          this.frequencyList = [
+            { id: 1, name: '第一班' }, { id: 2, name: '第二班' }, { id: 3, name: '第三班' }, { id: 4, name: '第四班' }, { id: 5, name: '第五班' }, { id: 6, name: '第六班' },
+          ]
+        }
+      })
     },
     getTimeFn() {
       const that = this
@@ -497,78 +497,78 @@ export default {
       setTimeout(()=>{
         this.isDispayTable2 = true
         this.$nextTick(() => {
-          let myList = []
-          if(this.isTable1){
-            this.tab2.table.getdataListParm.parammaps.mode = 0
-          }else{
-            this.tab2.table.getdataListParm.parammaps.mode = 1
+          let myList = []
+          if(this.isTable1){
+            this.tab2.table.getdataListParm.parammaps.mode = 0
+          }else{
+            this.tab2.table.getdataListParm.parammaps.mode = 1
           }
-          GetReportform(this.tab2.table.getdataListParm).then(response => {
-            if(this.isTable1){
-              if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
-                this.tab2.table.data = response.data.data
-                response.data.feedcode.push('')
-                response.data.feedcode.unshift('饲料编码')
-                for (let i = 0; i < response.data.list.data2.length; i++) {
-                  // console.log(response.data.list.data2[i],'===label')
-                  for (let j = 0; j < response.data.list.data1.length; j++) {
-                    for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
-                      if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
-                        response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
-                      }
-                    }
-                  }
-                  if (response.data.list.data2[i].children.length > 1) {
-                    for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
-                      if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
-                        this.$set(response.data.list.data2[i].children[j], 'width', '80px')
-                      } else {
-                        this.$set(response.data.list.data2[i].children[j], 'width', '80px')
-                      }
-                    }
-                  } else {
-                    this.$set(response.data.list.data2[i].children[0], 'width', '80px')
-                  }
-                }
-                let list = response.data.list.data2
-                let code = response.data.feedcode
-                const headers = []
-                for(let i=0;i<list.length;i++){
-                  for(let j=0;j<code.length;j++){
-                    if(i== j){
-                      let obj = {
-                        label:code[j],
-                        children:[
-                          list[i]
-                        ]
-                      }
-                      headers.push(obj)
-                    }
-                  }
-                }
-                myList = response.data.list.data1
-                this.tab2.table.list = response.data.list.data1
-                this.tab2.table.tableConfig = headers
-                this.tab2.table.total = response.data.list.data1.length
-
-                console.log('库存统计-用料分析this.tab2.table.data', response.data.data)
-                console.log('库存统计-用料分析this.tab2.table.feedcode', response.data.feedcode)
-                console.log('库存统计-用料分析this.tab2.table.list', response.data.list.data1)
-                console.log('库存统计-用料分析this.tab2.table.tableConfig',response.data.list.data2)
-              } else {
-                myList = []
-                this.tab2.table.list = []
-                this.tab2.table.tableConfig = []
-              }
-
-              console.log(this.tab2.table.list.length)
-              this.$refs.plTable2.reloadData(myList)
-            }else{
-              this.myData = response.data
-              this.tableColumns = response.data.columns;
-              this.tableData = response.data.data;
-              this.$refs.plTable22.reloadData(this.tableData)
-              this.handleSpan()
+          GetReportform(this.tab2.table.getdataListParm).then(response => {
+            if(this.isTable1){
+              if (response.data !== null && response.data.data !== null && response.data.data1 !== null) {
+                this.tab2.table.data = response.data.data
+                response.data.feedcode.push('')
+                response.data.feedcode.unshift('饲料编码')
+                for (let i = 0; i < response.data.list.data2.length; i++) {
+                  // console.log(response.data.list.data2[i],'===label')
+                  for (let j = 0; j < response.data.list.data1.length; j++) {
+                    for (let a = 0; a < response.data.list.data2[i].children.length; a++) {
+                      if (response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == undefined || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == null || response.data.list.data1[j][response.data.list.data2[i].children[a].prop] == '') {
+                        response.data.list.data1[j][response.data.list.data2[i].children[a].prop] = 0
+                      }
+                    }
+                  }
+                  if (response.data.list.data2[i].children.length > 1) {
+                    for (let j = 0; j < response.data.list.data2[i].children.length; j++) {
+                      if (response.data.list.data2[i].children[j].label == '理论' || response.data.list.data2[i].children[j].label == '实际') {
+                        this.$set(response.data.list.data2[i].children[j], 'width', '80px')
+                      } else {
+                        this.$set(response.data.list.data2[i].children[j], 'width', '80px')
+                      }
+                    }
+                  } else {
+                    this.$set(response.data.list.data2[i].children[0], 'width', '80px')
+                  }
+                }
+                let list = response.data.list.data2
+                let code = response.data.feedcode
+                const headers = []
+                for(let i=0;i<list.length;i++){
+                  for(let j=0;j<code.length;j++){
+                    if(i== j){
+                      let obj = {
+                        label:code[j],
+                        children:[
+                          list[i]
+                        ]
+                      }
+                      headers.push(obj)
+                    }
+                  }
+                }
+                myList = response.data.list.data1
+                this.tab2.table.list = response.data.list.data1
+                this.tab2.table.tableConfig = headers
+                this.tab2.table.total = response.data.list.data1.length
+
+                console.log('库存统计-用料分析this.tab2.table.data', response.data.data)
+                console.log('库存统计-用料分析this.tab2.table.feedcode', response.data.feedcode)
+                console.log('库存统计-用料分析this.tab2.table.list', response.data.list.data1)
+                console.log('库存统计-用料分析this.tab2.table.tableConfig',response.data.list.data2)
+              } else {
+                myList = []
+                this.tab2.table.list = []
+                this.tab2.table.tableConfig = []
+              }
+
+              console.log(this.tab2.table.list.length)
+              this.$refs.plTable2.reloadData(myList)
+            }else{
+              this.myData = response.data
+              this.tableColumns = response.data.columns;
+              this.tableData = response.data.data;
+              this.$refs.plTable22.reloadData(this.tableData)
+              this.handleSpan()
             }
             setTimeout(() => {
               this.tab2.table.listLoading = false
@@ -576,7 +576,7 @@ export default {
           })
         })
       })
-    },
+    },
 
     changeRadio2() {
       console.log(this.tab2.radio)
@@ -862,53 +862,53 @@ export default {
     },
     changeChecked(item) {
       this.form_search('second')
-    },
-    handlesWitch(item){
-      this.isTable1 = !this.isTable1
-        this.getTab2List()
-    },
-    handleSpan() {
-      this.mergekeys.forEach(key => {
-        this.spanObj[key] = []
-        let position = 0
-        this.tableData.forEach((item, index) => {
-          if (index === 0) {
-            this.spanObj[key].push(1)
-            position = 0
-          } else {
-            if (key == 'B') {
-              if (this.tableData[index][key] === this.tableData[index - 1][key] && this.tableData[index]['A'] === this.tableData[index - 1]['A']) {
-                this.spanObj[key][position] += 1
-                this.spanObj[key].push(0)
-              } else {
-                this.spanObj[key].push(1)
-                position = index
-              }
-            } else {
-              if (this.tableData[index][key] === this.tableData[index - 1][key]) {
-                this.spanObj[key][position] += 1
-                this.spanObj[key].push(0)
-              } else {
-                this.spanObj[key].push(1)
-                position = index
-              }
-            }
-          }
-        })
-      })
-    },
-    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
-      for (let i = 0; i < this.mergekeys.length; i++) {
-        if (column.property === this.mergekeys[i]) {
-          let _row = this.spanObj[this.mergekeys[i]][rowIndex]
-          let _col = _row > 0 ? 1 : 0
-          console.log(_row,'_row1')
-          return {
-            rowspan: _row,
-            colspan: _col
-          }
-        }
-      }
+    },
+    handlesWitch(item){
+      this.isTable1 = !this.isTable1
+        this.getTab2List()
+    },
+    handleSpan() {
+      this.mergekeys.forEach(key => {
+        this.spanObj[key] = []
+        let position = 0
+        this.tableData.forEach((item, index) => {
+          if (index === 0) {
+            this.spanObj[key].push(1)
+            position = 0
+          } else {
+            if (key == 'B') {
+              if (this.tableData[index][key] === this.tableData[index - 1][key] && this.tableData[index]['A'] === this.tableData[index - 1]['A']) {
+                this.spanObj[key][position] += 1
+                this.spanObj[key].push(0)
+              } else {
+                this.spanObj[key].push(1)
+                position = index
+              }
+            } else {
+              if (this.tableData[index][key] === this.tableData[index - 1][key]) {
+                this.spanObj[key][position] += 1
+                this.spanObj[key].push(0)
+              } else {
+                this.spanObj[key].push(1)
+                position = index
+              }
+            }
+          }
+        })
+      })
+    },
+    objectSpanMethod({ row, column, rowIndex, columnIndex }) {
+      for (let i = 0; i < this.mergekeys.length; i++) {
+        if (column.property === this.mergekeys[i]) {
+          let _row = this.spanObj[this.mergekeys[i]][rowIndex]
+          let _col = _row > 0 ? 1 : 0
+          console.log(_row,'_row1')
+          return {
+            rowspan: _row,
+            colspan: _col
+          }
+        }
+      }
     },
     handleExport(item) {
       if (item == 'tab1') {
@@ -934,7 +934,7 @@ export default {
             excel.export_json_to_excel({ multiHeader, multiHeader2, data, filename: '库存统计', merges })
           })
         })
-      } else if (item == 'tab2') {
+      } else if (item == 'tab2') {
         if(this.isTable1){
           console.log('用料分析导出数据', this.tab2.table.list)
           console.log('用料分析导出表头', this.tab2.table.tableConfig)
@@ -951,10 +951,10 @@ export default {
           for (let i = 0; i < this.tab2.table.tableConfig.length; i++) {
             exportTitle1.push(this.tab2.table.tableConfig[i].label)
             for (let j = 0; j < this.tab2.table.tableConfig[i].children.length; j++) {
-              exportTitle2.push(this.tab2.table.tableConfig[i].children[j].label)
-              for(let a = 0;a<this.tab2.table.tableConfig[i].children[j].children.length;a++){
-                exportTitle3.push(this.tab2.table.tableConfig[i].children[j].children[a].label)
-                filterValArr.push(this.tab2.table.tableConfig[i].children[j].children[a].prop)
+              exportTitle2.push(this.tab2.table.tableConfig[i].children[j].label)
+              for(let a = 0;a<this.tab2.table.tableConfig[i].children[j].children.length;a++){
+                exportTitle3.push(this.tab2.table.tableConfig[i].children[j].children[a].label)
+                filterValArr.push(this.tab2.table.tableConfig[i].children[j].children[a].prop)
               }
               // filterValArr.push(this.tab2.table.tableConfig[i].children[j].prop)
             }
@@ -971,11 +971,11 @@ export default {
                 headerArr.push(exportTitle1[i], '', '', '')
               } else {
                 headerArr.push(exportTitle1[i])
-              }
-              if (i > 0) {
-                headerArr2.push(exportTitle2[i], '', '', '')
-              } else {
-                headerArr2.push(exportTitle2[i])
+              }
+              if (i > 0) {
+                headerArr2.push(exportTitle2[i], '', '', '')
+              } else {
+                headerArr2.push(exportTitle2[i])
               }
             }
           } else {
@@ -985,11 +985,11 @@ export default {
                   headerArr.push(exportTitle1[i], '')
                 } else {
                   headerArr.push(exportTitle1[i])
-                }
-                if (i > 0) {
-                  headerArr2.push(exportTitle2[i], '')
-                } else {
-                  headerArr2.push(exportTitle2[i])
+                }
+                if (i > 0) {
+                  headerArr2.push(exportTitle2[i], '')
+                } else {
+                  headerArr2.push(exportTitle2[i])
                 }
               }
             }else{
@@ -1005,8 +1005,8 @@ export default {
               const multiHeader = [
                 headerArr
               ]
-              const multiHeader2 = [
-                headerArr2
+              const multiHeader2 = [
+                headerArr2
               ]
               const tHeader = exportTitle3
               const filterVal = filterValArr
@@ -1029,26 +1029,26 @@ export default {
               const merges = []
               excel.export_json_to_excel({ multiHeader, multiHeader2, header: tHeader, data, filename: '用料分析', merges })
             })
-          }
-        }else{
-          var startTime = this.tab2.table.getdataListParm.parammaps.startTime
-          var stopTime = this.tab2.table.getdataListParm.parammaps.stopTime
-          var title = '用料分析-'+startTime+'-' +stopTime
-          var tHeader = []
-          var filterVal = []
-          for (let i = 0; i < this.tableColumns.length; i++) {
-            tHeader.push(this.tableColumns[i].label)
-            filterVal.push(this.tableColumns[i].prop)
-          }
-          var excelDatas = [
-            {
-              tHeader: tHeader,
-              filterVal: filterVal,
-              tableDatas: this.tableData,
-              sheetName: 'Sheet'
-            }
-          ]
-          json2excel(excelDatas, title, true, 'xlsx')
+          }
+        }else{
+          var startTime = this.tab2.table.getdataListParm.parammaps.startTime
+          var stopTime = this.tab2.table.getdataListParm.parammaps.stopTime
+          var title = '用料分析-'+startTime+'-' +stopTime
+          var tHeader = []
+          var filterVal = []
+          for (let i = 0; i < this.tableColumns.length; i++) {
+            tHeader.push(this.tableColumns[i].label)
+            filterVal.push(this.tableColumns[i].prop)
+          }
+          var excelDatas = [
+            {
+              tHeader: tHeader,
+              filterVal: filterVal,
+              tableDatas: this.tableData,
+              sheetName: 'Sheet'
+            }
+          ]
+          json2excel(excelDatas, title, true, 'xlsx')
         }
       } else if (item == 'tab3') {
         console.log('价格分析导出')
@@ -1143,8 +1143,8 @@ export default {
   }
   .plTableBox .el-table td.is-hidden>*, .plTableBox .el-table th.is-hidden>*{
     visibility:inherit;
-  }
-  .plTableBox .el-table th>.cell{
-    white-space: pre-wrap;
+  }
+  .plTableBox .el-table th>.cell{
+    white-space: pre-wrap;
   }
 </style>

src/views/statisticalAnalysis/processAnalysis/group/index.vue

@@ -6,7 +6,7 @@
       <el-select v-model="table.getdataListParm.parammaps.pastureid" placeholder="牧场" class="filter-item" style="width: 120px;">
         <el-option v-for="item in pastureList" :key="item.pastureid" :label="item.pasturename" :value="item.pastureid" />
       </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
+      <el-date-picker v-model="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: 250px;" :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-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>
@@ -16,8 +16,8 @@
       <el-select v-model="table.getdataListParm.parammaps.iscompleted" placeholder="工作状态" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in workingConditionList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <el-row :gutter="20">
       <el-col :span="8">

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

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
     <div class="search">
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" @change="change_date"/>
+      <el-date-picker v-model="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: 250px;" :picker-options="pickerOptions" @change="change_date"/>
       <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-select v-model="table.getdataListParm.parammaps.lpplantype" placeholder="计划类型" class="filter-item" style="width: 120px;" clearable>
@@ -47,8 +47,8 @@
       </div>
       <el-checkbox v-model="ccys"  style="margin-right: 10px;" @change="changeccysChecked">只看超出预设值数据</el-checkbox>
       <!-- 临时注释 -->
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <el-row :gutter="10">
       <el-col :span="8">

src/views/statisticalAnalysis/pushingplan/index.vue

@@ -5,9 +5,9 @@
         v-model="table.parammaps.inputDatetime"
         type="daterange"
         class="inputDatetime filter-item"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
+        :range-separator="$t('common.to')"
+         :start-placeholder="$t('common.startTime')"
+        :end-placeholder="$t('common.endTime')"
       >
       </el-date-picker>
       <el-input
@@ -17,8 +17,8 @@
         class="filter-item"
         clearable
       />
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
     </div>
     <div class="table">
       <el-table

src/views/systemManagement/boardEchartManagement/index.vue

@@ -9,8 +9,8 @@
           <el-select v-model="table.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -117,8 +117,8 @@
           <el-select v-model="table2.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList2" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate2">新增</el-button>

src/views/systemManagement/boardEchartManagement2/index.vue

@@ -9,8 +9,8 @@
           <el-select v-model="table.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -117,8 +117,8 @@
           <el-select v-model="table2.getdataListParm.parammaps.statue" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
             <el-option v-for="item in statueList2" :key="item.id" :label="item.value" :value="item.id" />
           </el-select>
-          <el-button class="successBorder" @click="form_search2">查询</el-button>
-          <el-button class="successBorder" @click="handleRefresh2">重置</el-button>
+          <el-button class="successBorder" @click="form_search2">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="handleRefresh2">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate2">新增</el-button>

src/views/systemManagement/customboard2/ChartPanel2/index.vue

@@ -55,8 +55,8 @@
 
  
 
-          <el-button class="successBorder" @click="form_search">查询</el-button>
-          <el-button class="successBorder" @click="form_clear">重置</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+          <el-button class="successBorder" @click="form_clear">{{$t('common.reset')}}</el-button>
         </div>
         <div class="operation">
           <el-button class="success" icon="el-icon-plus" @click="form_add_screening">添加筛选条件</el-button>
@@ -83,13 +83,13 @@
             </el-select>
 
 
-            <el-date-picker v-model="screeningObj.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+            <el-date-picker v-model="screeningObj.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="successBorder" @click="form_search_screening">查询</el-button>
-             <el-button class="successBorder" @click="form_cancel_screening">重置</el-button> 
+            <el-button class="successBorder" @click="form_search_screening">{{$t('common.query')}}</el-button>
+             <el-button class="successBorder" @click="form_cancel_screening">{{$t('common.reset')}}</el-button> 
           </div>
 
           <div>

src/views/systemManagement/groupInformation/index.vue

@@ -4,7 +4,7 @@
       <el-tab-pane label="集团名称" name="first">
         <div class="search">
           <el-input v-model="table.getdataListParm.parammaps.groupsname" placeholder="集团名称" style="width: 180px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         </div>
 
         <div class="table">
@@ -53,7 +53,7 @@
       <el-tab-pane label="牧场管理" name="second">
         <div class="search">
           <el-input v-model="table.getdataListParm.parammaps.pasturename" placeholder="牧场名称" style="width: 180px;" class="filter-item" clearable />
-          <el-button class="successBorder" @click="form_search">查询</el-button>
+          <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
         </div>
 
         <div class="table">

src/views/systemManagement/labelManagement/index.vue

@@ -7,8 +7,8 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" filterable placeholder="标签值" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in tagValueList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/systemManagement/notificationManagement/index.vue

@@ -3,9 +3,9 @@
     <div class="search">
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="标题" style="width: 180px;" class="filter-item" clearable />
       <el-input v-model="table.getdataListParm.parammaps.rolename" placeholder="创建人" style="width: 180px;" class="filter-item" clearable />
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="form_search('table')">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh('table')">重置</el-button>
+      <el-date-picker ref="inputDatetime" 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="successBorder" @click="form_search('table')">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh('table')">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>
@@ -57,9 +57,9 @@
           <el-option v-for="item in pastureList" :key="item.id" :label="item.name" :value="item.id" />
         </el-select>
         <el-input v-model="statisticsRead.getdataListParm.parammaps.rolename" placeholder="用户" style="width: 180px;" class="filter-item" clearable />
-        <el-date-picker ref="inputDatetime" v-model="statisticsRead.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-        <el-button class="successBorder" @click="form_search('statisticsRead')">查询</el-button>
-        <el-button class="successBorder" @click="handleRefresh('statisticsRead')">重置</el-button>
+        <el-date-picker ref="inputDatetime" v-model="statisticsRead.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="successBorder" @click="form_search('statisticsRead')">{{$t('common.query')}}</el-button>
+        <el-button class="successBorder" @click="handleRefresh('statisticsRead')">{{$t('common.reset')}}</el-button>
       </div>
       <div class="table">
         <el-table

src/views/systemManagement/operation/index.vue

@@ -11,9 +11,9 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="操作人" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in operatorList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-date-picker ref="inputDatetime" 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="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="table">
       <el-table

src/views/systemManagement/operationManagement/group/index.vue

@@ -5,8 +5,8 @@
       <el-select v-model="tab1.table.getdataListParm.parammaps.enable" placeholder="状态" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in stateList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>

src/views/systemManagement/operationManagement/pasture/index.vue

@@ -8,8 +8,8 @@
       <el-select v-model="tab2.table.getdataListParm.parammaps.statue" placeholder="是否归属集团" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in isBelongGroupList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" class="success" icon="el-icon-plus" @click="handleCreate">新增</el-button>

src/views/systemManagement/ranchInformation/index.vue

@@ -21,8 +21,8 @@
           </li>
         </ul>
       </div>
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
 
     <div class="table">

src/views/systemManagement/reminderSettings/index.vue

@@ -170,7 +170,7 @@
                 <el-input v-model="setUp.empCode" placeholder="角色名称" style="width: 180px;" class="filter-item" clearable />
                 <el-input v-model="setUp.empCode" placeholder="用户名称" style="width: 180px;" class="filter-item" clearable />
                 <el-input v-model="setUp.empname" placeholder="员工姓名" style="width: 180px;" class="filter-item" clearable />
-                <el-button class="successBorder" @click="form_search">查询</el-button>
+                <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
               </div>
               <el-row :gutter="5">
                 <el-col :span="6">

src/views/systemManagement/role/index.vue

@@ -6,9 +6,9 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker ref="inputDatetime" v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-date-picker ref="inputDatetime" 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="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>

src/views/systemManagement/user/index.vue

@@ -6,14 +6,14 @@
       <el-select v-model="table.getdataListParm.parammaps.enable" placeholder="是否启用" class="filter-item" style="width: 120px;" clearable>
         <el-option v-for="item in enableList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
-      <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
+      <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-select v-model="table.getdataListParm.parammaps.enable" placeholder="公众号关注状态" class="filter-item" style="width: 150px;" clearable>
         <el-option v-for="item in attentionStatusList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select> -->
       <!-- 临时注释 -->
-      <el-button class="successBorder" @click="form_search">查询</el-button>
-      <el-button class="successBorder" @click="handleRefresh">重置</el-button>
+      <el-button class="successBorder" @click="form_search">{{$t('common.query')}}</el-button>
+      <el-button class="successBorder" @click="handleRefresh">{{$t('common.reset')}}</el-button>
     </div>
     <div class="operation">
       <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>