Signed-off-by: 段小段 <1729609802@qq.com>

src/views/formulationPlan/dailyExecutionPlan/typePage/materialIssuancePlan - 副本.vue

@@ -1,1453 +0,0 @@
-<template>
-  <div class="app-container">
-    <div class="menuList">
-      <div class="menuList-t">
-        <div class="menuList-t-l">
-          <span>班次：</span>
-          <el-radio-group v-model="menuRadio" size="small" @change="changeMenu">
-            <el-radio-button v-if="maxTime.isTime1" label="一班">一班</el-radio-button>
-            <el-radio-button v-if="maxTime.isTime2" label="二班">二班</el-radio-button>
-            <el-radio-button v-if="maxTime.isTime3" label="三班">三班</el-radio-button>
-            <el-radio-button v-if="maxTime.isTime4" label="四班">四班</el-radio-button>
-          </el-radio-group>
-        </div>
-        <div class="menuList-t-r">
-          <div v-if="!isBarracks" class="menuList-t-r-l" @click="clickBarracks(2);">栏舍计划统计-展开<i class="el-icon-arrow-down" /></div>
-          <div v-if="isBarracks" class="menuList-t-r-r" @click="clickBarracks(1);">栏舍计划统计-收起<i class="el-icon-arrow-up" /></div>
-          <div v-if="isBarracks" class="columnHouse">
-            <div class="smallTable">
-              <el-table
-                :list-loading="smallMenu.listLoading"
-                element-loading-text="给我一点时间"
-                :data="smallMenu.list"
-                :row-style="rowStyle2"
-                :cell-style="cellStyle2"
-                :header-row-style="headerRowStyle2"
-                :header-cell-style="headerCellStyle2"
-                show-summary
-                sum-text="总栏舍"
-              >
-                <el-table-column label="配方/班次" min-width="80px" align="center" prop="tname" />
-                <el-table-column label="总数" min-width="50px" align="center" prop="usedsum" />
-                <el-table-column v-if="maxTime.isTime1" label="第一班未分配" min-width="105px" align="center" prop="onetime" />
-                <el-table-column v-if="maxTime.isTime2" label="第二班未分配" min-width="105px" align="center" prop="twotime" />
-                <el-table-column v-if="maxTime.isTime3" label="第三班未分配" min-width="105px" align="center" prop="threetime" />
-                <el-table-column v-if="maxTime.isTime4" label="第四班未分配" min-width="105px" align="center" prop="fourtime" />
-              </el-table>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div class="menuList-b">
-        <ul v-loading="listLoadingTimes" class="draggableList">
-          <li v-for="element in MenuList" :key="element.arrid">
-            <span v-if="element.isShowTitle" class="draggableTitle">{{ element.ftname }}:</span>
-            <draggable id="1" data-source="juju1" :list="element.arrList" class="list-group1" draggable=".item" group="a" :move="move" @change="changeLog" @start="start" @end="end">
-              <div v-for="item in element.arrList" :key="item.id" class="list-group-item1 item" style="width: 88px;float: left;margin:5px 5px;height: 36px;">
-                <div style="position: relative;">
-                  <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;" :style="{'background':item.background}">
-                    <div slot="content">{{ item.barname }}</div>
-                    <div class="draggableName">{{ item.barname }}</div>
-                  </el-tooltip>
-                  <div class="draggableWeight" :style="{ background: 'rgba('+item.background2+ ',0.1)' }">
-
-                    <!-- <span v-if="item.isfill==1" style="background: #009C69;color:#fff;position: absolute;left: 0;top: 18px;">补</span> -->
-                    {{ item.weight }}
-                  </div>
-                </div>
-              </div>
-            </draggable>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <div class="operation" style="width: 100%; border-top: 2px solid #d8dce5; box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04)">
-      <el-button class="success" icon="el-icon-plus" style="float:left;" @click="handleCreate">新增车次</el-button>
-      <el-button class="danger" icon="el-icon-delete" style="float:left;" @click="handleReduceTrains">减少车次</el-button>
-    </div>
-
-    <div class="table">
-      <el-table
-        id="table"
-        :key="table.tableKey"
-        ref="table"
-        v-loading="table.listLoading"
-        element-loading-text="给我一点时间"
-        :data="table.list"
-        border
-        highlight-current-row
-        style="width: 100%;"
-        :height="height"
-        :row-style="rowStyle"
-        :cell-style="cellStyle"
-        class="elTable table-fixed"
-        row-key="id"
-        @selection-change="handleSelect"
-      >
-        <el-table-column type="selection" width="50" />
-        <el-table-column label="车次" width="75px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.sort }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.sort" type="number" placeholder="车次" class="filter-item" style="display: inline-block;width: 95%;" />
-          </template>
-        </el-table-column>
-        <el-table-column label="TMR编号" width="100px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.tmrname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.tmrid" placeholder="TMR编号" class="filter-item" style="width:95%;" @change="(value)=> {changeTMRNumber(value, scope.row)}">
-              <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.eqcode" :value="item.id" />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="描述" width="100px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.display }}</span>
-            <el-input v-if="scope.row.Edit" v-model="scope.row.display" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" placeholder="描述" maxlength="255" class="filter-item" style="display: inline-block;width: 95%;" />
-          </template>
-        </el-table-column>
-        <el-table-column label="生效" width="90px" align="center">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.sel" :disabled="scope.row.NoEdit" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleTakeEffectChange(scope.$index, scope.row)" />
-          </template>
-        </el-table-column>
-        <el-table-column label="班次" width="90px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.timesstr }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.times" :disabled="scope.row.Disabled" placeholder="班次" class="filter-item" style="width:95%;">
-              <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="时间" width="110px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.begintime }}</span>
-            <el-time-picker v-if="scope.row.Edit" v-model="scope.row.begintime" type="datetime" placeholder="选择时间" format="HH:mm" value-format="HH:mm" style="display: inline-block;width: 95%;" />
-          </template>
-        </el-table-column>
-        <el-table-column label="最大重量" width="80px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.maxweight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="合计重量" width="80px" align="center">
-          <template slot-scope="scope">
-            <span>{{ scope.row.sumweight }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="模板配方" width="120px" align="center">
-          <template slot-scope="scope">
-            <span v-if="scope.row.NoEdit">{{ scope.row.ftname }}</span>
-            <el-select v-if="scope.row.Edit" v-model="scope.row.ftid" :disabled="scope.row.Disabled" placeholder="模板配方" class="filter-item" style="width:95%;" @change="(value)=> {changeTemplateFormulation(value, scope.row)}">
-              <el-option v-for="item in templateFormulationList" :key="item.id" :label="item.tname" :value="item.id" />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="是否提前小料拆分" width="150px" align="center">
-          <template slot-scope="scope">
-            <el-switch v-model="scope.row.issplit" :disabled="scope.row.NoEdit" active-color="#13ce66" inactive-color="#ff4949" :active-value="1" :inactive-value="0" @change="handleIssplitChange(scope.$index, scope.row)" />
-          </template>
-        </el-table-column>
-        <el-table-column label="撒料" width="950px" align="center">
-          <template slot-scope="scope">
-            <draggable id="2" data-source="juju" :list="scope.row.arrList" class="list-group2" draggable=".item" group="a" :move="move2" @change="changeLog2(scope.row)" @start="start2" @end="end2(scope.row)">
-              <div v-for="element in scope.row.arrList" :key="element.name" class="list-group-item2 item">
-                <div class="arr-l" :style="{'background':element.tbackground}">
-                  <div class="arr-l-t">
-                    <div class="arr-l-t-t" />
-                    <el-select v-model="element.tmrid" placeholder="撒料设备" class="arr-l-t-b el-icon-arrow-down" @change="(value)=> {changeEquipment(value, scope.row,element.fttype,element.id)}">
-                      <el-option v-for="item in equipmentList" :key="item.id" :disabled="table.myTemp.isUpdateSave || scope.row.havebutton == 1" :label="item.tmrmix" :value="item.id" />
-                    </el-select>
-                  </div>
-                  <div class="arr-l-b">
-                    <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;">
-                      <div slot="content">{{ element.tmrname }}</div>
-                      <div class="tmrname">{{ element.tmrname }}</div>
-                    </el-tooltip>
-                  </div>
-                  <!-- <div v-if="element.fttype==0" style="background: #009C69;position:absolute;bottom: 0;left: 0;">补</div> -->
-                </div>
-                <div class="arr-r">
-                  <div class="arr-r-l">
-                    <el-tooltip placement="top">
-                      <div slot="content">{{ element.barname }}</div>
-                      <div class="barname">{{ element.barname }}</div>
-                    </el-tooltip>
-                  </div>
-                  <div class="arr-r-c">-</div>
-                  <div class="arr-r-r">
-                    <el-tooltip v-show="!element.isWeight" placement="top">
-                      <div slot="content">{{ element.weight }}</div>
-                      <div class="weight" @dblclick="dbclickWeight(element,scope.row)">{{ element.weight }}</div>
-                    </el-tooltip>
-                    <el-tooltip v-show="element.isWeight" placement="top">
-                      <div slot="content">{{ element.weight }}</div>
-                      <input ref="weight" v-model="element.weight" v-focus="element.focusState" type="number" placeholder="重量" step="0.01" class="filter-item2" style="display: inline-block;width: 95%;border: 1px solid #e6e6e6;" @blur="(value)=> {blurWeight(scope.row,element.fttype,element.id)}">
-                    </el-tooltip>
-                  </div>
-                </div>
-                <div class="arr-t" :style="{'background':element.background}">
-                  <i class="el-icon-close" style="position: absolute;right: 0;" @click="handleFLDelete(element,scope.row)" />
-                </div>
-              </div>
-            </draggable>
-          </template>
-        </el-table-column>
-
-        <el-table-column align="center" width="100" label="操作" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <el-button v-if="row.isCreate" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="createData(row)" />
-            <span v-if="row.isCreate" class="centerSpan">|</span>
-            <el-button v-if="row.isCreate" class="minCancel" icon="el-icon-close" @click="createCancel(row)" />
-            <el-button v-if="row.isUpdate" :disabled="row.havebutton == 1" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="row.isUpdate" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdate" :disabled="row.havebutton == 1" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
-            <el-button v-if="row.isUpdateSave" :disabled="isokDisable" icon="el-icon-folder-checked" class="miniSuccess" @click="updateData(row)" />
-            <span v-if="row.isUpdateSave" class="centerSpan">|</span>
-            <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-  </div>
-</template>
-
-<script>
-import { GetDataByName, postJson, PostDataByName, failproccess, ExecDataByConfig } from '@/api/common'
-import draggable from 'vuedraggable'
-import Sortable from 'sortablejs'
-import Cookies from 'js-cookie'
-import { MessageBox } from 'element-ui'
-export default {
-  name: 'MaterialIssuancePlan',
-  display: 'Two list header slot',
-  order: 14,
-  components: { draggable },
-  directives: {
-    focus: {
-      update: function(el, { value }) {
-        if (value) {
-          el.focus()
-        }
-      }
-    }
-  },
-  props: {
-    show: { type: Boolean, default: false }, // 弹框可见标志
-    parentDate: { type: String, defalut: '' }
-  },
-  data() {
-    return {
-      date: '',
-      isBarracks: false,
-      requestParams: {
-        name: 'getTMRListEnableType', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '1' }
-      },
-      requestParams2: {
-        name: 'getTMRListEnableTypeAll', offset: 0, parammaps: { pastureid: Cookies.get('pastureid'), eqtype: '1' }
-      },
-      requestParams3: {
-        name: 'getFTSWList', offset: 0, parammaps: { pastureid: Cookies.get('pastureid') }
-      },
-      equipmentList: [], // 撒料设备
-      TMRNumberList: [], // TMR编号
-      frequencyList: [], // 班次
-      templateFormulationList: [], // 模板配方
-
-      // 班次
-      maxTime: {
-        getMaxTimesParm: {
-          name: 'getSysoptEnable',
-          page: 1,
-          offset: 1,
-          pagecount: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            inforname: 'times'
-          }
-        },
-        // 班次
-        isTime1: false,
-        isTime2: false,
-        isTime3: false,
-        isTime4: false
-      },
-
-      table: {
-        getdataListParm: {
-          name: 'getLppListdate',
-          name1: 'getLppdListdate',
-          page: 1,
-          offset: 1,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid')
-          }
-        },
-        list: [],
-        total: 0,
-        tableKey: 0,
-        listLoading: false,
-        tabClickIndex: null, // 点击的单元格
-        tabClickLabel: '', // 当前点击的列名
-        temp: {},
-        move1: '',
-        changeList: [],
-        startObj: {},
-        isGoing: false,
-        myTemp: {}
-      },
-      selectList: [], // 选中数据
-
-      // 班次
-      menuRadio: '一班',
-      MenuList: [], // 配单列表
-      getdataListParmTimes: {
-        name: 'geFTListByFPdate',
-        name1: 'geFTListByFPDetaildate',
-        page: 1,
-        offset: 1,
-        returntype: 'Map',
-        parammaps: {
-          pastureid: Cookies.get('pastureid'),
-          times: '1'
-        }
-      },
-      listLoadingTimes: false,
-
-      // 栏舍统计
-      isLeftButton: true, // 向左
-      isRightButton: false, // 向右
-      rowStyle2: { maxHeight: 20 + 'px', height: 20 + 'px' },
-      cellStyle2: { padding: 0 + 'px' },
-      headerRowStyle2: { maxHeight: 20 + 'px', height: 20 + 'px' },
-      headerCellStyle2: { padding: 0 + 'px' },
-      smallMenu: {
-        getdataListParm: {
-          name: 'getLppUseSUMListdate',
-          page: 1,
-          offset: 1,
-          pagecount: 10,
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid')
-          }
-        },
-        total: 0,
-        tableKey: 0,
-        listLoading: false,
-        list: []
-      },
-      // 自动生成
-      automaticGeneration: {
-        dialogFormVisible: false,
-        dialogStatus: ''
-      },
-      historyRecord: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        myComponent: null
-      },
-      textMap: {
-        automaticGeneration: '提示',
-        historyRecord: '历史记录'
-      },
-      isokDisable: false,
-      requestParam: {},
-      height: document.body.clientHeight - 255 - 50, // table高度
-      // height: document.body.clientHeight - 450 - 50, // table高度
-      rowStyle: { maxHeight: 45 + 'px', height: 40 + 'px' },
-      cellStyle: { padding: 0 + 'px' },
-      dropState: false
-    }
-  },
-  watch: {
-    // 监听show,visible 随着show变化而变化
-    show: {
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log('newVal-show', newVal)
-      }
-    },
-    parentDate: {
-      immediate: true,
-      handler(newVal, oldVal) {
-        console.log('newVal-show', newVal)
-        this.date = newVal
-      }
-    }
-  },
-  created() {
-    this.getIsDisplay()
-    this.getDownList()
-  },
-  methods: {
-    clickBarracks(item) {
-      this.isBarracks = !this.isBarracks
-    },
-    // 下拉列表
-    getDownList() {
-      GetDataByName(this.requestParams).then(response => {
-        if (response.data !== null) {
-          this.TMRNumberList = response.data.list
-        } else {
-          this.TMRNumberList = []
-        }
-      })
-      GetDataByName(this.requestParams2).then(response => {
-        if (response.data !== null) {
-          this.equipmentList = response.data.list
-        } else {
-          this.equipmentList = []
-        }
-      })
-      GetDataByName(this.requestParams3).then(response => {
-        if (response.data !== null) {
-          this.templateFormulationList = response.data.list
-        } else {
-          this.templateFormulationList = []
-        }
-      })
-    },
-
-    // 显示班次
-    getIsDisplay() {
-      GetDataByName(this.maxTime.getMaxTimesParm).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: '第四班' }]
-        }
-        if (response.data.list !== null) {
-          if (response.data.list[0].inforvalue == 1) {
-            this.maxTime.isTime1 = true
-            this.maxTime.isTime2 = false
-            this.maxTime.isTime3 = false
-            this.maxTime.isTime4 = false
-          } else if (response.data.list[0].inforvalue == 2) {
-            this.maxTime.isTime1 = true
-            this.maxTime.isTime2 = true
-            this.maxTime.isTime3 = false
-            this.maxTime.isTime4 = false
-          } else if (response.data.list[0].inforvalue == 3) {
-            this.maxTime.isTime1 = true
-            this.maxTime.isTime2 = true
-            this.maxTime.isTime3 = true
-            this.maxTime.isTime4 = false
-          } else if (response.data.list[0].inforvalue == 4) {
-            this.maxTime.isTime1 = true
-            this.maxTime.isTime2 = true
-            this.maxTime.isTime3 = true
-            this.maxTime.isTime4 = true
-          }
-        } else {
-          this.maxTime.isTime1 = false
-          this.maxTime.isTime2 = false
-          this.maxTime.isTime3 = false
-          this.maxTime.isTime4 = false
-        }
-      })
-      this.getList()
-      this.getSmallMenuList() // 栏舍统计
-      this.getTimesList() // 班次
-    },
-
-    // 头部班次
-    getTimesList() {
-      this.listLoadingTimes = true
-      this.getdataListParmTimes.parammaps.date = this.date
-      const url = 'authdata/GetArrList'
-      const data = this.getdataListParmTimes
-      postJson(url, data).then(response => {
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.list.length; i++) {
-            this.$set(response.data.list[i], 'isShowTitle', true)
-            if (response.data.list[i].arrList == null) {
-              this.$set(response.data.list[i], 'isShowTitle', false)
-            } else {
-              for (let j = 0; j < response.data.list[i].arrList.length; j++) {
-                this.$set(response.data.list[i].arrList[j], 'background2', this.colorRgb(response.data.list[i].arrList[j].background))
-              }
-            }
-          }
-          this.MenuList = response.data.list
-        } else {
-          this.MenuList = []
-        }
-        setTimeout(() => {
-          this.listLoadingTimes = false
-        }, 100)
-      })
-    },
-    colorRgb(sColor) {
-      sColor = sColor.toLowerCase()
-      var reg = /^#([0-9a-fA-f]{3}|[0-9a-fA-f]{6})$/
-      // 如果是16进制颜色
-      if (sColor && reg.test(sColor)) {
-        if (sColor.length === 4) {
-          var sColorNew = '#'
-          for (var i = 1; i < 4; i += 1) {
-            sColorNew += sColor.slice(i, i + 1).concat(sColor.slice(i, i + 1))
-          }
-          sColor = sColorNew
-        }
-        // 处理六位的颜色值
-        var sColorChange = []
-        for (var i = 1; i < 7; i += 2) {
-          sColorChange.push(parseInt('0x' + sColor.slice(i, i + 2)))
-        }
-        return sColorChange.join(',')
-      }
-      return 'rgba(' + sColorChange.join(',') + ')'
-    },
-    // 切换班次
-    changeMenu(val) {
-      console.log(val)
-      if (this.menuRadio === '一班') {
-        this.getdataListParmTimes.parammaps.times = '1'
-        this.getTimesList()
-      } else if (this.menuRadio === '二班') {
-        this.getdataListParmTimes.parammaps.times = '2'
-        this.getTimesList()
-        this.MenuList = this.twoMenuList
-      } else if (this.menuRadio === '三班') {
-        this.getdataListParmTimes.parammaps.times = '3'
-        this.getTimesList()
-      } else if (this.menuRadio === '四班') {
-        this.getdataListParmTimes.parammaps.times = '4'
-        this.getTimesList()
-      }
-    },
-
-    // 右侧栏舍统计
-    getSmallMenuList() {
-      this.smallMenu.listLoading = true
-      this.smallMenu.getdataListParm.parammaps.date = this.date
-      GetDataByName(this.smallMenu.getdataListParm).then(response => {
-        console.log('smallMenu数据', response.data.list)
-        if (response.data.list !== null) {
-          for (let i = 0; i < response.data.list.length; i++) {
-            if (response.data.list[i].onetime == undefined) { this.$set(response.data.list[i], 'onetime', 0) } else { response.data.list[i].onetime = parseFloat(response.data.list[i].onetime) }
-            if (response.data.list[i].twotime == undefined) { this.$set(response.data.list[i], 'twotime', 0) } else { response.data.list[i].twotime = parseFloat(response.data.list[i].twotime) }
-            if (response.data.list[i].threetime == undefined) { this.$set(response.data.list[i], 'threetime', 0) } else { response.data.list[i].threetime = parseFloat(response.data.list[i].threetime) }
-            if (response.data.list[i].fourtime == undefined) { this.$set(response.data.list[i], 'fourtime', 0) } else { response.data.list[i].fourtime = parseFloat(response.data.list[i].fourtime) }
-            this.$set(response.data.list[i], 'usedsum', response.data.list[i].onetime + response.data.list[i].twotime + response.data.list[i].threetime + response.data.list[i].fourtime)
-            this.$set(response.data.list[i], 'all', '')
-          }
-          this.smallMenu.list = response.data.list
-          this.smallMenu.total = response.data.total
-        } else {
-          this.smallMenu.list = []
-        }
-
-        setTimeout(() => {
-          this.smallMenu.listLoading = false
-        }, 100)
-      })
-    },
-
-    // table
-    getList() {
-      this.table.listLoading = true
-      this.table.getdataListParm.parammaps.date = this.date
-      const url = 'authdata/GetArrList'
-      const data = this.table.getdataListParm
-      postJson(url, data).then(response => {
-        if (response.data !== null) {
-          console.log('table数据', response.data.list)
-          for (let i = 0; i < response.data.list.length; i++) {
-            this.$set(response.data.list[i], 'Edit', false) // 编辑
-            this.$set(response.data.list[i], 'NoEdit', true) // 不可编辑/输入
-            this.$set(response.data.list[i], 'isCreate', false) // 新增操作
-            this.$set(response.data.list[i], 'isUpdate', true) // 编辑操作
-            this.$set(response.data.list[i], 'isUpdateSave', false) // 编辑保存
-            this.$set(response.data.list[i], 'Disabled', true) // 班次/模板配方不可输入
-
-            if (response.data.list[i].arrList == null) {
-              this.$set(response.data.list[i], 'Disabled', false)
-              this.$set(response.data.list[i], 'arrList', [])
-            } else {
-              for (let j = 0; j < response.data.list[i].arrList.length; j++) {
-                this.$set(response.data.list[i].arrList[j], 'isWeight', false)
-                this.$set(response.data.list[i].arrList[j], 'focusState', false)
-              }
-            }
-          }
-          this.table.list = response.data.list
-          this.rowDrop()
-          this.table.changeList = []
-          this.table.startObj = {}
-          if (response.data.total) {
-            this.table.total = response.data.total
-          }
-        } else {
-          this.table.list = []
-        }
-
-        setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
-    },
-
-    // 行拖拽
-    rowDrop() {
-      console.log(document.querySelector('#table .el-table__body-wrapper tbody'))
-      const tbody = document.querySelector('#table .el-table__body-wrapper tbody')
-      const that = this
-      var sortable = Sortable.create(tbody, {
-        disabled: that.dropState,
-        onChoose({ newIndex, oldIndex }) {
-          if (that.dropState == true) {
-            sortable.destroy()
-          }
-        },
-        onEnd({ newIndex, oldIndex }) {
-          const currRow = that.table.list.splice(oldIndex, 1)[0]
-          that.table.list.splice(newIndex, 0, currRow)
-          console.log('索引', newIndex)
-          console.log('拖动数据', currRow)
-          console.log('上', that.table.list[newIndex - 1])
-          console.log('下', that.table.list[newIndex + 1])
-        }
-      })
-    },
-
-    // TMR编号
-    changeTMRNumber(item, row) {
-      row.tmrname = this.TMRNumberList.find(obj => obj.id === item).eqcode
-      row.maxweight = this.TMRNumberList.find(obj => obj.id === item).maxstirfeed
-    },
-    // 配方模板
-    changeTemplateFormulation(item, row) {
-      row.ftname = this.templateFormulationList.find(obj => obj.id === item).tname
-    },
-    // 增加车次
-    handleCreate() {
-      console.log(this.table.list)
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (this.table.list[i].Edit === true) {
-          this.$message({ type: 'error', message: '当前内容未保存，请点击取消或保存继续进行操作', duration: 2000 })
-          return false
-        }
-      }
-      if (this.table.list.length == 0) {
-        this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'tmrname': '', 'tmrid': '', 'sort': 1, 'sel': 1, 'issplit': 1, 'times': '', 'display': '', 'begintime': '', 'ftname': '', 'ftid': '', 'sumweight': '', 'sumcowcount': '', 'maxweight': '', 'arrList': [] })
-      } else {
-        this.table.list.unshift({ 'myId': (new Date()).valueOf(), 'Edit': true, 'NoEdit': false, 'isCreate': true, 'isUpdate': false, 'isUpdateSave': false, 'tmrname': '', 'tmrid': '', 'sort': parseInt(this.table.list[this.table.list.length - 1].sort) + 1, 'sel': 1, 'issplit': 1, 'times': '', 'display': '', 'begintime': '', 'ftname': '', 'ftid': '', 'sumweight': '', 'sumcowcount': '', 'maxweight': '', 'arrList': [] })
-      }
-      // this.$refs.box.scrollTop = 0
-      this.$refs.table.bodyWrapper.scrollTop = 0
-      this.dropState = true
-    },
-    createData(row) {
-      console.log('点击了新增保存', row)
-      this.table.temp.pastureid = Cookies.get('pastureid')
-      this.table.temp.tmrname = row.tmrname
-      this.table.temp.tmrid = row.tmrid
-      this.table.temp.sort = row.sort
-      this.table.temp.sel = row.sel
-      this.table.temp.issplit = row.issplit
-      this.table.temp.times = row.times
-      this.table.temp.display = row.display
-      this.table.temp.begintime = row.begintime
-      this.table.temp.ftname = row.ftname
-      this.table.temp.ftid = row.ftid
-      this.table.temp.sumweight = 0
-      this.table.temp.maxweight = row.maxweight
-      this.table.temp.date = this.date
-
-      if (this.table.temp.sort == '' && this.table.temp.tmrid == '' && this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '车次/TMR编号/班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.tmrid == '' && this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.times == '') {
-        this.$message({ type: 'error', message: '班次不能为空', duration: 2000 })
-        return false
-      }
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (row.sort == this.table.list[i].sort) {
-          if (row.myId !== this.table.list[i].myId) {
-            this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
-            return false
-          }
-        }
-      }
-      var isInteger = /^\d+$/
-      if (this.table.temp.sort !== '') {
-        if (!isInteger.test(parseFloat(this.table.temp.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-          return false
-        }
-      }
-
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam = {}
-      this.requestParam.name = 'insertLppdate'
-      this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
-        console.log('新增保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-          this.getList()
-          this.dropState = false
-        } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
-    },
-    createCancel(row) {
-      console.log('点击了新增取消')
-      this.dropState = false
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (row.myId === this.table.list[i].myId) {
-          var listIndex = this.table.list.indexOf(this.table.list[i])
-        }
-        if (listIndex > -1) {
-          this.table.list.splice(listIndex, 1)
-          return
-        }
-      }
-    },
-
-    // 编辑
-    handleUpdate(row) {
-      console.log(row, '点击了行编辑')
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (this.table.list[i].Edit == true) {
-          this.$message({ type: 'error', message: '当前内容未保存，请点击取消或保存继续进行操作', duration: 2000 })
-          return false
-        }
-      }
-      // 编辑true,不可编辑false
-      row.Edit = true
-      row.NoEdit = false
-      // 新增false,编辑false,编辑保存true
-      row.isCreate = false
-      row.isUpdate = false
-      row.isUpdateSave = true
-      row.times = String(row.times)
-      if (row.sort == undefined) { row.sort = '' }
-      if (row.tmrid == undefined || row.tmrname == undefined) {
-        row.tmrid = ''
-        row.tmrname = ''
-      }
-      if (row.display == undefined) { row.display = '' }
-      if (row.times == undefined) { row.times = '' }
-      if (row.begintime == undefined) { row.begintime = '' }
-      if (row.ftid == undefined || row.ftname == undefined) {
-        row.ftid = ''
-        row.ftname = ''
-      }
-      this.dropState = true
-      this.table.myTemp = Object.assign({}, row)
-    },
-    updateData(row) {
-      console.log('点击了编辑保存', row)
-      row.isUpdateSave = false
-      this.table.myTemp = Object.assign({}, row)
-      this.table.temp.pastureid = row.pastureid
-      this.table.temp.id = row.id
-      this.table.temp.tmrname = row.tmrname
-      this.table.temp.tmrid = row.tmrid
-      this.table.temp.sort = row.sort
-      this.table.temp.sel = row.sel
-      this.table.temp.issplit = row.issplit
-      this.table.temp.times = row.times
-      this.table.temp.display = row.display
-      this.table.temp.begintime = row.begintime
-      this.table.temp.ftname = row.ftname
-      this.table.temp.ftid = row.ftid
-      this.table.temp.sumweight = row.sumweight
-      this.table.temp.sumcowcount = row.sumcowcount
-      this.table.temp.maxweight = row.maxweight
-      this.table.temp.date = this.date
-
-      if (this.table.temp.sort == '' && this.table.temp.tmrid == '' && this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '车次/TMR编号/班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.tmrid == '' && this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: 'TMR编号/班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.times == '' && this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '班次/模板配方不能为空', duration: 2000 })
-        return false
-      } else if (this.table.temp.ftid == '') {
-        this.$message({ type: 'error', message: '模板配方不能为空', duration: 2000 })
-        return false
-      }
-      for (let i = 0; i < this.table.list.length; i++) {
-        if (row.sort == this.table.list[i].sort) {
-          if (row.id !== this.table.list[i].id) {
-            this.$message({ type: 'error', message: '车次不可重复', duration: 2000 })
-            return false
-          }
-        }
-      }
-      var isInteger = /^\d+$/
-      if (this.table.temp.sort !== '') {
-        if (!isInteger.test(parseFloat(this.table.temp.sort))) {
-          this.$message({ type: 'error', message: '车次请输入整数', duration: 2000 })
-          return false
-        }
-      }
-
-      this.isokDisable = true
-      setTimeout(() => {
-        this.isokDisable = false
-      }, 1000)
-      this.requestParam = {}
-      this.requestParam.name = 'updateLppdate'
-      this.requestParam.parammaps = this.table.temp
-      PostDataByName(this.requestParam).then(response => {
-        console.log('编辑保存发送参数', this.requestParam)
-        if (response.msg !== 'fail') {
-          this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
-          this.getList()
-          this.dropState = false
-        } else {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-        }
-      })
-    },
-    updateCancel(row) {
-      console.log('点击了编辑取消')
-      // 编辑false,不可编辑true
-      row.Edit = false
-      row.NoEdit = true
-      // 新增false,编辑true,编辑保存false
-      row.isCreate = false
-      row.isUpdate = true
-      row.isUpdateSave = false
-      this.dropState = false
-      this.table.myTemp = Object.assign({}, row)
-    },
-
-    // 配方
-    changeLog: function(evt) {
-      console.log('change1', evt)
-    },
-    start(evt) {
-      console.log('start1', evt)
-      this.$set(this.table.startObj, 'from', evt.from.className)
-      this.$set(this.table.startObj, 'to', evt.from.className)
-    },
-    end(evt) {
-      console.log('end1', evt)
-    },
-    move(evt, originalEvent) {
-      if (originalEvent.target.className === 'list-group-item1 item' || originalEvent.target.className === 'draggableWeight') {
-        return false
-      }
-      console.log(evt)
-      this.table.move1 = evt.draggedContext.element
-    },
-
-    start2(evt) {
-      console.log('start2', evt)
-      this.$set(this.table.startObj, 'from', evt.from.className)
-      this.$set(this.table.startObj, 'to', evt.from.className)
-    },
-    move2(evt, originalEvent) {
-      // console.log(evt, originalEvent)
-      if (originalEvent.target.className === 'list-group-item1 item' || originalEvent.target.className === 'draggableWeight') {
-        return false
-      }
-      this.table.move1 = evt.draggedContext.element
-    },
-    end2(evt) {
-      // console.log(evt)
-      console.log('end2', evt)
-    },
-    // 撒料位
-    changeLog2(evt) {
-      // console.log(this.table.startObj)
-      console.log(evt, 'evt-----')
-      if (evt.havebutton == 1) {
-        this.$message({ type: 'error', message: '该车次计划已执行，不允许修改', duration: 2000 })
-        this.getTimesList()
-        this.getSmallMenuList()
-        this.getList()
-        return false
-      }
-      this.table.changeList.push(evt)
-      evt = this.table.changeList[0]
-      if (evt.arrList.length == 1) {
-        evt.arrList[0].sort = 0
-      } else if (evt.arrList.length > 1) {
-        for (let i = 0; i < evt.arrList.length; i++) {
-          if (evt.arrList[i].id == this.table.move1.id && evt.arrList[i].fttype == this.table.move1.fttype) {
-            if (evt.arrList[i - 1] == undefined) {
-              evt.arrList[i].sort = 0
-              evt.sort = 0
-            } else {
-              evt.arrList[i].sort = parseFloat(evt.arrList[i - 1].sort) + 1
-              evt.sort = parseFloat(evt.arrList[i - 1].sort) + 1
-            }
-          }
-        }
-      }
-      console.log(evt.arrList, '==========1')
-      console.log(evt, '==========2')
-      if (this.table.startObj.from == 'list-group1' && this.table.startObj.to == 'list-group1') {
-        this.requestParam = {}
-        this.requestParam.common = { 'returnmap': '0' }
-        this.requestParam.data = []
-        this.requestParam.data[0] = { 'name': 'checkLLPDetailInsertdate', 'type': 'v', 'parammaps': {
-          pastureid: this.table.move1.pastureid,
-          barid: this.table.move1.barid,
-          lppid: evt.id,
-          times: evt.times,
-          ftid: this.table.move1.ftid,
-          ptsid: this.table.move1.ptsid,
-          ptid: this.table.move1.ptid,
-          fttype: this.table.move1.fttype,
-          timesTem: this.table.move1.times,
-          date: this.date
-        }}
-        this.requestParam.data[1] = { 'name': 'updateLpplandtlSortsdate', 'type': 'e', 'parammaps': {
-          pastureid: evt.pastureid,
-          sort: evt.sort,
-          lppid: evt.id,
-          date: this.date
-        }}
-        this.requestParam.data[2] = { 'name': 'insertLppddate', 'type': 'e', 'parammaps': {
-          pastureid: evt.pastureid,
-          lppid: evt.id,
-          barid: this.table.move1.barid,
-          barname: this.table.move1.barname,
-          fpdid: this.table.move1.id,
-          fttype: this.table.move1.fttype,
-          lweight: this.table.move1.weight,
-          sort: evt.sort,
-          tmrid: evt.tmrid,
-          tmrname: evt.tmrname,
-          background: this.table.move1.background,
-          ccountradio: this.table.move1.ccountradio,
-          cowcount: this.table.move1.cowcount,
-          date: this.date
-        }}
-        this.requestParam.data[3] = { 'name': 'updateFpdetailUsedate', 'type': 'e', 'parammaps': {
-          pastureid: this.table.move1.pastureid,
-          id: this.table.move1.id,
-          fttype: this.table.move1.fttype,
-          lweight: this.table.move1.weight,
-          date: this.date
-        }}
-
-        console.log('撒料位上-下新增', this.requestParam)
-        ExecDataByConfig(this.requestParam).then(response => {
-          console.log('撒料位新增保存发送参数', this.requestParam)
-          if (response.msg === 'fail') {
-            this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-            this.getTimesList()
-            this.getSmallMenuList()
-            this.getList()
-          } else {
-            this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-            this.getList()
-            this.getSmallMenuList()
-          }
-        })
-      } else if (this.table.startObj.from == 'list-group2' && this.table.startObj.to == 'list-group2') {
-        if (this.table.changeList.length == 1) {
-          this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'checkLLPDetailInsertdate', 'type': 'v', 'parammaps': {
-            pastureid: this.table.move1.pastureid,
-            barid: this.table.move1.barid,
-            lppid: evt.id,
-            times: evt.times,
-            ftid: this.table.move1.ftid,
-            ptsid: this.table.move1.ptsid,
-            ptid: this.table.move1.ptid,
-            fttype: this.table.move1.fttype,
-            timesTem: evt.times,
-            date: this.date
-          }}
-          this.requestParam.data[1] = { 'name': 'updateLpplandtlSortsdate', 'type': 'e', 'parammaps': {
-            pastureid: evt.pastureid,
-            sort: evt.sort,
-            lppid: evt.id,
-            date: this.date
-          }}
-          this.requestParam.data[2] = { 'name': 'deleteLppddate', 'type': 'e', 'parammaps': {
-            pastureid: evt.pastureid,
-            id: this.table.move1.id,
-            date: this.date
-          }}
-          this.requestParam.data[3] = { 'name': 'insertLppddate', 'type': 'e', 'parammaps': {
-            pastureid: evt.pastureid,
-            lppid: evt.id,
-            barid: this.table.move1.barid,
-            barname: this.table.move1.barname,
-            fpdid: this.table.move1.fpdid,
-            fttype: this.table.move1.fttype,
-            lweight: this.table.move1.weight,
-            sort: evt.sort,
-            tmrid: evt.tmrid,
-            tmrname: evt.tmrname,
-            background: this.table.move1.background,
-            ccountradio: this.table.move1.ccountradio,
-            cowcount: this.table.move1.cowcount,
-            date: this.date
-          }}
-          console.log('撒料位下-下新增', this.requestParam)
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('撒料位新增保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
-              this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-              this.getTimesList()
-              this.getSmallMenuList()
-              this.getList()
-            } else {
-              this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-              this.getList()
-              this.getSmallMenuList()
-            }
-          })
-        } else if (this.table.changeList.length == 1) {
-          if (this.table.isGoing == true) {
-            console.log(11111)
-            this.requestParam.common = { 'returnmap': '0' }
-            this.requestParam.data = []
-            this.requestParam.data[0] = { 'name': 'checkLLPDetailInsertdate', 'type': 'e', 'parammaps': {
-              pastureid: evt.pastureid,
-              sort: evt.sort,
-              lppid: evt.id,
-              date: this.date
-            }}
-            this.requestParam.data[1] = { 'name': 'deleteLppddate', 'type': 'e', 'parammaps': {
-              pastureid: evt.pastureid,
-              id: this.table.move1.id,
-              date: this.date
-            }}
-            this.requestParam.data[2] = { 'name': 'insertLppddate', 'type': 'e', 'parammaps': {
-              pastureid: evt.pastureid,
-              lppid: evt.id,
-              barid: this.table.move1.barid,
-              barname: this.table.move1.barname,
-              fpdid: this.table.move1.id,
-              fttype: this.table.move1.fttype,
-              lweight: this.table.move1.weight,
-              sort: evt.sort,
-              tmrid: evt.tmrid,
-              tmrname: evt.tmrname,
-              background: this.table.move1.background,
-              date: this.date
-            }}
-            this.requestParam.data[3] = { 'name': 'updateFpdetailUsedate', 'type': 'e', 'parammaps': {
-              pastureid: this.table.move1.pastureid,
-              id: this.table.move1.id,
-              fttype: this.table.move1.fttype,
-              statue: 1,
-              date: this.date
-            }}
-
-            console.log('撒料位新增', this.requestParam)
-            ExecDataByConfig(this.requestParam).then(response => {
-              console.log('撒料位新增保存发送参数', this.requestParam)
-              if (response.msg === 'fail') {
-                this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-                this.getTimesList()
-                this.getList()
-              } else {
-                this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-                this.getList()
-              }
-            })
-            this.table.isGoing = false
-          } else {
-            this.table.isGoing = true
-          }
-        }
-      }
-    },
-
-    // 编辑-撒料设备
-    changeEquipment(item, row, fttype, myid) {
-      var objList = {}
-      for (let i = 0; i < row.arrList.length; i++) {
-        row.arrList[i].tmrname = this.equipmentList.find(obj => obj.id === item).tname
-        if (row.arrList[i].fttype == fttype && row.arrList[i].id == myid) {
-          objList = row.arrList[i]
-        }
-        if (row.tmrid == row.arrList[i].tmrid) {
-          if (row.tmrid !== item) {
-            this.$message({ type: 'warning', message: '混料设备不可与其它撒料设备同时选择', duration: 2000 })
-            this.getList()
-            return false
-          }
-        } else {
-          if (row.tmrid == item) {
-            this.$message({ type: 'warning', message: '混料设备不可与其它撒料设备同时选择', duration: 2000 })
-            this.getList()
-            return false
-          }
-        }
-      }
-      console.log(row)
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'updateLppddate', 'type': 'e', 'parammaps': {
-        pastureid: row.pastureid,
-        lppid: row.id,
-        barid: objList.barid,
-        barname: objList.barname,
-        fpdid: objList.fpdid,
-        fttype: objList.fttype,
-        lweight: objList.weight,
-        sort: objList.sort,
-        tmrid: objList.tmrid,
-        tmrname: objList.tmrname,
-        background: objList.background,
-        id: objList.id,
-        date: this.date
-      }}
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('编辑保存发送参数', this.requestParam)
-        if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-        } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-          this.getList()
-          this.getTimesList()
-        }
-      })
-    },
-    dbclickWeight(row, row2) {
-      console.log(row2, 'row2')
-      if (row2.havebutton == 1) {
-        return false
-      }
-      if (this.table.myTemp.isUpdateSave == true) {
-        return false
-      }
-      console.log(row)
-      row.isWeight = true
-      row.focusState = true
-      this.dropState = true
-      this.myStart2 = false
-      this.myMove2 = false
-      this.myEnd2 = false
-    },
-    // 编辑-重量
-    blurWeight(row, fttype, myid) {
-      var objList = {}
-      for (let i = 0; i < row.arrList.length; i++) {
-        if (row.arrList[i].fttype == fttype && row.arrList[i].id == myid) {
-          objList = row.arrList[i]
-        }
-      }
-      if (objList.weight == '') { objList.weight = 0 }
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'checkFPdLeftWdate', 'type': 'v', 'parammaps': {
-        pastureid: objList.pastureid,
-        fpdid: objList.fpdid,
-        fttype: objList.fttype,
-        lweight: String(parseFloat(objList.weight) - parseFloat(objList.lweight)),
-        date: this.date
-      }}
-      this.requestParam.data[1] = { 'name': 'updateLppddate', 'type': 'e', 'parammaps': {
-        pastureid: row.pastureid,
-        lppid: row.id,
-        barid: objList.barid,
-        barname: objList.barname,
-        fpdid: objList.fpdid,
-        fttype: objList.fttype,
-        lweight: objList.weight,
-        sort: objList.sort,
-        tmrid: objList.tmrid,
-        tmrname: objList.tmrname,
-        background: objList.background,
-        id: objList.id,
-        date: this.date
-      }}
-      this.requestParam.data[2] = { 'name': 'updateFpdetailUsedate', 'type': 'e', 'parammaps': {
-        pastureid: objList.pastureid,
-        id: objList.fpdid,
-        fttype: objList.fttype,
-        lweight: String(parseFloat(objList.weight) - parseFloat(objList.lweight)),
-        date: this.date
-      }}
-
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('编辑保存发送参数', this.requestParam)
-        if (response.msg === 'fail') {
-          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
-          this.getList()
-          this.getTimesList()
-        } else {
-          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
-          this.getList()
-          this.getTimesList()
-        }
-      })
-    },
-    handleTakeEffectChange() {
-      console.log('点击了生效')
-    },
-    handleIssplitChange() {
-      console.log('是否提前小料拆分')
-    },
-
-    // 撒料位删除
-    handleFLDelete(ele, row) {
-      if (row.havebutton == 1) {
-        return false
-      }
-      if (this.table.myTemp.isUpdateSave == true) {
-        return false
-      }
-      console.log(ele, row, '点击了撒料删除')
-      this.selectList = []
-      this.requestParam = {}
-      this.requestParam.common = { 'returnmap': '0' }
-      this.requestParam.data = []
-      this.requestParam.data[0] = { 'name': 'deleteLppddate', 'type': 'e', 'parammaps': {
-        pastureid: ele.pastureid,
-        id: ele.id,
-        date: this.date
-      }}
-      this.requestParam.data[1] = { 'name': 'updateFpdetailUsedate', 'type': 'e', 'parammaps': {
-        pastureid: ele.pastureid,
-        id: ele.fpdid,
-        fttype: ele.fttype,
-        lweight: '-' + parseFloat(ele.weight),
-        date: this.date
-      }}
-      ExecDataByConfig(this.requestParam).then(response => {
-        console.log('删除保存发送参数', this.requestParam)
-        if (response.msg === 'fail') {
-          this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
-        } else {
-          this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
-          this.getList()
-          this.getTimesList()
-        }
-      })
-    },
-
-    handleSelect(val) {
-      console.log('勾选数据', val)
-      this.selectList = val
-    },
-    // 减少车次
-    handleReduceTrains() {
-      if (this.selectList.length == 0) {
-        this.$message({ type: 'error', message: '请选择车次', duration: 2000 })
-        return false
-      } else {
-        // 减少对应车次
-        for (let i = 0; i < this.selectList.length; i++) {
-          if (this.selectList[i].arrList.length > 0) {
-            this.$message({ type: 'error', message: '本车次已添加栏舍不可删除', duration: 2000 })
-            return false
-          }
-        }
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          console.log(this.selectList)
-          this.requestParam = {}
-          this.requestParam.common = { 'returnmap': '0' }
-          this.requestParam.data = []
-          this.requestParam.data[0] = { 'name': 'insertSpotListdate', 'resultmaps': { 'list': this.selectList }}
-          this.requestParam.data[0].children = []
-          this.requestParam.data[0].children[0] = { 'name': 'deleteLppdate', 'type': 'e', 'parammaps': {
-            id: '@insertSpotList.id',
-            pastureid: '@insertSpotList.pastureid',
-            date: this.date
-          }}
-          ExecDataByConfig(this.requestParam).then(response => {
-            console.log('删除保存发送参数', this.requestParam)
-            if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        })
-      }
-    },
-
-    // 行内删除
-    handleRowDelete(row) {
-      console.log(row, '点击了行删除')
-      if (row.arrList.length == 0) {
-        MessageBox.confirm('是否确认删除此信息?', {
-          confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-        }).then(() => {
-          this.selectList = []
-          this.requestParam = {}
-          this.requestParam.name = 'deleteLppdate'
-          this.requestParam.parammaps = {}
-          this.requestParam.parammaps.pastureid = row.pastureid
-          this.requestParam.parammaps.id = row.id
-          this.requestParam.parammaps.date = this.date
-          PostDataByName(this.requestParam).then(response => {
-            if (response.msg === 'fail') {
-              this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
-            } else {
-              this.$notify({ title: '成功', message: '删除成功', type: 'success', duration: 2000 })
-              this.getList()
-            }
-          })
-        }).catch(() => {
-          this.$message({ type: 'info', message: '已取消删除' })
-        })
-      } else {
-        this.$message({ type: 'error', message: '本车次已添加栏舍不可删除', duration: 2000 })
-        return false
-      }
-    },
-    handleLeftButton() { // 向左
-      this.isLeftButton = false
-      this.isRightButton = true
-      this.$refs.listR.style.width = '46%'
-      this.$refs.listR.style.zIndex = 4
-      this.getSmallMenuList()
-    },
-    handleRightButton() { // 向右
-      this.isLeftButton = true
-      this.isRightButton = false
-      this.$refs.list.style.zIndex = 1
-      this.$refs.listR.style.width = '50px'
-      this.$refs.listR.style.zIndex = 1
-      this.$nextTick(() => {
-        this.$refs.listRight.style.zIndex = 1
-        this.$refs.listRight2.style.zIndex = 1
-      })
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-  /deep/ :focus {
-    outline: 0;
-  }
-  :focus-visible {
-    outline: 0 !important;
-  }
-  // 下拉框
-  .filter-item2 .el-input--suffix .el-input__inner{
-    height: 30px !important;
-    font-size: 8px;
-    padding: 0 2px;
-  }
-  .filter-item2 .el-input--suffix .el-input__suffix .el-input__suffix-inner .el-input__icon{
-    line-height: 30px !important;
-  }
-  // 输入框
-  .filter-item2 .el-input__inner{
-    height: 30px !important;
-    font-size: 8px;
-    padding: 0 2px;
-  }
-</style>
-
-<style lang="scss">
- .menuList{
-    height: 190px;background: red;border-bottom: 2px solid #d8dce5; box-shadow: 0 1px 6px 0 rgba(0, 0, 0, 0.12), 0 0 6px 0 rgba(0, 0, 0, 0.04);
-    .menuList-t{
-      height: 60px;background: #fff;display: flex;justify:center;align-items:center;display:-webkit-flex; flex-direction: row; flex-wrap: wrap; justify-content: space-between;
-      .menuList-t-l{}
-      .menuList-t-r{
-        display: flex; flex-direction: row; flex-wrap: wrap; justify-content: space-between;position: relative;
-        .menuList-t-r-l{
-          margin-right:10px;cursor:pointer;width:150px;height: 20px;line-height:20px; text-align: center; background: rgba(25, 138, 244, 0); border: 1px solid #1BBD89; border-radius: 2px;font-size:12px;color: #1BBD89;
-        }
-        .menuList-t-r-r{
-          margin-right:10px;cursor:pointer;width:150px;height: 20px;line-height:20px; text-align: center; background: rgba(25, 138, 244, 0); border: 1px solid #1BBD89; border-radius: 2px;font-size:12px;color: #1BBD89;
-        }
-        .columnHouse{
-          width:650px;background: #fff; box-shadow: 0 0 6px 6px rgba(0, 0, 0, 0.04), 0 0 6px 6px rgba(0, 0, 0, 0.04);position: absolute;right: 0;top: 25px;z-index: 5;
-          .el-table {
-            height: 250px;
-            overflow: auto;
-          }
-        }
-      }
-
-    }
-    .menuList-b{
-      height: 130px;background: #fff;position: relative;
-      ::-webkit-scrollbar{ width: 7px; height: 7px; background-color: #F5F5F5; }
-      ::-webkit-scrollbar-track { box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3); border-radius: 10px; background-color: #F5F5F5; }
-      ::-webkit-scrollbar-thumb{ border-radius: 10px; box-shadow: inset 0 0 6px rgba(0, 0, 0, .1); -webkit-box-shadow: inset 0 0 6px rgba(0, 0, 0, .1); background-color: #c8c8c8; }
-      .draggableList{position: absolute;width: 100%;margin: 0 0; height: 130px; list-style: none;padding:0 0;overflow: auto;font-size: 12px;
-        .draggableTitle{float: left;width: 105px;white-space: nowrap;overflow: hidden; text-overflow: ellipsis;margin:5px 5px;border-radius: 7px;text-align: center;color:#000;height: 36px;line-height: 36px;}
-        li{
-          text-align: center;color:#fff;
-          .draggableName{display:block;width: 100%;overflow: hidden; text-overflow:ellipsis; white-space: nowrap;}
-        }
-      }
-    }
-  }
-  .list-group2{
-    .list-group-item2{
-      width: 220px;height: 50px;overflow: hidden; float: left;margin: 5px 5px;position: relative;
-      .arr-t{height: 50px;border-radius:5px 5px;}
-      .arr-l{
-        float: left;width: 60px;height: 50px;overflow: hidden;border-radius:5px 50% 50% 5px;
-        .arr-l-t{
-          position: relative;
-          .arr-l-t-t{
-            width: 0;height: 0; border-top: 26px solid #3479f2; border-right: 26px solid transparent;
-          }
-          .arr-l-t-b{
-            position: absolute;top: 4px;left: 1px;color: #fff;width: 10px; height: 10px;
-            .el-input--suffix{
-              opacity:0;
-              .el-input__inner{height: 10px;}
-            }
-          }
-        }
-
-        .arr-l-b{
-          width: 45px;position: absolute;top: 15px;left: 10px;color: #333;font-size: 12px;
-          .tmrname{width: 100%;overflow: hidden; text-overflow:ellipsis; white-space: nowrap;}
-        }
-      }
-      .arr-c{position: absolute;top: 0px;left: 0;}
-      .arr-r{
-        float: right;width: 160px;height: 50px;overflow: hidden;line-height: 50px;
-        .arr-r-l{
-          float: left;width: 85px;
-          .barname{width: 100%;overflow: hidden; text-overflow:ellipsis; white-space: nowrap;}
-        }
-        .arr-r-c{float: left;width: 10px;}
-        .arr-r-r{
-          float: left;width: 65px;
-          .weight{width: 100%;overflow: hidden; text-overflow:ellipsis; white-space: nowrap;}
-        }
-      }
-    }
-  }
-</style>
-<style>
-  .draggableWeight{display:block;line-height: 18px;height: 18px; color: #000; width: 100%; margin: 0 auto;}
-</style>

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

@@ -333,7 +333,22 @@
             <div class="spreadingMaterialList">
               <div v-for="element in create.list2" :key="element.name" class="list-group-item2 item">
                 <div class="arr-l" :style="{'background':element.tbackground}">
-                  <div class="arr-l-t" />
+                  <div class="arr-l-t">
+                    <div class="arr-l-t-t" />
+                    <el-select
+                      v-model="element.tmrid"
+                      placeholder="撒料设备"
+                      class="arr-l-t-b el-icon-arrow-down"
+                      @change="(value)=> {changeEquipment(value, element.fttype,element.id)}"
+                    >
+                      <el-option
+                        v-for="item in equipmentList"
+                        :key="item.id"
+                        :label="item.tname"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </div>
                   <div class="arr-l-b">
                     <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;">
                       <div slot="content">{{ element.barname }}</div>
@@ -380,7 +395,7 @@
 <script>
 import Cookies from 'js-cookie'
 import Sortable from 'sortablejs'
-import { checkButtons, postJson } from '@/api/common'
+import { checkButtons, postJson,ExecDataByConfig } from '@/api/common'
 import { MessageBox } from 'element-ui'
 export default {
   name: 'MaterialIssuancePlan',
@@ -769,8 +784,8 @@ export default {
         }).catch(() => {
           this.create.temp.tmrid2 = this.create.temp.tmrid
           this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
-          this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2)
-            .maxstirfeed
+          this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+          this.create.temp.tclassname = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
           console.log(this.create.temp)
           this.$message({
             type: 'info',
@@ -780,7 +795,8 @@ export default {
       } else {
         this.create.temp.tmrid = this.create.temp.tmrid2
         this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === item).eqcode
-        this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
+        this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
+        this.create.temp.tclassname = this.equipmentList.find(obj => obj.id === item).tclassname
         console.log('TMR编号item==>', item)
         console.log('tmrname==>', this.create.temp)
       }
@@ -1109,7 +1125,21 @@ export default {
     },
     clickBar(item) {
       console.log('点击了栏舍item==>', item)
-      this.create.temp.sumweight = parseFloat(this.create.temp.sumweight)
+      this.create.temp.sumweight = parseFloat(this.create.temp.sumweight)
+      if(this.create.temp.tclassname == '固定式'){
+        console.log(this.equipmentList.find(obj => obj.tclassname == '撒料设备'))
+        if(this.equipmentList.find(obj => obj.tclassname == '撒料设备') !== undefined){
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '撒料设备').eqcode
+          this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '撒料设备').id
+        }else if(this.equipmentList.find(obj => obj.tclassname == '自走式') !== undefined){
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '自走式').eqcode
+          this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '自走式').id
+        }else{
+          this.$message({ type: 'error', message: '请先在TMR设备中创建撒料设备', duration: 2000 })
+          return
+        }
+        console.log('temp',this.create.temp)
+      }
       console.log('this.create.temp.sumweight', this.create.temp.sumweight)
       var evt = this.create.temp
       if (parseFloat(evt.maxweight) - parseFloat(evt.sumweight) < parseFloat(item.weight)) {
@@ -1311,6 +1341,55 @@ export default {
           }
         })
       }
+    },
+    changeEquipment(item, fttype, myid) {
+      console.log('item==>',item)
+      console.log('fttype==>',fttype)
+      console.log('myid==>',myid)
+      let tclassname = this.equipmentList.find(obj => obj.id == item).tclassname
+      if(tclassname == '固定式'){
+        this.$message({ type: 'error', message: '固定式设备无法撒料，请选择撒料设备', duration: 2000 })
+        this.getCreateList2()
+        return
+      }
+      var objList = {}
+      for (let i = 0; i < this.create.list2.length; i++) {
+        this.create.list2[i].tmrname = this.equipmentList.find(obj => obj.id === item).tname
+        if (this.create.list2[i].fttype == fttype && this.create.list2[i].id == myid) {
+          objList = this.create.list2[i]
+        }
+      }
+      this.requestParam = {}
+      this.requestParam.common = {
+        'returnmap': '0'
+      }
+      this.requestParam.data = []
+      this.requestParam.data[0] = {
+        'name': 'updateLppd',
+        'type': 'e',
+        'parammaps': {
+          pastureid: this.create.temp.pastureid,
+          lppid: this.create.temp.id,
+          barid: objList.barid,
+          barname: objList.barname,
+          fpdid: objList.fpdid,
+          fttype: objList.fttype,
+          lweight: objList.weight,
+          sort: objList.sort,
+          tmrid: objList.tmrid,
+          tmrname: objList.tmrname,
+          background: objList.background,
+          id: objList.id
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('编辑保存发送参数', this.requestParam)
+        if (response.msg === 'fail') {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+        }
+      })
     },
     // 减少车次
     handleReduceTrains() {

src/views/formulationPlan/dhedFormula/index.vue

@@ -4225,7 +4225,11 @@ export default {
           obj['ptsid'] = '-1'
         }
         obj['weight'] = row['w' + i]
-        obj['supplement'] = row['bw' + i]
+        if(row['bw' + i] == ""){
+          obj['supplement'] = 0
+        }else{
+          obj['supplement'] = row['bw' + i]
+        }
         obj['tratio'] = Math.round(row['r' + i])
         obj['todaysupplement'] = row.todaysupplement
         obj['todayweight'] = row.todayweight

src/views/formulationPlan/materialIssuancePlan/index.vue

@@ -188,7 +188,7 @@
             <el-col :span="8">
               <el-form-item label="TMR编号:" prop="tmrid2">
                 <el-select v-model="create.temp.tmrid2" style="width: 100%;" placeholder="TMR编号" @change="changeTMRNumber">
-                  <el-option v-for="item in equipmentList" :key="item.id" :label="item.eqcode" :value="item.id" />
+                  <el-option v-for="item in equipmentList" :key="item.id" :label="`${item.tclassname}/${item.eqcode}`" :value="item.id" />
                 </el-select>
               </el-form-item>
             </el-col>
@@ -268,7 +268,22 @@
             <div class="spreadingMaterialList">
               <div v-for="element in create.list2" :key="element.name" class="list-group-item2 item">
                 <div class="arr-l" :style="{'background':element.tbackground}">
-                  <div class="arr-l-t" />
+                  <div class="arr-l-t">
+                    <div class="arr-l-t-t" />
+                    <el-select
+                      v-model="element.tmrid"
+                      placeholder="撒料设备"
+                      class="arr-l-t-b el-icon-arrow-down"
+                      @change="(value)=> {changeEquipment(value, element.fttype,element.id)}"
+                    >
+                      <el-option
+                        v-for="item in equipmentList"
+                        :key="item.id"
+                        :label="item.tname"
+                        :value="item.id"
+                      />
+                    </el-select>
+                  </div>
                   <div class="arr-l-b">
                     <el-tooltip placement="top" class="list-group-item1 item" style="height: 18px;line-height: 18px;">
                       <div slot="content">{{ element.barname }}</div>
@@ -586,6 +601,7 @@ export default {
           this.create.temp.tmrid = this.create.temp.tmrid2
           this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === item).eqcode
           this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
+          this.create.temp.tclassname = this.equipmentList.find(obj => obj.id === item).tclassname
           console.log('tmrname==>', this.create.temp)
           if (this.isDispaly || this.create.dialogStatus == 'update') {
             this.getClearList()
@@ -594,6 +610,7 @@ export default {
           this.create.temp.tmrid2 = this.create.temp.tmrid
           this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).eqcode
           this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).maxstirfeed
+          this.create.temp.tclassname = this.equipmentList.find(obj => obj.id === this.create.temp.tmrid2).tclassname
           console.log(this.create.temp)
           this.$message({ type: 'info', message: '已取消' })
         })
