admin/zhyc-sheep-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部门更改，生物安全模块的人员更换为下拉框

Browse Source
This commit is contained in:
漂泊
2026-01-30 15:55:07 +08:00
parent 1d821764fd
commit 39f9bf1b67
10 changed files with 492 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/api/common/user.js Normal file
View File

@@ -0,0 +1,10 @@
import request from '@/utils/request'
// 根据岗位查询用户信息
export function getUserByPost(query) {
return request({
url: '/userPost/getUser',
method: 'get',
params: query
})
}

63
src/views/biosafety/deworm/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword placeholder="输入耳号搜索"
@@ -71,8 +71,13 @@
start-placeholder="开始日期" end-placeholder="结束日期" />
</el-form-item>
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
</el-form-item>
<el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -165,10 +170,15 @@
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
</el-form-item>
<el-col :span="12">
<el-form-item label="技术员">
<el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div style="margin: 8px 5px;">
@@ -269,10 +279,15 @@
<el-date-picker v-model="editForm.datetime" type="date" style="width: 100%" readonly />
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
</el-form-item>
<el-col :span="12">
<el-form-item label="技术员">
<el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<div style="margin: 10px 10px;">
@@ -345,6 +360,7 @@
import { searchEarNumbers } from '@/api/common/sheep'
import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
import { getUserByPost } from '@/api/common/user'
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -355,6 +371,8 @@
const total = ref(0)
const dewormList = ref([])
const daterangeDatetime = ref([])
const technicalOptions = ref([])
const queryParams = reactive({
pageNum: 1,
@@ -729,6 +747,27 @@
function handleAddDetail() {
usageDetails.value.push({ mediId: null, dosage: 0, unit: null, usageId: null,manufacturer:null,batchNumber:null })
}
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
/* ------------------ 初始化 ------------------ */
onMounted(() => {
@@ -747,6 +786,8 @@
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
fetchTechnicalList()
})
</script>
<style scoped>

30
src/views/biosafety/diagnosis/index.vue
View File

@@ -3,7 +3,7 @@
<!-- 查询区域 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
@@ -274,6 +274,33 @@ import { listSheepfold_management } from '@/api/fileManagement/sheepfold_managem
import { listDisease } from '@/api/biosafety/disease'
import { getCurrentInstance, onMounted, ref, watch } from 'vue'
import { searchEarNumbers } from '@/api/common/sheep'
import { getUserByPost } from '@/api/common/user'
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
/* ---------- 基础依赖 ---------- */
const { proxy } = getCurrentInstance()
@@ -654,6 +681,7 @@ onMounted(() => {
label: i.sheepfoldName,
}))
})
fetchTechnicalList() // 获取技术员列表
})
</script>

55
src/views/biosafety/disinfect/index.vue
View File

@@ -18,7 +18,14 @@
</el-form-item>
<el-form-item label="技术员" prop="technician">
<el-input v-model="queryParams.technician" placeholder="请输入技术员" clearable />
<el-form-item label="技术员">
<el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
<el-form-item label="消毒方式" prop="way">
<el-select v-model="queryParams.way" clearable placeholder="请选择消毒方式" filterable style="width: 200px">
@@ -101,7 +108,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员" prop="technician">
<el-input v-model="form.technician" placeholder="请输入技术员姓名" />
<el-form-item label="技术员">
<el-select v-model="form.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -199,7 +213,14 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="editForm.technician" placeholder="请输入技术员姓名" />
<el-form-item label="技术员">
<el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -289,6 +310,33 @@ import { listMedicine } from '@/api/biosafety/medicine'
import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
import { getUserByPost } from '@/api/common/user'
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
const { proxy } = getCurrentInstance()
const { disinfect_type } = proxy.useDict('disinfect_type')
@@ -538,5 +586,6 @@ onMounted(() => {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
fetchTechnicalList() // 获取技术员列表
})
</script>

52
src/views/biosafety/health/index.vue
View File

