|
@@ -1,43 +1,150 @@
|
|
|
<template>
|
|
<template>
|
|
|
<div class="app-container">
|
|
<div class="app-container">
|
|
|
<div class="search">
|
|
<div class="search">
|
|
|
- <el-date-picker v-model="table.getdataListParm.parammaps.inputDatetime" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" />
|
|
|
|
|
- <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.barid" filterable placeholder="栏舍名称" class="filter-item" style="width: 120px;" clearable>
|
|
|
|
|
- <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
|
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
|
+ v-model="table.getdataListParm.parammaps.inputDatetime"
|
|
|
|
|
+ class="inputDatetime filter-item"
|
|
|
|
|
+ type="daterange"
|
|
|
|
|
+ range-separator="至"
|
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
|
+ style="width: 250px"
|
|
|
|
|
+ />
|
|
|
|
|
+ <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.barid"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="栏舍名称"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 120px"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in houseNameList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.bname"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
- <el-select v-model="record" filterable placeholder="记录" class="filter-item" style="width: 150px;" @change="changeRecord">
|
|
|
|
|
- <el-option v-for="item in recordList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-model="record"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="记录"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 150px"
|
|
|
|
|
+ @change="changeRecord"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in recordList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
- <el-select v-if="record== '1'" v-model="table.getdataListParm.parammaps.eqcode" filterable placeholder="TMR编号" class="filter-item" style="width: 120px;" clearable>
|
|
|
|
|
- <el-option v-for="item in TMRNumberList" :key="item.id" :label="item.tname" :value="item.eqcode" />
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ v-if="record == '1'"
|
|
|
|
|
+ v-model="table.getdataListParm.parammaps.eqcode"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="TMR编号"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 120px"
|
|
|
|
|
+ clearable
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in TMRNumberList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.tname"
|
|
|
|
|
+ :value="item.eqcode"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
<el-button class="successBorder" @click="form_search">查询</el-button>
|
|
<el-button class="successBorder" @click="form_search">查询</el-button>
|
|
|
<el-button class="successBorder" @click="handleRefresh">重置</el-button>
|
|
<el-button class="successBorder" @click="handleRefresh">重置</el-button>
|
|
|
</div>
|
|
</div>
|
|
|
- <div class="operation" v-if="record== '0'">
|
|
|
|
|
- <el-button v-if="isRoleEdit" icon="el-icon-plus" class="success" @click="handleCreate">新增</el-button>
|
|
|
|
|
- <el-button v-if="isRoleEdit" icon="el-icon-delete" class="danger" @click="form_delete">删除</el-button>
|
|
|
|
|
- <el-button v-if="isRoleEdit" icon="el-icon-copy-document" class="copy" @click="handleCopy">复制</el-button>
|
|
|
|
|
- <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
|
|
|
|
|
- <el-upload v-if="isRoleEdit" style="float: right;" :headers="headers" :data="uploadData" :action="uploadExcelUrl" :show-file-list="false" :before-upload="beforeImport" :on-success="handleImportSuccess">
|
|
|
|
|
- <el-button class="import" icon="el-icon-download" style="float: right;">导入</el-button>
|
|
|
|
|
|
|
+ <div class="operation" v-if="record == '0'">
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ icon="el-icon-plus"
|
|
|
|
|
+ class="success"
|
|
|
|
|
+ @click="handleCreate"
|
|
|
|
|
+ >新增</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ icon="el-icon-delete"
|
|
|
|
|
+ class="danger"
|
|
|
|
|
+ @click="form_delete"
|
|
|
|
|
+ >删除</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit && sapUpload.isSap"
|
|
|
|
|
+ class="success"
|
|
|
|
|
+ icon="el-icon-upload2"
|
|
|
|
|
+ @click="handleSAPUpload"
|
|
|
|
|
+ >SAP上传</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ icon="el-icon-copy-document"
|
|
|
|
|
+ class="copy"
|
|
|
|
|
+ @click="handleCopy"
|
|
|
|
|
+ >复制</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="dataSynchronization.isDataSynchronization && isRoleEdit"
|
|
|
|
|
+ class="success"
|
|
|
|
|
+ @click="handleDataUpload"
|
|
|
|
|
+ >数据上传</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-upload
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ style="float: right"
|
|
|
|
|
+ :headers="headers"
|
|
|
|
|
+ :data="uploadData"
|
|
|
|
|
+ :action="uploadExcelUrl"
|
|
|
|
|
+ :show-file-list="false"
|
|
|
|
|
+ :before-upload="beforeImport"
|
|
|
|
|
+ :on-success="handleImportSuccess"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button class="import" icon="el-icon-download" style="float: right"
|
|
|
|
|
+ >导入</el-button
|
|
|
|
|
+ >
|
|
|
</el-upload>
|
|
</el-upload>
|
|
|
- <el-dropdown style="float: right;margin-right: 10px;">
|
|
|
|
|
|
|
+ <el-dropdown style="float: right; margin-right: 10px">
|
|
|
<el-button class="export" icon="el-icon-upload2">导出</el-button>
|
|
<el-button class="export" icon="el-icon-upload2">导出</el-button>
|
|
|
<el-dropdown-menu slot="dropdown">
|
|
<el-dropdown-menu slot="dropdown">
|
|
|
- <el-dropdown-item @click.native="handleExport(1)">导出模板</el-dropdown-item>
|
|
|
|
|
- <el-dropdown-item @click.native="handleExport(2)">导出数据</el-dropdown-item>
|
|
|
|
|
|
|
+ <el-dropdown-item @click.native="handleExport(1)"
|
|
|
|
|
+ >导出模板</el-dropdown-item
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-dropdown-item @click.native="handleExport(2)"
|
|
|
|
|
+ >导出数据</el-dropdown-item
|
|
|
|
|
+ >
|
|
|
</el-dropdown-menu>
|
|
</el-dropdown-menu>
|
|
|
</el-dropdown>
|
|
</el-dropdown>
|
|
|
</div>
|
|
</div>
|
|
|
<div class="operation" v-else>
|
|
<div class="operation" v-else>
|
|
|
- <el-button v-if="dataSynchronization.isDataSynchronization && isRoleEdit" class="success" @click="handleDataUpload">数据上传</el-button>
|
|
|
|
|
- <el-button style="float: right;margin-right: 10px;" class="export" icon="el-icon-upload2" @click="handleExport(3)">导出</el-button>
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="dataSynchronization.isDataSynchronization && isRoleEdit"
|
|
|
|
|
+ class="success"
|
|
|
|
|
+ @click="handleDataUpload"
|
|
|
|
|
+ >数据上传</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ style="float: right; margin-right: 10px"
|
|
|
|
|
+ class="export"
|
|
|
|
|
+ icon="el-icon-upload2"
|
|
|
|
|
+ @click="handleExport(3)"
|
|
|
|
|
+ >导出</el-button
|
|
|
|
|
+ >
|
|
|
</div>
|
|
</div>
|
|
|
<!-- 手动记录 -->
|
|
<!-- 手动记录 -->
|
|
|
- <div class="table" v-if="record== '0'">
|
|
|
|
|
|
|
+ <div class="table" v-if="record == '0'">
|
|
|
<el-table
|
|
<el-table
|
|
|
:key="table.tableKey"
|
|
:key="table.tableKey"
|
|
|
v-loading="table.listLoading"
|
|
v-loading="table.listLoading"
|
|
@@ -46,7 +153,7 @@
|
|
|
border
|
|
border
|
|
|
fit
|
|
fit
|
|
|
highlight-current-row
|
|
highlight-current-row
|
|
|
- style="width: 100%;"
|
|
|
|
|
|
|
+ style="width: 100%"
|
|
|
:row-style="rowStyle"
|
|
:row-style="rowStyle"
|
|
|
:cell-style="cellStyle"
|
|
:cell-style="cellStyle"
|
|
|
class="elTable table-fixed"
|
|
class="elTable table-fixed"
|
|
@@ -56,27 +163,93 @@
|
|
|
<el-table-column type="selection" align="center" width="50" />
|
|
<el-table-column type="selection" align="center" width="50" />
|
|
|
<el-table-column label="序号" align="center" type="index" width="50px">
|
|
<el-table-column label="序号" align="center" type="index" width="50px">
|
|
|
<template slot-scope="scope">
|
|
<template slot-scope="scope">
|
|
|
- <span>{{ scope.$index + (table.pageNum-1) * table.pageSize + 1 }}</span>
|
|
|
|
|
|
|
+ <span>{{
|
|
|
|
|
+ scope.$index + (table.pageNum - 1) * table.pageSize + 1
|
|
|
|
|
+ }}</span>
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
- <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
|
|
|
|
|
- <el-table-column label="配方名称" min-width="150px" align="center" prop="ftname" />
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="栏舍名称"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="barname"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="配方名称"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="ftname"
|
|
|
|
|
+ />
|
|
|
<!-- <el-table-column label="收集" min-width="150px" align="center" prop="timesstr" /> -->
|
|
<!-- <el-table-column label="收集" min-width="150px" align="center" prop="timesstr" /> -->
|
|
|
- <el-table-column label="原剩料所属时间" min-width="150px" align="center" prop="remaindate" />
|
|
|
|
|
- <el-table-column label="剩料量(kg)" min-width="150px" align="center" prop="remain" />
|
|
|
|
|
- <el-table-column label="干物质" min-width="150px" align="center" prop="dry" />
|
|
|
|
|
- <el-table-column label="班次(收集)" min-width="90px" align="center" prop="timesstr" />
|
|
|
|
|
- <el-table-column label="收集时间" min-width="100px" align="center" prop="operatetime" />
|
|
|
|
|
- <el-table-column label="操作人" min-width="90px" align="center" prop="emp" />
|
|
|
|
|
- <el-table-column label="操作" align="center" width="80" class-name="small-padding fixed-width" fixed="right">
|
|
|
|
|
- <template slot-scope="{row}">
|
|
|
|
|
- <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniSuccess" icon="el-icon-edit-outline" @click="handleUpdate(row)" />
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="原剩料所属时间"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="remaindate"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="剩料量(kg)"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="remain"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="干物质"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="dry"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="班次(收集)"
|
|
|
|
|
+ min-width="90px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="timesstr"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="收集时间"
|
|
|
|
|
+ min-width="100px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="operatetime"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="操作人"
|
|
|
|
|
+ min-width="90px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="emp"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="操作"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ width="80"
|
|
|
|
|
+ class-name="small-padding fixed-width"
|
|
|
|
|
+ fixed="right"
|
|
|
|
|
+ >
|
|
|
|
|
+ <template slot-scope="{ row }">
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ :disabled="row.emp == '设备采集'"
|
|
|
|
|
+ class="miniSuccess"
|
|
|
|
|
+ icon="el-icon-edit-outline"
|
|
|
|
|
+ @click="handleUpdate(row)"
|
|
|
|
|
+ />
|
|
|
<span v-if="isRoleEdit" class="centerSpan">|</span>
|
|
<span v-if="isRoleEdit" class="centerSpan">|</span>
|
|
|
- <el-button v-if="isRoleEdit" :disabled="row.emp == '设备采集'" class="miniDanger" icon="el-icon-delete" @click="handleRowDelete(row)" />
|
|
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="isRoleEdit"
|
|
|
|
|
+ :disabled="row.emp == '设备采集'"
|
|
|
|
|
+ class="miniDanger"
|
|
|
|
|
+ icon="el-icon-delete"
|
|
|
|
|
+ @click="handleRowDelete(row)"
|
|
|
|
|
+ />
|
|
|
</template>
|
|
</template>
|
|
|
</el-table-column>
|
|
</el-table-column>
|
|
|
</el-table>
|
|
</el-table>
|
|
|
- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
|
|
|
|
|
|
|
+ <pagination
|
|
|
|
|
+ v-show="table.total >= 0"
|
|
|
|
|
+ :total="table.total"
|
|
|
|
|
+ :page.sync="table.getdataListParm.offset"
|
|
|
|
|
+ :limit.sync="table.getdataListParm.pagecount"
|
|
|
|
|
+ @pagination="getList"
|
|
|
|
|
+ />
|
|
|
</div>
|
|
</div>
|
|
|
<!-- TMR设备自动记录 -->
|
|
<!-- TMR设备自动记录 -->
|
|
|
<div class="table" v-else>
|
|
<div class="table" v-else>
|
|
@@ -88,47 +261,137 @@
|
|
|
border
|
|
border
|
|
|
fit
|
|
fit
|
|
|
highlight-current-row
|
|
highlight-current-row
|
|
|
- style="width: 98%;"
|
|
|
|
|
|
|
+ style="width: 98%"
|
|
|
:row-style="rowStyle"
|
|
:row-style="rowStyle"
|
|
|
:cell-style="cellStyle"
|
|
:cell-style="cellStyle"
|
|
|
class="elTable table-fixed"
|
|
class="elTable table-fixed"
|
|
|
:height="myHeight"
|
|
:height="myHeight"
|
|
|
>
|
|
>
|
|
|
<el-table-column type="selection" align="center" width="50" />
|
|
<el-table-column type="selection" align="center" width="50" />
|
|
|
- <el-table-column label="TMR设备编号" min-width="150px" align="center" prop="eqcode" />
|
|
|
|
|
- <el-table-column label="TMR设备名称" min-width="150px" align="center" prop="eqname" />
|
|
|
|
|
- <el-table-column label="TMR设备类型" min-width="150px" align="center" prop="tclassname" />
|
|
|
|
|
- <el-table-column label="栏舍名称" min-width="150px" align="center" prop="barname" />
|
|
|
|
|
- <el-table-column label="收集时间" min-width="150px" align="center" prop="createtime" />
|
|
|
|
|
- <el-table-column label="剩料重量(kg)" min-width="150px" align="center" prop="weight" />
|
|
|
|
|
- <el-table-column label="开始重量(kg)" min-width="150px" align="center" prop="beginweight" />
|
|
|
|
|
- <el-table-column label="结束重量(kg)" min-width="150px" align="center" prop="endweight" />
|
|
|
|
|
- <el-table-column label="驾驶员" min-width="150px" align="center" prop="driver" />
|
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="TMR设备编号"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="eqcode"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="TMR设备名称"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="eqname"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="TMR设备类型"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="tclassname"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="栏舍名称"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="barname"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="收集时间"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="createtime"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="剩料重量(kg)"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="weight"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="开始重量(kg)"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="beginweight"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="结束重量(kg)"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="endweight"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-table-column
|
|
|
|
|
+ label="驾驶员"
|
|
|
|
|
+ min-width="150px"
|
|
|
|
|
+ align="center"
|
|
|
|
|
+ prop="driver"
|
|
|
|
|
+ />
|
|
|
</el-table>
|
|
</el-table>
|
|
|
- <pagination v-show="table.total>=0" :total="table.total" :page.sync="table.getdataListParm.offset" :limit.sync="table.getdataListParm.pagecount" @pagination="getList" />
|
|
|
|
|
|
|
+ <pagination
|
|
|
|
|
+ v-show="table.total >= 0"
|
|
|
|
|
+ :total="table.total"
|
|
|
|
|
+ :page.sync="table.getdataListParm.offset"
|
|
|
|
|
+ :limit.sync="table.getdataListParm.pagecount"
|
|
|
|
|
+ @pagination="getList"
|
|
|
|
|
+ />
|
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
<!-- 新增/编辑 -->
|
|
<!-- 新增/编辑 -->
|
|
|
- <el-dialog :fullscreen="dialogFull" :visible.sync="create.dialogFormVisible" :close-on-click-modal="false" v-if='create.dialogFormVisible' width="40%">
|
|
|
|
|
|
|
+ <el-dialog
|
|
|
|
|
+ :fullscreen="dialogFull"
|
|
|
|
|
+ :visible.sync="create.dialogFormVisible"
|
|
|
|
|
+ :close-on-click-modal="false"
|
|
|
|
|
+ v-if="create.dialogFormVisible"
|
|
|
|
|
+ width="40%"
|
|
|
|
|
+ >
|
|
|
<template slot="title">
|
|
<template slot="title">
|
|
|
<div class="avue-crud__dialog__header">
|
|
<div class="avue-crud__dialog__header">
|
|
|
<span class="el-dialog__title">
|
|
<span class="el-dialog__title">
|
|
|
- <span style="display:inline-block;width:3px;height:20px;margin-right:5px; float: left;margin-top:2px" />
|
|
|
|
|
|
|
+ <span
|
|
|
|
|
+ style="
|
|
|
|
|
+ display: inline-block;
|
|
|
|
|
+ width: 3px;
|
|
|
|
|
+ height: 20px;
|
|
|
|
|
+ margin-right: 5px;
|
|
|
|
|
+ float: left;
|
|
|
|
|
+ margin-top: 2px;
|
|
|
|
|
+ "
|
|
|
|
|
+ />
|
|
|
{{ textMap[create.dialogStatus] }}
|
|
{{ textMap[create.dialogStatus] }}
|
|
|
</span>
|
|
</span>
|
|
|
- <div class="avue-crud__dialog__menu" @click="dialogFull? dialogFull=false: dialogFull=true">
|
|
|
|
|
|
|
+ <div
|
|
|
|
|
+ class="avue-crud__dialog__menu"
|
|
|
|
|
+ @click="dialogFull ? (dialogFull = false) : (dialogFull = true)"
|
|
|
|
|
+ >
|
|
|
<svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
<svg-icon v-if="dialogFull" icon-class="exit-fullscreen" />
|
|
|
<svg-icon v-else icon-class="fullscreen" />
|
|
<svg-icon v-else icon-class="fullscreen" />
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</template>
|
|
</template>
|
|
|
<div class="app-add">
|
|
<div class="app-add">
|
|
|
- <el-form ref="temp" :rules="create.rules" :model="create.temp" label-position="right" label-width="135px" style="width: 90%;margin:0 auto 50px">
|
|
|
|
|
- <el-row v-if="create.dialogStatus=='create'">
|
|
|
|
|
|
|
+ <el-form
|
|
|
|
|
+ ref="temp"
|
|
|
|
|
+ :rules="create.rules"
|
|
|
|
|
+ :model="create.temp"
|
|
|
|
|
+ label-position="right"
|
|
|
|
|
+ label-width="135px"
|
|
|
|
|
+ style="width: 90%; margin: 0 auto 50px"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-row v-if="create.dialogStatus == 'create'">
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="栏舍名称:" prop="barid">
|
|
<el-form-item label="栏舍名称:" prop="barid">
|
|
|
- <el-select ref="barid" v-model="create.temp.barid" :disabled="create.dialogStatus=='update'" filterable placeholder="栏舍名称" class="filter-item" style="width: 100%;" @change="changeBar">
|
|
|
|
|
- <el-option v-for="item in houseNameList" :key="item.id" :label="item.bname" :value="item.id" />
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ ref="barid"
|
|
|
|
|
+ v-model="create.temp.barid"
|
|
|
|
|
+ :disabled="create.dialogStatus == 'update'"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="栏舍名称"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ @change="changeBar"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in houseNameList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.bname"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -136,23 +399,47 @@
|
|
|
<el-row v-else>
|
|
<el-row v-else>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="栏舍名称:" prop="barname">
|
|
<el-form-item label="栏舍名称:" prop="barname">
|
|
|
- <el-input ref="barname" v-model="create.temp.barname" disabled class="filter-item" placeholder="barname" />
|
|
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ ref="barname"
|
|
|
|
|
+ v-model="create.temp.barname"
|
|
|
|
|
+ disabled
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ placeholder="barname"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<!-- TODO: -->
|
|
<!-- TODO: -->
|
|
|
- <el-row >
|
|
|
|
|
|
|
+ <el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="配方名称:" >
|
|
|
|
|
- <el-input v-model="create.temp.ftname" class="filter-item" placeholder="配方名称" disabled />
|
|
|
|
|
|
|
+ <el-form-item label="配方名称:">
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ v-model="create.temp.ftname"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ placeholder="配方名称"
|
|
|
|
|
+ disabled
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
- <el-form-item label="班次(收集):" >
|
|
|
|
|
- <el-select ref="times" v-model="create.temp.times" filterable placeholder="班次(收集)" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;">
|
|
|
|
|
- <el-option v-for="item in frequencyList" :key="item.id" :label="item.name" :value="item.id" />
|
|
|
|
|
|
|
+ <el-form-item label="班次(收集):">
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ ref="times"
|
|
|
|
|
+ v-model="create.temp.times"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="班次(收集)"
|
|
|
|
|
+ :disabled="create.dialogStatus == 'update'"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in frequencyList"
|
|
|
|
|
+ :key="item.id"
|
|
|
|
|
+ :label="item.name"
|
|
|
|
|
+ :value="item.id"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -165,9 +452,10 @@
|
|
|
v-model="create.temp.remaindate"
|
|
v-model="create.temp.remaindate"
|
|
|
type="date"
|
|
type="date"
|
|
|
value-format="yyyy-MM-dd"
|
|
value-format="yyyy-MM-dd"
|
|
|
- style="width: 100%;"
|
|
|
|
|
|
|
+ style="width: 100%"
|
|
|
:picker-options="pickerOptions"
|
|
:picker-options="pickerOptions"
|
|
|
- placeholder="原剩料所属时间">
|
|
|
|
|
|
|
+ placeholder="原剩料所属时间"
|
|
|
|
|
+ >
|
|
|
</el-date-picker>
|
|
</el-date-picker>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
@@ -176,14 +464,26 @@
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="剩料量:" prop="remain">
|
|
<el-form-item label="剩料量:" prop="remain">
|
|
|
- <el-input ref="remain" v-model="create.temp.remain" class="filter-item" placeholder="剩料量" type="number" />
|
|
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ ref="remain"
|
|
|
|
|
+ v-model="create.temp.remain"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ placeholder="剩料量"
|
|
|
|
|
+ type="number"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="干物质:" prop="dry">
|
|
<el-form-item label="干物质:" prop="dry">
|
|
|
- <el-input ref="dry" v-model="create.temp.dry" class="filter-item" placeholder="干物质" type="number" />
|
|
|
|
|
|
|
+ <el-input
|
|
|
|
|
+ ref="dry"
|
|
|
|
|
+ v-model="create.temp.dry"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ placeholder="干物质"
|
|
|
|
|
+ type="number"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
@@ -191,24 +491,137 @@
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="收集时间:" prop="operatetime">
|
|
<el-form-item label="收集时间:" prop="operatetime">
|
|
|
- <el-date-picker v-model="create.temp.operatetime" :disabled="create.dialogStatus=='update'" type="datetime" placeholder="选择处理时间" format="yyyy-MM-dd HH:mm" value-format="yyyy-MM-dd HH:mm" style="width: 100%;" :clearable="false" />
|
|
|
|
|
|
|
+ <el-date-picker
|
|
|
|
|
+ v-model="create.temp.operatetime"
|
|
|
|
|
+ :disabled="create.dialogStatus == 'update'"
|
|
|
|
|
+ type="datetime"
|
|
|
|
|
+ placeholder="选择处理时间"
|
|
|
|
|
+ format="yyyy-MM-dd HH:mm"
|
|
|
|
|
+ value-format="yyyy-MM-dd HH:mm"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ :clearable="false"
|
|
|
|
|
+ />
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
<el-row>
|
|
<el-row>
|
|
|
<el-col :span="20">
|
|
<el-col :span="20">
|
|
|
<el-form-item label="操作人:" prop="emp">
|
|
<el-form-item label="操作人:" prop="emp">
|
|
|
- <el-select ref="emp" v-model="create.temp.emp" filterable placeholder="操作人" :disabled="create.dialogStatus=='update'" class="filter-item" style="width: 100%;" @blur="blurEmp">
|
|
|
|
|
- <el-option v-for="item in create.noteTakerList" :key="item.myId" :label="item.emp" :value="item.emp" />
|
|
|
|
|
|
|
+ <el-select
|
|
|
|
|
+ ref="emp"
|
|
|
|
|
+ v-model="create.temp.emp"
|
|
|
|
|
+ filterable
|
|
|
|
|
+ placeholder="操作人"
|
|
|
|
|
+ :disabled="create.dialogStatus == 'update'"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ style="width: 100%"
|
|
|
|
|
+ @blur="blurEmp"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-option
|
|
|
|
|
+ v-for="item in create.noteTakerList"
|
|
|
|
|
+ :key="item.myId"
|
|
|
|
|
+ :label="item.emp"
|
|
|
|
|
+ :value="item.emp"
|
|
|
|
|
+ />
|
|
|
</el-select>
|
|
</el-select>
|
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</el-row>
|
|
|
</el-form>
|
|
</el-form>
|
|
|
<div slot="footer" class="dialog-footer">
|
|
<div slot="footer" class="dialog-footer">
|
|
|
- <el-button class="cancelClose" @click="create.dialogFormVisible = false;getList()">关闭</el-button>
|
|
|
|
|
- <el-button v-if="create.dialogStatus==='create'" class="save" :disabled="isokDisable" @click="createDataAgain()">确认新增</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
|
|
|
|
|
+ class="cancelClose"
|
|
|
|
|
+ @click="
|
|
|
|
|
+ create.dialogFormVisible = false;
|
|
|
|
|
+ getList();
|
|
|
|
|
+ "
|
|
|
|
|
+ >关闭</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ v-if="create.dialogStatus === 'create'"
|
|
|
|
|
+ class="save"
|
|
|
|
|
+ :disabled="isokDisable"
|
|
|
|
|
+ @click="createDataAgain()"
|
|
|
|
|
+ >确认新增</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>
|
|
|
|
|
+ <!-- / -->
|
|
|
|
|
+ <el-dialog
|
|
|
|
|
+ :title="textMap[sapUpload.dialogStatus]"
|
|
|
|
|
+ :destroy-on-close="true"
|
|
|
|
|
+ :visible.sync="sapUpload.dialogFormVisible"
|
|
|
|
|
+ :close-on-click-modal="false"
|
|
|
|
|
+ width="40%"
|
|
|
|
|
+ >
|
|
|
|
|
+ <div class="sapUpload">
|
|
|
|
|
+ <el-form
|
|
|
|
|
+ ref="sapUpload"
|
|
|
|
|
+ :rules="sapUpload.rules"
|
|
|
|
|
+ :model="sapUpload.temp"
|
|
|
|
|
+ label-position="right"
|
|
|
|
|
+ label-width="100px"
|
|
|
|
|
+ style="width: 100%; margin: 0 auto 50px"
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-row>
|
|
|
|
|
+ <el-col :span="24">
|
|
|
|
|
+ <el-form-item label="时间:" prop="date">
|
|
|
|
|
+ <el-date-picker
|
|
|
|
|
+ v-if="
|
|
|
|
|
+ sapUpload.dialogStatus != 'udload5' &&
|
|
|
|
|
+ sapUpload.dialogStatus != 'udload4'
|
|
|
|
|
+ "
|
|
|
|
|
+ v-model="sapUpload.temp.date"
|
|
|
|
|
+ :clearable="false"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ type="date"
|
|
|
|
|
+ />
|
|
|
|
|
+ <el-date-picker
|
|
|
|
|
+ v-else
|
|
|
|
|
+ start-placeholder="开始日期"
|
|
|
|
|
+ end-placeholder="结束日期"
|
|
|
|
|
+ format="yyyy-MM-dd"
|
|
|
|
|
+ value-format="yyyy-MM-dd"
|
|
|
|
|
+ v-model="dateRange"
|
|
|
|
|
+ :clearable="false"
|
|
|
|
|
+ :picker-options="pickerOptionsT"
|
|
|
|
|
+ @change="handleDateChange"
|
|
|
|
|
+ class="filter-item"
|
|
|
|
|
+ type="daterange"
|
|
|
|
|
+ />
|
|
|
|
|
+ </el-form-item>
|
|
|
|
|
+ </el-col>
|
|
|
|
|
+ </el-row>
|
|
|
|
|
+ </el-form>
|
|
|
|
|
+ <div slot="footer" class="dialog-footer" style="bottom: 20px">
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ class="cancelClose"
|
|
|
|
|
+ @click="
|
|
|
|
|
+ sapUpload.dialogFormVisible = false;
|
|
|
|
|
+ getList();
|
|
|
|
|
+ "
|
|
|
|
|
+ >取消</el-button
|
|
|
|
|
+ >
|
|
|
|
|
+ <el-button
|
|
|
|
|
+ class="save"
|
|
|
|
|
+ v-if="sapUpload.dialogStatus == 'sapUpload'"
|
|
|
|
|
+ :disabled="isokDisable"
|
|
|
|
|
+ @click="sapUploadData()"
|
|
|
|
|
+ >确认</el-button
|
|
|
|
|
+ >
|
|
|
</div>
|
|
</div>
|
|
|
</div>
|
|
</div>
|
|
|
</el-dialog>
|
|
</el-dialog>
|
|
@@ -216,704 +629,1171 @@
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
|
|
<script>
|
|
<script>
|
|
|
-import { GetDataByName, PostDataByName, failproccess, ExecDataByConfig, GetDataByNames, checkButtons,postJson2 } from '@/api/common'
|
|
|
|
|
-import Cookies from 'js-cookie'
|
|
|
|
|
-import { parseTime, json2excel } from '@/utils/index.js'
|
|
|
|
|
-import Pagination from '@/components/Pagination'
|
|
|
|
|
-import { MessageBox } from 'element-ui'
|
|
|
|
|
-import axios from 'axios'
|
|
|
|
|
-import { getToken } from '@/utils/auth'
|
|
|
|
|
|
|
+import {
|
|
|
|
|
+ GetDataByName,
|
|
|
|
|
+ PostDataByName,
|
|
|
|
|
+ failproccess,
|
|
|
|
|
+ ExecDataByConfig,
|
|
|
|
|
+ GetDataByNames,
|
|
|
|
|
+ checkButtons,
|
|
|
|
|
+ postJson,
|
|
|
|
|
+ postJson2,
|
|
|
|
|
+ getSapRoute,
|
|
|
|
|
+} from "@/api/common";
|
|
|
|
|
+import Cookies from "js-cookie";
|
|
|
|
|
+import { parseTime, json2excel } from "@/utils/index.js";
|
|
|
|
|
+import Pagination from "@/components/Pagination";
|
|
|
|
|
+import { MessageBox } from "element-ui";
|
|
|
|
|
+import axios from "axios";
|
|
|
|
|
+import { getToken } from "@/utils/auth";
|
|
|
export default {
|
|
export default {
|
|
|
- name: 'MaterialRemainingRecord',
|
|
|
|
|
|
|
+ name: "MaterialRemainingRecord",
|
|
|
components: { Pagination },
|
|
components: { Pagination },
|
|
|
data() {
|
|
data() {
|
|
|
return {
|
|
return {
|
|
|
- pickerOptions:{
|
|
|
|
|
|
|
+ dateRange: [
|
|
|
|
|
+ parseTime(new Date(), "{y}-{m}-{d}"),
|
|
|
|
|
+ parseTime(new Date(), "{y}-{m}-{d}"),
|
|
|
|
|
+ ],
|
|
|
|
|
+ pickerOptionsT: {
|
|
|
|
|
+ // onPick: this.getPickDateT,
|
|
|
|
|
+ disabledDate: this.disabledDateT,
|
|
|
|
|
+ },
|
|
|
|
|
+ pickDateT: "",
|
|
|
|
|
+ sapUpload: {
|
|
|
|
|
+ dialogFormVisible: false,
|
|
|
|
|
+ dialogStatus: "",
|
|
|
|
|
+ temp: {
|
|
|
|
|
+ date: parseTime(new Date(), "{y}-{m}-{d}"),
|
|
|
|
|
+ },
|
|
|
|
|
+ rules: {
|
|
|
|
|
+ date: [{ required: true, message: "必填", trigger: "blur" }],
|
|
|
|
|
+ },
|
|
|
|
|
+ getdataListParm: {
|
|
|
|
|
+ name: "getSysoptEnable",
|
|
|
|
|
+ page: 1,
|
|
|
|
|
+ offset: 1,
|
|
|
|
|
+ pagecount: 1,
|
|
|
|
|
+ returntype: "Map",
|
|
|
|
|
+ parammaps: {
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ inforname: "xdmysapupload",
|
|
|
|
|
+ date: parseTime(new Date(), "{y}-{m}-{d}"),
|
|
|
|
|
+ },
|
|
|
|
|
+ },
|
|
|
|
|
+ isSap: false,
|
|
|
|
|
+ },
|
|
|
|
|
+ pickerOptions: {
|
|
|
disabledDate(time) {
|
|
disabledDate(time) {
|
|
|
- return time.getTime() > Date.now() - 8.64e6;//如果没有后面的-8.64e6就是不可以选择今天的
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ return time.getTime() > Date.now() - 8.64e6; //如果没有后面的-8.64e6就是不可以选择今天的
|
|
|
|
|
+ },
|
|
|
},
|
|
},
|
|
|
dialogFull: false,
|
|
dialogFull: false,
|
|
|
isRoleEdit: [],
|
|
isRoleEdit: [],
|
|
|
getParmas: {
|
|
getParmas: {
|
|
|
- name: 'getFPList',
|
|
|
|
|
- page: 1,
|
|
|
|
|
- offset: 1,
|
|
|
|
|
|
|
+ name: "getFPList",
|
|
|
|
|
+ page: 1,
|
|
|
|
|
+ offset: 1,
|
|
|
|
|
+ pagecount: 0,
|
|
|
|
|
+ returntype: "Map",
|
|
|
|
|
+ parammaps: {
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ ftname: "",
|
|
|
|
|
+ },
|
|
|
|
|
+ },
|
|
|
|
|
+ requestParams: [
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "getBarListEnable",
|
|
|
|
|
+ offset: 0,
|
|
|
|
|
+ pagecount: 0,
|
|
|
|
|
+ parammaps: { pastureid: Cookies.get("pastureid") },
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "getSysoptEnable",
|
|
|
|
|
+ offset: 0,
|
|
|
pagecount: 0,
|
|
pagecount: 0,
|
|
|
- returntype: 'Map',
|
|
|
|
|
parammaps: {
|
|
parammaps: {
|
|
|
- pastureid: Cookies.get('pastureid'),
|
|
|
|
|
- ftname:"",
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ inforname: "times",
|
|
|
|
|
+ },
|
|
|
|
|
+ },
|
|
|
|
|
+ {
|
|
|
|
|
+ name: "getTMRListEnableType",
|
|
|
|
|
+ offset: 0,
|
|
|
|
|
+ pagecount: 0,
|
|
|
|
|
+ parammaps: { pastureid: Cookies.get("pastureid"), eqtype: "1" },
|
|
|
},
|
|
},
|
|
|
- requestParams: [
|
|
|
|
|
- { name: 'getBarListEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid') }},
|
|
|
|
|
- { name: 'getSysoptEnable', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'inforname': 'times' }},
|
|
|
|
|
- { name: 'getTMRListEnableType', offset: 0, pagecount: 0, parammaps: { 'pastureid': Cookies.get('pastureid'), 'eqtype': '1' }},
|
|
|
|
|
-
|
|
|
|
|
],
|
|
],
|
|
|
houseNameList: [], // 栏舍名称
|
|
houseNameList: [], // 栏舍名称
|
|
|
frequencyList: [], // 收集
|
|
frequencyList: [], // 收集
|
|
|
- recordList:[{id:'0',name:'手动记录'},{id:'1',name:'TMR设备自动记录'}],
|
|
|
|
|
- record:'0',
|
|
|
|
|
|
|
+ recordList: [
|
|
|
|
|
+ { id: "0", name: "手动记录" },
|
|
|
|
|
+ { id: "1", name: "TMR设备自动记录" },
|
|
|
|
|
+ ],
|
|
|
|
|
+ record: "0",
|
|
|
table: {
|
|
table: {
|
|
|
getdataListParm: {
|
|
getdataListParm: {
|
|
|
- name: 'getBarfeedremainList',
|
|
|
|
|
|
|
+ name: "getBarfeedremainList",
|
|
|
page: 1,
|
|
page: 1,
|
|
|
offset: 1,
|
|
offset: 1,
|
|
|
- pagecount: parseInt(Cookies.get('pageCount')),
|
|
|
|
|
- returntype: 'Map',
|
|
|
|
|
|
|
+ pagecount: parseInt(Cookies.get("pageCount")),
|
|
|
|
|
+ returntype: "Map",
|
|
|
parammaps: {
|
|
parammaps: {
|
|
|
- pastureid: Cookies.get('pastureid'),
|
|
|
|
|
- barid: '',
|
|
|
|
|
- startTime: '',
|
|
|
|
|
- stopTime: '',
|
|
|
|
|
- inputDatetime: ''
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ barid: "",
|
|
|
|
|
+ startTime: "",
|
|
|
|
|
+ stopTime: "",
|
|
|
|
|
+ inputDatetime: "",
|
|
|
|
|
+ },
|
|
|
},
|
|
},
|
|
|
tableKey: 0,
|
|
tableKey: 0,
|
|
|
list: [],
|
|
list: [],
|
|
|
total: 0,
|
|
total: 0,
|
|
|
listLoading: true,
|
|
listLoading: true,
|
|
|
temp: {},
|
|
temp: {},
|
|
|
- tableKey2:0,
|
|
|
|
|
|
|
+ tableKey2: 0,
|
|
|
listLoading2: false,
|
|
listLoading2: false,
|
|
|
- list2:[]
|
|
|
|
|
|
|
+ list2: [],
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// 新增/编辑
|
|
// 新增/编辑
|
|
|
create: {
|
|
create: {
|
|
|
dialogFormVisible: false,
|
|
dialogFormVisible: false,
|
|
|
- dialogStatus: '',
|
|
|
|
|
- temp: { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'), emp: Cookies.get('employename'), barid: '', barname: '', remain: '',dry:0, times: '0',remaindate:'' },
|
|
|
|
|
|
|
+ dialogStatus: "",
|
|
|
|
|
+ temp: {
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ operatetime: parseTime(new Date(), "{y}-{m}-{d} {h}:{i}"),
|
|
|
|
|
+ emp: Cookies.get("employename"),
|
|
|
|
|
+ barid: "",
|
|
|
|
|
+ barname: "",
|
|
|
|
|
+ remain: "",
|
|
|
|
|
+ dry: 0,
|
|
|
|
|
+ times: "0",
|
|
|
|
|
+ remaindate: "",
|
|
|
|
|
+ },
|
|
|
rules: {
|
|
rules: {
|
|
|
- barid: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
|
|
- remain: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
|
|
- times: [{ type: 'string', required: true, message: '必填', trigger: 'blur' }],
|
|
|
|
|
- ftname:[{ type: 'string', required: true, message: '必填', trigger: 'blur' }]
|
|
|
|
|
|
|
+ barid: [
|
|
|
|
|
+ {
|
|
|
|
|
+ type: "string",
|
|
|
|
|
+ required: true,
|
|
|
|
|
+ message: "必填",
|
|
|
|
|
+ trigger: "blur",
|
|
|
|
|
+ },
|
|
|
|
|
+ ],
|
|
|
|
|
+ remain: [
|
|
|
|
|
+ {
|
|
|
|
|
+ type: "string",
|
|
|
|
|
+ required: true,
|
|
|
|
|
+ message: "必填",
|
|
|
|
|
+ trigger: "blur",
|
|
|
|
|
+ },
|
|
|
|
|
+ ],
|
|
|
|
|
+ times: [
|
|
|
|
|
+ {
|
|
|
|
|
+ type: "string",
|
|
|
|
|
+ required: true,
|
|
|
|
|
+ message: "必填",
|
|
|
|
|
+ trigger: "blur",
|
|
|
|
|
+ },
|
|
|
|
|
+ ],
|
|
|
|
|
+ ftname: [
|
|
|
|
|
+ {
|
|
|
|
|
+ type: "string",
|
|
|
|
|
+ required: true,
|
|
|
|
|
+ message: "必填",
|
|
|
|
|
+ trigger: "blur",
|
|
|
|
|
+ },
|
|
|
|
|
+ ],
|
|
|
},
|
|
},
|
|
|
getdataListParm: {
|
|
getdataListParm: {
|
|
|
- name: 'getBarfeedremainEmpHis',
|
|
|
|
|
|
|
+ name: "getBarfeedremainEmpHis",
|
|
|
page: 1,
|
|
page: 1,
|
|
|
offset: 1,
|
|
offset: 1,
|
|
|
pagecount: 10,
|
|
pagecount: 10,
|
|
|
- returntype: 'Map',
|
|
|
|
|
|
|
+ returntype: "Map",
|
|
|
parammaps: {
|
|
parammaps: {
|
|
|
- pastureid: Cookies.get('pastureid')
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ },
|
|
|
},
|
|
},
|
|
|
- noteTakerList: [] // 记录人
|
|
|
|
|
|
|
+ noteTakerList: [], // 记录人
|
|
|
},
|
|
},
|
|
|
textMap: {
|
|
textMap: {
|
|
|
- create: '新增',
|
|
|
|
|
- update: '编辑'
|
|
|
|
|
|
|
+ create: "新增",
|
|
|
|
|
+ update: "编辑",
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
requestParam: {},
|
|
requestParam: {},
|
|
|
download: {
|
|
download: {
|
|
|
getdataListParm: {
|
|
getdataListParm: {
|
|
|
- name: 'getBarfeedremainList',
|
|
|
|
|
|
|
+ name: "getBarfeedremainList",
|
|
|
page: 1,
|
|
page: 1,
|
|
|
offset: 1,
|
|
offset: 1,
|
|
|
pagecount: 0,
|
|
pagecount: 0,
|
|
|
- returntype: 'Map',
|
|
|
|
|
|
|
+ returntype: "Map",
|
|
|
parammaps: {
|
|
parammaps: {
|
|
|
- pastureid: Cookies.get('pastureid'),
|
|
|
|
|
- barid: '',
|
|
|
|
|
- startTime: '',
|
|
|
|
|
- stopTime: '',
|
|
|
|
|
- inputDatetime: ''
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ barid: "",
|
|
|
|
|
+ startTime: "",
|
|
|
|
|
+ stopTime: "",
|
|
|
|
|
+ inputDatetime: "",
|
|
|
|
|
+ },
|
|
|
},
|
|
},
|
|
|
- list: []
|
|
|
|
|
|
|
+ list: [],
|
|
|
},
|
|
},
|
|
|
dataSynchronization: {
|
|
dataSynchronization: {
|
|
|
dialogFormVisible: false,
|
|
dialogFormVisible: false,
|
|
|
- dialogStatus: '',
|
|
|
|
|
|
|
+ dialogStatus: "",
|
|
|
getdataListParm: {
|
|
getdataListParm: {
|
|
|
- name: 'getSysoptEnable',
|
|
|
|
|
|
|
+ name: "getSysoptEnable",
|
|
|
page: 1,
|
|
page: 1,
|
|
|
offset: 1,
|
|
offset: 1,
|
|
|
pagecount: 1,
|
|
pagecount: 1,
|
|
|
- returntype: 'Map',
|
|
|
|
|
|
|
+ returntype: "Map",
|
|
|
parammaps: {
|
|
parammaps: {
|
|
|
- pastureid: Cookies.get('pastureid'),
|
|
|
|
|
- inforname: 'wgSap'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ inforname: "wgSap",
|
|
|
|
|
+ },
|
|
|
},
|
|
},
|
|
|
- isDataSynchronization: false
|
|
|
|
|
|
|
+ isDataSynchronization: false,
|
|
|
},
|
|
},
|
|
|
isokDisable: false,
|
|
isokDisable: false,
|
|
|
selectList: [],
|
|
selectList: [],
|
|
|
- rowStyle: { maxHeight: 30 + 'px', height: 30 + 'px' },
|
|
|
|
|
- cellStyle: { padding: 0 + 'px' },
|
|
|
|
|
- myHeight:document.documentElement.clientHeight - 85- 150 - 45,
|
|
|
|
|
- url:'authdata/ImportExcel'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ rowStyle: { maxHeight: 30 + "px", height: 30 + "px" },
|
|
|
|
|
+ cellStyle: { padding: 0 + "px" },
|
|
|
|
|
+ myHeight: document.documentElement.clientHeight - 85 - 150 - 45,
|
|
|
|
|
+ url: "authdata/ImportExcel",
|
|
|
|
|
+ };
|
|
|
},
|
|
},
|
|
|
computed: {
|
|
computed: {
|
|
|
// 设置请求头
|
|
// 设置请求头
|
|
|
headers() {
|
|
headers() {
|
|
|
return {
|
|
return {
|
|
|
- token: getToken()
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ token: getToken(),
|
|
|
|
|
+ };
|
|
|
},
|
|
},
|
|
|
uploadData() {
|
|
uploadData() {
|
|
|
return {
|
|
return {
|
|
|
- name: 'checkbarname,checktimes,insertBarfeedremainUpload',
|
|
|
|
|
- importParams: '栏舍名称,配方名称,原剩料所属时间,剩料量(kg),干物质,班次收集(一天/第一班/第二班/第三班),收集时间,操作人',
|
|
|
|
|
- sheetname: 'Sheet1',
|
|
|
|
|
|
|
+ name: "checkbarname,checktimes,insertBarfeedremainUpload",
|
|
|
|
|
+ importParams:
|
|
|
|
|
+ "栏舍名称,配方名称,原剩料所属时间,剩料量(kg),干物质,班次收集(一天/第一班/第二班/第三班),收集时间,操作人",
|
|
|
|
|
+ sheetname: "Sheet1",
|
|
|
// 登录牧场
|
|
// 登录牧场
|
|
|
- pastureid: Cookies.get('pastureid'),
|
|
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
// 日期参数
|
|
// 日期参数
|
|
|
- dateParams: '原剩料所属时间',
|
|
|
|
|
|
|
+ dateParams: "原剩料所属时间",
|
|
|
// 必填参数
|
|
// 必填参数
|
|
|
- requiredParams: '栏舍名称,剩料量(kg),班次收集(一天/第一班/第二班/第三班)',
|
|
|
|
|
|
|
+ requiredParams:
|
|
|
|
|
+ "栏舍名称,剩料量(kg),班次收集(一天/第一班/第二班/第三班)",
|
|
|
// 为数值的参数
|
|
// 为数值的参数
|
|
|
- numParams: '剩料量(kg)'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ numParams: "剩料量(kg)",
|
|
|
|
|
+ };
|
|
|
},
|
|
},
|
|
|
// 设置上传地址
|
|
// 设置上传地址
|
|
|
uploadExcelUrl() {
|
|
uploadExcelUrl() {
|
|
|
// return Cookies.get('url') + 'authdata/ImportExcel'
|
|
// return Cookies.get('url') + 'authdata/ImportExcel'
|
|
|
- return Cookies.get('url') + 'authdata/ImportExcel'
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ return Cookies.get("url") + "authdata/ImportExcel";
|
|
|
|
|
+ },
|
|
|
// let url = 'authdata/ImportExcel';
|
|
// let url = 'authdata/ImportExcel';
|
|
|
-
|
|
|
|
|
},
|
|
},
|
|
|
created() {
|
|
created() {
|
|
|
- console.log(document.querySelector("html").getAttribute("domain"),'7777')
|
|
|
|
|
- this.getDataSynchronization()
|
|
|
|
|
- this.getList()
|
|
|
|
|
- this.getDownList()
|
|
|
|
|
- this.getButtons()
|
|
|
|
|
|
|
+ console.log(document.querySelector("html").getAttribute("domain"), "7777");
|
|
|
|
|
+ this.getDataSynchronization();
|
|
|
|
|
+ this.getList();
|
|
|
|
|
+ this.getDownList();
|
|
|
|
|
+ this.getButtons();
|
|
|
|
|
+ this.getIsSap();
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
methods: {
|
|
methods: {
|
|
|
|
|
+ disabledDateT(time) {
|
|
|
|
|
+ const today = new Date();
|
|
|
|
|
+ const oneMonthAgo = new Date();
|
|
|
|
|
+ oneMonthAgo.setDate(today.getDate() - 15);
|
|
|
|
|
+ console.log(today.getTime(), oneMonthAgo.getTime(), "选择日期----2");
|
|
|
|
|
+ // return time.getTime() > today.getTime() || time.getTime() < oneMonthAgo.getTime();
|
|
|
|
|
+ return time.getTime() > today.getTime();
|
|
|
|
|
+ },
|
|
|
|
|
+ checkDateDifference(date1, date2) {
|
|
|
|
|
+ const dateObj1 = new Date(date1);
|
|
|
|
|
+ const dateObj2 = new Date(date2);
|
|
|
|
|
+ const differenceInMs = Math.abs(dateObj2 - dateObj1);
|
|
|
|
|
+ const differenceInDays = differenceInMs / (1000 * 60 * 60 * 24);
|
|
|
|
|
+ if (differenceInDays > 7) {
|
|
|
|
|
+ this.$message.warning("日期范围相隔大于7天,请重新选择!");
|
|
|
|
|
+ return false;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.dateRange = [date1, date2];
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ handleDateChange(value) {
|
|
|
|
|
+ console.log(value, "arr");
|
|
|
|
|
+ if (value.length === 2) {
|
|
|
|
|
+ this.checkDateDifference(value[0], value[1]);
|
|
|
|
|
+ }
|
|
|
|
|
+ },
|
|
|
|
|
+ sapUploadData() {
|
|
|
|
|
+ this.$refs["sapUpload"].validate((valid) => {
|
|
|
|
|
+ if (valid) {
|
|
|
|
|
+ const url = "authdata/xdmy/sap/leftoverEntry";
|
|
|
|
|
+ const data = {
|
|
|
|
|
+ // "name":"xdmysapupload",
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ date: parseTime(this.sapUpload.temp.date, "{y}-{m}-{d}"),
|
|
|
|
|
+ };
|
|
|
|
|
+ postJson(url, data).then((response) => {
|
|
|
|
|
+ if (response.msg == "ok") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "",
|
|
|
|
|
+ message: "成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.sapUpload.dialogFormVisible = false;
|
|
|
|
|
+ this.getList();
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+ getIsSap() {
|
|
|
|
|
+ GetDataByName(this.sapUpload.getdataListParm).then((response) => {
|
|
|
|
|
+ if (response.data.list !== null) {
|
|
|
|
|
+ if (response.data.list[0].inforvalue == 1) {
|
|
|
|
|
+ this.sapUpload.isSap = true;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.sapUpload.isSap = false;
|
|
|
|
|
+ }
|
|
|
|
|
+ console.log(this.sapUpload.isSap);
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+ handleSAPUpload() {
|
|
|
|
|
+ this.sapUpload.dialogStatus = "sapUpload";
|
|
|
|
|
+ this.sapUpload.dialogFormVisible = true;
|
|
|
|
|
+ },
|
|
|
|
|
+
|
|
|
getDataSynchronization() {
|
|
getDataSynchronization() {
|
|
|
- GetDataByName(this.dataSynchronization.getdataListParm).then(response => {
|
|
|
|
|
- // console.log(response.data.list[0])
|
|
|
|
|
- if (response.data.list[0].inforvalue == 0) {
|
|
|
|
|
- this.dataSynchronization.isDataSynchronization = false
|
|
|
|
|
- } else {
|
|
|
|
|
- this.dataSynchronization.isDataSynchronization = true
|
|
|
|
|
|
|
+ GetDataByName(this.dataSynchronization.getdataListParm).then(
|
|
|
|
|
+ (response) => {
|
|
|
|
|
+ // console.log(response.data.list[0])
|
|
|
|
|
+ if (response.data.list[0].inforvalue == 0) {
|
|
|
|
|
+ this.dataSynchronization.isDataSynchronization = false;
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.dataSynchronization.isDataSynchronization = true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ );
|
|
|
},
|
|
},
|
|
|
getButtons() {
|
|
getButtons() {
|
|
|
- const Edit = 'MaterialRemainingRecord'
|
|
|
|
|
- const isRoleEdit = checkButtons(JSON.parse(sessionStorage.getItem('buttons')), Edit)
|
|
|
|
|
- this.isRoleEdit = isRoleEdit
|
|
|
|
|
|
|
+ const Edit = "MaterialRemainingRecord";
|
|
|
|
|
+ const isRoleEdit = checkButtons(
|
|
|
|
|
+ JSON.parse(sessionStorage.getItem("buttons")),
|
|
|
|
|
+ Edit
|
|
|
|
|
+ );
|
|
|
|
|
+ this.isRoleEdit = isRoleEdit;
|
|
|
},
|
|
},
|
|
|
getDownList() {
|
|
getDownList() {
|
|
|
- GetDataByNames(this.requestParams).then(response => {
|
|
|
|
|
- this.houseNameList = response.data.getBarListEnable.list
|
|
|
|
|
- this.TMRNumberList = response.data.getTMRListEnableType.list
|
|
|
|
|
|
|
+ GetDataByNames(this.requestParams).then((response) => {
|
|
|
|
|
+ this.houseNameList = response.data.getBarListEnable.list;
|
|
|
|
|
+ this.TMRNumberList = response.data.getTMRListEnableType.list;
|
|
|
if (response.data.getSysoptEnable.list !== null) {
|
|
if (response.data.getSysoptEnable.list !== null) {
|
|
|
- for (let i = 1; i <= response.data.getSysoptEnable.list[0].inforvalue; i++) {
|
|
|
|
|
- const obj = {}
|
|
|
|
|
- obj.id = String(i)
|
|
|
|
|
- if (i == 1) { obj.name = '第一班' } else if (i == 2) { obj.name = '第二班' } else if (i == 3) { obj.name = '第三班' } else if (i == 4) { obj.name = '第四班' }else if (i == 5) { obj.name = '第五班' }else if (i == 6) { obj.name = '第六班' }
|
|
|
|
|
- this.frequencyList.push(obj)
|
|
|
|
|
|
|
+ for (
|
|
|
|
|
+ let i = 1;
|
|
|
|
|
+ i <= response.data.getSysoptEnable.list[0].inforvalue;
|
|
|
|
|
+ i++
|
|
|
|
|
+ ) {
|
|
|
|
|
+ const obj = {};
|
|
|
|
|
+ obj.id = String(i);
|
|
|
|
|
+ if (i == 1) {
|
|
|
|
|
+ obj.name = "第一班";
|
|
|
|
|
+ } else if (i == 2) {
|
|
|
|
|
+ obj.name = "第二班";
|
|
|
|
|
+ } else if (i == 3) {
|
|
|
|
|
+ obj.name = "第三班";
|
|
|
|
|
+ } else if (i == 4) {
|
|
|
|
|
+ obj.name = "第四班";
|
|
|
|
|
+ } else if (i == 5) {
|
|
|
|
|
+ obj.name = "第五班";
|
|
|
|
|
+ } else if (i == 6) {
|
|
|
|
|
+ obj.name = "第六班";
|
|
|
|
|
+ }
|
|
|
|
|
+ this.frequencyList.push(obj);
|
|
|
}
|
|
}
|
|
|
- this.frequencyList.unshift({id:'0',name:"一天"})
|
|
|
|
|
|
|
+ this.frequencyList.unshift({ id: "0", name: "一天" });
|
|
|
} else {
|
|
} else {
|
|
|
- this.frequencyList = [{id:'0',name:"一天"}]
|
|
|
|
|
|
|
+ this.frequencyList = [{ id: "0", name: "一天" }];
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
handleBefore() {
|
|
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()
|
|
|
|
|
|
|
+ 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();
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
handleNext() {
|
|
handleNext() {
|
|
|
- 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()
|
|
|
|
|
|
|
+ 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();
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
getList() {
|
|
getList() {
|
|
|
- this.table.listLoading = true
|
|
|
|
|
- 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.table.listLoading = true;
|
|
|
|
|
+ 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}"
|
|
|
|
|
+ );
|
|
|
} else {
|
|
} else {
|
|
|
- this.table.getdataListParm.parammaps.inputDatetime = ''
|
|
|
|
|
- this.table.getdataListParm.parammaps.startTime = ''
|
|
|
|
|
- this.table.getdataListParm.parammaps.stopTime = ''
|
|
|
|
|
|
|
+ this.table.getdataListParm.parammaps.inputDatetime = "";
|
|
|
|
|
+ this.table.getdataListParm.parammaps.startTime = "";
|
|
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = "";
|
|
|
}
|
|
}
|
|
|
- GetDataByName(this.table.getdataListParm).then(response => {
|
|
|
|
|
- console.log('table数据', response.data.list)
|
|
|
|
|
|
|
+ GetDataByName(this.table.getdataListParm).then((response) => {
|
|
|
|
|
+ console.log("table数据", response.data.list);
|
|
|
if (response.data.list !== null) {
|
|
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
|
|
|
|
|
|
|
+ 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 {
|
|
} else {
|
|
|
- this.table.list = []
|
|
|
|
|
|
|
+ this.table.list = [];
|
|
|
}
|
|
}
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.table.listLoading = false
|
|
|
|
|
- }, 100)
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ this.table.listLoading = false;
|
|
|
|
|
+ }, 100);
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
- changeRecord(item){
|
|
|
|
|
- if(item == '0'){
|
|
|
|
|
- this.table.getdataListParm.name = 'getBarfeedremainList'
|
|
|
|
|
- }else{
|
|
|
|
|
- this.table.getdataListParm.name = 'getRemainplanrecord'
|
|
|
|
|
|
|
+ changeRecord(item) {
|
|
|
|
|
+ if (item == "0") {
|
|
|
|
|
+ this.table.getdataListParm.name = "getBarfeedremainList";
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.table.getdataListParm.name = "getRemainplanrecord";
|
|
|
}
|
|
}
|
|
|
- this.table.getdataListParm.offset = 1
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ this.table.getdataListParm.offset = 1;
|
|
|
|
|
+ this.getList();
|
|
|
},
|
|
},
|
|
|
form_search() {
|
|
form_search() {
|
|
|
- console.log('点击了查询')
|
|
|
|
|
- this.table.getdataListParm.offset = 1
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ console.log("点击了查询");
|
|
|
|
|
+ this.table.getdataListParm.offset = 1;
|
|
|
|
|
+ this.getList();
|
|
|
},
|
|
},
|
|
|
handleRefresh() {
|
|
handleRefresh() {
|
|
|
- console.log('点击了重置')
|
|
|
|
|
- this.table.getdataListParm.parammaps.barid = ''
|
|
|
|
|
- this.table.getdataListParm.parammaps.startTime = ''
|
|
|
|
|
- this.table.getdataListParm.parammaps.stopTime = ''
|
|
|
|
|
- this.table.getdataListParm.parammaps.inputDatetime = ''
|
|
|
|
|
- this.table.getdataListParm.offset = 1
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ console.log("点击了重置");
|
|
|
|
|
+ this.table.getdataListParm.parammaps.barid = "";
|
|
|
|
|
+ this.table.getdataListParm.parammaps.startTime = "";
|
|
|
|
|
+ this.table.getdataListParm.parammaps.stopTime = "";
|
|
|
|
|
+ this.table.getdataListParm.parammaps.inputDatetime = "";
|
|
|
|
|
+ this.table.getdataListParm.offset = 1;
|
|
|
|
|
+ this.getList();
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// 新增
|
|
// 新增
|
|
|
resetTemp() {
|
|
resetTemp() {
|
|
|
- this.create.temp = { pastureid: Cookies.get('pastureid'), operatetime: parseTime(new Date(), '{y}-{m}-{d} {h}:{i}'), emp: Cookies.get('employename'), barid: '', barname: '', remain: '',dry:0, times: '0',remaindate:'' }
|
|
|
|
|
|
|
+ this.create.temp = {
|
|
|
|
|
+ pastureid: Cookies.get("pastureid"),
|
|
|
|
|
+ operatetime: parseTime(new Date(), "{y}-{m}-{d} {h}:{i}"),
|
|
|
|
|
+ emp: Cookies.get("employename"),
|
|
|
|
|
+ barid: "",
|
|
|
|
|
+ barname: "",
|
|
|
|
|
+ remain: "",
|
|
|
|
|
+ dry: 0,
|
|
|
|
|
+ times: "0",
|
|
|
|
|
+ remaindate: "",
|
|
|
|
|
+ };
|
|
|
},
|
|
},
|
|
|
blurEmp(item) {
|
|
blurEmp(item) {
|
|
|
- this.create.temp.emp = item.target.value
|
|
|
|
|
|
|
+ this.create.temp.emp = item.target.value;
|
|
|
},
|
|
},
|
|
|
// 栏舍名称
|
|
// 栏舍名称
|
|
|
changeBar(item) {
|
|
changeBar(item) {
|
|
|
- this.create.temp.barname = this.houseNameList.find(obj => obj.id === item).bname;
|
|
|
|
|
- this.getParmas.parammaps.barid = item;
|
|
|
|
|
|
|
+ this.create.temp.barname = this.houseNameList.find(
|
|
|
|
|
+ (obj) => obj.id === item
|
|
|
|
|
+ ).bname;
|
|
|
|
|
+ this.getParmas.parammaps.barid = item;
|
|
|
this.chooseftname();
|
|
this.chooseftname();
|
|
|
},
|
|
},
|
|
|
// 根据栏舍选择配方名称
|
|
// 根据栏舍选择配方名称
|
|
|
- chooseftname(){
|
|
|
|
|
- GetDataByName(this.getParmas).then(res=>{
|
|
|
|
|
|
|
+ chooseftname() {
|
|
|
|
|
+ GetDataByName(this.getParmas).then((res) => {
|
|
|
const { data } = res;
|
|
const { data } = res;
|
|
|
- const ftname =data.list.length && data.list[0].ftname;
|
|
|
|
|
- this.$set(this.create.temp, 'ftname', ftname)
|
|
|
|
|
|
|
+ const ftname = data.list.length && data.list[0].ftname;
|
|
|
|
|
+ this.$set(this.create.temp, "ftname", ftname);
|
|
|
// this.create.temp.ftname = ftname;
|
|
// this.create.temp.ftname = ftname;
|
|
|
- console.log( this.create.temp.ftname,ftname, '配方名字');
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ console.log(this.create.temp.ftname, ftname, "配方名字");
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
getNoteTakerList() {
|
|
getNoteTakerList() {
|
|
|
- GetDataByName(this.create.getdataListParm).then(response => {
|
|
|
|
|
|
|
+ GetDataByName(this.create.getdataListParm).then((response) => {
|
|
|
if (response.data.list !== null) {
|
|
if (response.data.list !== null) {
|
|
|
for (let i = 0; i < response.data.list.length; i++) {
|
|
for (let i = 0; i < response.data.list.length; i++) {
|
|
|
- response.data.list[i].myId = i
|
|
|
|
|
|
|
+ response.data.list[i].myId = i;
|
|
|
}
|
|
}
|
|
|
- this.create.noteTakerList = response.data.list
|
|
|
|
|
- console.log('记录人数据', response.data.list)
|
|
|
|
|
- console.log(this.create.noteTakerList)
|
|
|
|
|
|
|
+ this.create.noteTakerList = response.data.list;
|
|
|
|
|
+ console.log("记录人数据", response.data.list);
|
|
|
|
|
+ console.log(this.create.noteTakerList);
|
|
|
} else {
|
|
} else {
|
|
|
- this.create.noteTakerList = []
|
|
|
|
|
|
|
+ this.create.noteTakerList = [];
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
handleCreate() {
|
|
handleCreate() {
|
|
|
- console.log('点击了新增', this.create)
|
|
|
|
|
|
|
+ console.log("点击了新增", this.create);
|
|
|
|
|
|
|
|
- this.dialogFull = false
|
|
|
|
|
- this.resetTemp()
|
|
|
|
|
- this.getNoteTakerList()
|
|
|
|
|
- this.create.dialogStatus = 'create'
|
|
|
|
|
- this.create.dialogFormVisible = true
|
|
|
|
|
|
|
+ this.dialogFull = false;
|
|
|
|
|
+ this.resetTemp();
|
|
|
|
|
+ this.getNoteTakerList();
|
|
|
|
|
+ this.create.dialogStatus = "create";
|
|
|
|
|
+ this.create.dialogFormVisible = true;
|
|
|
},
|
|
},
|
|
|
createData() {
|
|
createData() {
|
|
|
- console.log('点击了新增保存')
|
|
|
|
|
- console.log(this.create.temp,'发送数据')
|
|
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ console.log("点击了新增保存");
|
|
|
|
|
+ console.log(this.create.temp, "发送数据");
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- this.$refs['temp'].validate(valid => {
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ this.$refs["temp"].validate((valid) => {
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- const remain = /^\d+(\.\d{1,2})?$/
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ const remain = /^\d+(\.\d{1,2})?$/;
|
|
|
// 剩料量
|
|
// 剩料量
|
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
|
- this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
|
|
|
|
|
- return false
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "剩料量请输入自然数并保留两位小数",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (this.create.temp.dry) {
|
|
|
|
|
+ this.create.temp.dry = parseFloat(this.create.temp.dry);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.create.temp.dry = 0;
|
|
|
}
|
|
}
|
|
|
- if(this.create.temp.dry){
|
|
|
|
|
- this.create.temp.dry = parseFloat(this.create.temp.dry)
|
|
|
|
|
- }else{
|
|
|
|
|
- this.create.temp.dry = 0
|
|
|
|
|
|
|
+ this.requestParam.name = "insertBarfeedremain";
|
|
|
|
|
+ this.requestParam.parammaps = this.create.temp;
|
|
|
|
|
+ if (this.create.temp.emp == "") {
|
|
|
|
|
+ this.create.temp.emp = Cookies.get("employename");
|
|
|
}
|
|
}
|
|
|
- this.requestParam.name = 'insertBarfeedremain'
|
|
|
|
|
- this.requestParam.parammaps = this.create.temp
|
|
|
|
|
- if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
|
|
|
|
|
- PostDataByName(this.requestParam).then(response => {
|
|
|
|
|
- console.log('新增保存发送参数', this.requestParam)
|
|
|
|
|
- if (response.msg !== 'fail') {
|
|
|
|
|
- this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
|
|
- this.create.dialogFormVisible = false
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ PostDataByName(this.requestParam).then((response) => {
|
|
|
|
|
+ console.log("新增保存发送参数", this.requestParam);
|
|
|
|
|
+ if (response.msg !== "fail") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "成功",
|
|
|
|
|
+ message: "保存成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.create.dialogFormVisible = false;
|
|
|
|
|
+ this.getList();
|
|
|
} else {
|
|
} else {
|
|
|
- const barid = new RegExp("key 'barid'")
|
|
|
|
|
|
|
+ const barid = new RegExp("key 'barid'");
|
|
|
if (barid.test(response.data)) {
|
|
if (barid.test(response.data)) {
|
|
|
- this.$message({ type: 'error', message: '该栏舍该班次收集今日剩料量已存在,不可重复生成', duration: 2000 })
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "该栏舍该班次收集今日剩料量已存在,不可重复生成",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "保存失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
createDataAgain() {
|
|
createDataAgain() {
|
|
|
- console.log('点击了新增保存',this.create.temp)
|
|
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ console.log("点击了新增保存", this.create.temp);
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- this.$refs['temp'].validate(valid => {
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ this.$refs["temp"].validate((valid) => {
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- const remain = /^\d+(\.\d{1,2})?$/
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ const remain = /^\d+(\.\d{1,2})?$/;
|
|
|
// 剩料量
|
|
// 剩料量
|
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
|
- this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
|
|
|
|
|
- return false
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "剩料量请输入自然数并保留两位小数",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ return false;
|
|
|
|
|
+ }
|
|
|
|
|
+ if (this.create.temp.dry) {
|
|
|
|
|
+ this.create.temp.dry = parseFloat(this.create.temp.dry);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.create.temp.dry = 0;
|
|
|
}
|
|
}
|
|
|
- if(this.create.temp.dry){
|
|
|
|
|
- this.create.temp.dry = parseFloat(this.create.temp.dry)
|
|
|
|
|
- }else{
|
|
|
|
|
- this.create.temp.dry = 0
|
|
|
|
|
|
|
+ this.requestParam.name = "insertBarfeedremain";
|
|
|
|
|
+ this.requestParam.parammaps = this.create.temp;
|
|
|
|
|
+ if (this.create.temp.emp == "") {
|
|
|
|
|
+ this.create.temp.emp = Cookies.get("employename");
|
|
|
}
|
|
}
|
|
|
- this.requestParam.name = 'insertBarfeedremain'
|
|
|
|
|
- this.requestParam.parammaps = this.create.temp
|
|
|
|
|
- if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
|
|
|
|
|
- PostDataByName(this.requestParam).then(response => {
|
|
|
|
|
- console.log('新增保存发送参数', this.requestParam)
|
|
|
|
|
- if (response.msg !== 'fail') {
|
|
|
|
|
- this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
|
|
- this.resetTemp()
|
|
|
|
|
- this.getList()
|
|
|
|
|
- this.getNoteTakerList()
|
|
|
|
|
|
|
+ PostDataByName(this.requestParam).then((response) => {
|
|
|
|
|
+ console.log("新增保存发送参数", this.requestParam);
|
|
|
|
|
+ if (response.msg !== "fail") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "成功",
|
|
|
|
|
+ message: "保存成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.resetTemp();
|
|
|
|
|
+ this.getList();
|
|
|
|
|
+ this.getNoteTakerList();
|
|
|
} else {
|
|
} else {
|
|
|
- const barid = new RegExp("key 'barid'")
|
|
|
|
|
|
|
+ const barid = new RegExp("key 'barid'");
|
|
|
if (barid.test(response.data)) {
|
|
if (barid.test(response.data)) {
|
|
|
- this.$message({ type: 'error', message: '该栏舍该班次收集收集今日剩料量已存在,不可重复生成', duration: 2000 })
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "该栏舍该班次收集收集今日剩料量已存在,不可重复生成",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "保存失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// 编辑
|
|
// 编辑
|
|
|
handleUpdate(row) {
|
|
handleUpdate(row) {
|
|
|
- console.log('点击了编辑', row)
|
|
|
|
|
- console.log(this.frequencyList,'frequencyList')
|
|
|
|
|
- this.dialogFull = false
|
|
|
|
|
- row.barid = String(row.barid)
|
|
|
|
|
- this.create.temp = Object.assign({}, row)
|
|
|
|
|
- this.create.temp.id = row.id
|
|
|
|
|
|
|
+ console.log("点击了编辑", row);
|
|
|
|
|
+ console.log(this.frequencyList, "frequencyList");
|
|
|
|
|
+ this.dialogFull = false;
|
|
|
|
|
+ row.barid = String(row.barid);
|
|
|
|
|
+ this.create.temp = Object.assign({}, row);
|
|
|
|
|
+ this.create.temp.id = row.id;
|
|
|
|
|
|
|
|
- this.getNoteTakerList()
|
|
|
|
|
- this.create.dialogStatus = 'update'
|
|
|
|
|
- this.create.dialogFormVisible = true
|
|
|
|
|
|
|
+ this.getNoteTakerList();
|
|
|
|
|
+ this.create.dialogStatus = "update";
|
|
|
|
|
+ this.create.dialogFormVisible = true;
|
|
|
},
|
|
},
|
|
|
updateData() {
|
|
updateData() {
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- this.$refs['temp'].validate(valid => {
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ this.$refs["temp"].validate((valid) => {
|
|
|
if (valid) {
|
|
if (valid) {
|
|
|
- this.isokDisable = true
|
|
|
|
|
|
|
+ this.isokDisable = true;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isokDisable = false
|
|
|
|
|
- }, 1000)
|
|
|
|
|
- const remain = /^\d+(\.\d{1,2})?$/
|
|
|
|
|
|
|
+ this.isokDisable = false;
|
|
|
|
|
+ }, 1000);
|
|
|
|
|
+ const remain = /^\d+(\.\d{1,2})?$/;
|
|
|
// 剩料量
|
|
// 剩料量
|
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
if (!remain.test(parseFloat(this.create.temp.remain))) {
|
|
|
- this.$message({ type: 'error', message: '剩料量请输入自然数并保留两位小数', duration: 2000 })
|
|
|
|
|
- return false
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "剩料量请输入自然数并保留两位小数",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ return false;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- this.requestParam.name = 'updateBarfeedremain'
|
|
|
|
|
- if(this.create.temp.dry){
|
|
|
|
|
- this.create.temp.dry = parseFloat(this.create.temp.dry)
|
|
|
|
|
- }else{
|
|
|
|
|
- this.create.temp.dry = 0
|
|
|
|
|
|
|
+ this.requestParam.name = "updateBarfeedremain";
|
|
|
|
|
+ if (this.create.temp.dry) {
|
|
|
|
|
+ this.create.temp.dry = parseFloat(this.create.temp.dry);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.create.temp.dry = 0;
|
|
|
}
|
|
}
|
|
|
- this.requestParam.parammaps = this.create.temp
|
|
|
|
|
- if (this.create.temp.emp == '') { this.create.temp.emp = Cookies.get('employename') }
|
|
|
|
|
- PostDataByName(this.requestParam).then(response => {
|
|
|
|
|
- console.log('新增保存发送参数', this.requestParam)
|
|
|
|
|
- if (response.msg !== 'fail') {
|
|
|
|
|
- this.$notify({ title: '成功', message: '保存成功', type: 'success', duration: 2000 })
|
|
|
|
|
- this.create.dialogFormVisible = false
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ this.requestParam.parammaps = this.create.temp;
|
|
|
|
|
+ if (this.create.temp.emp == "") {
|
|
|
|
|
+ this.create.temp.emp = Cookies.get("employename");
|
|
|
|
|
+ }
|
|
|
|
|
+ PostDataByName(this.requestParam).then((response) => {
|
|
|
|
|
+ console.log("新增保存发送参数", this.requestParam);
|
|
|
|
|
+ if (response.msg !== "fail") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "成功",
|
|
|
|
|
+ message: "保存成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.create.dialogFormVisible = false;
|
|
|
|
|
+ this.getList();
|
|
|
} else {
|
|
} else {
|
|
|
- this.$notify({ title: '保存失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "保存失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
// 删除
|
|
// 删除
|
|
|
handleRowDelete(row) {
|
|
handleRowDelete(row) {
|
|
|
- console.log('点击了行内删除')
|
|
|
|
|
- MessageBox.confirm('是否确认删除此信息?', {
|
|
|
|
|
- confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
|
|
|
|
|
- }).then(() => {
|
|
|
|
|
- this.selectList = []
|
|
|
|
|
- this.requestParam.name = 'deleteBarfeedremain'
|
|
|
|
|
- this.requestParam.parammaps = {}
|
|
|
|
|
- this.requestParam.parammaps.pastureid = row.pastureid
|
|
|
|
|
- this.requestParam.parammaps.id = row.id
|
|
|
|
|
- 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: '已取消删除' })
|
|
|
|
|
|
|
+ console.log("点击了行内删除");
|
|
|
|
|
+ MessageBox.confirm("是否确认删除此信息?", {
|
|
|
|
|
+ confirmButtonText: "确认",
|
|
|
|
|
+ cancelButtonText: "取消",
|
|
|
|
|
+ type: "warning",
|
|
|
})
|
|
})
|
|
|
|
|
+ .then(() => {
|
|
|
|
|
+ this.selectList = [];
|
|
|
|
|
+ this.requestParam.name = "deleteBarfeedremain";
|
|
|
|
|
+ this.requestParam.parammaps = {};
|
|
|
|
|
+ this.requestParam.parammaps.pastureid = row.pastureid;
|
|
|
|
|
+ this.requestParam.parammaps.id = row.id;
|
|
|
|
|
+ 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: "已取消删除" });
|
|
|
|
|
+ });
|
|
|
},
|
|
},
|
|
|
handleSelectionChange(val) {
|
|
handleSelectionChange(val) {
|
|
|
- console.log('勾选数据', val)
|
|
|
|
|
- this.selectList = val
|
|
|
|
|
|
|
+ console.log("勾选数据", val);
|
|
|
|
|
+ this.selectList = val;
|
|
|
},
|
|
},
|
|
|
form_delete() {
|
|
form_delete() {
|
|
|
- console.log('点击了删除')
|
|
|
|
|
|
|
+ console.log("点击了删除");
|
|
|
if (this.selectList.length == 0) {
|
|
if (this.selectList.length == 0) {
|
|
|
- this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "请选择栏舍剩料记录",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- MessageBox.confirm('当前选中' + this.selectList.length + '条信息,是否删除?', {
|
|
|
|
|
- confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
|
|
|
|
|
- }).then(() => {
|
|
|
|
|
- console.log(this.selectList)
|
|
|
|
|
- this.requestParam.common = { 'returnmap': '0' }
|
|
|
|
|
- this.requestParam.data = []
|
|
|
|
|
- this.requestParam.data[0] = { 'name': 'insertSpotList', 'resultmaps': { 'list': this.selectList }}
|
|
|
|
|
- this.requestParam.data[0].children = []
|
|
|
|
|
- this.requestParam.data[0].children[0] = { 'name': 'deleteBarfeedremain', 'type': 'e', 'parammaps': {
|
|
|
|
|
- id: '@insertSpotList.id',
|
|
|
|
|
- pastureid: '@insertSpotList.pastureid'
|
|
|
|
|
- }}
|
|
|
|
|
- ExecDataByConfig(this.requestParam).then(response => {
|
|
|
|
|
- console.log('删除保存发送参数', this.requestParam)
|
|
|
|
|
- if (response.msg === 'fail') {
|
|
|
|
|
- this.$notify({ title: '删除失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
|
|
|
|
+ MessageBox.confirm(
|
|
|
|
|
+ "当前选中" + this.selectList.length + "条信息,是否删除?",
|
|
|
|
|
+ {
|
|
|
|
|
+ confirmButtonText: "确认",
|
|
|
|
|
+ cancelButtonText: "取消",
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ }
|
|
|
|
|
+ ).then(() => {
|
|
|
|
|
+ console.log(this.selectList);
|
|
|
|
|
+ this.requestParam.common = { returnmap: "0" };
|
|
|
|
|
+ this.requestParam.data = [];
|
|
|
|
|
+ this.requestParam.data[0] = {
|
|
|
|
|
+ name: "insertSpotList",
|
|
|
|
|
+ resultmaps: { list: this.selectList },
|
|
|
|
|
+ };
|
|
|
|
|
+ this.requestParam.data[0].children = [];
|
|
|
|
|
+ this.requestParam.data[0].children[0] = {
|
|
|
|
|
+ name: "deleteBarfeedremain",
|
|
|
|
|
+ type: "e",
|
|
|
|
|
+ parammaps: {
|
|
|
|
|
+ id: "@insertSpotList.id",
|
|
|
|
|
+ pastureid: "@insertSpotList.pastureid",
|
|
|
|
|
+ },
|
|
|
|
|
+ };
|
|
|
|
|
+ ExecDataByConfig(this.requestParam).then((response) => {
|
|
|
|
|
+ console.log("删除保存发送参数", this.requestParam);
|
|
|
|
|
+ if (response.msg === "fail") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "删除失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- this.$notify({ title: '', message: '删除成功', type: 'success', duration: 2000 })
|
|
|
|
|
- this.getList()
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "",
|
|
|
|
|
+ message: "删除成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.getList();
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// 复制
|
|
// 复制
|
|
|
handleCopy() {
|
|
handleCopy() {
|
|
|
- console.log('点击了复制')
|
|
|
|
|
|
|
+ console.log("点击了复制");
|
|
|
if (this.selectList.length == 0) {
|
|
if (this.selectList.length == 0) {
|
|
|
- this.$message({ type: 'error', message: '请选择栏舍剩料记录', duration: 2000 })
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "请选择栏舍剩料记录",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
} else if (this.selectList.length == 1) {
|
|
} else if (this.selectList.length == 1) {
|
|
|
- MessageBox.confirm('是否确认复制此信息?', {
|
|
|
|
|
- confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning'
|
|
|
|
|
- }).then(() => {
|
|
|
|
|
- this.requestParam.name = 'copybarfeedremain'
|
|
|
|
|
- this.requestParam.parammaps = {}
|
|
|
|
|
- this.requestParam.parammaps.pastureid = this.selectList[0].pastureid
|
|
|
|
|
- this.requestParam.parammaps.id = this.selectList[0].id
|
|
|
|
|
- PostDataByName(this.requestParam).then(response => {
|
|
|
|
|
- if (response.msg === 'fail') {
|
|
|
|
|
- const barid = new RegExp("key 'barid'")
|
|
|
|
|
- if (barid.test(response.data)) {
|
|
|
|
|
- this.$notify({ type: 'warning', message: '该栏舍该班次收集今日剩料量已存在,不可重复生成', duration: 2000 })
|
|
|
|
|
- return
|
|
|
|
|
|
|
+ MessageBox.confirm("是否确认复制此信息?", {
|
|
|
|
|
+ confirmButtonText: "确认",
|
|
|
|
|
+ cancelButtonText: "取消",
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ })
|
|
|
|
|
+ .then(() => {
|
|
|
|
|
+ this.requestParam.name = "copybarfeedremain";
|
|
|
|
|
+ this.requestParam.parammaps = {};
|
|
|
|
|
+ this.requestParam.parammaps.pastureid =
|
|
|
|
|
+ this.selectList[0].pastureid;
|
|
|
|
|
+ this.requestParam.parammaps.id = this.selectList[0].id;
|
|
|
|
|
+ PostDataByName(this.requestParam).then((response) => {
|
|
|
|
|
+ if (response.msg === "fail") {
|
|
|
|
|
+ const barid = new RegExp("key 'barid'");
|
|
|
|
|
+ if (barid.test(response.data)) {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ message: "该栏舍该班次收集今日剩料量已存在,不可重复生成",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ return;
|
|
|
|
|
+ }
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "保存失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "成功",
|
|
|
|
|
+ message: "保存成功",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ this.getList();
|
|
|
}
|
|
}
|
|
|
- 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: '已取消复制' })
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ .catch(() => {
|
|
|
|
|
+ this.$message({ type: "info", message: "已取消复制" });
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- this.$message({ type: 'error', message: '请选择一条栏舍剩料记录', duration: 2000 })
|
|
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ type: "error",
|
|
|
|
|
+ message: "请选择一条栏舍剩料记录",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
// 导出
|
|
// 导出
|
|
|
handleExport(item) {
|
|
handleExport(item) {
|
|
|
if (item == 1) {
|
|
if (item == 1) {
|
|
|
- console.log('点击了导出模板')
|
|
|
|
|
- console.log('点击了导出模板')
|
|
|
|
|
- const requestParam = this.requestParam
|
|
|
|
|
- const url = Cookies.get('url') + 'authdata/barfeedremain/excel' // 请求下载文件的地址
|
|
|
|
|
- console.log(url)
|
|
|
|
|
|
|
+ console.log("点击了导出模板");
|
|
|
|
|
+ console.log("点击了导出模板");
|
|
|
|
|
+ const requestParam = this.requestParam;
|
|
|
|
|
+ const url = Cookies.get("url") + "authdata/barfeedremain/excel"; // 请求下载文件的地址
|
|
|
|
|
+ console.log(url);
|
|
|
axios({
|
|
axios({
|
|
|
- method: 'POST',
|
|
|
|
|
|
|
+ method: "POST",
|
|
|
url: url,
|
|
url: url,
|
|
|
data: requestParam,
|
|
data: requestParam,
|
|
|
- headers: { token: getToken(), optname: 'insertcustomdoc' },
|
|
|
|
|
- responseType: 'blob'
|
|
|
|
|
- }).then(res => {
|
|
|
|
|
- if (!res) return
|
|
|
|
|
- this.percentage = 99
|
|
|
|
|
|
|
+ headers: { token: getToken(), optname: "insertcustomdoc" },
|
|
|
|
|
+ responseType: "blob",
|
|
|
|
|
+ }).then((res) => {
|
|
|
|
|
+ if (!res) return;
|
|
|
|
|
+ this.percentage = 99;
|
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
|
- this.isPercentage = false
|
|
|
|
|
- }, 2000)
|
|
|
|
|
|
|
+ this.isPercentage = false;
|
|
|
|
|
+ }, 2000);
|
|
|
const blob = new Blob([res.data], {
|
|
const blob = new Blob([res.data], {
|
|
|
- type: 'application/octet-stream;charset=utf-8'
|
|
|
|
|
- })
|
|
|
|
|
- const url = window.URL.createObjectURL(blob)
|
|
|
|
|
- const aLink = document.createElement('a')
|
|
|
|
|
- aLink.style.display = 'none'
|
|
|
|
|
- aLink.href = url
|
|
|
|
|
- const docname = '栏舍剩料记录导入模板.xlsx'
|
|
|
|
|
- aLink.setAttribute('download', docname) // 下载的文件
|
|
|
|
|
- document.body.appendChild(aLink)
|
|
|
|
|
- aLink.click()
|
|
|
|
|
- document.body.removeChild(aLink)
|
|
|
|
|
- window.URL.revokeObjectURL(url)
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ type: "application/octet-stream;charset=utf-8",
|
|
|
|
|
+ });
|
|
|
|
|
+ const url = window.URL.createObjectURL(blob);
|
|
|
|
|
+ const aLink = document.createElement("a");
|
|
|
|
|
+ aLink.style.display = "none";
|
|
|
|
|
+ aLink.href = url;
|
|
|
|
|
+ const docname = "栏舍剩料记录导入模板.xlsx";
|
|
|
|
|
+ aLink.setAttribute("download", docname); // 下载的文件
|
|
|
|
|
+ document.body.appendChild(aLink);
|
|
|
|
|
+ aLink.click();
|
|
|
|
|
+ document.body.removeChild(aLink);
|
|
|
|
|
+ window.URL.revokeObjectURL(url);
|
|
|
|
|
+ });
|
|
|
} else {
|
|
} else {
|
|
|
- console.log('点击了导出数据',item,this.record)
|
|
|
|
|
- if(this.record == '0'){
|
|
|
|
|
- this.download.getdataListParm.name = 'getBarfeedremainList'
|
|
|
|
|
- }else{
|
|
|
|
|
- this.download.getdataListParm.name = 'getRemainplanrecord'
|
|
|
|
|
|
|
+ console.log("点击了导出数据", item, this.record);
|
|
|
|
|
+ if (this.record == "0") {
|
|
|
|
|
+ this.download.getdataListParm.name = "getBarfeedremainList";
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.download.getdataListParm.name = "getRemainplanrecord";
|
|
|
}
|
|
}
|
|
|
- this.download.getdataListParm.parammaps = this.table.getdataListParm.parammaps
|
|
|
|
|
- if (this.download.getdataListParm.parammaps.inputDatetime !== '' && this.download.getdataListParm.parammaps.inputDatetime !== null) {
|
|
|
|
|
- this.download.getdataListParm.parammaps.startTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[0], '{y}-{m}-{d}')
|
|
|
|
|
- this.download.getdataListParm.parammaps.stopTime = parseTime(this.download.getdataListParm.parammaps.inputDatetime[1], '{y}-{m}-{d}')
|
|
|
|
|
|
|
+ this.download.getdataListParm.parammaps =
|
|
|
|
|
+ this.table.getdataListParm.parammaps;
|
|
|
|
|
+ if (
|
|
|
|
|
+ this.download.getdataListParm.parammaps.inputDatetime !== "" &&
|
|
|
|
|
+ this.download.getdataListParm.parammaps.inputDatetime !== null
|
|
|
|
|
+ ) {
|
|
|
|
|
+ this.download.getdataListParm.parammaps.startTime = parseTime(
|
|
|
|
|
+ this.download.getdataListParm.parammaps.inputDatetime[0],
|
|
|
|
|
+ "{y}-{m}-{d}"
|
|
|
|
|
+ );
|
|
|
|
|
+ this.download.getdataListParm.parammaps.stopTime = parseTime(
|
|
|
|
|
+ this.download.getdataListParm.parammaps.inputDatetime[1],
|
|
|
|
|
+ "{y}-{m}-{d}"
|
|
|
|
|
+ );
|
|
|
} else {
|
|
} else {
|
|
|
- this.download.getdataListParm.parammaps.inputDatetime = ''
|
|
|
|
|
- this.download.getdataListParm.parammaps.startTime = ''
|
|
|
|
|
- this.download.getdataListParm.parammaps.stopTime = ''
|
|
|
|
|
|
|
+ this.download.getdataListParm.parammaps.inputDatetime = "";
|
|
|
|
|
+ this.download.getdataListParm.parammaps.startTime = "";
|
|
|
|
|
+ this.download.getdataListParm.parammaps.stopTime = "";
|
|
|
}
|
|
}
|
|
|
- GetDataByName(this.download.getdataListParm).then(response => {
|
|
|
|
|
|
|
+ GetDataByName(this.download.getdataListParm).then((response) => {
|
|
|
if (response.data.list !== null) {
|
|
if (response.data.list !== null) {
|
|
|
- this.download.list = response.data.list
|
|
|
|
|
|
|
+ this.download.list = response.data.list;
|
|
|
} else {
|
|
} else {
|
|
|
- this.download.list = []
|
|
|
|
|
|
|
+ this.download.list = [];
|
|
|
}
|
|
}
|
|
|
- if(item== 2){
|
|
|
|
|
- var excelDatas1 = [
|
|
|
|
|
- {
|
|
|
|
|
- tHeader: ['栏舍名称','配方名称','原剩料所属时间', '剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人'],
|
|
|
|
|
- filterVal: ['barname', 'ftname','remaindate','remain','dry', 'timesstr', 'operatetime', 'emp'],
|
|
|
|
|
- tableDatas: this.download.list,
|
|
|
|
|
- sheetName: 'Sheet1'
|
|
|
|
|
- }
|
|
|
|
|
- ]
|
|
|
|
|
- json2excel(excelDatas1, '栏舍剩料记录-手动记录', true, 'xlsx')
|
|
|
|
|
- }else{
|
|
|
|
|
- var excelDatas2 = [
|
|
|
|
|
- {
|
|
|
|
|
- tHeader: ['TMR设备编号','TMR设备名称','TMR设备类型','栏舍名称','收集时间','剩料重量(kg)','开始重量(kg)','结束重量(kg)','驾驶员'],
|
|
|
|
|
- filterVal: ['eqcode','eqname','tclassname','barname','createtime','weight','beginweight','endweight','driver'],
|
|
|
|
|
- tableDatas: this.download.list,
|
|
|
|
|
- sheetName: 'Sheet1'
|
|
|
|
|
- }
|
|
|
|
|
- ]
|
|
|
|
|
- json2excel(excelDatas2, '栏舍剩料记录-TMR设备自动记录', true, 'xlsx')
|
|
|
|
|
- }
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ if (item == 2) {
|
|
|
|
|
+ var excelDatas1 = [
|
|
|
|
|
+ {
|
|
|
|
|
+ tHeader: [
|
|
|
|
|
+ "栏舍名称",
|
|
|
|
|
+ "配方名称",
|
|
|
|
|
+ "原剩料所属时间",
|
|
|
|
|
+ "剩料量(kg)",
|
|
|
|
|
+ "干物质",
|
|
|
|
|
+ "班次(收集)",
|
|
|
|
|
+ "收集时间",
|
|
|
|
|
+ "操作人",
|
|
|
|
|
+ ],
|
|
|
|
|
+ filterVal: [
|
|
|
|
|
+ "barname",
|
|
|
|
|
+ "ftname",
|
|
|
|
|
+ "remaindate",
|
|
|
|
|
+ "remain",
|
|
|
|
|
+ "dry",
|
|
|
|
|
+ "timesstr",
|
|
|
|
|
+ "operatetime",
|
|
|
|
|
+ "emp",
|
|
|
|
|
+ ],
|
|
|
|
|
+ tableDatas: this.download.list,
|
|
|
|
|
+ sheetName: "Sheet1",
|
|
|
|
|
+ },
|
|
|
|
|
+ ];
|
|
|
|
|
+ json2excel(excelDatas1, "栏舍剩料记录-手动记录", true, "xlsx");
|
|
|
|
|
+ } else {
|
|
|
|
|
+ var excelDatas2 = [
|
|
|
|
|
+ {
|
|
|
|
|
+ tHeader: [
|
|
|
|
|
+ "TMR设备编号",
|
|
|
|
|
+ "TMR设备名称",
|
|
|
|
|
+ "TMR设备类型",
|
|
|
|
|
+ "栏舍名称",
|
|
|
|
|
+ "收集时间",
|
|
|
|
|
+ "剩料重量(kg)",
|
|
|
|
|
+ "开始重量(kg)",
|
|
|
|
|
+ "结束重量(kg)",
|
|
|
|
|
+ "驾驶员",
|
|
|
|
|
+ ],
|
|
|
|
|
+ filterVal: [
|
|
|
|
|
+ "eqcode",
|
|
|
|
|
+ "eqname",
|
|
|
|
|
+ "tclassname",
|
|
|
|
|
+ "barname",
|
|
|
|
|
+ "createtime",
|
|
|
|
|
+ "weight",
|
|
|
|
|
+ "beginweight",
|
|
|
|
|
+ "endweight",
|
|
|
|
|
+ "driver",
|
|
|
|
|
+ ],
|
|
|
|
|
+ tableDatas: this.download.list,
|
|
|
|
|
+ sheetName: "Sheet1",
|
|
|
|
|
+ },
|
|
|
|
|
+ ];
|
|
|
|
|
+ json2excel(
|
|
|
|
|
+ excelDatas2,
|
|
|
|
|
+ "栏舍剩料记录-TMR设备自动记录",
|
|
|
|
|
+ true,
|
|
|
|
|
+ "xlsx"
|
|
|
|
|
+ );
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
|
|
|
|
|
beforeImport(file) {
|
|
beforeImport(file) {
|
|
|
- const isLt2M = file.size / 1024 / 1024 < 2
|
|
|
|
|
|
|
+ const isLt2M = file.size / 1024 / 1024 < 2;
|
|
|
if (!isLt2M) {
|
|
if (!isLt2M) {
|
|
|
- this.$message.error('上传文件大小不能超过 2MB!')
|
|
|
|
|
|
|
+ this.$message.error("上传文件大小不能超过 2MB!");
|
|
|
}
|
|
}
|
|
|
- return isLt2M
|
|
|
|
|
|
|
+ return isLt2M;
|
|
|
},
|
|
},
|
|
|
handleImportSuccess(res, file) {
|
|
handleImportSuccess(res, file) {
|
|
|
- this.getList()
|
|
|
|
|
- if (res.msg === 'ok') {
|
|
|
|
|
- this.$message({ title: '成功', message: '导入成功:' + res.data.success + '条!', type: 'success', duration: 2000 })
|
|
|
|
|
|
|
+ this.getList();
|
|
|
|
|
+ if (res.msg === "ok") {
|
|
|
|
|
+ this.$message({
|
|
|
|
|
+ title: "成功",
|
|
|
|
|
+ message: "导入成功:" + res.data.success + "条!",
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
if (res.data.err_count > 0) {
|
|
if (res.data.err_count > 0) {
|
|
|
- this.$notify({ title: '失败', message: '导入失败:' + res.data.err_count + '条!', type: 'danger', duration: 2000 })
|
|
|
|
|
- import('@/vendor/Export2Excel').then(excel => {
|
|
|
|
|
- const list1 = res.data.result
|
|
|
|
|
- const tHeader = ['栏舍名称', '配方名称','原剩料所属时间','剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人', '错误信息']
|
|
|
|
|
- const filterVal = ['栏舍名称', '配方名称','原剩料所属时间','剩料量(kg)','干物质', '班次(收集)', '收集时间', '操作人', 'error_msg']
|
|
|
|
|
- const data1 = this.formatJson(filterVal, list1)
|
|
|
|
|
- excel.export_json_to_excel({ header: tHeader, data: data1, filename: '栏舍剩料记录导入报错信息', autoWidth: true, bookType: 'xlsx' })
|
|
|
|
|
- })
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "失败",
|
|
|
|
|
+ message: "导入失败:" + res.data.err_count + "条!",
|
|
|
|
|
+ type: "danger",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ import("@/vendor/Export2Excel").then((excel) => {
|
|
|
|
|
+ const list1 = res.data.result;
|
|
|
|
|
+ const tHeader = [
|
|
|
|
|
+ "栏舍名称",
|
|
|
|
|
+ "配方名称",
|
|
|
|
|
+ "原剩料所属时间",
|
|
|
|
|
+ "剩料量(kg)",
|
|
|
|
|
+ "干物质",
|
|
|
|
|
+ "班次(收集)",
|
|
|
|
|
+ "收集时间",
|
|
|
|
|
+ "操作人",
|
|
|
|
|
+ "错误信息",
|
|
|
|
|
+ ];
|
|
|
|
|
+ const filterVal = [
|
|
|
|
|
+ "栏舍名称",
|
|
|
|
|
+ "配方名称",
|
|
|
|
|
+ "原剩料所属时间",
|
|
|
|
|
+ "剩料量(kg)",
|
|
|
|
|
+ "干物质",
|
|
|
|
|
+ "班次(收集)",
|
|
|
|
|
+ "收集时间",
|
|
|
|
|
+ "操作人",
|
|
|
|
|
+ "error_msg",
|
|
|
|
|
+ ];
|
|
|
|
|
+ const data1 = this.formatJson(filterVal, list1);
|
|
|
|
|
+ excel.export_json_to_excel({
|
|
|
|
|
+ header: tHeader,
|
|
|
|
|
+ data: data1,
|
|
|
|
|
+ filename: "栏舍剩料记录导入报错信息",
|
|
|
|
|
+ autoWidth: true,
|
|
|
|
|
+ bookType: "xlsx",
|
|
|
|
|
+ });
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
} else {
|
|
} else {
|
|
|
- this.$notify({ title: '失败', message: '上传失败', type: 'danger', duration: 2000 })
|
|
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "失败",
|
|
|
|
|
+ message: "上传失败",
|
|
|
|
|
+ type: "danger",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
},
|
|
},
|
|
|
formatJson(filterVal, jsonData) {
|
|
formatJson(filterVal, jsonData) {
|
|
|
- return jsonData.map(v =>
|
|
|
|
|
- filterVal.map(j => {
|
|
|
|
|
- if (j === 'timestamp') {
|
|
|
|
|
- return parseTime(v[j])
|
|
|
|
|
|
|
+ return jsonData.map((v) =>
|
|
|
|
|
+ filterVal.map((j) => {
|
|
|
|
|
+ if (j === "timestamp") {
|
|
|
|
|
+ return parseTime(v[j]);
|
|
|
} else {
|
|
} else {
|
|
|
- return v[j]
|
|
|
|
|
|
|
+ return v[j];
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
- )
|
|
|
|
|
- },
|
|
|
|
|
- handleDataUpload(){
|
|
|
|
|
- let a = Cookies.get('url')
|
|
|
|
|
- let b = a.search(8081)
|
|
|
|
|
- let c = a.substring(0,a.search(8081)) + '8082'
|
|
|
|
|
- let d = a.substring(0,a.lastIndexOf('/'))
|
|
|
|
|
- console.log(d)
|
|
|
|
|
- let url = ''
|
|
|
|
|
- if(b == -1){
|
|
|
|
|
- url = d + ':8082'
|
|
|
|
|
- }else{
|
|
|
|
|
- url = c
|
|
|
|
|
|
|
+ );
|
|
|
|
|
+ },
|
|
|
|
|
+ handleDataUpload() {
|
|
|
|
|
+ let a = Cookies.get("url");
|
|
|
|
|
+ let b = a.search(8081);
|
|
|
|
|
+ let c = a.substring(0, a.search(8081)) + "8082";
|
|
|
|
|
+ let d = a.substring(0, a.lastIndexOf("/"));
|
|
|
|
|
+ console.log(d);
|
|
|
|
|
+ let url = "";
|
|
|
|
|
+ if (b == -1) {
|
|
|
|
|
+ url = d + ":8082";
|
|
|
|
|
+ } else {
|
|
|
|
|
+ url = c;
|
|
|
}
|
|
}
|
|
|
- console.log(url,'url')
|
|
|
|
|
- let _url = url + '/authdata/surplus/push'
|
|
|
|
|
|
|
+ console.log(url, "url");
|
|
|
|
|
+ let _url = url + "/authdata/surplus/push";
|
|
|
let data = {
|
|
let data = {
|
|
|
- date:parseTime(new Date(), '{y}-{m}-{d}'),
|
|
|
|
|
- pastureId:Cookies.get('pastureid')
|
|
|
|
|
- }
|
|
|
|
|
- console.log(_url,'_url')
|
|
|
|
|
- postJson2(_url, data).then(response => {
|
|
|
|
|
- if(response.msg == 'ok'){
|
|
|
|
|
- this.$notify({ title: '', message: response.data, type: 'success', duration: 2000 })
|
|
|
|
|
- }else{
|
|
|
|
|
- this.$notify({ title: '上传失败', message: response.data, type: 'warning', duration: 2000 })
|
|
|
|
|
|
|
+ date: parseTime(new Date(), "{y}-{m}-{d}"),
|
|
|
|
|
+ pastureId: Cookies.get("pastureid"),
|
|
|
|
|
+ };
|
|
|
|
|
+ console.log(_url, "_url");
|
|
|
|
|
+ postJson2(_url, data).then((response) => {
|
|
|
|
|
+ if (response.msg == "ok") {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "success",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.$notify({
|
|
|
|
|
+ title: "上传失败",
|
|
|
|
|
+ message: response.data,
|
|
|
|
|
+ type: "warning",
|
|
|
|
|
+ duration: 2000,
|
|
|
|
|
+ });
|
|
|
}
|
|
}
|
|
|
- })
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
-}
|
|
|
|
|
|
|
+ });
|
|
|
|
|
+ },
|
|
|
|
|
+ },
|
|
|
|
|
+};
|
|
|
</script>
|
|
</script>
|