部分bug修改,创建日期精确到几点几分,日期放最前面,转场优化
This commit is contained in:
@@ -61,7 +61,7 @@
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="胎次" prop="parity">
|
||||
<el-input v-model="form.parity" placeholder="请输入胎次" />
|
||||
<el-input-number v-model="form.parity" :min="0" label="胎次" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
@@ -75,13 +75,20 @@
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="入群日期" prop="joinDate">
|
||||
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
|
||||
<el-form-item label="羊只类别" prop="typeId">
|
||||
<el-select v-model="form.typeId" placeholder="请选择羊只类别" clearable>
|
||||
<el-option v-for="type in sheepTypeList" :key="type.id" :label="type.name" :value="Number(type.id)" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
</el-row>
|
||||
|
||||
<el-row :gutter="20">
|
||||
<el-col :span="10">
|
||||
<el-form-item label="入群日期" prop="joinDate">
|
||||
<el-date-picker v-model="form.joinDate" type="date" placeholder="选择入群日期" />
|
||||
</el-form-item>
|
||||
</el-col>
|
||||
<el-col :span="10">
|
||||
<el-form-item label="技术员" prop="technician">
|
||||
<el-input v-model="form.technician" placeholder="请输入技术员" />
|
||||
@@ -102,26 +109,27 @@
|
||||
<el-button @click="resetForm">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
|
||||
<!-- 导入弹窗 -->
|
||||
<el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
|
||||
<el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
|
||||
:auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
|
||||
<i class="el-icon-upload" />
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
</el-upload>
|
||||
<template #footer>
|
||||
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
|
||||
<el-button type="primary" @click="submitUpload">确 定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
<!-- 导入弹窗 -->
|
||||
<el-dialog title="导入羊只信息" v-model="importOpen" width="400px" append-to-body>
|
||||
<el-upload ref="uploadRef" :limit="1" accept=".xlsx,.xls" :action="importUrl" :headers="headers"
|
||||
:auto-upload="false" :on-success="handleImportSuccess" :on-error="handleImportError" drag>
|
||||
<i class="el-icon-upload" />
|
||||
<div class="el-upload__text">将文件拖到此处,或<em>点击上传</em></div>
|
||||
</el-upload>
|
||||
<template #footer>
|
||||
<el-button type="info" @click="downloadTemplate">下载模板</el-button>
|
||||
<el-button type="primary" @click="submitUpload">确 定</el-button>
|
||||
</template>
|
||||
</el-dialog>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref, onMounted, getCurrentInstance } from 'vue'
|
||||
import { ref, getCurrentInstance } from 'vue'
|
||||
import request from '@/utils/request'
|
||||
import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
|
||||
import { getSheepTypeList } from "@/api/produce/bodyManage/body_measure"
|
||||
import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
|
||||
import { getToken } from '@/utils/auth'
|
||||
|
||||
@@ -137,6 +145,7 @@ const form = ref({
|
||||
gender: '',
|
||||
parity: '',
|
||||
varietyId: '',
|
||||
typeId: null,
|
||||
joinDate: '',
|
||||
comment: '',
|
||||
technician: ''
|
||||
@@ -153,8 +162,9 @@ const rules = {
|
||||
birthday: [{ required: true, message: '请选择出生日期', trigger: 'change' }],
|
||||
gender: [{ required: true, message: '请选择性别', trigger: 'change' }],
|
||||
varietyId: [{ required: true, message: '请选择品种', trigger: 'change' }],
|
||||
joinDate:[{ required: true, message: '请选择入群日期', trigger: 'change' }],
|
||||
technician:[{ required: true, message: '请输入技术员', trigger: 'change' }],
|
||||
typeId: [{ required: true, message: '请选择羊只类别', trigger: 'change' }],
|
||||
joinDate: [{ required: true, message: '请选择入群日期', trigger: 'change' }],
|
||||
technician: [{ required: true, message: '请输入技术员', trigger: 'change' }],
|
||||
}
|
||||
|
||||
// 校验耳号是否存在
|
||||
@@ -211,6 +221,16 @@ function getVarietyOptions() {
|
||||
})
|
||||
}
|
||||
|
||||
// 加载羊只类别数据
|
||||
const sheepTypeList = ref([]);
|
||||
function loadSheepTypeList() {
|
||||
getSheepTypeList().then(response => {
|
||||
sheepTypeList.value = response.rows || [];
|
||||
}).catch(error => {
|
||||
console.error('加载羊只类别失败', error);
|
||||
});
|
||||
}
|
||||
|
||||
//确保日期格式一致
|
||||
function formatDate(date) {
|
||||
if (!date) return null;
|
||||
@@ -254,8 +274,9 @@ function resetForm() {
|
||||
bornWeight: '',
|
||||
birthday: '',
|
||||
gender: '',
|
||||
parity: '',
|
||||
parity: 0,
|
||||
varietyId: '',
|
||||
typeId: null,
|
||||
joinDate: '',
|
||||
comment: '',
|
||||
technician: ''
|
||||
@@ -312,10 +333,11 @@ function handleImportError(err) {
|
||||
proxy.$modal.msgError('导入失败:' + msg)
|
||||
}
|
||||
|
||||
|
||||
getSheepfoldOptions()
|
||||
getVarietyOptions()
|
||||
|
||||
onMounted(() => {
|
||||
getSheepfoldOptions()
|
||||
loadSheepTypeList()
|
||||
getVarietyOptions()
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
|
||||
Reference in New Issue
Block a user