部分bug修改,创建日期精确到几点几分,日期放最前面,转场优化

This commit is contained in:
zyh
2025-08-19 17:09:06 +08:00
parent da5a15167c
commit c44b2da619
11 changed files with 655 additions and 352 deletions

View File

@@ -9,6 +9,10 @@
@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="管理耳号" prop="manageTags">
<el-input v-model="queryParams.manageTags" placeholder="请输入管理耳号" clearable @keyup.enter="handleQuery"
style="width: 150px;" />
@@ -23,9 +27,10 @@
<el-option v-for="item in varietyOptions" :key="item.value" :label="item.label" :value="item.value" />
</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 label="羊舍" prop="sheepfoldId">
<el-select v-model="queryParams.sheepfoldId" placeholder="请选择羊舍" style="min-width:150px" clearable>
<el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -57,16 +62,18 @@
<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="createTime" width="180">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d} {h}:{i}') }}</span>
</template>
</el-table-column>
<el-table-column label="管理耳号" align="center" prop="manageTags" />
<el-table-column label="羊舍" align="center" prop="sheepfoldName" />
<el-table-column label="事件类型" align="center" prop="eventType" width="120" />
<el-table-column label="原品种" align="center" prop="varietyOld" />
<el-table-column label="新品种" align="center" prop="varietyNew" />
<el-table-column label="备注" align="center" prop="comment" />
<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">
<template #default="scope">
<!-- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
@@ -90,7 +97,7 @@
<el-input v-model="form.manageTags" placeholder="请输入管理耳号" @blur="onManageTagsBlur" :disabled="!isAdd" />
</el-form-item>
<el-form-item label="原品种" prop="varietyOld">
<el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled/>
<el-input v-model="form.varietyOld" placeholder="请输入原品种" disabled />
</el-form-item>
<el-form-item label="新品种" prop="varietyNew">
<el-select v-model="form.varietyNew" placeholder="请选择新品种" clearable filterable :disabled="!isAdd">
@@ -113,6 +120,7 @@
<script setup name="ChangeVariety">
import { listChangeVariety, getChangeVariety, delChangeVariety, addChangeVariety, updateChangeVariety, getSheepByManageTags } from "@/api/produce/manage_sheep/changeVariety"
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
import { listVariety } from '@/api/variety/variety'
const { proxy } = getCurrentInstance()
@@ -139,6 +147,7 @@ const data = reactive({
pageSize: 10,
// sheepId: null,
manageTags: null,
sheepfoldId: null,
varietyOld: null,
varietyNew: null,
createTime: null
@@ -166,6 +175,9 @@ function getList() {
queryParams.value.params["beginCreateTime"] = daterangeCreateTime.value[0]
queryParams.value.params["endCreateTime"] = daterangeCreateTime.value[1]
}
if (queryParams.value.sheepfoldId) {
queryParams.value.params["sheepfoldId"] = queryParams.value.sheepfoldId;
}
listChangeVariety(queryParams.value).then(response => {
changeVarietyList.value = response.rows
total.value = response.total
@@ -234,6 +246,7 @@ function handleQuery() {
/** 重置按钮操作 */
function resetQuery() {
daterangeCreateTime.value = []
queryParams.value.sheepfoldId = null;
proxy.resetForm("queryRef")
handleQuery()
}
@@ -298,7 +311,7 @@ function submitForm() {
/** 删除按钮操作 */
function handleDelete(row) {
const _ids = row.id || ids.value
proxy.$modal.confirm('是否确认删除改品种记录编号为"' + _ids + '"的数据项?').then(function () {
proxy.$modal.confirm('是否确认删除这条记录数据').then(function () {
return delChangeVariety(_ids)
}).then(() => {
getList()
@@ -313,8 +326,18 @@ function handleExport() {
}, `changeVariety_${new Date().getTime()}.xlsx`)
}
//加载羊舍数据
const sheepfoldOptions = ref([])
function getSheepfoldOptions() {
listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
sheepfoldOptions.value = res.rows
})
}
onMounted(() => {
loadVarietyOptions();
getSheepfoldOptions();
getList();
});
</script>