修改导出时间&栏舍搜索

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

@@ -845,10 +845,10 @@
       </el-tab-pane>
     </el-tabs>
     <!-- 导出 -->
-    <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="20%">
+    <el-dialog :title="textMap[exportList.dialogStatus]" :visible.sync="exportList.dialogFormVisible" :close-on-click-modal="false" width="40%">
     <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: 280px;" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions2" />
     </div>
     <div slot="footer" class="dialog-footer" style="margin-bottom: 10px;">
       <el-button class="cancelClose" @click="exportList.dialogFormVisible = false">关闭</el-button>
@@ -1419,7 +1419,7 @@ export default {
               pastureid: Cookies.get('pastureid'),
               startTime: parseTime(new Date(), '{y}-{m}-{d}'),
               stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
-              inputDatetime: [new Date(), new Date()],
+              inputDatetime:  [new Date(), new Date()],
               inputDate:null,
               fname: '',
               sort: '',
@@ -1811,7 +1811,7 @@ export default {
       cellStyle: { padding: 0 + 'px' },
       exportList:{
         dialogFormVisible:false,
-        inputDatetime: [new Date(), new Date()]
+        inputDatetime:  [new Date(), new Date()],
       },
       textMap: {
         exportList: '导出',
@@ -4732,6 +4732,8 @@ export default {
     handleExport3() {
       this.exportList.dialogFormVisible = true
       this.exportList.dialogStatus = 'exportList'
+      console.log(this.tab3.table.getdataListParm.parammaps.inputDatetime,'999')
+      this.exportList.inputDatetime = this.tab3.table.getdataListParm.parammaps.inputDatetime ||  [new Date(), new Date()]
       // var excelDatasTab3 = [
       //   {
       //     tHeader: ['日期', 'TMR名称', '车次', '班次', '配方名称', '栏舍', '理论重量', '实际重量', '误差值', '准确率', '开始时间', '结束时间', '跳转方式', '开始重量', '结束重量', '搅拌时间'],
@@ -4758,8 +4760,9 @@ export default {
       data.parammaps.buttontype = this.tab3.table.getdataListParm.parammaps.buttontype
       data.parammaps.templetname = this.tab3.table.getdataListParm.parammaps.templetname
       data.parammaps.isuse = this.tab3.table.getdataListParm.parammaps.isuse
+      data.parammaps.fname = this.tab3.table.getdataListParm.parammaps.fname
       postJson(url,data).then(response => {
-        console.log('混料统计table数据', response.data.list)
+        console.log('hss-撒料', response.data.list)
         var exportList = []
         if (response.data.list !== null) {
           exportList = response.data.list