|
@@ -699,7 +699,7 @@
|
|
|
<u-table-column sortable label="TMR名称" min-width="70px" align="center" prop="TMR名称" />
|
|
|
<u-table-column sortable label="车次" min-width="50px" align="center" prop="车次" />
|
|
|
<u-table-column sortable label="班次" min-width="50px" align="center" prop="班次" />
|
|
|
- <!-- <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
|
|
|
+ <u-table-column sortable label="配方名称" min-width="70px" align="center" prop="配方名称">
|
|
|
<template slot-scope="{row}">
|
|
|
<a @click="clickRecipeName2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.配方名称 }}</a>
|
|
|
</template>
|
|
@@ -708,7 +708,7 @@
|
|
|
<template slot-scope="{row}">
|
|
|
<a @click="clickFeed2(row)" style="text-decoration: underline;color: #0000FF;">{{ row.饲料 }}</a>
|
|
|
</template>
|
|
|
- </u-table-column> -->
|
|
|
+ </u-table-column>
|
|
|
<u-table-column sortable label="配方名称" min-width="55px" align="center" prop="配方名称" />
|
|
|
<u-table-column sortable label="饲料" min-width="55px" align="center" prop="饲料" />
|
|
|
<u-table-column sortable label="理论重量" min-width="55px" align="center" prop="理论重量" />
|
|
@@ -4899,12 +4899,12 @@ export default {
|
|
|
this.recipeNameTemp2.getdataListParm.parammaps.startdate = this.recipeNameTemp2.getdataListParm.parammaps.inputDatetime[0] + ' 00:00'
|
|
|
this.recipeNameTemp2.getdataListParm.parammaps.enddate = this.recipeNameTemp2.getdataListParm.parammaps.inputDatetime[1] + ' 23:59'
|
|
|
}
|
|
|
- const url = 'authdata/feedtemplet/history'
|
|
|
+ const url = 'api/v1/ops/feed_template/history'
|
|
|
const data = {
|
|
|
- pastureid:this.recipeNameTemp2.getdataListParm.parammaps.pastureid,
|
|
|
+ pasture_id:this.tab2.table.getdataListParm.parammaps.pastureId,
|
|
|
ftid:this.recipeNameTemp2.getdataListParm.parammaps.ftid,
|
|
|
- startdate:this.recipeNameTemp2.getdataListParm.parammaps.startdate,
|
|
|
- enddate:this.recipeNameTemp2.getdataListParm.parammaps.enddate
|
|
|
+ start_time:this.recipeNameTemp2.getdataListParm.parammaps.startdate,
|
|
|
+ end_time:this.recipeNameTemp2.getdataListParm.parammaps.enddate
|
|
|
}
|
|
|
postJson(url, data).then(response => {
|
|
|
if (response.data !== null && response.data !=='') {
|
|
@@ -4961,14 +4961,19 @@ export default {
|
|
|
this.feedTemp.getdataListParm.parammaps.startTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[0] +' 00:00'
|
|
|
this.feedTemp.getdataListParm.parammaps.stopTime = this.feedTemp.getdataListParm.parammaps.inputDatetime[1] +' 23:59'
|
|
|
}
|
|
|
- const url = 'authdata/GetDataByName'
|
|
|
+ const url = 'api/v1/ops/accuracy/data_by_name'
|
|
|
+ // const url = 'authdata/GetDataByName'
|
|
|
const data = {
|
|
|
- name:'getFitistoryByName',
|
|
|
+ api_name:'getFitistoryByName',
|
|
|
page: this.feedTemp.getdataListParm.page,
|
|
|
- offset: this.feedTemp.getdataListParm.offset,
|
|
|
- pagecount: this.feedTemp.getdataListParm.pagecount,
|
|
|
- returntype: this.feedTemp.getdataListParm.returntype,
|
|
|
- parammaps: this.feedTemp.getdataListParm.parammaps
|
|
|
+ page_size: this.feedTemp.getdataListParm.offset,
|
|
|
+ pasture_id:this.tab2.table.getdataListParm.parammaps.pastureId,
|
|
|
+ // pagecount: this.feedTemp.getdataListParm.pagecount,
|
|
|
+ // parammaps: this.feedTemp.getdataListParm.parammaps,
|
|
|
+ fitid: this.feedTemp.getdataListParm.parammaps.fitid,
|
|
|
+ name: this.feedTemp.getdataListParm.parammaps.name,
|
|
|
+ start_time: this.feedTemp.getdataListParm.parammaps.startTime,
|
|
|
+ end_time: this.feedTemp.getdataListParm.parammaps.stopTime,
|
|
|
}
|
|
|
postJson(url, data).then(response => {
|
|
|
if (response.data.list !== null && response.data.list !== '' && response.data.list.length > 0) {
|