@@ -601,6 +618,7 @@ export default {
         this.create.temp.tmrid = this.create.temp.tmrid2
         this.create.temp.tmrname = this.equipmentList.find(obj => obj.id === item).eqcode
         this.create.temp.maxweight = this.equipmentList.find(obj => obj.id === item).maxstirfeed
+        this.create.temp.tclassname = this.equipmentList.find(obj => obj.id === item).tclassname
         console.log('TMR编号item==>', item)
         console.log('tmrname==>', this.create.temp)
       }
@@ -832,7 +850,22 @@ export default {
     clickBar(item) {
       console.log('点击了栏舍item==>', item)
       this.create.temp.sumweight = parseFloat(this.create.temp.sumweight)
-      console.log('this.create.temp.sumweight', this.create.temp.sumweight)
+      console.log('temp==>',this.create.temp)
+      console.log('this.equipmentList==>',this.equipmentList)
+      if(this.create.temp.tclassname == '固定式'){
+        console.log(this.equipmentList.find(obj => obj.tclassname == '撒料设备'))
+        if(this.equipmentList.find(obj => obj.tclassname == '撒料设备') !== undefined){
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '撒料设备').eqcode
+          this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '撒料设备').id
+        }else if(this.equipmentList.find(obj => obj.tclassname == '自走式') !== undefined){
+          this.create.temp.tmrname = this.equipmentList.find(obj => obj.tclassname == '自走式').eqcode
+          this.create.temp.tmrid = this.equipmentList.find(obj => obj.tclassname == '自走式').id
+        }else{
+          this.$message({ type: 'error', message: '请先在TMR设备中创建撒料设备', duration: 2000 })
+          return
+        }
+        console.log('temp',this.create.temp)
+      }
       var evt = this.create.temp
       if (parseFloat(evt.maxweight) - parseFloat(evt.sumweight) < parseFloat(item.weight)) {
         if (parseFloat(evt.sumweight) + parseFloat(item.weight) > parseFloat(evt.maxweight)) {
@@ -924,13 +957,10 @@ export default {
         postJson(url, data).then(response => {
           console.log('新增保存发送参数', this.requestParam)
           if (response.msg !== 'fail') {
-            // this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
             this.isDispaly = false
             this.dialogFull = false
             this.create.dialogFormVisible = false
             this.getList()
-          } else {
-            // this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
           }
         })
       } else {
@@ -957,6 +987,55 @@ export default {
         })
       }
     },
