修蹄，去势，转群的新增功能完善

2025-07-22 14:55:51 +08:00
parent 08b625b0ae
commit eac0f8c53c
6 changed files with 598 additions and 210 deletions
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -1,8 +1,11 @@
 <template>
  <div class="app-container">
    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="羊只id" prop="sheepId">
+      <!-- <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="耳号" prop="manageTags">
+        <el-input v-model="queryParams.manageTags" placeholder="请输入耳号" clearable @keyup.enter="handleQuery" />
      </el-form-item>
      <el-form-item label="转出羊舍" prop="foldFrom">
        <el-select v-model="queryParams.foldFrom" placeholder="请选择转出羊舍" style="min-width:150px" clearable>
@@ -57,7 +60,8 @@
    <el-table v-loading="loading" :data="trans_groupList" @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="羊只id" align="center" prop="sheepId" /> -->
+      <el-table-column label="耳号" align="center" prop="manageTags" />
      <el-table-column label="转出羊舍" align="center" prop="foldFromName" />
      <el-table-column label="转入羊舍" align="center" prop="foldToName" />
      <el-table-column label="品种" align="center" prop="varietyName" />
@@ -91,11 +95,18 @@
    <!-- 添加或修改转群记录对话框 -->
    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
      <el-form ref="trans_groupRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="羊只id" prop="sheepId">
+        <!-- <el-form-item label="羊只id" prop="sheepId">
          <el-input v-model="form.sheepId" placeholder="请输入羊只id" />
+        </el-form-item> -->
+        <el-form-item label="耳号" prop="manageTags">
+          <el-select v-model="form.manageTags" placeholder="请输入或选择耳号" multiple filterable collapse-tags allow-create
+            style="width: 100%" @change="loadSheepInfo">
+            <el-option v-for="sheep in sheepOptions" :key="sheep.id" :label="sheep.manageTags"
+              :value="sheep.manageTags" />
+          </el-select>
        </el-form-item>
        <el-form-item label="转出羊舍" prop="foldFrom">
-          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable>
+          <el-select v-model="form.foldFrom" placeholder="请选择转出羊舍" clearable @change="handleSheepFilter">
            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
          </el-select>
        </el-form-item>
@@ -104,9 +115,9 @@
            <el-option v-for="fold in sheepfoldOptions" :key="fold.id" :label="fold.sheepfoldName" :value="fold.id" />
          </el-select>
        </el-form-item>
-        <el-form-item label="品种" prop="varietyId">
-          <el-select v-model="form.varietyId" placeholder="请选择品种" clearable>
-            <el-option v-for="item in varietyOptions" :key="item.id" :label="item.variety" :value="Number(item.id)" />
+        <el-form-item label="羊只类型" prop="sheepTypeId">
+          <el-select v-model="form.sheepTypeId" placeholder="请选择羊只类型" clearable @change="handleSheepFilter">
+            <el-option v-for="type in sheepTypeOptions" :key="type.id" :label="type.name" :value="type.id" />
          </el-select>
        </el-form-item>
        <el-form-item label="转群原因" prop="reason">
@@ -118,9 +129,6 @@
        <el-form-item label="技术员" prop="technician">
          <el-input v-model="form.technician" placeholder="请输入技术员" />
        </el-form-item>
-        <el-form-item label="备注" prop="comment">
-          <el-input v-model="form.comment" placeholder="请输入备注" />
-        </el-form-item>
      </el-form>
      <template #footer>
        <div class="dialog-footer">
@@ -134,8 +142,11 @@
  <!-- 审批对话框 -->
  <el-dialog :title="'审批转群记录'" v-model="approveDialog" width="500px" append-to-body>
    <el-form ref="approveFormRef" :model="approveForm" label-width="120px">
-      <el-form-item label="羊只id">
+      <!-- <el-form-item label="羊只id">
        <el-input v-model="approveForm.sheepId" disabled />