@@ -3,7 +3,7 @@
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
@@ -74,7 +74,12 @@
</el-form-item>
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
<el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -172,7 +177,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
<el-form-item label="技术员">
<el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -276,7 +288,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
<el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -352,6 +369,32 @@ import { listMedicine } from '@/api/biosafety/medicine'
import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
import { searchEarNumbers } from '@/api/common/sheep'
import { getUserByPost } from '@/api/common/user'
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -754,6 +797,7 @@ onMounted(() => {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
fetchTechnicalList() // 获取技术员列表
})
</script>
<style scoped>

51
src/views/biosafety/immunity/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 1. 搜索 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
@@ -72,7 +72,12 @@
<el-input v-model="queryParams.sheepNo" placeholder="请输入耳号,多个用空格分隔" clearable @keyup.enter="getList" />
</el-form-item> -->
<el-form-item label="技术员" prop="technical">
<el-input v-model="queryParams.technical" placeholder="请输入技术员" clearable />
<el-select v-model="queryParams.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -169,7 +174,14 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="addForm.technical" placeholder="请输入技术员姓名" />
<el-form-item label="技术员">
<el-select v-model="addForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-form-item>
</el-col>
</el-row>
@@ -273,7 +285,12 @@
</el-col>
<el-col :span="12">
<el-form-item label="技术员">
<el-input v-model="editForm.technical" placeholder="请输入技术员姓名" />
<el-select v-model="editForm.technical" filterable clearable placeholder="请输入技术员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -349,6 +366,31 @@ import { listMedicine } from '@/api/biosafety/medicine'
import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
import { searchEarNumbers } from '@/api/common/sheep'
import { getUserByPost } from '@/api/common/user'
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
const { proxy } = getCurrentInstance()
const { sheep_gender } = proxy.useDict('sheep_gender')
@@ -752,6 +794,7 @@ onMounted(() => {
listMedicine().then(res => {
medicines.value = res.rows.map(item => ({ value: item.id, label: item.name }))
})
fetchTechnicalList() // 获取技术员列表
})
</script>