+    changeEquipment(item, fttype, myid) {
+      console.log('item==>',item)
+      console.log('fttype==>',fttype)
+      console.log('myid==>',myid)
+      let tclassname = this.equipmentList.find(obj => obj.id == item).tclassname
+      if(tclassname == '固定式'){
+        this.$message({ type: 'error', message: '固定式设备无法撒料，请选择撒料设备', duration: 2000 })
+        this.getCreateList2()
+        return
+      }
+      var objList = {}
+      for (let i = 0; i < this.create.list2.length; i++) {
+        this.create.list2[i].tmrname = this.equipmentList.find(obj => obj.id === item).tname
+        if (this.create.list2[i].fttype == fttype && this.create.list2[i].id == myid) {
+          objList = this.create.list2[i]
+        }
+      }
+      this.requestParam = {}
+      this.requestParam.common = {
+        'returnmap': '0'
+      }
+      this.requestParam.data = []
+      this.requestParam.data[0] = {
+        'name': 'updateLppd',
+        'type': 'e',
+        'parammaps': {
+          pastureid: this.create.temp.pastureid,
+          lppid: this.create.temp.id,
+          barid: objList.barid,
+          barname: objList.barname,
+          fpdid: objList.fpdid,
+          fttype: objList.fttype,
+          lweight: objList.weight,
+          sort: objList.sort,
+          tmrid: objList.tmrid,
+          tmrname: objList.tmrname,
+          background: objList.background,
+          id: objList.id
+        }
+      }
+      ExecDataByConfig(this.requestParam).then(response => {
+        console.log('编辑保存发送参数', this.requestParam)
+        if (response.msg === 'fail') {
+          this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
+        } else {
+          this.$notify({ title: '', message: '保存成功', type: 'success', duration: 2000 })
+        }
+      })
+    },
     // 减少车次
     handleReduceTrains() {
       if (this.selectList.length == 0) {

src/views/inventoryManagement/inventoryList/index.vue

@@ -64,11 +64,9 @@
             <span>{{ scope.row.remark }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
-            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(scope.row)" />
+            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
             <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(scope.row)" />
           </template>
@@ -96,6 +94,7 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="盘点日期:" prop="inventorydate">
+                <!-- :picker-options="create.pickerOptions2" -->
                 <el-date-picker v-model="create.createTemp.inventorydate" class="filter-item" type="date" placeholder="盘点日期" :disabled="create.dialogStatus==='see'" :picker-options="create.pickerOptions1" :clearable="false" />
               </el-form-item>
             </el-col>
@@ -136,7 +135,7 @@
           </el-table-column>
           <el-table-column label="实际重量(kg)" min-width="110px" align="center">
             <template slot-scope="scope">
-              <el-input v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" ref="input" v-model="scope.row.factweight" style="width:80%;padding:10px 0;" @blur="blurFactweight(scope.row)" />
+              <el-input v-if="create.dialogStatus==='create'" ref="input" v-model="scope.row.factweight" style="width:80%;padding:10px 0;" @blur="blurFactweight(scope.row)" />
               <span v-else> {{ scope.row.factweight }}</span>
             </template>
           </el-table-column>
@@ -149,8 +148,8 @@
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus==='see'" class="import" icon="el-icon-upload2" :disabled="isokDisable" @click="handleExport(2)">导出</el-button>
           <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
@@ -193,8 +192,7 @@ export default {
       },
       textMap: {
         create: '新增',
-        see: '查看盘点单',
-        update:'编辑'
+        see: '查看盘点单'
       },
       create: {
         pickerOptions1: {
@@ -478,6 +476,7 @@ export default {
     },
     getSeeList() {
       this.create.listLoading = true
+
       GetDataByName(this.see.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
         if (response.data.list !== null) {
@@ -512,19 +511,6 @@ export default {
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消删除' })
       })
-    },
-    handleUpdate(row){
-      console.log('点击了编辑')
-      this.dialogFull = false
-      this.create.dialogStatus = 'update'
-      this.create.dialogFormVisible = true
-      this.create.createTemp = Object.assign({}, row)
-      this.see.getdataListParm.parammaps.pastureid = row.pastureid
-      this.see.getdataListParm.parammaps.id = row.id
-      this.getSeeList()
-    },
-    updateData(){
-      console.log('点击了编辑保存')
     },
     handleInventoryList() {
       this.download.getdataListParm.name = 'getFeedstorageWeightList'

src/views/inventoryManagement/inventoryList/index备.vue → src/views/inventoryManagement/inventoryList/index改.vue

@@ -64,9 +64,11 @@
             <span>{{ scope.row.remark }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" width="100" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="scope">
-            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
+            <el-button class="miniSuccess" :disabled="isokDisable" icon="el-icon-search" @click="handleSee(scope.row)" />
+            <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-edit-outline" class="miniSuccess" @click="handleUpdate(scope.row)" />
             <span v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" class="centerSpan">|</span>
             <el-button v-if="scope.$index + (table.pageNum-1) * table.pageSize + 1 == 1 && isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(scope.row)" />
           </template>
@@ -94,7 +96,6 @@
           <el-row>
             <el-col :span="8">
               <el-form-item label="盘点日期:" prop="inventorydate">
-                <!-- :picker-options="create.pickerOptions2" -->
                 <el-date-picker v-model="create.createTemp.inventorydate" class="filter-item" type="date" placeholder="盘点日期" :disabled="create.dialogStatus==='see'" :picker-options="create.pickerOptions1" :clearable="false" />
               </el-form-item>
             </el-col>
@@ -135,7 +136,7 @@
           </el-table-column>
           <el-table-column label="实际重量(kg)" min-width="110px" align="center">
             <template slot-scope="scope">
-              <el-input v-if="create.dialogStatus==='create'" ref="input" v-model="scope.row.factweight" style="width:80%;padding:10px 0;" @blur="blurFactweight(scope.row)" />
+              <el-input v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" ref="input" v-model="scope.row.factweight" style="width:80%;padding:10px 0;" @blur="blurFactweight(scope.row)" />
               <span v-else> {{ scope.row.factweight }}</span>
             </template>
           </el-table-column>
@@ -148,8 +149,8 @@
         <div slot="footer" class="dialog-footer">
           <el-button v-if="create.dialogStatus==='see'" class="import" icon="el-icon-upload2" :disabled="isokDisable" @click="handleExport(2)">导出</el-button>
           <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+          <el-button v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" class="cancelClose" @click="create.dialogFormVisible = false; ">关闭</el-button>
+          <el-button v-if="create.dialogStatus =='create' || create.dialogStatus=='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
@@ -192,7 +193,8 @@ export default {
       },
       textMap: {
         create: '新增',
-        see: '查看盘点单'
+        see: '查看盘点单',
+        update:'编辑'
       },
       create: {
         pickerOptions1: {
@@ -476,7 +478,6 @@ export default {
     },
     getSeeList() {
       this.create.listLoading = true
-
       GetDataByName(this.see.getdataListParm).then(response => {
         console.log('table数据', response.data.list)
         if (response.data.list !== null) {
@@ -511,6 +512,19 @@ export default {
       }).catch(() => {
         this.$message({ type: 'info', message: '已取消删除' })
       })
+    },
+    handleUpdate(row){
+      console.log('点击了编辑')
+      this.dialogFull = false
+      this.create.dialogStatus = 'update'
+      this.create.dialogFormVisible = true
+      this.create.createTemp = Object.assign({}, row)
+      this.see.getdataListParm.parammaps.pastureid = row.pastureid
+      this.see.getdataListParm.parammaps.id = row.id
+      this.getSeeList()
+    },
+    updateData(){
+      console.log('点击了编辑保存')
     },
     handleInventoryList() {
       this.download.getdataListParm.name = 'getFeedstorageWeightList'

src/views/inventoryManagement/laborConsumption/index.vue

@@ -85,11 +85,9 @@
             <span>{{ scope.row.createemp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button  v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
-            <span v-if="isRoleEdit" class="centerSpan">|</span>
-            <el-button v-if="isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
+            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleSee(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -115,21 +113,21 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="操作类型：" prop="usetype">
-                <el-select v-model="create.createTemp.usetype" placeholder="操作类型" class="filter-item" style="width: 100%;"  @change="changeUsetype">
+                <el-select v-model="create.createTemp.usetype" placeholder="操作类型" class="filter-item" style="width: 100%;" :disabled="create.dialogStatus==='see'" @change="changeUsetype">
                   <el-option v-for="item in operationTypeList" :key="item.id" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="出库日期：" prop="usedate">
-                <el-date-picker v-model="create.createTemp.usedate" :picker-options="create.pickerOptions1" :clearable="false" class="filter-item" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;" type="datetime" placeholder="出库日期" />
+                <el-date-picker v-model="create.createTemp.usedate" :picker-options="create.pickerOptions1" :clearable="false" class="filter-item" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;" type="datetime" placeholder="出库日期" :disabled="create.dialogStatus==='see'" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="饲料名称：" prop="feedname">
-                <el-autocomplete v-model="create.createTemp.feedname" value-key="feedname" class="inline-input" :fetch-suggestions="feedNameSearch" placeholder="请选择饲料名称" style="width:100%" @select="handleSelectFeedName" @blur="blurFeedName">
+                <el-autocomplete v-model="create.createTemp.feedname" :disabled="create.dialogStatus==='see'" value-key="feedname" class="inline-input" :fetch-suggestions="feedNameSearch" placeholder="请选择饲料名称" style="width:100%" @select="handleSelectFeedName" @blur="blurFeedName">
                   <template slot-scope="{ item }">
                     <span>{{ item.feedname }}</span>
                   </template>
@@ -154,14 +152,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="操作重量（kg）：" prop="operateweight">
-                <el-input ref="operateweight" v-model="create.createTemp.operateweight" class="filter-item" placeholder="最多两位小数" type="text" />
+                <el-input ref="operateweight" v-model="create.createTemp.operateweight" class="filter-item" placeholder="最多两位小数" type="text" :disabled="create.dialogStatus==='see'" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item" placeholder="1-255字符" type="text" />
+                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item" placeholder="1-255字符" type="text" :disabled="create.dialogStatus==='see'" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -172,8 +170,9 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
@@ -188,8 +187,7 @@ import Pagination from '@/components/Pagination'
 import Cookies from 'js-cookie'
 import { parseTime, json2excel } from '@/utils/index.js'
 import axios from 'axios'
-import { getToken } from '@/utils/auth'
-import { MessageBox } from 'element-ui'
+import { getToken } from '@/utils/auth'
 export default {
   name: 'LaborConsumption',
   components: { Pagination },
@@ -256,7 +254,7 @@ export default {
 
       textMap: {
         create: '新增',
-        update: '编辑'
+        see: '查看'
       },
       requestParam: {},
       download: {
@@ -533,31 +531,21 @@ export default {
         }
       })
     },
-    handleUpdate(row) {
+    handleSee(row) {
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
       })
       this.dialogFull = false
-      this.create.dialogStatus = 'update'
+      this.create.dialogStatus = 'see'
       this.create.dialogFormVisible = true
       if (row.cowclassid == -1) {
         row.cowclassid = ''
         row.cowclass = ''
       }
       this.create.createTemp = Object.assign({}, row)
-    },
-    updateData(){
-      console.log('点击了编辑保存')
     },
     handleRowDelete(row) {
-      console.log('点击了行内删除')
-      MessageBox.confirm('是否确认删除此信息?', {
-        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
-      }).then(() => {
-
-      }).catch(() => {
-        this.$message({ type: 'info', message: '已取消删除' })
-      })
+      console.log('点击了行内删除')
     },
     // 导出
     handleExport(item) {

src/views/inventoryManagement/laborConsumption/index备.vue → src/views/inventoryManagement/laborConsumption/index改.vue

@@ -85,9 +85,11 @@
             <span>{{ scope.row.createemp }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="50" class-name="small-padding fixed-width" fixed="right">
+        <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-edit-outline" @click="handleSee(row)" />
+            <el-button  v-if="isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <span v-if="isRoleEdit" class="centerSpan">|</span>
+            <el-button v-if="isRoleEdit" icon="el-icon-delete" class="miniDanger" @click="handleRowDelete(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -113,21 +115,21 @@
           <el-row>
             <el-col :span="12">
               <el-form-item label="操作类型：" prop="usetype">
-                <el-select v-model="create.createTemp.usetype" placeholder="操作类型" class="filter-item" style="width: 100%;" :disabled="create.dialogStatus==='see'" @change="changeUsetype">
+                <el-select v-model="create.createTemp.usetype" placeholder="操作类型" class="filter-item" style="width: 100%;"  @change="changeUsetype">
                   <el-option v-for="item in operationTypeList" :key="item.id" :label="item.label" :value="item.value" />
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="12">
               <el-form-item label="出库日期：" prop="usedate">
-                <el-date-picker v-model="create.createTemp.usedate" :picker-options="create.pickerOptions1" :clearable="false" class="filter-item" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;" type="datetime" placeholder="出库日期" :disabled="create.dialogStatus==='see'" />
+                <el-date-picker v-model="create.createTemp.usedate" :picker-options="create.pickerOptions1" :clearable="false" class="filter-item" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%;" type="datetime" placeholder="出库日期" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="饲料名称：" prop="feedname">
-                <el-autocomplete v-model="create.createTemp.feedname" :disabled="create.dialogStatus==='see'" value-key="feedname" class="inline-input" :fetch-suggestions="feedNameSearch" placeholder="请选择饲料名称" style="width:100%" @select="handleSelectFeedName" @blur="blurFeedName">
+                <el-autocomplete v-model="create.createTemp.feedname" value-key="feedname" class="inline-input" :fetch-suggestions="feedNameSearch" placeholder="请选择饲料名称" style="width:100%" @select="handleSelectFeedName" @blur="blurFeedName">
                   <template slot-scope="{ item }">
                     <span>{{ item.feedname }}</span>
                   </template>
@@ -152,14 +154,14 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="操作重量（kg）：" prop="operateweight">
-                <el-input ref="operateweight" v-model="create.createTemp.operateweight" class="filter-item" placeholder="最多两位小数" type="text" :disabled="create.dialogStatus==='see'" />
+                <el-input ref="operateweight" v-model="create.createTemp.operateweight" class="filter-item" placeholder="最多两位小数" type="text" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
               <el-form-item label="备注：" prop="remark">
-                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item" placeholder="1-255字符" type="text" :disabled="create.dialogStatus==='see'" />
+                <el-input ref="remark" v-model="create.createTemp.remark" class="filter-item" placeholder="1-255字符" type="text" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
@@ -170,9 +172,8 @@
           </el-row>
         </el-form>
         <div slot="footer" class="dialog-footer">
-          <el-button v-if="create.dialogStatus==='see'" class="cancelClose cancelClose1" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
-          <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createData()">确认</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="cancelClose" @click="create.dialogFormVisible = false;getList();">关闭</el-button>
+          <el-button v-if="create.dialogStatus==='create' || create.dialogStatus==='update'" class="save" :disabled="isokDisable" @click="create.dialogStatus==='create'?createData():updateData()">确认</el-button>
         </div>
       </div>
     </el-dialog>
@@ -187,7 +188,8 @@ import Pagination from '@/components/Pagination'
 import Cookies from 'js-cookie'
 import { parseTime, json2excel } from '@/utils/index.js'
 import axios from 'axios'
-import { getToken } from '@/utils/auth'
+import { getToken } from '@/utils/auth'
+import { MessageBox } from 'element-ui'
 export default {
   name: 'LaborConsumption',
   components: { Pagination },
@@ -254,7 +256,7 @@ export default {
 
       textMap: {
         create: '新增',
-        see: '查看'
+        update: '编辑'
       },
       requestParam: {},
       download: {
@@ -531,21 +533,31 @@ export default {
         }
       })
     },
-    handleSee(row) {
+    handleUpdate(row) {
       this.$nextTick(() => {
         this.$refs.createTemp.resetFields()
       })
       this.dialogFull = false
-      this.create.dialogStatus = 'see'
+      this.create.dialogStatus = 'update'
       this.create.dialogFormVisible = true
       if (row.cowclassid == -1) {
         row.cowclassid = ''
         row.cowclass = ''
       }
       this.create.createTemp = Object.assign({}, row)
+    },
+    updateData(){
+      console.log('点击了编辑保存')
     },
     handleRowDelete(row) {
-      console.log('点击了行内删除')
+      console.log('点击了行内删除')
+      MessageBox.confirm('是否确认删除此信息?', {
+        confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
+      }).then(() => {
+
+      }).catch(() => {
+        this.$message({ type: 'info', message: '已取消删除' })
+      })
     },
     // 导出
     handleExport(item) {

src/views/inventoryManagement/systemConsumption/index.vue

@@ -10,9 +10,6 @@
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
-      </el-select>
-      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
-        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <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" />
@@ -60,10 +57,9 @@
             <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="是否预混料" min-width="60px" align="center">
+        <el-table-column label="是否预混料" min-width="100px" align="center">
           <template slot-scope="scope">
-            <span v-if="scope.row.premix == 0">否</span>
-            <span v-else>是</span>
+            <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
         <el-table-column label="库存重量(kg)" min-width="100px" align="center">
@@ -87,13 +83,13 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.operateweight" placeholder="最多保留两位小数" type="number" :step="0.01" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="70px" align="center">
+        <el-table-column label="备注" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="是否审核" min-width="70px" align="center">
+        <el-table-column label="是否审核" min-width="100px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.ischarge == 1">是</span>
             <span v-else>否</span>
@@ -104,7 +100,6 @@
             <el-button v-if="row.isUpdate && row.ischarge !== 1 && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <el-button v-if="row.isUpdateSave" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
-            <el-button v-if="row.ischarge == 1 && isRoleEdit" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -125,7 +120,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-      isPremixList:[{ id: '1', name: '是' }, { id: '0', name: '否' }],//是否预混料
+
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
       isAuditList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否审核
@@ -313,13 +308,6 @@ export default {
       row.isUpdate = true
       row.isUpdateSave = false
       this.getList()
-    },
-    handleRevoke(row){
-      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
-        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
-      }).then(() => {
-        console.log('点击了撤销')
-      })
     },
     handleSelectionChange(val) {
       console.log('勾选数据', val)

src/views/inventoryManagement/systemConsumption/index备.vue → src/views/inventoryManagement/systemConsumption/index改.vue

@@ -10,6 +10,9 @@
       </el-select>
       <el-select v-model="table.getdataListParm.parammaps.feedid" placeholder="饲料名称" class="filter-item" style="width: 150px;" filterable clearable>
         <el-option v-for="item in feedNameList" :key="item.id" :label="item.fname" :value="item.id" />
+      </el-select>
+      <el-select v-model="table.getdataListParm.parammaps.ischarge" placeholder="是否预混料" class="filter-item" style="width: 150px;" clearable>
+        <el-option v-for="item in isPremixList" :key="item.id" :label="item.name" :value="item.id" />
       </el-select>
       <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" />
@@ -57,9 +60,10 @@
             <span>{{ scope.row.feedname }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="是否预混料" min-width="100px" align="center">
+        <el-table-column label="是否预混料" min-width="60px" align="center">
           <template slot-scope="scope">
-            <span>{{ scope.row.feedname }}</span>
+            <span v-if="scope.row.premix == 0">否</span>
+            <span v-else>是</span>
           </template>
         </el-table-column>
         <el-table-column label="库存重量(kg)" min-width="100px" align="center">
@@ -83,13 +87,13 @@
             <el-input v-if="scope.row.Edit" v-model="scope.row.operateweight" placeholder="最多保留两位小数" type="number" :step="0.01" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="备注" min-width="100px" align="center">
+        <el-table-column label="备注" min-width="70px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.NoEdit">{{ scope.row.remark }}</span>
             <el-input v-if="scope.row.Edit" v-model="scope.row.remark" placeholder="1-32个字符" type="textarea" :autosize="{ minRows: 1.3, maxRows: 4}" maxlength="32" style="width:95%;padding:10px 0;" />
           </template>
         </el-table-column>
-        <el-table-column label="是否审核" min-width="100px" align="center">
+        <el-table-column label="是否审核" min-width="70px" align="center">
           <template slot-scope="scope">
             <span v-if="scope.row.ischarge == 1">是</span>
             <span v-else>否</span>
@@ -100,6 +104,7 @@
             <el-button v-if="row.isUpdate && row.ischarge !== 1 && isRoleEdit" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
             <el-button v-if="row.isUpdateSave" :disabled="isokDisable" class="miniSuccess" icon="el-icon-folder-checked" @click="updateData(row)" />
             <el-button v-if="row.isUpdateSave" class="minCancel" icon="el-icon-close" @click="updateCancel(row)" />
+            <el-button v-if="row.ischarge == 1 && isRoleEdit" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -120,7 +125,7 @@ export default {
   components: { Pagination },
   data() {
     return {
-
+      isPremixList:[{ id: '1', name: '是' }, { id: '0', name: '否' }],//是否预混料
       livestockTypeList: [], // 牲畜类别
       feedNameList: [{ id: 0, name: '羊草' }, { id: 1, name: '小苏打' }], // 饲料名称
       isAuditList: [{ id: '1', name: '是' }, { id: '0', name: '否' }], // 是否审核
@@ -308,6 +313,13 @@ export default {
       row.isUpdate = true
       row.isUpdateSave = false
       this.getList()
+    },
+    handleRevoke(row){
+      MessageBox.confirm('请确认是否要撤销审核结果?', '提示', {
+        confirmButtonText: '是', cancelButtonText: '否', type: 'warning'
+      }).then(() => {
+        console.log('点击了撤销')
+      })
     },
     handleSelectionChange(val) {
       console.log('勾选数据', val)

src/views/inventoryManagement/warehousing/index.vue

@@ -10,7 +10,7 @@
       <el-select v-model="table.getdataListParm.parammaps.providerid" 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-select v-model="table.getdataListParm.parammaps.islaid" placeholder="入库状态" class="filter-item" style="width: 150px;" clearable>
+      <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.name" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
@@ -101,8 +101,7 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-            <el-button v-if="row.islaid == '已入库'" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
-            <el-button v-if="row.islaid == '未入库'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="row.islaid == '否'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -338,7 +337,7 @@ export default {
       feedNameAddList: [], // 饲料名称新增
       supplierList: [], // 供应商
       contractNoList: [], // 合同编号
-      islaidList: [{ id: 0, name: '已入库' }, { id: 1, name: '未入库' }, { id: 2, name: '已撤销' }], // 是否入库
+      islaidList: [{ id: 0, name: '是' }, { id: 1, name: '否' }], // 是否入库
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getProviderListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -1016,9 +1015,6 @@ export default {
           })
         }
       })
-    },
-    handleRevoke(row){
-      console.log('点击了撤销')
     },
     handleSee(row) {
       console.log('点击了查看')

src/views/inventoryManagement/warehousing/index备份.vue → src/views/inventoryManagement/warehousing/index改.vue

@@ -10,7 +10,7 @@
       <el-select v-model="table.getdataListParm.parammaps.providerid" 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-select v-model="table.getdataListParm.parammaps.islaid" placeholder="是否入库" class="filter-item" style="width: 150px;" clearable>
+      <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.name" />
       </el-select>
       <el-button class="successBorder" @click="handleSearch">查询</el-button>
@@ -101,7 +101,8 @@
         <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
           <template slot-scope="{row}">
             <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-            <el-button v-if="row.islaid == '否'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
+            <el-button v-if="row.islaid == '已入库'" class="miniSuccess" icon="el-icon-refresh-left" @click="handleRevoke(row)" />
+            <el-button v-if="row.islaid == '未入库'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
           </template>
         </el-table-column>
       </el-table>
@@ -337,7 +338,7 @@ export default {
       feedNameAddList: [], // 饲料名称新增
       supplierList: [], // 供应商
       contractNoList: [], // 合同编号
-      islaidList: [{ id: 0, name: '是' }, { id: 1, name: '否' }], // 是否入库
+      islaidList: [{ id: 0, name: '已入库' }, { id: 1, name: '未入库' }, { id: 2, name: '已撤销' }], // 是否入库
       requestParams: [
         { name: 'getFeedListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }},
         { name: 'getProviderListEnable', offset: 0, pagecount: 0, parammaps: { pastureid: Cookies.get('pastureid') }}
@@ -1015,6 +1016,9 @@ export default {
           })
         }
       })
+    },
+    handleRevoke(row){
+      console.log('点击了撤销')
     },
     handleSee(row) {
       console.log('点击了查看')

src/views/statisticalAnalysis/formulationEvaluation/index.vue

@@ -1,247 +1,237 @@
-<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-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
+<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-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;">
-        <el-option v-for="item in searchList" :key="item.id" :label="item.name" :value="item.id" />
-      </el-select>
-      <el-select v-if="table.getdataListParm.parammaps.search == '0'" v-model="table.getdataListParm.parammaps.templetid" clearable filterable placeholder="请输入配方名称" style="width: 180px;" class="filter-item">
-        <el-option v-for="(item,index) in fenceHouseList" :key="index" :label="item.tname" :value="item.id" />
-      </el-select>
-      <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="handleSearch">查询</el-button>
-    </div>
-    <div class="search" />
-    <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="tableCellStyle"
-        class="elTable table-fixed"
-      >
-        <el-table-column sortable label="配方模板/指标" min-width="98px" align="center">
-          <template slot-scope="{row}">
-            <a @click="clickFormulaTemplateIndex(row)">{{ row.tname }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column sortable label="牛头数" prop="ccount" min-width="58px" align="center" />
-        <el-table-column label="干物质(kg)" align="center">
-          <el-table-column sortable prop="dry" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.dry) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.dry) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="产奶净能(MJ)" align="center">
-          <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nm) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nm) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="奶牛能量单位(NND)" align="center">
-          <el-table-column sortable prop="nuint" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nuint) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗蛋白(g)" align="center">
-          <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
-          <el-table-column label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cp) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cp) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="磷(g)" align="center">
-          <el-table-column sortable prop="p" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.p) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.p) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="产奶净能(MCal/DM)" align="center">
-          <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nmd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗蛋白(%DM)" align="center">
-          <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cpd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cpd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="脂肪(%DM)" align="center">
-          <el-table-column sortable prop="fat" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.fat) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.fat) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="淀粉(%DM)" align="center">
-          <el-table-column sortable prop="starch" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.starch) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.starch) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="NDF(%DM)" align="center">
-          <el-table-column sortable prop="ndf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.ndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.ndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗料中的NDF(%DM)" align="center">
-          <el-table-column sortable prop="cndf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="ADF(%DM)" align="center">
-          <el-table-column sortable prop="adf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.adf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.adf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="钙(%DM)" align="center">
-          <el-table-column sortable prop="cad" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cad) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cad) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="磷(%DM)" align="center">
-          <el-table-column sortable prop="pd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.pd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.pd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column sortable label="精粗比(%)" align="center">
-          <el-table-column sortable prop="jcrate" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.jcrate) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.jcrate) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
-    </div>
-
-    <!-- 查看 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" class="dialogMinHeight" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
+    </div>
+    <div class="search" />
+    <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="tableCellStyle"
+        class="elTable table-fixed"
+      >
+        <el-table-column sortable label="配方模板/指标" min-width="98px" align="center">
+          <template slot-scope="{row}">
+            <a @click="clickFormulaTemplateIndex(row)">{{ row.tname }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column sortable label="牛头数" prop="ccount" min-width="58px" align="center" />
+        <el-table-column label="干物质(kg)" align="center">
+          <el-table-column sortable prop="dry" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.dry) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.dry) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="产奶净能(MJ)" align="center">
+          <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nm) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nm) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="奶牛能量单位(NND)" align="center">
+          <el-table-column sortable prop="nuint" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nuint) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗蛋白(g)" align="center">
+          <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
+          <el-table-column label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cp) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cp) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="磷(g)" align="center">
+          <el-table-column sortable prop="p" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.p) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.p) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="产奶净能(MCal/DM)" align="center">
+          <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nmd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗蛋白(%DM)" align="center">
+          <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cpd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cpd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="脂肪(%DM)" align="center">
+          <el-table-column sortable prop="fat" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.fat) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.fat) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="淀粉(%DM)" align="center">
+          <el-table-column sortable prop="starch" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.starch) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.starch) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="NDF(%DM)" align="center">
+          <el-table-column sortable prop="ndf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.ndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.ndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗料中的NDF(%DM)" align="center">
+          <el-table-column sortable prop="cndf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="ADF(%DM)" align="center">
+          <el-table-column sortable prop="adf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.adf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.adf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="钙(%DM)" align="center">
+          <el-table-column sortable prop="cad" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cad) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cad) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="磷(%DM)" align="center">
+          <el-table-column sortable prop="pd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.pd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.pd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column sortable label="精粗比(%)" align="center">
+          <el-table-column sortable prop="jcrate" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.jcrate) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.jcrate) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    </div>
+
+    <!-- 查看 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" class="dialogMinHeight" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -254,158 +244,158 @@
           </div>
         </div>
       </template>