+      </el-form-item> -->
+      <el-form-item label="耳号">
+        <el-input v-model="displayManageTags" disabled />
      </el-form-item>
      <el-form-item label="转出羊舍">
        <el-input :value="sheepfoldNameMap[approveForm.foldFrom] || approveForm.foldFrom" disabled />
@@ -171,46 +182,52 @@
 <script setup name="Trans_group">
 import { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
+import { checkSheepByManageTags, getSheepBySheepfoldId } from '@/api/produce/other/fixHoof/fixHoof'
 import request from '@/utils/request'

 const { proxy } = getCurrentInstance()
 const { trans_group_reason, status } = proxy.useDict('trans_group_reason', 'status')

-/* -------------------- 响应式变量 -------------------- */
 const trans_groupList = ref([])
 const open = ref(false)
 const loading = ref(true)
 const showSearch = ref(true)
 const ids = ref([])
 const single = ref(true)
-const multiple = ref(true)
+const multiple = ref(false)
 const total = ref(0)
 const title = ref('')
 const daterangeCreateTime = ref([])

 const approveDialog = ref(false)
 const approveForm = ref({})
-
+const displayManageTags = ref('')
+const sheepOptions = ref([])
 const sheepfoldOptions = ref([])
 const sheepfoldNameMap = ref({})
 const varietyOptions = ref([])
+const sheepTypeOptions = ref([]);

-/* -------------------- 表单 & 查询 -------------------- */
 const data = reactive({
-  form: {},
+  form: {
+    manageTags: [],
+    tagDetails: {},
+  },
  queryParams: {
    pageNum: 1,
    pageSize: 10,
    sheepId: null,
+    manageTags: null,
    foldTo: null,
    foldFrom: null,
-    varietyId: null,      // 新增
+    varietyId: null,
    status: null,
    createTime: null
  },
  rules: {
-    sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
-    foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
+    // sheepId: [{ required: true, message: '羊只id不能为空', trigger: 'blur' }],
+    manageTags: [{ required: true, message: '耳号不能为空', trigger: 'blue' }],
+    // foldFrom: [{ required: true, message: '转出羊舍不能为空', trigger: 'change' }],
    foldTo: [{ required: true, message: '转入羊舍不能为空', trigger: 'change' }],
    varietyId: [{ required: true, message: '品种不能为空', trigger: 'change' }],
    reason: [{ required: true, message: '转群原因不能为空', trigger: 'change' }],
@@ -219,7 +236,7 @@ const data = reactive({
 })
 const { queryParams, form, rules } = toRefs(data)

-/* -------------------- 业务函数 -------------------- */
+
 function getList() {
  loading.value = true
  queryParams.value.params = {}
@@ -240,7 +257,7 @@ function reset() {
    sheepId: null,
    foldFrom: null,
    foldTo: null,
-    varietyId: null,      // 新增
+    varietyId: null,
    reason: null,
    technician: null,
    status: null,
@@ -251,6 +268,154 @@ function reset() {
  proxy.resetForm('trans_groupRef')
 }

+async function handleSheepFilter() {
+  const { foldFrom, sheepTypeId } = form.value;
+  sheepOptions.value = [];
+  let loadedSheep = [];
+
+  if (!foldFrom && !sheepTypeId) return;
+  if (foldFrom && sheepTypeId) {
+    loadedSheep = await loadSheepBySheepfoldAndType(foldFrom, sheepTypeId);
+    if (loadedSheep.length > 0) {
+      form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
+      loadSheepInfo();
+    }
+  } else if (foldFrom) {
+    loadedSheep = await loadSheepBySheepfoldOnly(foldFrom);
+    form.value.manageTags = [];
+  } else if (sheepTypeId) {
+    loadedSheep = await loadSheepByTypeOnly(sheepTypeId);
+    if (loadedSheep.length > 0) {
+      form.value.manageTags = loadedSheep.map(sheep => sheep.manageTags);
+      loadSheepInfo();
+    }
+  }
+}
+function getSheepTypeList() {
+  request({
+    url: '/base/base/list',
+    method: 'get',
+    params: { pageNum: 1, pageSize: 9999 }
+  }).then(res => {
+    sheepTypeOptions.value = res.rows || [];
+  }).catch(error => {
+    console.error('获取羊只类型失败', error);
+    proxy.$modal.msgError('加载羊只类型失败，请重试');
+  });
+}
+async function loadSheepBySheepfoldAndType(sheepfoldId, typeId) {
+  try {
+    const res = await request({
+      url: '/sheep/sheep/listBySheepfoldAndType',
+      method: 'get',
+      params: { sheepfoldId, typeId, _t: Date.now() }
+    });
+    const sheepList = res.rows || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`该羊舍没有该类型羊只`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据羊舍+类型加载耳号失败', error);
+    proxy.$modal.msgError("加载耳号失败，请重试");
+    return [];
+  }
+}
+async function loadSheepBySheepfoldOnly(sheepfoldId) {
+  try {
+    const res = await getSheepBySheepfoldId(String(sheepfoldId));
+    const sheepList = res.data || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`该羊舍下没有羊只数据`);
+    } else {
+      proxy.$message.success(`成功加载 ${sheepOptions.value.length} 个耳号`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据羊舍加载耳号失败', error);
+    proxy.$modal.msgError("加载羊舍耳号失败，请重试");
+    return [];
+  }
+}
+async function loadSheepByTypeOnly(typeId) {
+  try {
+    const res = await request({
+      url: '/sheep/sheep/listByTypeId',
+      method: 'get',
+      params: { typeId }
+    });
+    const sheepList = res.rows || [];
+    const formattedSheep = sheepList.map(sheep => ({
+      id: sheep.id,
+      manageTags: sheep.manageTags,
+      sheepfoldId: sheep.sheepfoldId
+    }));
+    sheepOptions.value = formattedSheep;
+    if (sheepOptions.value.length === 0) {
+      proxy.$message.error(`未查询到“${getSheepTypeName(typeId)}”类型的羊只`);
+    }
+    return formattedSheep;
+  } catch (error) {
+    console.error('根据类型加载耳号失败', error);
+    proxy.$modal.msgError("加载耳号失败，请重试");
+    return [];
+  }
+}
+
+function getSheepTypeName(typeId) {
+  if (!typeId) return '未知类型';
+  const type = sheepTypeOptions.value.find(item => item.id === typeId);
+  return type ? type.name : '未知类型';
+}
+
+async function loadSheepInfo() {
+  const tags = form.value.manageTags;
+  if (!tags || tags.length === 0) return;
+
+  const tagDetails = {};
+  const validResults = [];
+
+  for (const tag of tags) {
+    try {
+      const { data: sheepData } = await checkSheepByManageTags(tag.trim());
+      if (!sheepData) {
+        validResults.push(false);
+        proxy.$modal.msgError(`耳号 ${tag} 不存在或信息异常`);
+      } else {
+        validResults.push(true);
+        tagDetails[tag] = {
+          comment: sheepData.comment || '',
+          varietyId: sheepData.varietyId,
+          sheepId: sheepData.id,
+          sheepfoldId: sheepData.sheepfoldId
+        };
+      }
+    } catch (error) {
+      console.error('获取耳号信息失败:', error);
+      proxy.$modal.msgError(`耳号 ${tag} 验证失败，请重试`);
+      validResults.push(false);
+    }
+  }
+
+  if (validResults.includes(false)) {
+    form.value.manageTags = tags.filter((_, index) => validResults[index]);
+    proxy.$message.warning('部分耳号不合法，已自动过滤');
+  }
+  form.value.tagDetails = tagDetails;
+}
+
 function cancel() {
  open.value = false
  reset()
@@ -274,38 +439,72 @@ function handleSelectionChange(selection) {
 }

 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = '添加转群记录'
+  reset();
+  open.value = true;
+  title.value = '添加转群记录';
+
+  sheepOptions.value = [];
+  form.value.manageTags = [];
 }

 function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
+  reset();
+  const _id = row.id || ids.value;
+
  getTrans_group(_id).then(res => {
-    const d = res.data
-    // 统一转成 Number，避免 undefined
-    d.foldFrom = Number(d.foldFrom ?? 0)
-    d.foldTo = Number(d.foldTo ?? 0)
-    d.reason = Number(d.reason ?? 0)
-    d.status = Number(d.status ?? 0)
-    d.varietyId = Number(d.varietyId ?? 0)
-    form.value = d
-    open.value = true
-    title.value = '修改转群记录'
-  })
+    const d = res.data;
+    d.foldFrom = Number(d.foldFrom ?? 0);
+    d.foldTo = Number(d.foldTo ?? 0);
+    d.reason = Number(d.reason ?? 0);
+    d.status = Number(d.status ?? 0);
+    d.varietyId = Number(d.varietyId ?? 0);
+
+    form.value = { ...d, manageTags: d.manageTags, isEdit: true };
+
+    handleSheepFilter();
+
+    open.value = true;
+    title.value = '修改转群记录';
+  });
 }

 function submitForm() {
  proxy.$refs.trans_groupRef.validate(valid => {
-    if (!valid) return
-    const api = form.value.id ? updateTrans_group : addTrans_group
-    api(form.value).then(() => {
-      proxy.$modal.msgSuccess(form.value.id ? '修改成功' : '新增成功')
-      open.value = false
-      getList()
-    })
-  })
+    if (!valid) return;
+
+    const allTags = form.value.manageTags;
+    const tagDetails = form.value.tagDetails || {};
+    if (!allTags || allTags.length === 0) {
+      proxy.$modal.msgError('请选择或输入至少一个耳号');
+      return;
+    }
+
+    const requests = allTags.map(async (tag) => {
+      const formData = { ...form.value };
+      const details = tagDetails[tag] || {};
+      formData.manageTags = tag;
+      formData.sheepId = details.sheepId;
+      formData.foldFrom = details.sheepfoldId;
+      formData.comment = details.comment || '';
+      formData.varietyId = details.varietyId || formData.varietyId;
+
+      if (formData.id) {
+        return updateTrans_group(formData);
+      } else {
+        return addTrans_group(formData);
+      }
+    });
+
+    Promise.all(requests)
+      .then(() => {
+        proxy.$modal.msgSuccess('操作成功');
+        open.value = false;
+        getList();
+      })
+      .catch(error => {
+        proxy.$modal.msgError(`处理失败：${error.message}`);
+      });
+  });
 }

 function handleDelete(row) {
@@ -326,10 +525,12 @@ function handleExport() {
  )
 }

-/* -------------------- 审批 -------------------- */
+//审核
 function handleApprove(row) {
  approveForm.value = { ...row }
  approveDialog.value = true
+  displayManageTags.value = row.manageTags;
+
 }
 function handleApproveAgree() {
  approveForm.value.status = 1
@@ -348,7 +549,6 @@ function handleApproveReject() {
  })
 }

-/* -------------------- 下拉数据 -------------------- */
 function loadSheepfold() {
  listSheepfold({ pageNum: 1, pageSize: 9999 }).then(res => {
    sheepfoldOptions.value = res.rows
@@ -364,14 +564,15 @@ function getVarietyOptions() {
    method: 'get',
    params: { pageNum: 1, pageSize: 9999 }
  }).then(res => {
-    varietyOptions.value = res.rows || []
-  })
+    varietyOptions.value = res.rows || [];
+  });
 }

-/* -------------------- 初始化 -------------------- */
+
 onMounted(() => {
-  loadSheepfold()
-  getVarietyOptions()
-  getList()
+  loadSheepfold();
+  getVarietyOptions();
+  getSheepTypeList();
+  getList();
 })
 </script>