部分bug修改,创建日期精确到几点几分,日期放最前面,转场优化
This commit is contained in:
@@ -4,6 +4,14 @@
|
||||
<!-- <el-form-item label="羊只id" prop="sheepId">
|
||||
<el-input v-model="queryParams.sheepId" placeholder="请输入羊只id" clearable @keyup.enter="handleQuery" />
|
||||
</el-form-item> -->
|
||||
<el-form-item label="创建时间" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="测量日期" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="管理耳号" prop="manageTags">
|
||||
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
|
||||
style="max-width: 160px;" />
|
||||
@@ -13,24 +21,16 @@
|
||||
<el-option v-for="item in sheepfoldOptions" :key="item.id" :label="item.sheepfoldName" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="品种" prop="varietyId">
|
||||
<el-form-item label="品种" prop="varietyId" style="width: 308px">
|
||||
<el-select v-model="queryParams.varietyId" placeholder="请选择品种" style="min-width:150px" clearable>
|
||||
<el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="item.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="测量日期" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeMeasureDate" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item label="羊只类别" prop="sheepTypeId">
|
||||
<el-select v-model="queryParams.sheepTypeId" placeholder="请选择羊只类别" clearable style="min-width:150px">
|
||||
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="type.id" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" style="width: 308px">
|
||||
<el-date-picker v-model="daterangeCreateTime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
|
||||
start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
@@ -59,17 +59,20 @@
|
||||
|
||||
<el-table v-loading="loading" :data="body_measureList" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="55" align="center" />
|
||||
<!-- <el-table-column label="${comment}" align="center" prop="id" /> -->
|
||||
<!-- <el-table-column label="羊只id" align="center" prop="sheepId" /> -->
|
||||
<el-table-column label="管理耳号" align="center" prop="manageTags" fixed min-width="100px" />
|
||||
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
|
||||
<el-table-column label="品种" align="center" prop="varietyName" />
|
||||
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180" fixed>
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="测量日期" align="center" prop="measureDate" width="120">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.measureDate, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="管理耳号" align="center" prop="manageTags" min-width="100px" />
|
||||
<el-table-column label="羊舍" align="center" prop="sheepfoldName" min-width="100px" />
|
||||
<el-table-column label="品种" align="center" prop="varietyName" />
|
||||
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
|
||||
<el-table-column label="羊只类别" align="center" prop="sheepTypeName" />
|
||||
<el-table-column label="性别" align="center">
|
||||
<template #default="scope">
|
||||
@@ -90,25 +93,21 @@
|
||||
<el-table-column label="尻高" align="center" prop="rumpHeignt" />
|
||||
<el-table-column label="腰角宽" align="center" prop="hipWidth" />
|
||||
<el-table-column label="十字部高" align="center" prop="hipCrossHeight" />
|
||||
|
||||
<el-table-column label="繁育状态" align="center" prop="breedStatusName" width="100">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.breedStatusName || '未设置' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="泌乳天数" align="center" prop="lactationDay" width="100">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.lactationDay || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="怀孕天数" align="center" prop="gestationDay" width="100">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.gestationDay || '-' }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<el-table-column label="配后天数" align="center" prop="postMatingDay" width="100">
|
||||
<template #default="scope">
|
||||
<span>{{ scope.row.postMatingDay || '-' }}</span>
|
||||
@@ -117,11 +116,6 @@
|
||||
<el-table-column label="备注" align="center" prop="comment" min-width="100px" />
|
||||
<el-table-column label="技术员" align="center" prop="technician" />
|
||||
<el-table-column label="创建人" align="center" prop="createBy" />
|
||||
<el-table-column label="创建时间" align="center" prop="createTime" width="180">
|
||||
<template #default="scope">
|
||||
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" min-width="130px">
|
||||
<template #default="scope">
|
||||
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
|
||||
@@ -411,7 +405,7 @@ function submitForm() {
|
||||
/** 删除按钮操作 */
|
||||
function handleDelete(row) {
|
||||
const _ids = row.id || ids.value
|
||||
proxy.$modal.confirm('是否确认删除体尺测量编号为"' + _ids + '"的数据项?').then(function () {
|
||||
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
|
||||
return delBody_measure(_ids)
|
||||
}).then(() => {
|
||||
getList()
|
||||
|
||||
Reference in New Issue
Block a user