|
|
@@ -50,7 +50,7 @@
|
|
|
<el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
|
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
|
- <el-button class="export" style="float: right;" @click="handleRecipeRecord">配方下发</el-button>
|
|
|
+ <el-button class="export" style="float: right;" @click="handleDistributeFormula">下发配方</el-button>
|
|
|
</div>
|
|
|
<div ref="table" class="table">
|
|
|
<el-table
|
|
|
@@ -128,14 +128,14 @@
|
|
|
</el-table-column>
|
|
|
<el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
|
|
|
<template slot-scope="{row}">
|
|
|
- <el-button v-if="row.NoEdit && isRoleEdit && ispastureuse==0" icon="el-icon-tickets" class="miniSuccess" @click="handleRowRecipeRecord(row)" />
|
|
|
- <span v-if="row.NoEdit && isRoleEdit && ispastureuse ==0" icon="el-icon-data-line" class="centerSpan">|</span>
|
|
|
+ <el-button v-if="row.NoEdit && isUsageOverview" icon="el-icon-tickets" class="miniSuccess" @click="handleRowUsageOverview(row)" />
|
|
|
+ <span v-if="row.NoEdit && isRoleEdit && isUsageOverview" icon="el-icon-data-line" class="centerSpan">|</span>
|
|
|
<el-button v-if="row.isCreate && isAdd1" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData1(row)" />
|
|
|
<span v-if="row.isCreate && isAdd1" class="centerSpan">|</span>
|
|
|
<el-button v-if="row.isCreate && isAdd1" class="minCancel" icon="el-icon-close" @click="createCancel1(row)" />
|
|
|
|
|
|
<el-button v-if="row.isUpdate && isEdit1" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate1(row)" />
|
|
|
- <span v-if="row.isUpdate && isEdit && isDelete1" class="centerSpan">|</span>
|
|
|
+ <span v-if="row.isUpdate && isEdit1 && isDelete1" class="centerSpan">|</span>
|
|
|
|
|
|
<el-button v-if="row.isUpdate && isDelete1" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete1(row)" />
|
|
|
|
|
|
@@ -143,8 +143,8 @@
|
|
|
<span v-if="row.isUpdateSave && isEdit1" class="centerSpan">|</span>
|
|
|
<el-button v-if="row.isUpdateSave && isEdit1" class="minCancel" icon="el-icon-close" @click="updateCancel1(row)" />
|
|
|
|
|
|
- <span v-if="row.NoEdit && isEdit1 && ispastureuse ==0" icon="el-icon-data-line" class="centerSpan">|</span>
|
|
|
- <el-button v-if="row.NoEdit && isRoleEdit && ispastureuse==0" icon="el-icon-data-line" class="miniSuccess" @click="handleFormulationEvaluation(row)" />
|
|
|
+ <span v-if="row.NoEdit && isEdit1" icon="el-icon-data-line" class="centerSpan">|</span>
|
|
|
+ <el-button v-if="row.NoEdit && isFormulaEvaluation" icon="el-icon-data-line" class="miniSuccess" @click="handleFormulationEvaluation(row)" />
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
@@ -409,6 +409,57 @@
|
|
|
</el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
+ <!-- 下发配方 -->
|
|
|
+ <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="distributeFormula.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
+ <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[distributeFormula.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="dialogMinHeight" style="overflow-y: auto;margin-bottom: 0px;overflow-x: hidden;">
|
|
|
+ <div ref="distributeFormulaDialog" class="distributeFormulaDialog">
|
|
|
+ <div class="search">
|
|
|
+ <el-input v-model="distributeFormula.table.parammaps.name" placeholder="请输入牧场名称搜索" style="width: 245px;" />
|
|
|
+ <el-button class="successBorder" @click="handleDistributeFormulaSearch" style="margin-left:10px;">查询</el-button>
|
|
|
+ <el-button class="successBorder" @click="handleDistributeFormulaRefresh" style="margin-left:10px;">重置</el-button>
|
|
|
+ </div>
|
|
|
+ <div class="table">
|
|
|
+ <el-table
|
|
|
+ :key="distributeFormula.table.tableKey"
|
|
|
+ v-loading="distributeFormula.table.listLoading"
|
|
|
+ element-loading-text="给我一点时间"
|
|
|
+ :data="distributeFormula.table.list"
|
|
|
+ border
|
|
|
+ fit
|
|
|
+ highlight-current-row
|
|
|
+ style="width: 98%;"
|
|
|
+ :row-style="rowStyle"
|
|
|
+ :cell-style="cellStyle"
|
|
|
+ class="elTable table-fixed"
|
|
|
+ @selection-change="handleSelectionDistributeFormula">
|
|
|
+ >
|
|
|
+ <el-table-column type="selection" width="55" />
|
|
|
+ <el-table-column label="序号" align="center" type="index" width="50px" />
|
|
|
+ <el-table-column label="牧场名称" min-width="130px" align="center" prop="name" />
|
|
|
+ <el-table-column label="负责人姓名" min-width="90px" align="center" prop="manager_user" />
|
|
|
+ <el-table-column label="手机号" min-width="90px" align="center" prop="manager_phone" />
|
|
|
+ <el-table-column label="牧场地址" min-width="90px" align="center" prop="address" />
|
|
|
+ </el-table>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div slot="footer" class="dialog-footer">
|
|
|
+ <el-button class="cancelClose" @click="distributeFormula.dialogFormVisible = false; ">关闭</el-button>
|
|
|
+ <el-button class="save" :disabled="isokDisable || distributeFormula.selectionList.length == 0" @click="distributeFormulaData()">确认</el-button>
|
|
|
+ </div>
|
|
|
+ </el-dialog>
|
|
|
<!-- 配方模板表 -->
|
|
|
<el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="template.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
<template slot="title">
|
|
|
@@ -769,18 +820,18 @@
|
|
|
</el-dialog>
|
|
|
|
|
|
<!-- 行内配方记录 -->
|
|
|
- <el-dialog :title="textMap[rowRecipeRecord.dialogStatus]" :destroy-on-close="true" :visible.sync="rowRecipeRecord.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
- <div class="rowRecipeRecord">
|
|
|
+ <el-dialog :title="textMap[usageOverview.dialogStatus]" :destroy-on-close="true" :visible.sync="usageOverview.dialogFormVisible" :close-on-click-modal="false" width="90%">
|
|
|
+ <div class="usageOverview">
|
|
|
<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="usageOverview.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="handleRowUsageOverviewSearch">查询</el-button>
|
|
|
</div>
|
|
|
<div class="table">
|
|
|
<el-table
|
|
|
- :key="rowRecipeRecord.tableKey"
|
|
|
- v-loading="rowRecipeRecord.listLoading"
|
|
|
+ :key="usageOverview.tableKey"
|
|
|
+ v-loading="usageOverview.listLoading"
|
|
|
element-loading-text="给我一点时间"
|
|
|
- :data="rowRecipeRecord.list"
|
|
|
+ :data="usageOverview.list"
|
|
|
border
|
|
|
highlight-current-row
|
|
|
style="width: 100%;"
|
|
|
@@ -790,35 +841,32 @@
|
|
|
>
|
|
|
<el-table-column label="序号" align="center" type="index" width="50px">
|
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.$index + (rowRecipeRecord.pageNum-1) * rowRecipeRecord.pageSize + 1 }}</span>
|
|
|
+ <span>{{ scope.$index + (usageOverview.pageNum-1) * usageOverview.pageSize + 1 }}</span>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<!-- <el-table-column label="序号" width="60px" align="center" prop="sort" /> -->
|
|
|
- <el-table-column label="修改时间" width="100px" align="center" prop="datetime1" />
|
|
|
- <el-table-column label="饲料名称(单位:kg)" min-width="800px" align="center">
|
|
|
- <template slot-scope="scope">
|
|
|
- <div v-for="element in scope.row.arrList" :key="element.name" class="list-group-item2 item" style="width:150px;float: left;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;margin: 5px 5px;padding: 0;height: 30px;">
|
|
|
- <el-tooltip v-if="element.change== 'red'" placement="top" :open-delay="1000">
|
|
|
- <div slot="content">{{ element.name }}( {{ element.weight }} / {{ element.Eweight }} )</div>
|
|
|
- <span :style="{'color':element.change}" style="display: block;height:30px;line-height: 30px;">
|
|
|
- {{ element.name }}( {{ element.weight }} / {{ element.Eweight }} )
|
|
|
- </span>
|
|
|
- </el-tooltip>
|
|
|
- <el-tooltip v-else placement="top" :open-delay="1000">
|
|
|
- <div slot="content">{{ element.name }}( {{ element.weight }})</div>
|
|
|
- <span :style="{'color':element.change}" style="display: block;height:30px;line-height: 30px;">
|
|
|
- {{ element.name }}( {{ element.weight }})
|
|
|
- </span>
|
|
|
- </el-tooltip>
|
|
|
- </div>
|
|
|
+ <el-table-column label="牧场名称" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="混料准确率（%）" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="混料正确率（%）" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="撒料准确率（%）" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="撒料正确率（%）" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="搅拌时间(分钟)" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="搅拌延时(分钟)" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="撒料时间(分钟)" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="最近修改配方时间" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="下发时间" min-width="100px" align="center" prop="datetime1" />
|
|
|
+ <el-table-column label="操作" align="center" width="150" class-name="small-padding fixed-width" fixed="right">
|
|
|
+ <template slot-scope="{row}">
|
|
|
+ <a class="correcting" size="mini" style="width: 80px;" @click="handle_feedingefficiency(row)">饲喂效率</a>
|
|
|
+ <span v-if="isCanceldistributingformula" icon="el-icon-data-line" class="centerSpan">|</span>
|
|
|
+ <a v-if="isCanceldistributingformula" class="correcting" size="mini" style="width: 80px;" @click="handle_canceldistributingformula(row)">取消下发配方</a>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
</el-table>
|
|
|
- <pagination v-show="rowRecipeRecord.total>=0" :total="rowRecipeRecord.total" :page.sync="rowRecipeRecord.getdataListParm.offset" :limit.sync="rowRecipeRecord.getdataListParm.pagecount" @pagination="getRowRecipeRecordList()" />
|
|
|
</div>
|
|
|
</div>
|
|
|
<div slot="footer" class="dialog-footer" style="bottom: 10px;">
|
|
|
- <el-button class="cancelClose1" @click="rowRecipeRecord.dialogFormVisible = false; ">关闭</el-button>
|
|
|
+ <el-button class="cancelClose1" @click="usageOverview.dialogFormVisible = false; ">关闭</el-button>
|
|
|
</div>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
@@ -840,7 +888,7 @@ export default {
|
|
|
components: { Pagination },
|
|
|
data() {
|
|
|
return {
|
|
|
- isAdd1:'',isEdit1:'',isImport1:'',isExport1:'',isDelete1:'',isModify1:'',isEnable1:'',isModify2:'',
|
|
|
+ isAdd1:'',isEdit1:'',isImport1:'',isExport1:'',isDelete1:'',isFormulaEvaluation:'',isUsageOverview:'',isCanceldistributingformula:'',isModify1:'',isEnable1:'',isModify2:'',
|
|
|
predefineColors: [
|
|
|
'#E57373', '#F06292', '#BA68C8', '#9575CD', '#7986CB', '#64B5F6', '#4FC3F7', '#4DD0E1', '#4DB6AC', '#81C784', '#AED581', '#DCE775', '#FFF176', '#FFD54F', '#FFB74D', '#FF8A65', '#A1887F', '#E0E0E0', '#90A4AE'
|
|
|
],
|
|
|
@@ -855,7 +903,7 @@ export default {
|
|
|
tableKey: 0,
|
|
|
list: [],
|
|
|
total: 0,
|
|
|
- listLoading: true,
|
|
|
+ listLoading: false,
|
|
|
parammaps: {
|
|
|
cattle_category_id: '',formula_type_id:'',data_source_id:'',is_show:'',name:'',remarks:''
|
|
|
},
|
|
|
@@ -881,8 +929,26 @@ export default {
|
|
|
rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
|
|
|
cellStyle: { padding: 0 + 'px' },
|
|
|
myheight1: document.documentElement.clientHeight - 265,
|
|
|
- // ==============================
|
|
|
+ distributeFormula:{
|
|
|
+ dialogFormVisible: false,
|
|
|
+ dialogStatus: '',
|
|
|
+ table: {
|
|
|
+ parammaps: {
|
|
|
+ name:''
|
|
|
+ },
|
|
|
+ tableKey: 0,
|
|
|
+ total: 0,
|
|
|
+ listLoading: true,
|
|
|
+ list: []
|
|
|
+ },
|
|
|
+ selectionList:[]
|
|
|
+ },
|
|
|
dialogFull: false,
|
|
|
+ textMap: {
|
|
|
+ distributeFormula: '选择牧场',
|
|
|
+ usageOverviewTxt:'使用概况'
|
|
|
+ },
|
|
|
+ // ==============================
|
|
|
|
|
|
isRoleEdit: [],
|
|
|
|
|
|
@@ -1050,13 +1116,13 @@ export default {
|
|
|
},
|
|
|
selectList: [],
|
|
|
selectList2: [],
|
|
|
- textMap: {
|
|
|
- RecipeRecord: '配方记录',
|
|
|
- SyntheticPremix: '合成预混料',
|
|
|
- historyRecord: '历史记录',
|
|
|
- detail: '饲料详情',
|
|
|
- rowRecipeRecordTxt: '配方修改记录'
|
|
|
- },
|
|
|
+ // textMap: {
|
|
|
+ // RecipeRecord: '配方记录',
|
|
|
+ // SyntheticPremix: '合成预混料',
|
|
|
+ // historyRecord: '历史记录',
|
|
|
+ // detail: '饲料详情',
|
|
|
+ // rowRecipeRecordTxt: '配方修改记录'
|
|
|
+ // },
|
|
|
|
|
|
requestParam: {},
|
|
|
requestParam2: {},
|
|
|
@@ -1089,7 +1155,7 @@ export default {
|
|
|
dropState: false,
|
|
|
myheight2: 0,
|
|
|
height: 0,
|
|
|
- rowRecipeRecord: {
|
|
|
+ usageOverview: {
|
|
|
dialogStatus: '',
|
|
|
dialogFormVisible: false,
|
|
|
getdataListParm: {
|
|
|
@@ -1139,21 +1205,29 @@ export default {
|
|
|
methods: {
|
|
|
getButton(){
|
|
|
const add = 'recipe:recipeList:add'
|
|
|
- this.isAdd = checkButtons(add)
|
|
|
+ this.isAdd1 = checkButtons(add)
|
|
|
const edit = 'recipe:recipeList:edit'
|
|
|
- this.isEdit = checkButtons(edit)
|
|
|
+ this.isEdit1 = checkButtons(edit)
|
|
|
const _import = 'recipe:recipeList:import'
|
|
|
- this.isImport = checkButtons(_import)
|
|
|
+ this.isImport1 = checkButtons(_import)
|
|
|
const _export = 'recipe:recipeList:export'
|
|
|
- this.isExport = checkButtons(_export)
|
|
|
+ this.isExport1 = checkButtons(_export)
|
|
|
const del = 'recipe:recipeList:delete'
|
|
|
- this.isDelete = checkButtons(del)
|
|
|
+ this.isDelete1 = checkButtons(del)
|
|
|
+ const formulaEvaluation = 'recipe:recipeList:formulaEvaluation'
|
|
|
+ this.isFormulaEvaluation = checkButtons(formulaEvaluation)
|
|
|
+ const usageOverview = 'recipe:recipeList:usageOverview'
|
|
|
+ this.isUsageOverview = checkButtons(usageOverview)
|
|
|
+ const canceldistributingformula = 'recipe:recipeList:canceldistributingformula'
|
|
|
+ this.isCanceldistributingformula = checkButtons(canceldistributingformula)
|
|
|
+
|
|
|
const enable = 'recipe:recipeList:enable'
|
|
|
this.isEnable = checkButtons(enable)
|
|
|
const modify1 = 'recipe:recipeList:modify'
|
|
|
this.isModify1 = checkButtons(modify1)
|
|
|
const modify2 = 'recipe:recipeList:modify2'
|
|
|
this.isModify2 = checkButtons(modify2)
|
|
|
+
|
|
|
},
|
|
|
// -------------------模板-----------------------------
|
|
|
getList() {
|
|
|
@@ -1200,7 +1274,7 @@ export default {
|
|
|
},
|
|
|
handleSearch1() {
|
|
|
console.log('点击了查询')
|
|
|
- this.table.page = 1
|
|
|
+ this.table.page = 1
|
|
|
this.getList()
|
|
|
this.arrowDown = true
|
|
|
this.arrowUp = false
|
|
|
@@ -1568,6 +1642,72 @@ export default {
|
|
|
}, 1000)
|
|
|
})
|
|
|
},
|
|
|
+ // 下发配方
|
|
|
+ handleDistributeFormula(){
|
|
|
+ if(this.selectList.length>0){
|
|
|
+ this.distributeFormula.dialogStatus = 'distributeFormula'
|
|
|
+ this.distributeFormula.dialogFormVisible = true
|
|
|
+ this.dialogFull = false
|
|
|
+ this.getPastureList()
|
|
|
+ }else{
|
|
|
+ this.$message({ type: 'error', message: '请先选择配方', duration: 2000 })
|
|
|
+ }
|
|
|
+ },
|
|
|
+ getPastureList(){
|
|
|
+ this.distributeFormula.table.listLoading = true
|
|
|
+ let page = 1
|
|
|
+ let page_size = 0
|
|
|
+ let url = 'api/v1/ops/pasture/list' + '?page=' + page + '&page_size=' + page_size
|
|
|
+ let data = {
|
|
|
+ "name":this.distributeFormula.table.parammaps.name
|
|
|
+ }
|
|
|
+ postJson(url, data).then(response => {
|
|
|
+ if (response.code == 200) {
|
|
|
+ this.distributeFormula.table.list = response.data.list
|
|
|
+ } else {
|
|
|
+ this.distributeFormula.table.list = []
|
|
|
+ }
|
|
|
+ setTimeout(() => {
|
|
|
+ this.distributeFormula.table.listLoading = false
|
|
|
+ }, 1000)
|
|
|
+ })
|
|
|
+ },
|
|
|
+ handleDistributeFormulaSearch(){
|
|
|
+ this.getPastureList()
|
|
|
+ },
|
|
|
+ handleDistributeFormulaRefresh(){
|
|
|
+ this.distributeFormula.table.parammaps.name = ''
|
|
|
+ },
|
|
|
+ handleSelectionDistributeFormula(item){
|
|
|
+ this.distributeFormula.selectionList = item
|
|
|
+ console.log(this.distributeFormula.selectionList)
|
|
|
+ },
|
|
|
+ distributeFormulaData(){
|
|
|
+ let feed_formula_ids = []
|
|
|
+ let pasture_ids = []
|
|
|
+ this.distributeFormula.selectionList.forEach((item)=>{
|
|
|
+ pasture_ids.push(item.id)
|
|
|
+ })
|
|
|
+ this.selectList.forEach((item)=>{
|
|
|
+ feed_formula_ids.push(item.id)
|
|
|
+ })
|
|
|
+ this.isokDisable = true
|
|
|
+ setTimeout(() => {
|
|
|
+ this.isokDisable = false
|
|
|
+ }, 1000)
|
|
|
+ let url = '/api/v1/ops/feed_formula/distribute'
|
|
|
+ let data = {
|
|
|
+ feed_formula_ids:feed_formula_ids,
|
|
|
+ pasture_ids:pasture_ids
|
|
|
+ }
|
|
|
+ postJson(url, data).then(response => {
|
|
|
+ if(response.code == 200){
|
|
|
+ this.$notify({ title: '成功', message: '成功', type: 'success', duration: 2000 })
|
|
|
+ this.distributeFormula.dialogFormVisible = false
|
|
|
+ this.getList()
|
|
|
+ }
|
|
|
+ })
|
|
|
+ },
|
|
|
// =================================
|
|
|
// 模板行点击
|
|
|
table1RowClick(row, column, event) {
|
|
|
@@ -2984,6 +3124,7 @@ export default {
|
|
|
},
|
|
|
handleFormulationEvaluation(row) {
|
|
|
console.log(row)
|
|
|
+ alert('跳转页面弹窗接口待对接')
|
|
|
// this.$router.push({ path: '/statisticalAnalysis/FormulationEvaluation', query: { tname: row.tname }})
|
|
|
this.$router.push({
|
|
|
name: 'FormulationEvaluation',
|
|
|
@@ -2997,31 +3138,32 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
- // 配方记录
|
|
|
- handleRowRecipeRecord(row) {
|
|
|
+ // 使用概况
|
|
|
+ handleRowUsageOverview(row) {
|
|
|
+ alert('接口待对接')
|
|
|
console.log(row)
|
|
|
- this.rowRecipeRecord.temp = Object.assign({}, row)
|
|
|
- this.rowRecipeRecord.dialogFormVisible = true
|
|
|
- this.textMap.rowRecipeRecordTxt = '配方修改记录——配方：' + row.tname
|
|
|
- this.rowRecipeRecord.dialogStatus = 'rowRecipeRecordTxt'
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.fitid = row.id
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.inputDatetime = []
|
|
|
- this.getRowRecipeRecordList()
|
|
|
- },
|
|
|
- getRowRecipeRecordList() {
|
|
|
- this.rowRecipeRecord.listLoading = true
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.fitid = this.rowRecipeRecord.temp.id
|
|
|
- if (this.rowRecipeRecord.getdataListParm.parammaps.inputDatetime == null) {
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.inputDatetime = ''
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.startTime = ''
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.stopTime = ''
|
|
|
+ this.usageOverview.temp = Object.assign({}, row)
|
|
|
+ this.usageOverview.dialogFormVisible = true
|
|
|
+ this.textMap.usageOverviewTxt = row.tname + '配方使用概况'
|
|
|
+ this.usageOverview.dialogStatus = 'usageOverviewTxt'
|
|
|
+ this.usageOverview.getdataListParm.parammaps.pastureid = row.pastureid
|
|
|
+ this.usageOverview.getdataListParm.parammaps.fitid = row.id
|
|
|
+ this.usageOverview.getdataListParm.parammaps.inputDatetime = []
|
|
|
+ this.getRowUsageOverviewList()
|
|
|
+ },
|
|
|
+ getRowUsageOverviewList() {
|
|
|
+ this.usageOverview.listLoading = false
|
|
|
+ this.usageOverview.getdataListParm.parammaps.fitid = this.usageOverview.temp.id
|
|
|
+ if (this.usageOverview.getdataListParm.parammaps.inputDatetime == null) {
|
|
|
+ this.usageOverview.getdataListParm.parammaps.inputDatetime = ''
|
|
|
+ this.usageOverview.getdataListParm.parammaps.startTime = ''
|
|
|
+ this.usageOverview.getdataListParm.parammaps.stopTime = ''
|
|
|
} else {
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.startTime = this.rowRecipeRecord.getdataListParm.parammaps.inputDatetime[0]
|
|
|
- this.rowRecipeRecord.getdataListParm.parammaps.stopTime = this.rowRecipeRecord.getdataListParm.parammaps.inputDatetime[1]
|
|
|
+ this.usageOverview.getdataListParm.parammaps.startTime = this.usageOverview.getdataListParm.parammaps.inputDatetime[0]
|
|
|
+ this.usageOverview.getdataListParm.parammaps.stopTime = this.usageOverview.getdataListParm.parammaps.inputDatetime[1]
|
|
|
}
|
|
|
const url = 'authdata/GetArrList'
|
|
|
- const data = this.rowRecipeRecord.getdataListParm
|
|
|
+ const data = this.usageOverview.getdataListParm
|
|
|
postJson(url, data).then(response => {
|
|
|
if (response.data.list !== null) {
|
|
|
for (let i = 0; i < response.data.list.length; i++) {
|
|
|
@@ -3029,22 +3171,32 @@ export default {
|
|
|
this.$set(response.data.list[i], 'arrList', [])
|
|
|
}
|
|
|
}
|
|
|
- this.rowRecipeRecord.list = response.data.list
|
|
|
- this.rowRecipeRecord.pageNum = response.data.pageNum
|
|
|
- this.rowRecipeRecord.pageSize = response.data.pageSize
|
|
|
- this.rowRecipeRecord.total = response.data.total
|
|
|
+ this.usageOverview.list = response.data.list
|
|
|
+ this.usageOverview.pageNum = response.data.pageNum
|
|
|
+ this.usageOverview.pageSize = response.data.pageSize
|
|
|
+ this.usageOverview.total = response.data.total
|
|
|
} else {
|
|
|
- this.rowRecipeRecord.list = []
|
|
|
- this.rowRecipeRecord.total = 0
|
|
|
+ this.usageOverview.list = []
|
|
|
+ this.usageOverview.total = 0
|
|
|
}
|
|
|
console.log(response.data, 'response.data')
|
|
|
setTimeout(() => {
|
|
|
- this.rowRecipeRecord.listLoading = false
|
|
|
+ this.usageOverview.listLoading = false
|
|
|
}, 100)
|
|
|
})
|
|
|
},
|
|
|
- handleRowRecipeRecordSearch() {
|
|
|
- this.getRowRecipeRecordList()
|
|
|
+ handleRowUsageOverviewSearch() {
|
|
|
+ this.getRowUsageOverviewList()
|
|
|
+ },
|
|
|
+ handle_feedingefficiency(row){
|
|
|
+
|
|
|
+ },
|
|
|
+ handle_canceldistributingformula(row){
|
|
|
+ MessageBox.confirm('取消后该牧场将无法继续使用该配方，确认取消吗？', {
|
|
|
+ confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
|
|
|
+ }).then(() => {
|
|
|
+
|
|
|
+ })
|
|
|
},
|
|
|
handleEnlarge() {
|
|
|
var height = (document.documentElement.clientHeight - 165 + 50).toString() + 'px'
|