-      <div class="app-see dialogMinHeight">
-        <div class="tableSee">
-          <el-table
-            :key="see.table.tableKey"
-            v-loading="see.table.listLoading"
-            element-loading-text="给我一点时间"
-            :data="see.table.list"
-            border
-            fit
-            show-summary
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="tableCellStyle"
-            class="elTable table-fixed"
-          >
-            <el-table-column label="栏舍/指标" min-width="100px" align="center">
-              <template slot-scope="{row}">
-                <a @click="clickFormulaHurdlesIndex(row)">{{ row.barname }}</a>
-              </template>
-            </el-table-column>
-            <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
-            <el-table-column label="干物质(kg)" min-width="130px" align="center">
-              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
-              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
-              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
-              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="磷(g)" min-width="130px" align="center">
-              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
-              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
-              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
-              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="ADF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="钙(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="磷(%DM)" min-width="130px" align="center">
-              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="精粗比(%)" min-width="130px" align="center">
-              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="日粮成本(元)" min-width="130px" align="center">
-              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
-              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
-              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+      <div class="app-see dialogMinHeight">
+        <div class="tableSee">
+          <el-table
+            :key="see.table.tableKey"
+            v-loading="see.table.listLoading"
+            element-loading-text="给我一点时间"
+            :data="see.table.list"
+            border
+            fit
+            show-summary
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="tableCellStyle"
+            class="elTable table-fixed"
+          >
+            <el-table-column label="栏舍/指标" min-width="100px" align="center">
+              <template slot-scope="{row}">
+                <a @click="clickFormulaHurdlesIndex(row)">{{ row.barname }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
+            <el-table-column label="干物质(kg)" min-width="130px" align="center">
+              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
+              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
+              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
+              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="磷(g)" min-width="130px" align="center">
+              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
+              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
+              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
+              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="NDF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="ADF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="钙(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="磷(%DM)" min-width="130px" align="center">
+              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
+              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
+              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="精粗比(%)" min-width="130px" align="center">
+              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="日粮成本(元)" min-width="130px" align="center">
+              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
+              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
+              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">关闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 配方详情 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="details.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      </div>
+    </el-dialog>
+
+    <!-- 配方详情 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="details.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -418,67 +408,67 @@
           </div>
         </div>
       </template>
-      <div class="details dialogMinHeight">
-        <el-form ref="temp" :rules="details.rules" :model="details.temp" label-position="right" label-width="120px" style="width: 100%;margin-bottom:30px">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="历史记录时间:" prop="maxDate">
-                <el-date-picker v-model="details.temp.maxDate" :clearable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择历史记录时间" @change="changeMaxDate" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div class="table1">
-          <div ref="templateDialog" class="templateDialog">
-            <div class="recipeTemplateF">
-              <p>配方模板表</p>
-            </div>
-          </div>
-          <el-table
-            :key="details.table1.tableKey"
-            v-loading="details.table1.listLoading"
-            element-loading-text="给我一点时间"
-            :data="details.table1.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
+      <div class="details dialogMinHeight">
+        <el-form ref="temp" :rules="details.rules" :model="details.temp" label-position="right" label-width="120px" style="width: 100%;margin-bottom:30px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="历史记录时间:" prop="maxDate">
+                <el-date-picker v-model="details.temp.maxDate" :clearable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择历史记录时间" @change="changeMaxDate" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="table1">
+          <div ref="templateDialog" class="templateDialog">
+            <div class="recipeTemplateF">
+              <p>配方模板表</p>
+            </div>
+          </div>
+          <el-table
+            :key="details.table1.tableKey"
+            v-loading="details.table1.listLoading"
+            element-loading-text="给我一点时间"
+            :data="details.table1.list"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
+          >
+            <el-table-column label="序号" type="index" width="50" align="center" />
+            <el-table-column label="配方名称" min-width="100px" align="center" prop="tname" />
+            <el-table-column label="牲畜类别" min-width="100px" align="center" prop="ccname" />
+            <el-table-column label="配方类型" min-width="100px" align="center" prop="fttype" />
+            <el-table-column label="来源" min-width="100px" align="center" prop="source" />
+            <el-table-column label="版本号" min-width="100px" align="center" prop="version" />
+            <el-table-column label="版本时间" min-width="100px" align="center" prop="versiontime" />
+          </el-table>
+        </div>
+        <div class="table2 detailDialog">
+          <div class="recipeTemplateF">
+            <p>配方详情表</p>
+          </div>
+          <el-table
+            :key="details.table2.tableKey"
+            v-loading="details.table2.listLoading"
+            element-loading-text="给我一点时间"
+            :data="details.table2.list"
+            border
+            fit
+            show-summary
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
           >
-            <el-table-column label="序号" type="index" width="50" align="center" />
-            <el-table-column label="配方名称" min-width="100px" align="center" prop="tname" />
-            <el-table-column label="牲畜类别" min-width="100px" align="center" prop="ccname" />
-            <el-table-column label="配方类型" min-width="100px" align="center" prop="fttype" />
-            <el-table-column label="来源" min-width="100px" align="center" prop="source" />
-            <el-table-column label="版本号" min-width="100px" align="center" prop="version" />
-            <el-table-column label="版本时间" min-width="100px" align="center" prop="versiontime" />
-          </el-table>
-        </div>
-        <div class="table2 detailDialog">
-          <div class="recipeTemplateF">
-            <p>配方详情表</p>
-          </div>
-          <el-table
-            :key="details.table2.tableKey"
-            v-loading="details.table2.listLoading"
-            element-loading-text="给我一点时间"
-            :data="details.table2.list"
-            border
-            fit
-            show-summary
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-          >
-            <el-table-column label="序号" type="index" width="50" align="center" />
-            <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
-            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
-            <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
-            <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
+            <el-table-column label="序号" type="index" width="50" align="center" />
+            <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
+            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
+            <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
+            <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
             <el-table-column label="是否锁定牛头数比例" min-width="100" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.islockcount == '0'">否</span>
@@ -489,403 +479,349 @@
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
               </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { GetDataByName, postJson } from '@/api/common'
-import Cookies from 'js-cookie'
-import Pagination from '@/components/Pagination'
-import { parseTime } from '@/utils/index.js'
-export default {
-  name: 'FormulationEvaluation',
-  components: { Pagination },
-  filters: {
-    keepTreeNum(value) {
-      value = Number(value)
-      return value.toFixed(3)
-    }
-  },
-  data() {
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { GetDataByName, postJson } from '@/api/common'
+import Cookies from 'js-cookie'
+import Pagination from '@/components/Pagination'
+import { parseTime } from '@/utils/index.js'
+export default {
+  name: 'FormulationEvaluation',
+  components: { Pagination },
+  filters: {
+    keepTreeNum(value) {
+      value = Number(value)
+      return value.toFixed(3)
+    }
+  },
+  data() {
     return {
       dialogFull: false,
-      searchList: [{ id: '0', name: '按配方查询' }, { id: '1', name: '按栏舍查询' }],
-      formulaList: [],
-      fenceHouseList: [],
-      table: {
-        getdataListParm: {
-          name: 'judgenurFTReport',
-          page: 1,
-          offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            inputDatetime: [new Date(), new Date()],
-            search: '0',
-            templetid:'',
-            barid:''
-          }
-        },
-        tableKey: 1,
-        list: [],
-        total: 0,
-        listLoading: true,
-        temp: {}
-      },
-      see: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {},
-        rules: {},
-        table: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'judgenurFTReport',
-            page: 1,
-            offset: 1,
-            pagecount: 0,
-            returntype: 'Map',
-            parammaps: {
-              name: 'judgenurBarBmReport',
-              name1: 'judgenurBarHSL'
-            }
-          }
-        }
-      },
-      details: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {
-          maxDate: ''
-        },
-        rules: {},
-        table1: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'getFTListDateHis',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              id: ''
-            }
-          }
-        },
-        table2: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'getFTdetailListDate',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              ftid: '',
-              date: '',
-              version: ''
-            }
-          }
-        },
-        maxDate: {
-          getdataListParm: {
-            name: 'getFTMaxDate',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: ''
-            }
-          }
-        }
-      },
-      textMap: {
-        see: '',
-        details: '配方详情'
-      },
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-    }
-  },
-
-  created() {
-    if (this.$route.params.tname !== '' && this.$route.params.tname !== undefined && this.$route.params.startTime !== undefined && this.$route.params.stopTime !== undefined) {
-      console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
-      this.table.getdataListParm.parammaps.startTime = this.$route.params.startTime
-      this.table.getdataListParm.parammaps.stopTime = this.$route.params.stopTime
-      this.textMap.see = '栏舍详情——' + this.$route.params.tname
+      table: {
+        getdataListParm: {
+          name: 'judgenurFTReport',
+          page: 1,
+          offset: 1,
+          pagecount: parseInt(Cookies.get('pageCount')),
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            inputDatetime: [new Date(), new Date()]
+          }
+        },
+        tableKey: 1,
+        list: [],
+        total: 0,
+        listLoading: true,
+        temp: {}
+      },
+      see: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {},
+        rules: {},
+        table: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'judgenurFTReport',
+            page: 1,
+            offset: 1,
+            pagecount: 0,
+            returntype: 'Map',
+            parammaps: {
+              name: 'judgenurBarBmReport',
+              name1: 'judgenurBarHSL'
+            }
+          }
+        }
+      },
+      details: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {
+          maxDate: ''
+        },
+        rules: {},
+        table1: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'getFTListDateHis',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: '',
+              id: ''
+            }
+          }
+        },
+        table2: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'getFTdetailListDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: '',
+              ftid: '',
+              date: '',
+              version: ''
+            }
+          }
+        },
+        maxDate: {
+          getdataListParm: {
+            name: 'getFTMaxDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: ''
+            }
+          }
+        }
+      },
+      textMap: {
+        see: '',
+        details: '配方详情'
+      },
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+
+  created() {
+    if (this.$route.params.tname !== '' && this.$route.params.tname !== undefined && this.$route.params.startTime !== undefined && this.$route.params.stopTime !== undefined) {
+      console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
+      this.table.getdataListParm.parammaps.startTime = this.$route.params.startTime
+      this.table.getdataListParm.parammaps.stopTime = this.$route.params.stopTime
+      this.textMap.see = '栏舍详情——' + this.$route.params.tname
       setTimeout(() => {
-        this.dialogFull = false
-        this.see.dialogStatus = 'see'
-        this.see.dialogFormVisible = true
-      }, 500)
-      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = this.$route.params.pastureid
-      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
-      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
-    }
+        this.dialogFull = false
+        this.see.dialogStatus = 'see'
+        this.see.dialogFormVisible = true
+      }, 500)
+      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
+      this.see.table.getdataListParm.parammaps.pastureid = this.$route.params.pastureid
+      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
+      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
+      this.getListSee()
+    }
     this.getList()