73
src/views/biosafety/quarantine/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 查询表单 -->
<el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
@@ -79,11 +79,21 @@
</el-form-item>
<el-form-item label="采样员" prop="sampler">
<el-input v-model="queryParams.sampler" placeholder="请输入采样员名字" clearable @keyup.enter="getList" />
<el-select v-model="queryParams.sampler" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="检疫员" prop="quarOfficer">
<el-input v-model="queryParams.quarOfficer" placeholder="请输入检疫员名字" clearable @keyup.enter="getList" />
<el-select v-model="queryParams.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
@@ -225,12 +235,22 @@
<el-row :gutter="20">
<el-col :span="12">
<el-form-item label="采样员" prop="sampler">
<el-input v-model="addForm.sampler" />
<el-select v-model="addForm.sampler" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检疫员" prop="quarOfficer">
<el-input v-model="addForm.quarOfficer" />
<el-select v-model="addForm.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
@@ -316,13 +336,23 @@
</el-col>
<el-col :span="12">
<el-form-item label="采样员">
<el-input v-model="editForm.sampler" />
<el-select v-model="editForm.sampleOfficer" filterable clearable placeholder="请输入采样员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="检疫员">
<el-input v-model="editForm.quarOfficer" />
<el-select v-model="editForm.quarOfficer" filterable clearable placeholder="请输入检疫员姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -363,6 +393,7 @@ import request from '@/utils/request'
import { parseTime } from '@/utils/ruoyi'
import { useRouter } from 'vue-router'
import { searchEarNumbers } from '@/api/common/sheep'
import { getUserByPost } from '@/api/common/user'
const { proxy } = getCurrentInstance()
const { quar_result, quar_status, sheep_gender } = proxy.useDict(
@@ -372,6 +403,33 @@ const { quar_result, quar_status, sheep_gender } = proxy.useDict(
)
const router = useRouter()
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
/* 基础数据 */
const loading = ref(true)
const showSearch = ref(true)
@@ -774,6 +832,7 @@ getItems()
getSample()
getBarns()
getSheepType()
getTechnicalList()
</script>
<style scoped>

49
src/views/biosafety/treatment/index.vue
View File

@@ -2,7 +2,7 @@
<div class="app-container">
<!-- 搜索栏 -->
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword
@@ -78,7 +78,12 @@
</el-select>
</el-form-item>
<el-form-item label="兽医" prop="veterinary">
<el-input v-model="queryParams.veterinary" placeholder="请输入兽医" clearable />
<el-select v-model="editForm.veterinary" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
@@ -263,7 +268,12 @@
<el-row :gutter="20" style="margin-top:20px;">
<el-col :span="12">
<el-form-item label="兽医">
<el-input v-model="addForm.veterinarian" placeholder="请输入兽医姓名" />
<el-select v-model="addForm.veterinarian" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -442,6 +452,12 @@
<el-col :span="12">
<el-form-item label="兽医">
<el-input v-model="editForm.veterinarian" placeholder="请输入兽医姓名" />
<el-select v-model="editForm.veterinarian" filterable clearable placeholder="请输入兽医姓名" style="width: 100%"
@change="handleTechnicalChange">
<el-option v-for="item in technicalOptions" :key="item.value" :label="item.label" :value="item.value">
<span style="float: left">{{ item.label }}</span>
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
@@ -508,6 +524,31 @@ import { listMedicine } from '@/api/biosafety/medicine'
import request from '@/utils/request'
import { useRouter } from 'vue-router'
import { searchEarNumbers } from '@/api/common/sheep'
import { getUserByPost } from '@/api/common/user'
const technicalOptions = ref([]) //自定义技术员数组变量
// 获取技术员列表
const fetchTechnicalList = () => {
getUserByPost({ postCode: "techs" })
.then(res => {
if (res.code === 200 && Array.isArray(res.data)) {
technicalOptions.value = res.data.map(item => ({
// value: item.userId,
value: item.nickName,
label: item.nickName,
// postName: item.postName, // 保留用于下拉显示
// postCode: item.postCode // 保留用于逻辑判断
}))
console.log(technicalOptions.value);
} else {
technicalOptions.value = []
ElMessage.warning(res.msg || '获取技术员列表失败')
}
})
}
const router = useRouter()
@@ -1007,7 +1048,9 @@ onMounted(() => {
listSheepfold_management().then(res => {
sheepfolds.value = res.rows.map(item => ({ id: item.id, name: item.sheepfoldName }))
})
fetchTechnicalList() // 获取技术员列表
})
</script>
<style scoped>

2
src/views/biosafety/usageInfo/index.vue
View File

@@ -3,7 +3,7 @@
<!-- 搜索表单 -->
<el-form ref="queryRef" :model="queryParams" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="母羊耳号" prop="allEarNumbers">
<el-form-item label="羊只耳号" prop="allEarNumbers">
<div style="display: flex; align-items: center; gap: 10px; flex-wrap: wrap;">
<!-- 主选择器：不显示已选标签 -->
<el-select v-model="queryParams.allEarNumbers" multiple filterable remote reserve-keyword

278
src/views/system/dept/index.vue
View File

@@ -2,22 +2,13 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="部门名称" prop="deptName">
<el-input
v-model="queryParams.deptName"
placeholder="请输入部门名称"
clearable
style="width: 200px"
@keyup.enter="handleQuery"
/>
<el-input v-model="queryParams.deptName" placeholder="请输入部门名称" clearable style="width: 200px"
@keyup.enter="handleQuery" />
</el-form-item>
<el-form-item label="状态" prop="status">
<el-select v-model="queryParams.status" placeholder="部门状态" clearable style="width: 200px">
<el-option
v-for="dict in sys_normal_disable"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
<el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label"
:value="dict.value" />
</el-select>
</el-form-item>
<el-form-item>
@@ -28,50 +19,33 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
v-hasPermi="['system:dept:add']"
>新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd"
v-hasPermi="['system:dept:add']">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button
type="info"
plain
icon="Sort"
@click="toggleExpandAll"
>展开/折叠</el-button>
<el-button type="info" plain icon="Sort" @click="toggleExpandAll">展开/折叠</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
v-if="refreshTable"
v-loading="loading"
:data="deptList"
row-key="deptId"
:default-expand-all="isExpandAll"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
>
<el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
<el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
<el-table-column prop="status" label="状态" width="100">
<el-table v-if="refreshTable" v-loading="loading" :data="deptList" row-key="deptId"
:default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
<el-table-column prop="deptName" label="部门名称" ></el-table-column>
<el-table-column prop="ranchName" label="牧场名称"></el-table-column>
<el-table-column prop="orderNum" label="排序"></el-table-column>
<el-table-column prop="status" label="状态">
<template #default="scope">
<dict-tag :options="sys_normal_disable" :value="scope.row.status" />
</template>
</el-table-column>
<el-table-column label="创建时间" align="center" prop="createTime" width="200">
<template #default="scope">
<span>{{ parseTime(scope.row.createTime) }}</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)" v-hasPermi="['system:dept:edit']">修改</el-button>
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['system:dept:add']">新增</el-button>
<el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
v-hasPermi="['system:dept:edit']">修改</el-button>
<el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)"
v-hasPermi="['system:dept:add']">新增</el-button>
<el-button v-if="scope.row.parentId != 0" link type="primary" icon="Delete"
@click="handleDelete(scope.row)" v-hasPermi="['system:dept:remove']">删除</el-button>
</template>
</el-table-column>
</el-table>
@@ -82,14 +56,15 @@
<el-row>
<el-col :span="24" v-if="form.parentId !== 0">
<el-form-item label="上级部门" prop="parentId">
<el-tree-select
v-model="form.parentId"
:data="deptOptions"
:props="{ value: 'deptId', label: 'deptName', children: 'children' }"
value-key="deptId"
placeholder="选择上级部门"
check-strictly
/>
<el-tree-select v-model="form.parentId" :data="deptOptions"
:props="{ value: 'deptId', label: 'deptName', children: 'children' }" value-key="deptId"
placeholder="选择上级部门" check-strictly />
</el-form-item>
</el-col>
<!-- 修改：当新增且上级部门为根部门时显示 -->
<el-col :span="24" v-if="showRanchNameInput">
<el-form-item label="羊场名称" prop="ranchName">
<el-input v-model="form.ranchName" placeholder="请输入羊场名称" maxlength="50" />
</el-form-item>
</el-col>
<el-col :span="12">
@@ -120,11 +95,8 @@
<el-col :span="12">
<el-form-item label="部门状态">
<el-radio-group v-model="form.status">
<el-radio
v-for="dict in sys_normal_disable"
:key="dict.value"
:value="dict.value"
>{{ dict.label }}</el-radio>
<el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label
}}</el-radio>
</el-radio-group>
</el-form-item>
</el-col>
@@ -156,128 +128,160 @@ const isExpandAll = ref(true)
const refreshTable = ref(true)
const data = reactive({
form: {},
queryParams: {
deptName: undefined,
status: undefined
},
rules: {
parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }]
},
form: {},
queryParams: {
deptName: undefined,
status: undefined
},
rules: {
parentId: [{ required: true, message: "上级部门不能为空", trigger: "blur" }],
deptName: [{ required: true, message: "部门名称不能为空", trigger: "blur" }],
orderNum: [{ required: true, message: "显示排序不能为空", trigger: "blur" }],
email: [{ type: "email", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] }],
phone: [{ pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/, message: "请输入正确的手机号码", trigger: "blur" }],
// 羊场名称非必填，如需必填添加规则
ranchName: [{ required: false, message: "请输入羊场名称", trigger: "blur" }]
},
})
const { queryParams, form, rules } = toRefs(data)
// 计算属性：是否显示羊场名称输入框
// 条件：1. 新增模式（无deptId） 2. 上级部门为根部门（所选部门的parentId为0）
const showRanchNameInput = computed(() => {
// 编辑模式不显示
if (form.value.deptId !== undefined) return false
// 新增模式：如果没有选择上级（parentId为undefined或0），或者是根部门的直接上级
if (!form.value.parentId) {
// 未选择上级或上级为0（根），通常这种情况视为添加根部门，显示羊场名称
return true
}
// 从部门树中查找所选上级部门的信息
const findNode = (tree, id) => {
for (let node of tree) {
if (node.deptId === id) return node
if (node.children && node.children.length > 0) {
const found = findNode(node.children, id)
if (found) return found
}
}
return null
}
const parentNode = findNode(deptOptions.value, form.value.parentId)
// 如果找到父节点，且其父ID为0，说明选择的是根部门（一级部门）
return parentNode && parentNode.parentId === 0
})
/** 查询部门列表 */
function getList() {
loading.value = true
listDept(queryParams.value).then(response => {
deptList.value = proxy.handleTree(response.data, "deptId")
loading.value = false
})
loading.value = true
listDept(queryParams.value).then(response => {
deptList.value = proxy.handleTree(response.data, "deptId")
loading.value = false
})
}
/** 取消按钮 */
function cancel() {
open.value = false
reset()
open.value = false
reset()
}
/** 表单重置 */
function reset() {
form.value = {
deptId: undefined,
parentId: undefined,
deptName: undefined,
orderNum: 0,
leader: undefined,
phone: undefined,
email: undefined,
status: "0"
}
proxy.resetForm("deptRef")
form.value = {
deptId: undefined,
parentId: undefined,
deptName: undefined,
orderNum: 0,
leader: undefined,
phone: undefined,
email: undefined,
status: "0",
ranchName: undefined // 重置羊场名称
}
proxy.resetForm("deptRef")
}
/** 搜索按钮操作 */
function handleQuery() {
getList()
getList()
}
/** 重置按钮操作 */
function resetQuery() {
proxy.resetForm("queryRef")
handleQuery()
proxy.resetForm("queryRef")
handleQuery()
}
/** 新增按钮操作 */
function handleAdd(row) {
reset()
listDept().then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId")
})
if (row != undefined) {
form.value.parentId = row.deptId
}
open.value = true
title.value = "添加部门"
reset()
listDept().then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId")
})
if (row != undefined) {
form.value.parentId = row.deptId
}
open.value = true
title.value = "添加部门"
}
/** 展开/折叠操作 */
function toggleExpandAll() {
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
nextTick(() => {
refreshTable.value = true
})
refreshTable.value = false
isExpandAll.value = !isExpandAll.value
nextTick(() => {
refreshTable.value = true
})
}
/** 修改按钮操作 */
function handleUpdate(row) {
reset()
listDeptExcludeChild(row.deptId).then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId")
})
getDept(row.deptId).then(response => {
form.value = response.data
open.value = true
title.value = "修改部门"
})
reset()
listDeptExcludeChild(row.deptId).then(response => {
deptOptions.value = proxy.handleTree(response.data, "deptId")
})
getDept(row.deptId).then(response => {
form.value = response.data
open.value = true
title.value = "修改部门"
})
}
/** 提交按钮 */
function submitForm() {
proxy.$refs["deptRef"].validate(valid => {
if (valid) {
if (form.value.deptId != undefined) {
updateDept(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addDept(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
proxy.$refs["deptRef"].validate(valid => {
if (valid) {
if (form.value.deptId != undefined) {
updateDept(form.value).then(response => {
proxy.$modal.msgSuccess("修改成功")
open.value = false
getList()
})
} else {
addDept(form.value).then(response => {
proxy.$modal.msgSuccess("新增成功")
open.value = false
getList()
})
}
}
}
})
})
}
/** 删除按钮操作 */
function handleDelete(row) {
proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function() {
return delDept(row.deptId)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => {})
proxy.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项?').then(function () {
return delDept(row.deptId)
}).then(() => {
getList()
proxy.$modal.msgSuccess("删除成功")
}).catch(() => { })
}
getList()
</script>
</script>