|
|
@@ -65,7 +65,7 @@
|
|
|
<el-table-column label="原剩料所属时间" min-width="150px" align="center" prop="remaindate" />
|
|
|
<el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
|
|
|
<el-table-column label="干物质" min-width="150px" align="center" prop="dry" />
|
|
|
- <el-table-column label="收集" min-width="90px" align="center" prop="timesstr" />
|
|
|
+ <el-table-column label="班次(收集)" min-width="90px" align="center" prop="timesstr" />
|
|
|
<el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
|
|
|
<el-table-column label="操作人" min-width="90px" align="center" prop="emp" />
|
|
|
<el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
|
|
|
@@ -150,8 +150,8 @@
|
|
|
</el-row>
|
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="收集：" >
|
|
|
- <el-select ref="times" v-model="create.temp.times" filterable placeholder="收集" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;">
|
|
|
+ <el-form-item label="班次(收集)：" >
|
|
|
+ <el-select ref="times" v-model="create.temp.times" filterable placeholder="班次(收集)" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;">
|
|
|
<el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
@@ -829,7 +829,7 @@ export default {
|
|
|
if(item== 2){
|
|
|
var excelDatas1 = [
|
|
|
{
|
|
|
- tHeader: ['栏舍名称','配方名称','原剩料所属时间', '剩料量（kg）','干物质', '收集', '收集时间', '操作人'],
|
|
|
+ tHeader: ['栏舍名称','配方名称','原剩料所属时间', '剩料量（kg）','干物质', '班次(收集)', '收集时间', '操作人'],
|
|
|
filterVal: ['barname', 'ftname','remaindate','remain','dry', 'timesstr', 'operatetime', 'emp'],
|
|
|
tableDatas: this.download.list,
|
|
|
sheetName: 'Sheet1'
|
|
|
@@ -866,8 +866,8 @@ export default {
|
|
|
this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
|
|
|
import('@/vendor/Export2Excel').then(excel => {
|
|
|
const list1 = res.data.result
|
|
|
- const tHeader = ['栏舍名称', '配方名称','原剩料所属时间','剩料量（kg）','干物质', '收集', '收集时间', '操作人', '错误信息']
|
|
|
- const filterVal = ['栏舍名称', '配方名称','原剩料所属时间','剩料量（kg）','干物质', '收集', '收集时间', '操作人', 'error_msg']
|
|
|
+ const tHeader = ['栏舍名称', '配方名称','原剩料所属时间','剩料量（kg）','干物质', '班次(收集)', '收集时间', '操作人', '错误信息']
|
|
|
+ const filterVal = ['栏舍名称', '配方名称','原剩料所属时间','剩料量（kg）','干物质', '班次(收集)', '收集时间', '操作人', 'error_msg']
|
|
|
const data1 = this.formatJson(filterVal, list1)
|
|
|
excel.export_json_to_excel({ header: tHeader, data: data1, filename: '栏舍剩料记录导入报错信息', autoWidth: true, bookType: 'xlsx' })
|
|
|
})
|
Shan9312