-    this.getformulaList()
-    this.getfenceHouseList()
-  },
-
+  },
+
   methods: {
-    getformulaList(){
-      const url = 'authdata/GetDataByName'
-      const data = {}
-      data.name = 'getBarListEnable'
-      data.parammaps = {}
-      data.parammaps.pastureid = Cookies.get('pastureid')
-      postJson(url, data).then(response => {
-        if(response.data.list !== null){
-          this.formulaList = response.data.list
-        }else{
-          this.formulaList = []
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
         }
+        console.log(this.$route.params.tname)
+        // this.see.dialogFormVisible = false
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
       })
     },
-    getfenceHouseList(){
-      const url = 'authdata/GetDataByName'
-      const data = {}
-      data.name = 'getFeedTempletName'
-      postJson(url, data).then(response => {
-        if(response.data.list !== null){
-          this.fenceHouseList = response.data.list
-        }else{
-          this.fenceHouseList = []
-        }
-      })
-    },
-    getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
-        } else {
-          this.table.list = []
-          this.table.pageNum = 0
-          this.table.pageSize = 0
-          this.table.total = 0
-        }
-        setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
-      })
+    changeDate() {
+      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}')
+        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+        this.getList()
+      }
+    },
+    handleBefore() {
+      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
+      }
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getList()
     },
-    handleSearch() {
-      if(this.table.getdataListParm.parammaps.search == '0'){
-        this.table.getdataListParm.parammaps.barid = ''
-      }else{
-        this.table.getdataListParm.parammaps.templetid = ''
-        console.log(this.table.getdataListParm.parammaps.barid)
+    handleNext() {
+      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
+        this.$forceUpdate()
       }
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
       this.getList()
-    },
-    changeDate() {
-      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}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-        this.getList()
-      }
-    },
-    handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
-      }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
-    },
-    handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
-      }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
-    },
-    tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        return {
-          textDecoration: 'underline'
-        }
-      }
-      return {
-        textDecoration: 'none'
-      }
-    },
-    clickFormulaTemplateIndex(row) {
+    },
+    tableCellStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        return {
+          textDecoration: 'underline'
+        }
+      }
+      return {
+        textDecoration: 'none'
+      }
+    },
+    clickFormulaTemplateIndex(row) {
       console.log('点击了配方模板/指标')
-      this.dialogFull = false
-      this.details.dialogStatus = 'details'
-      this.details.dialogFormVisible = true
-      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid
-      this.details.table1.getdataListParm.parammaps.id = row.ftid
-
-      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid
-      this.getMaxDate()
-    },
-
-    getMaxDate() {
-      GetDataByName(this.details.maxDate.getdataListParm).then(response => {
-        if (response.data.list !== null) {
-          this.details.temp.maxDate = response.data.list[0].maxdate
-        } else {
-          this.details.temp.maxDate = ''
-        }
-        this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
-        this.details.table2.getdataListParm.parammaps.date = this.details.temp.maxDate
-
-        this.getListDetails1()
-      })
-    },
-    changeMaxDate(item) {
-      this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
-      this.getListDetails1()
-    },
-    getListDetails1() {
-      this.details.table1.listLoading = true
-      GetDataByName(this.details.table1.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.details.table1.list = response.data.list
-          this.details.table1.pageNum = response.data.pageNum
-          this.details.table1.pageSize = response.data.pageSize
-          this.details.table1.total = response.data.total
-
-          this.details.table2.getdataListParm.parammaps.pastureid = this.details.table1.list[0].pastureid
-          this.details.table2.getdataListParm.parammaps.ftid = this.details.table1.list[0].id
-          this.details.table2.getdataListParm.parammaps.version = this.details.table1.list[0].version
-          this.getListDetails2()
-        } else {
-          this.details.table1.list = []
+      this.dialogFull = false
+      this.details.dialogStatus = 'details'
+      this.details.dialogFormVisible = true
+      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid
+      this.details.table1.getdataListParm.parammaps.id = row.ftid
+
+      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid
+      this.getMaxDate()
+    },
+
+    getMaxDate() {
+      GetDataByName(this.details.maxDate.getdataListParm).then(response => {
+        if (response.data.list !== null) {
+          this.details.temp.maxDate = response.data.list[0].maxdate
+        } else {
+          this.details.temp.maxDate = ''
+        }
+        this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
+        this.details.table2.getdataListParm.parammaps.date = this.details.temp.maxDate
+
+        this.getListDetails1()
+      })
+    },
+    changeMaxDate(item) {
+      this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
+      this.getListDetails1()
+    },
+    getListDetails1() {
+      this.details.table1.listLoading = true
+      GetDataByName(this.details.table1.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.details.table1.list = response.data.list
+          this.details.table1.pageNum = response.data.pageNum
+          this.details.table1.pageSize = response.data.pageSize
+          this.details.table1.total = response.data.total
+
+          this.details.table2.getdataListParm.parammaps.pastureid = this.details.table1.list[0].pastureid
+          this.details.table2.getdataListParm.parammaps.ftid = this.details.table1.list[0].id
+          this.details.table2.getdataListParm.parammaps.version = this.details.table1.list[0].version
+          this.getListDetails2()
+        } else {
+          this.details.table1.list = []
           this.details.table2.list = []
-          this.details.table1.pageNum = 0
-          this.details.table1.pageSize = 0
-          this.details.table1.total = 0
-        }
-        setTimeout(() => {
-          this.details.table1.listLoading = false
-        }, 100)
-      })
-    },
-    getListDetails2() {
-      this.details.table2.listLoading = true
-      GetDataByName(this.details.table2.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.details.table2.list = response.data.list
-          this.details.table2.pageNum = response.data.pageNum
-          this.details.table2.pageSize = response.data.pageSize
-          this.details.table2.total = response.data.total
-        } else {
+        }
+        setTimeout(() => {
+          this.details.table1.listLoading = false
+        }, 100)
+      })
+    },
+    getListDetails2() {
+      this.details.table2.listLoading = true
+      GetDataByName(this.details.table2.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.details.table2.list = response.data.list
+          this.details.table2.pageNum = response.data.pageNum
+          this.details.table2.pageSize = response.data.pageSize
+          this.details.table2.total = response.data.total
+        } else {
           this.details.table2.list = []
-          this.details.table2.pageNum = 0
-          this.details.table2.pageSize = 0
-          this.details.table2.total = 0
-        }
-        setTimeout(() => {
-          this.details.table2.listLoading = false
-        }, 100)
-      })
-    },
-    clickFormulaHurdlesIndex(row) {
-      console.log('点击了栏舍/指标')
-      this.$router.push('/formulationPlan/DhedFormula')
-    },
-    handleSee(row) {
+        }
+        setTimeout(() => {
+          this.details.table2.listLoading = false
+        }, 100)
+      })
+    },
+    clickFormulaHurdlesIndex(row) {
+      console.log('点击了栏舍/指标')
+      this.$router.push('/formulationPlan/DhedFormula')
+    },
+    handleSee(row) {
       console.log('查看', row)
-      this.dialogFull = false
-      this.textMap.see = '栏舍详情——' + row.tname
-      this.see.dialogStatus = 'see'
-      this.see.dialogFormVisible = true
-      this.see.table.getdataListParm.parammaps.ftid = row.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
-      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
-      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
-    },
-    getListSee() {
+      this.dialogFull = false
+      this.textMap.see = '栏舍详情——' + row.tname
+      this.see.dialogStatus = 'see'
+      this.see.dialogFormVisible = true
+      this.see.table.getdataListParm.parammaps.ftid = row.ftid
+      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
+      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
+      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
+      this.getListSee()
+    },
+    getListSee() {
       this.see.table.listLoading = true
       const url = 'authdata/GETNurJudgeRport'
       const data = this.see.table.getdataListParm
-      postJson(url, data).then(response => {
-        if (response.data !== null) {
-          console.log('table数据', response.data)
-          this.see.table.list = response.data
-          this.see.table.pageNum = response.data.pageNum
-          this.see.table.pageSize = response.data.pageSize
-          this.see.table.total = response.data.total
-        } else {
+      postJson(url, data).then(response => {
+        if (response.data !== null) {
+          console.log('table数据', response.data)
+          this.see.table.list = response.data
+          this.see.table.pageNum = response.data.pageNum
+          this.see.table.pageSize = response.data.pageSize
+          this.see.table.total = response.data.total
+        } else {
           this.see.table.list = []
-          this.see.table.pageNum = 0
-          this.see.table.pageSize = 0
-          this.see.table.total = 0
-        }
-        setTimeout(() => {
-          this.see.table.listLoading = false
-        }, 100)
-      })
-    }
-
-  }
-}
-</script>
-<style lang="scss" scoped>
-  .search {clear: both; }
-  .table { margin-top: 10px; }
-  .table2{margin-top: 20px;}
-  .templateDialog{
-     background: #fff;
-     position: relative;
-   }
-  .detailDialog{
-     background: #fff;
-     position: relative;
-   }
-</style>
-<style>
-  .tableSee .el-table { overflow-x: auto; }
-  .tableSee .el-table__header-wrapper,
-  .tableSee .el-table__body-wrapper,
-  .tableSee .el-table__footer-wrapper { overflow: visible; }
-  .tableSee .el-table::after { position: relative; }
-  .tableSee .el-table--scrollable-x .el-table__body-wrapper { overflow: visible; }
-
-</style>
+        }
+        setTimeout(() => {
+          this.see.table.listLoading = false
+        }, 100)
+      })
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .search {clear: both; }
+  .table { margin-top: 10px; }
+  .table2{margin-top: 20px;}
+  .templateDialog{
+     background: #fff;
+     position: relative;
+   }
+  .detailDialog{
+     background: #fff;
+     position: relative;
+   }
+</style>
+<style>
+  .tableSee .el-table { overflow-x: auto; }
+  .tableSee .el-table__header-wrapper,
+  .tableSee .el-table__body-wrapper,
+  .tableSee .el-table__footer-wrapper { overflow: visible; }
+  .tableSee .el-table::after { position: relative; }
+  .tableSee .el-table--scrollable-x .el-table__body-wrapper { overflow: visible; }
+</style>

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

@@ -1,237 +1,247 @@
-<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-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
+<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-button class="el-icon-arrow-left elIconArrowLeft" @click="handleBefore" />
       <el-button class="el-icon-arrow-right elIconArrowRight" @click="handleNext" />
-    </div>
-    <div class="search" />
-    <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="tableCellStyle"
-        class="elTable table-fixed"
-      >
-        <el-table-column sortable label="配方模板/指标" min-width="98px" align="center">
-          <template slot-scope="{row}">
-            <a @click="clickFormulaTemplateIndex(row)">{{ row.tname }}</a>
-          </template>
-        </el-table-column>
-        <el-table-column sortable label="牛头数" prop="ccount" min-width="58px" align="center" />
-        <el-table-column label="干物质(kg)" align="center">
-          <el-table-column sortable prop="dry" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.dry) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.dry) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="产奶净能(MJ)" align="center">
-          <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nm) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nm) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="奶牛能量单位(NND)" align="center">
-          <el-table-column sortable prop="nuint" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nuint) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗蛋白(g)" align="center">
-          <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
-          <el-table-column label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cp) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cp) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="磷(g)" align="center">
-          <el-table-column sortable prop="p" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.p) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.p) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="产奶净能(MCal/DM)" align="center">
-          <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.nmd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗蛋白(%DM)" align="center">
-          <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cpd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cpd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="脂肪(%DM)" align="center">
-          <el-table-column sortable prop="fat" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.fat) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.fat) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="淀粉(%DM)" align="center">
-          <el-table-column sortable prop="starch" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.starch) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.starch) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="NDF(%DM)" align="center">
-          <el-table-column sortable prop="ndf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.ndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.ndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="粗料中的NDF(%DM)" align="center">
-          <el-table-column sortable prop="cndf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cndf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="ADF(%DM)" align="center">
-          <el-table-column sortable prop="adf" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.adf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.adf) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="钙(%DM)" align="center">
-          <el-table-column sortable prop="cad" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.cad) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.cad) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="磷(%DM)" align="center">
-          <el-table-column sortable prop="pd" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.pd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.pd) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column sortable label="精粗比(%)" align="center">
-          <el-table-column sortable prop="jcrate" label="配方量" min-width="58" align="center" />
-          <el-table-column sortable label="TMR料" min-width="65" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Hrate * scope.row.jcrate) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column sortable label="采食量" min-width="58" align="center">
-            <template slot-scope="scope">
-              <span>{{ (scope.row.Srate * scope.row.jcrate) | keepTreeNum }}</span>
-            </template>
-          </el-table-column>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
-          <template slot-scope="{row}">
-            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
-          </template>
-        </el-table-column>
-      </el-table>
-      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
-    </div>
-
-    <!-- 查看 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" class="dialogMinHeight" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      <el-select v-model="table.getdataListParm.parammaps.search" placeholder="查询" class="filter-item" style="width: 120px;margin-right: 10px;">
+        <el-option v-for="item in searchList" :key="item.id" :label="item.name" :value="item.id" />
+      </el-select>
+      <el-select v-if="table.getdataListParm.parammaps.search == '0'" v-model="table.getdataListParm.parammaps.templetid" clearable filterable placeholder="请输入配方名称" style="width: 180px;" class="filter-item">
+        <el-option v-for="(item,index) in fenceHouseList" :key="index" :label="item.tname" :value="item.id" />
+      </el-select>
+      <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="handleSearch">查询</el-button>
+    </div>
+    <div class="search" />
+    <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="tableCellStyle"
+        class="elTable table-fixed"
+      >
+        <el-table-column sortable label="配方模板/指标" min-width="98px" align="center">
+          <template slot-scope="{row}">
+            <a @click="clickFormulaTemplateIndex(row)">{{ row.tname }}</a>
+          </template>
+        </el-table-column>
+        <el-table-column sortable label="牛头数" prop="ccount" min-width="58px" align="center" />
+        <el-table-column label="干物质(kg)" align="center">
+          <el-table-column sortable prop="dry" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.dry) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.dry) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="产奶净能(MJ)" align="center">
+          <el-table-column sortable prop="nm" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nm) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nm) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="奶牛能量单位(NND)" align="center">
+          <el-table-column sortable prop="nuint" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nuint) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nuint) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗蛋白(g)" align="center">
+          <el-table-column prop="cp" label="配方量" min-width="58" align="center" />
+          <el-table-column label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cp) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cp) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="磷(g)" align="center">
+          <el-table-column sortable prop="p" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.p) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.p) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="产奶净能(MCal/DM)" align="center">
+          <el-table-column sortable prop="nmd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.nmd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.nmd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗蛋白(%DM)" align="center">
+          <el-table-column sortable prop="cpd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cpd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cpd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="脂肪(%DM)" align="center">
+          <el-table-column sortable prop="fat" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.fat) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.fat) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="淀粉(%DM)" align="center">
+          <el-table-column sortable prop="starch" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.starch) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.starch) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="NDF(%DM)" align="center">
+          <el-table-column sortable prop="ndf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.ndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.ndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="粗料中的NDF(%DM)" align="center">
+          <el-table-column sortable prop="cndf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cndf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="ADF(%DM)" align="center">
+          <el-table-column sortable prop="adf" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.adf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.adf) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="钙(%DM)" align="center">
+          <el-table-column sortable prop="cad" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.cad) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.cad) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="磷(%DM)" align="center">
+          <el-table-column sortable prop="pd" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.pd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.pd) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column sortable label="精粗比(%)" align="center">
+          <el-table-column sortable prop="jcrate" label="配方量" min-width="58" align="center" />
+          <el-table-column sortable label="TMR料" min-width="65" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Hrate * scope.row.jcrate) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column sortable label="采食量" min-width="58" align="center">
+            <template slot-scope="scope">
+              <span>{{ (scope.row.Srate * scope.row.jcrate) | keepTreeNum }}</span>
+            </template>
+          </el-table-column>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="70" class-name="small-padding fixed-width" fixed="right">
+          <template slot-scope="{row}">
+            <el-button class="miniSuccess" icon="el-icon-search" @click="handleSee(row)" />
+          </template>
+        </el-table-column>
+      </el-table>
+      <pagination v-show="table.total>0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
+    </div>
+
+    <!-- 查看 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" class="dialogMinHeight" :visible.sync="see.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -244,158 +254,158 @@
           </div>
         </div>
       </template>
-      <div class="app-see dialogMinHeight">
-        <div class="tableSee">
-          <el-table
-            :key="see.table.tableKey"
-            v-loading="see.table.listLoading"
-            element-loading-text="给我一点时间"
-            :data="see.table.list"
-            border
-            fit
-            show-summary
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="tableCellStyle"
-            class="elTable table-fixed"
-          >
-            <el-table-column label="栏舍/指标" min-width="100px" align="center">
-              <template slot-scope="{row}">
-                <a @click="clickFormulaHurdlesIndex(row)">{{ row.barname }}</a>
-              </template>
-            </el-table-column>
-            <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
-            <el-table-column label="干物质(kg)" min-width="130px" align="center">
-              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
-              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
-              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
-              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="磷(g)" min-width="130px" align="center">
-              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
-              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
-              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
-              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="ADF(%DM)" min-width="130px" align="center">
-              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="钙(%DM)" min-width="130px" align="center">
-              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="磷(%DM)" min-width="130px" align="center">
-              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
-              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="精粗比(%)" min-width="130px" align="center">
-              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="日粮成本(元)" min-width="130px" align="center">
-              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
-              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
-              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
-              <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
-              <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
-              <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+      <div class="app-see dialogMinHeight">
+        <div class="tableSee">
+          <el-table
+            :key="see.table.tableKey"
+            v-loading="see.table.listLoading"
+            element-loading-text="给我一点时间"
+            :data="see.table.list"
+            border
+            fit
+            show-summary
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="tableCellStyle"
+            class="elTable table-fixed"
+          >
+            <el-table-column label="栏舍/指标" min-width="100px" align="center">
+              <template slot-scope="{row}">
+                <a @click="clickFormulaHurdlesIndex(row)">{{ row.barname }}</a>
+              </template>
+            </el-table-column>
+            <el-table-column label="牛头数" min-width="100px" align="center" prop="ccount" />
+            <el-table-column label="干物质(kg)" min-width="130px" align="center">
+              <el-table-column prop="dry-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="dry-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="dry-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="dry-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="产奶净能(M)" min-width="130px" align="center">
+              <el-table-column prop="nm-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nm-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nm-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nm-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="奶牛能量单位(NND)" min-width="130px" align="center">
+              <el-table-column prop="nuint-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nuint-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nuint-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nuint-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗蛋白(g)" min-width="130px" align="center">
+              <el-table-column prop="cp-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cp-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cp-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cp-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="磷(g)" min-width="130px" align="center">
+              <el-table-column prop="p-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="p-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="p-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="p-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="产奶净能(MCal/DM)" min-width="130px" align="center">
+              <el-table-column prop="nmd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="nmd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="nmd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="nmd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗蛋白(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cpd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cpd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cpd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cpd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="脂肪(%DM)" min-width="130px" align="center">
+              <el-table-column prop="fat-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="fat-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="fat-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="fat-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="淀粉(%DM)" min-width="130px" align="center">
+              <el-table-column prop="starch-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="starch-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="starch-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="starch-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="NDF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="ndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="ndf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="ndf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="ndf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="粗料中的NDF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cndf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cndf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cndf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cndf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="ADF(%DM)" min-width="130px" align="center">
+              <el-table-column prop="adf-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="adf-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="adf-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="adf-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="钙(%DM)" min-width="130px" align="center">
+              <el-table-column prop="cad-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="cad-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="cad-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="cad-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="磷(%DM)" min-width="130px" align="center">
+              <el-table-column prop="pd-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="pd-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="pd-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="pd-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="(4.0)饲料转化效率(kg/DM)" min-width="130px" align="center">
+              <el-table-column prop="trans4f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans4f-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="trans4f-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="trans4f-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="(3.5)饲料转化效率(kg/DM)" min-width="130px" align="center">
+              <el-table-column prop="trans35f-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="trans35f-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="trans35f-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="trans35f-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="精粗比(%)" min-width="130px" align="center">
+              <el-table-column prop="jcrate-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="jcrate-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="jcrate-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="jcrate-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="日粮成本(元)" min-width="130px" align="center">
+              <el-table-column prop="uprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="uprice-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="uprice-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="uprice-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="干物质成本(元/公斤)" min-width="130px" align="center">
+              <el-table-column prop="upriced-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="upriced-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="upriced-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="upriced-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+            <el-table-column label="日公斤奶成本(元)" min-width="130px" align="center">
+              <el-table-column prop="kprice-nur" label="奶牛需要" min-width="70" align="center" />
+              <el-table-column prop="kprice-FT" label="配方量" min-width="58" align="center" />
+              <el-table-column prop="kprice-H" label="TMR料" min-width="65" align="center" />
+              <el-table-column prop="kprice-S" label="采食量" min-width="58" align="center" />
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
         <el-button class="cancelClose" style="right: 20px" @click="see.dialogFormVisible = false;$route.params.tname = '' ">关闭</el-button>
-      </div>
-    </el-dialog>
-
-    <!-- 配方详情 -->
-    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="details.dialogFormVisible" :close-on-click-modal="false" width="90%">
+      </div>
+    </el-dialog>
+
+    <!-- 配方详情 -->
+    <el-dialog :fullscreen="dialogFull" :destroy-on-close="true" :visible.sync="details.dialogFormVisible" :close-on-click-modal="false" width="90%">
       <template slot="title">
         <div class="avue-crud__dialog__header">
           <span class="el-dialog__title">
@@ -408,67 +418,67 @@
           </div>
         </div>
       </template>
-      <div class="details dialogMinHeight">
-        <el-form ref="temp" :rules="details.rules" :model="details.temp" label-position="right" label-width="120px" style="width: 100%;margin-bottom:30px">
-          <el-row>
-            <el-col :span="8">
-              <el-form-item label="历史记录时间:" prop="maxDate">
-                <el-date-picker v-model="details.temp.maxDate" :clearable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择历史记录时间" @change="changeMaxDate" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
-        <div class="table1">
-          <div ref="templateDialog" class="templateDialog">
-            <div class="recipeTemplateF">
-              <p>配方模板表</p>
-            </div>
-          </div>
-          <el-table
-            :key="details.table1.tableKey"
-            v-loading="details.table1.listLoading"
-            element-loading-text="给我一点时间"
-            :data="details.table1.list"
-            border
-            fit
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
-          >
-            <el-table-column label="序号" type="index" width="50" align="center" />
-            <el-table-column label="配方名称" min-width="100px" align="center" prop="tname" />
-            <el-table-column label="牲畜类别" min-width="100px" align="center" prop="ccname" />
-            <el-table-column label="配方类型" min-width="100px" align="center" prop="fttype" />
-            <el-table-column label="来源" min-width="100px" align="center" prop="source" />
-            <el-table-column label="版本号" min-width="100px" align="center" prop="version" />
-            <el-table-column label="版本时间" min-width="100px" align="center" prop="versiontime" />
-          </el-table>
-        </div>
-        <div class="table2 detailDialog">
-          <div class="recipeTemplateF">
-            <p>配方详情表</p>
-          </div>
-          <el-table
-            :key="details.table2.tableKey"
-            v-loading="details.table2.listLoading"
-            element-loading-text="给我一点时间"
-            :data="details.table2.list"
-            border
-            fit
-            show-summary
-            highlight-current-row
-            style="width: 100%;"
-            :row-style="rowStyle"
-            :cell-style="cellStyle"
-            class="elTable table-fixed"
+      <div class="details dialogMinHeight">
+        <el-form ref="temp" :rules="details.rules" :model="details.temp" label-position="right" label-width="120px" style="width: 100%;margin-bottom:30px">
+          <el-row>
+            <el-col :span="8">
+              <el-form-item label="历史记录时间:" prop="maxDate">
+                <el-date-picker v-model="details.temp.maxDate" :clearable="false" format="yyyy-MM-dd" value-format="yyyy-MM-dd" type="date" placeholder="请选择历史记录时间" @change="changeMaxDate" />
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+        <div class="table1">
+          <div ref="templateDialog" class="templateDialog">
+            <div class="recipeTemplateF">
+              <p>配方模板表</p>
+            </div>
+          </div>
+          <el-table
+            :key="details.table1.tableKey"
+            v-loading="details.table1.listLoading"
+            element-loading-text="给我一点时间"
+            :data="details.table1.list"
+            border
+            fit
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
           >
-            <el-table-column label="序号" type="index" width="50" align="center" />
-            <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
-            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
-            <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
-            <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
+            <el-table-column label="序号" type="index" width="50" align="center" />
+            <el-table-column label="配方名称" min-width="100px" align="center" prop="tname" />
+            <el-table-column label="牲畜类别" min-width="100px" align="center" prop="ccname" />
+            <el-table-column label="配方类型" min-width="100px" align="center" prop="fttype" />
+            <el-table-column label="来源" min-width="100px" align="center" prop="source" />
+            <el-table-column label="版本号" min-width="100px" align="center" prop="version" />
+            <el-table-column label="版本时间" min-width="100px" align="center" prop="versiontime" />
+          </el-table>
+        </div>
+        <div class="table2 detailDialog">
+          <div class="recipeTemplateF">
+            <p>配方详情表</p>
+          </div>
+          <el-table
+            :key="details.table2.tableKey"
+            v-loading="details.table2.listLoading"
+            element-loading-text="给我一点时间"
+            :data="details.table2.list"
+            border
+            fit
+            show-summary
+            highlight-current-row
+            style="width: 100%;"
+            :row-style="rowStyle"
+            :cell-style="cellStyle"
+            class="elTable table-fixed"
+          >
+            <el-table-column label="序号" type="index" width="50" align="center" />
+            <el-table-column label="饲料组" min-width="100px" align="center" prop="feedgroup" />
+            <el-table-column label="饲料名称" min-width="100px" align="center" prop="fname" />
+            <el-table-column label="重量(KG)" min-width="100px" align="center" prop="fweight" />
+            <el-table-column label="搅拌延时(min)" min-width="100px" align="center" prop="autosecond" />
             <el-table-column label="是否锁定牛头数比例" min-width="100" align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.islockcount == '0'">否</span>
@@ -479,349 +489,403 @@
               <template slot-scope="scope">
                 <span>{{ scope.row.sort }}</span>
               </template>
-            </el-table-column>
-          </el-table>
-        </div>
-      </div>
-      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
-        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { GetDataByName, postJson } from '@/api/common'
-import Cookies from 'js-cookie'
-import Pagination from '@/components/Pagination'
-import { parseTime } from '@/utils/index.js'
-export default {
-  name: 'FormulationEvaluation',
-  components: { Pagination },
-  filters: {
-    keepTreeNum(value) {
-      value = Number(value)
-      return value.toFixed(3)
-    }
-  },
-  data() {
+            </el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div slot="footer" class="dialog-footer" style="bottom: 10px;">
+        <el-button class="cancelClose" style="right: 20px" @click="details.dialogFormVisible = false;">关闭</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { GetDataByName, postJson } from '@/api/common'
+import Cookies from 'js-cookie'
+import Pagination from '@/components/Pagination'
+import { parseTime } from '@/utils/index.js'
+export default {
+  name: 'FormulationEvaluation',
+  components: { Pagination },
+  filters: {
+    keepTreeNum(value) {
+      value = Number(value)
+      return value.toFixed(3)
+    }
+  },
+  data() {
     return {
       dialogFull: false,
-      table: {
-        getdataListParm: {
-          name: 'judgenurFTReport',
-          page: 1,
-          offset: 1,
-          pagecount: parseInt(Cookies.get('pageCount')),
-          returntype: 'Map',
-          parammaps: {
-            pastureid: Cookies.get('pastureid'),
-            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
-            inputDatetime: [new Date(), new Date()]
-          }
-        },
-        tableKey: 1,
-        list: [],
-        total: 0,
-        listLoading: true,
-        temp: {}
-      },
-      see: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {},
-        rules: {},
-        table: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'judgenurFTReport',
-            page: 1,
-            offset: 1,
-            pagecount: 0,
-            returntype: 'Map',
-            parammaps: {
-              name: 'judgenurBarBmReport',
-              name1: 'judgenurBarHSL'
-            }
-          }
-        }
-      },
-      details: {
-        dialogFormVisible: false,
-        dialogStatus: '',
-        temp: {
-          maxDate: ''
-        },
-        rules: {},
-        table1: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'getFTListDateHis',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              id: ''
-            }
-          }
-        },
-        table2: {
-          tableKey: 0,
-          list: [],
-          total: 0,
-          listLoading: true,
-          getdataListParm: {
-            name: 'getFTdetailListDate',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: '',
-              ftid: '',
-              date: '',
-              version: ''
-            }
-          }
-        },
-        maxDate: {
-          getdataListParm: {
-            name: 'getFTMaxDate',
-            page: 1,
-            offset: 1,
-            pagecount: 10,
-            returntype: 'Map',
-            parammaps: {
-              pastureid: ''
-            }
-          }
-        }
-      },
-      textMap: {
-        see: '',
-        details: '配方详情'
-      },
-      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
-      cellStyle: { padding: 0 + 'px' }
-    }
-  },
-
-  created() {
-    if (this.$route.params.tname !== '' && this.$route.params.tname !== undefined && this.$route.params.startTime !== undefined && this.$route.params.stopTime !== undefined) {
-      console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
-      this.table.getdataListParm.parammaps.startTime = this.$route.params.startTime
-      this.table.getdataListParm.parammaps.stopTime = this.$route.params.stopTime
-      this.textMap.see = '栏舍详情——' + this.$route.params.tname
+      searchList: [{ id: '0', name: '按配方查询' }, { id: '1', name: '按栏舍查询' }],
+      formulaList: [],
+      fenceHouseList: [],
+      table: {
+        getdataListParm: {
+          name: 'judgenurFTReport',
+          page: 1,
+          offset: 1,
+          pagecount: parseInt(Cookies.get('pageCount')),
+          returntype: 'Map',
+          parammaps: {
+            pastureid: Cookies.get('pastureid'),
+            startTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            stopTime: parseTime(new Date(), '{y}-{m}-{d}'),
+            inputDatetime: [new Date(), new Date()],
+            search: '0',
+            templetid:'',
+            barid:''
+          }
+        },
+        tableKey: 1,
+        list: [],
+        total: 0,
+        listLoading: true,
+        temp: {}
+      },
+      see: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {},
+        rules: {},
+        table: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'judgenurFTReport',
+            page: 1,
+            offset: 1,
+            pagecount: 0,
+            returntype: 'Map',
+            parammaps: {
+              name: 'judgenurBarBmReport',
+              name1: 'judgenurBarHSL'
+            }
+          }
+        }
+      },
+      details: {
+        dialogFormVisible: false,
+        dialogStatus: '',
+        temp: {
+          maxDate: ''
+        },
+        rules: {},
+        table1: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'getFTListDateHis',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: '',
+              id: ''
+            }
+          }
+        },
+        table2: {
+          tableKey: 0,
+          list: [],
+          total: 0,
+          listLoading: true,
+          getdataListParm: {
+            name: 'getFTdetailListDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: '',
+              ftid: '',
+              date: '',
+              version: ''
+            }
+          }
+        },
+        maxDate: {
+          getdataListParm: {
+            name: 'getFTMaxDate',
+            page: 1,
+            offset: 1,
+            pagecount: 10,
+            returntype: 'Map',
+            parammaps: {
+              pastureid: ''
+            }
+          }
+        }
+      },
+      textMap: {
+        see: '',
+        details: '配方详情'
+      },
+      rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
+      cellStyle: { padding: 0 + 'px' }
+    }
+  },
+
+  created() {
+    if (this.$route.params.tname !== '' && this.$route.params.tname !== undefined && this.$route.params.startTime !== undefined && this.$route.params.stopTime !== undefined) {
+      console.log(this.table.getdataListParm.parammaps.inputDatetime, 'this.table.getdataListParm.parammaps.inputDatetime')
+      this.table.getdataListParm.parammaps.startTime = this.$route.params.startTime
+      this.table.getdataListParm.parammaps.stopTime = this.$route.params.stopTime
+      this.textMap.see = '栏舍详情——' + this.$route.params.tname
       setTimeout(() => {
-        this.dialogFull = false
-        this.see.dialogStatus = 'see'
-        this.see.dialogFormVisible = true
-      }, 500)
-      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = this.$route.params.pastureid
-      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
-      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
-    }
+        this.dialogFull = false
+        this.see.dialogStatus = 'see'
+        this.see.dialogFormVisible = true
+      }, 500)
+      this.see.table.getdataListParm.parammaps.ftid = this.$route.params.ftid
+      this.see.table.getdataListParm.parammaps.pastureid = this.$route.params.pastureid
+      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
+      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
+      this.getListSee()
+    }
     this.getList()
-  },
-
+    this.getformulaList()
+    this.getfenceHouseList()
+  },
+
   methods: {
-    getList() {
-      this.table.listLoading = true
-      GetDataByName(this.table.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.table.list = response.data.list
-          this.table.pageNum = response.data.pageNum
-          this.table.pageSize = response.data.pageSize
-          this.table.total = response.data.total
-        } else {
-          this.table.list = []
+    getformulaList(){
+      const url = 'authdata/GetDataByName'
+      const data = {}
+      data.name = 'getBarListEnable'
+      data.parammaps = {}
+      data.parammaps.pastureid = Cookies.get('pastureid')
+      postJson(url, data).then(response => {
+        if(response.data.list !== null){
+          this.formulaList = response.data.list
+        }else{
+          this.formulaList = []
         }
-        console.log(this.$route.params.tname)
-        // this.see.dialogFormVisible = false
-        setTimeout(() => {
-          this.table.listLoading = false
-        }, 100)
       })
     },
-    changeDate() {
-      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}')
-        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-        this.getList()
-      }
-    },
-    handleBefore() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
-        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
-        this.$forceUpdate()
-      }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
-      this.getList()
+    getfenceHouseList(){
+      const url = 'authdata/GetDataByName'
+      const data = {}
+      data.name = 'getFeedTempletName'
+      postJson(url, data).then(response => {
+        if(response.data.list !== null){
+          this.fenceHouseList = response.data.list
+        }else{
+          this.fenceHouseList = []
+        }
+      })
+    },
+    getList() {
+      this.table.listLoading = true
+      GetDataByName(this.table.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.table.list = response.data.list
+          this.table.pageNum = response.data.pageNum
+          this.table.pageSize = response.data.pageSize
+          this.table.total = response.data.total
+        } else {
+          this.table.list = []
+          this.table.pageNum = 0
+          this.table.pageSize = 0
+          this.table.total = 0
+        }
+        setTimeout(() => {
+          this.table.listLoading = false
+        }, 100)
+      })
     },
-    handleNext() {
-      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
-        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
-        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
-        this.table.getdataListParm.parammaps.inputDatetime.length = 0
-        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
-        this.$forceUpdate()
+    handleSearch() {
+      if(this.table.getdataListParm.parammaps.search == '0'){
+        this.table.getdataListParm.parammaps.barid = ''
+      }else{
+        this.table.getdataListParm.parammaps.templetid = ''
+        console.log(this.table.getdataListParm.parammaps.barid)
       }
-      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
-      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
       this.getList()
-    },
-    tableCellStyle({ row, column, rowIndex, columnIndex }) {
-      if (columnIndex === 0) {
-        return {
-          textDecoration: 'underline'
-        }
-      }
-      return {
-        textDecoration: 'none'
-      }
-    },
-    clickFormulaTemplateIndex(row) {
+    },
+    changeDate() {
+      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}')
+        this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+        this.getList()
+      }
+    },
+    handleBefore() {
+      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() - 1))
+        var stop = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() - 1))
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.table.getdataListParm.parammaps.inputDatetime.push(start, stop)
+        this.$forceUpdate()
+      }
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getList()
+    },
+    handleNext() {
+      if (this.table.getdataListParm.parammaps.inputDatetime !== '' && this.table.getdataListParm.parammaps.inputDatetime !== null) {
+        var start2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[0].setDate(this.table.getdataListParm.parammaps.inputDatetime[0].getDate() + 1))
+        var stop2 = new Date(this.table.getdataListParm.parammaps.inputDatetime[1].setDate(this.table.getdataListParm.parammaps.inputDatetime[1].getDate() + 1))
+        this.table.getdataListParm.parammaps.inputDatetime.length = 0
+        this.table.getdataListParm.parammaps.inputDatetime.push(start2, stop2)
+        this.$forceUpdate()
+      }
+      this.table.getdataListParm.parammaps.startTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
+      this.table.getdataListParm.parammaps.stopTime = parseTime(this.table.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
+      this.getList()
+    },
+    tableCellStyle({ row, column, rowIndex, columnIndex }) {
+      if (columnIndex === 0) {
+        return {
+          textDecoration: 'underline'
+        }
+      }
+      return {
+        textDecoration: 'none'
+      }
+    },
+    clickFormulaTemplateIndex(row) {
       console.log('点击了配方模板/指标')
-      this.dialogFull = false
-      this.details.dialogStatus = 'details'
-      this.details.dialogFormVisible = true
-      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid
-      this.details.table1.getdataListParm.parammaps.id = row.ftid
-
-      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid
-      this.getMaxDate()
-    },
-
-    getMaxDate() {
-      GetDataByName(this.details.maxDate.getdataListParm).then(response => {
-        if (response.data.list !== null) {
-          this.details.temp.maxDate = response.data.list[0].maxdate
-        } else {
-          this.details.temp.maxDate = ''
-        }
-        this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
-        this.details.table2.getdataListParm.parammaps.date = this.details.temp.maxDate
-
-        this.getListDetails1()
-      })
-    },
-    changeMaxDate(item) {
-      this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
-      this.getListDetails1()
-    },
-    getListDetails1() {
-      this.details.table1.listLoading = true
-      GetDataByName(this.details.table1.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.details.table1.list = response.data.list
-          this.details.table1.pageNum = response.data.pageNum
-          this.details.table1.pageSize = response.data.pageSize
-          this.details.table1.total = response.data.total
-
-          this.details.table2.getdataListParm.parammaps.pastureid = this.details.table1.list[0].pastureid
-          this.details.table2.getdataListParm.parammaps.ftid = this.details.table1.list[0].id
-          this.details.table2.getdataListParm.parammaps.version = this.details.table1.list[0].version
-          this.getListDetails2()
-        } else {
-          this.details.table1.list = []
+      this.dialogFull = false
+      this.details.dialogStatus = 'details'
+      this.details.dialogFormVisible = true
+      this.details.table1.getdataListParm.parammaps.pastureid = row.pastureid
+      this.details.table1.getdataListParm.parammaps.id = row.ftid
+
+      this.details.maxDate.getdataListParm.parammaps.pastureid = row.pastureid
+      this.getMaxDate()
+    },
+
+    getMaxDate() {
+      GetDataByName(this.details.maxDate.getdataListParm).then(response => {
+        if (response.data.list !== null) {
+          this.details.temp.maxDate = response.data.list[0].maxdate
+        } else {
+          this.details.temp.maxDate = ''
+        }
+        this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
+        this.details.table2.getdataListParm.parammaps.date = this.details.temp.maxDate
+
+        this.getListDetails1()
+      })
+    },
+    changeMaxDate(item) {
+      this.details.table1.getdataListParm.parammaps.date = this.details.temp.maxDate
+      this.getListDetails1()
+    },
+    getListDetails1() {
+      this.details.table1.listLoading = true
+      GetDataByName(this.details.table1.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.details.table1.list = response.data.list
+          this.details.table1.pageNum = response.data.pageNum
+          this.details.table1.pageSize = response.data.pageSize
+          this.details.table1.total = response.data.total
+
+          this.details.table2.getdataListParm.parammaps.pastureid = this.details.table1.list[0].pastureid
+          this.details.table2.getdataListParm.parammaps.ftid = this.details.table1.list[0].id
+          this.details.table2.getdataListParm.parammaps.version = this.details.table1.list[0].version
+          this.getListDetails2()
+        } else {
+          this.details.table1.list = []
           this.details.table2.list = []
-        }
-        setTimeout(() => {
-          this.details.table1.listLoading = false
-        }, 100)
-      })
-    },
-    getListDetails2() {
-      this.details.table2.listLoading = true
-      GetDataByName(this.details.table2.getdataListParm).then(response => {
-        console.log('table数据', response.data.list)
-        if (response.data.list !== null) {
-          this.details.table2.list = response.data.list
-          this.details.table2.pageNum = response.data.pageNum
-          this.details.table2.pageSize = response.data.pageSize
-          this.details.table2.total = response.data.total
-        } else {
+          this.details.table1.pageNum = 0
+          this.details.table1.pageSize = 0
+          this.details.table1.total = 0
+        }
+        setTimeout(() => {
+          this.details.table1.listLoading = false
+        }, 100)
+      })
+    },
+    getListDetails2() {
+      this.details.table2.listLoading = true
+      GetDataByName(this.details.table2.getdataListParm).then(response => {
+        console.log('table数据', response.data.list)
+        if (response.data.list !== null) {
+          this.details.table2.list = response.data.list
+          this.details.table2.pageNum = response.data.pageNum
+          this.details.table2.pageSize = response.data.pageSize
+          this.details.table2.total = response.data.total
+        } else {
           this.details.table2.list = []
-        }
-        setTimeout(() => {
-          this.details.table2.listLoading = false
-        }, 100)
-      })
-    },
-    clickFormulaHurdlesIndex(row) {
-      console.log('点击了栏舍/指标')
-      this.$router.push('/formulationPlan/DhedFormula')
-    },
-    handleSee(row) {
+          this.details.table2.pageNum = 0
+          this.details.table2.pageSize = 0
+          this.details.table2.total = 0
+        }
+        setTimeout(() => {
+          this.details.table2.listLoading = false
+        }, 100)
+      })
+    },
+    clickFormulaHurdlesIndex(row) {
+      console.log('点击了栏舍/指标')
+      this.$router.push('/formulationPlan/DhedFormula')
+    },
+    handleSee(row) {
       console.log('查看', row)
-      this.dialogFull = false
-      this.textMap.see = '栏舍详情——' + row.tname
-      this.see.dialogStatus = 'see'
-      this.see.dialogFormVisible = true
-      this.see.table.getdataListParm.parammaps.ftid = row.ftid
-      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
-      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
-      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
-      this.getListSee()
-    },
-    getListSee() {
+      this.dialogFull = false
+      this.textMap.see = '栏舍详情——' + row.tname
+      this.see.dialogStatus = 'see'
+      this.see.dialogFormVisible = true
+      this.see.table.getdataListParm.parammaps.ftid = row.ftid
+      this.see.table.getdataListParm.parammaps.pastureid = row.pastureid
+      this.see.table.getdataListParm.parammaps.startTime = this.table.getdataListParm.parammaps.startTime
+      this.see.table.getdataListParm.parammaps.stopTime = this.table.getdataListParm.parammaps.stopTime
+      this.getListSee()
+    },
+    getListSee() {
       this.see.table.listLoading = true
       const url = 'authdata/GETNurJudgeRport'
       const data = this.see.table.getdataListParm
-      postJson(url, data).then(response => {
-        if (response.data !== null) {
-          console.log('table数据', response.data)
-          this.see.table.list = response.data
-          this.see.table.pageNum = response.data.pageNum
-          this.see.table.pageSize = response.data.pageSize
-          this.see.table.total = response.data.total
-        } else {
+      postJson(url, data).then(response => {
+        if (response.data !== null) {
+          console.log('table数据', response.data)
+          this.see.table.list = response.data
+          this.see.table.pageNum = response.data.pageNum
+          this.see.table.pageSize = response.data.pageSize
+          this.see.table.total = response.data.total
+        } else {
           this.see.table.list = []
-        }
-        setTimeout(() => {
-          this.see.table.listLoading = false
-        }, 100)
-      })
-    }
-
-  }
-}
-</script>
-<style lang="scss" scoped>
-  .search {clear: both; }
-  .table { margin-top: 10px; }
-  .table2{margin-top: 20px;}
-  .templateDialog{
-     background: #fff;
-     position: relative;
-   }
-  .detailDialog{
-     background: #fff;
-     position: relative;
-   }
-</style>
-<style>
-  .tableSee .el-table { overflow-x: auto; }
-  .tableSee .el-table__header-wrapper,
-  .tableSee .el-table__body-wrapper,
-  .tableSee .el-table__footer-wrapper { overflow: visible; }
-  .tableSee .el-table::after { position: relative; }
-  .tableSee .el-table--scrollable-x .el-table__body-wrapper { overflow: visible; }
-</style>
+          this.see.table.pageNum = 0
+          this.see.table.pageSize = 0
+          this.see.table.total = 0
+        }
+        setTimeout(() => {
+          this.see.table.listLoading = false
+        }, 100)
+      })
+    }
+
+  }
+}
+</script>
+<style lang="scss" scoped>
+  .search {clear: both; }
+  .table { margin-top: 10px; }
+  .table2{margin-top: 20px;}
+  .templateDialog{
+     background: #fff;
+     position: relative;
+   }
+  .detailDialog{
+     background: #fff;
+     position: relative;
+   }
+</style>
+<style>
+  .tableSee .el-table { overflow-x: auto; }
+  .tableSee .el-table__header-wrapper,
+  .tableSee .el-table__body-wrapper,
+  .tableSee .el-table__footer-wrapper { overflow: visible; }
+  .tableSee .el-table::after { position: relative; }
+  .tableSee .el-table--scrollable-x .el-table__body-wrapper { overflow: visible; }
+
+</style>