From 586252bbcbe8fc130f57938c54b3ed6c92b762a6 Mon Sep 17 00:00:00 2001
From: piaobo <1913856125@qq.com>
Date: Fri, 18 Jul 2025 18:13:18 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=A3=80=E7=96=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage_sheep/{add_sheep => }/add_sheep.js |   0
 .../{trans_group => }/trans_group.js          |   0
 .../{transition_info => }/transition_info.js  |   0
 .../produce/other/{castrate => }/castrate.js  |   0
 .../produce/other/{fixHoof => }/fixHoof.js    |   0
 src/views/biosafety/quarantine/index.vue      | 534 +++++++++++++-----
 .../produce/manage_sheep/add_sheep/index.vue  |   6 +-
 .../manage_sheep/trans_group/index.vue        |   5 +-
 .../manage_sheep/transition_info/index.vue    |   4 +-
 src/views/produce/other/castrate/index.vue    |   6 +-
 src/views/produce/other/fixHoof/index.vue     |   6 +-
 src/views/variety/variety/index.vue           |   1 +
 12 files changed, 423 insertions(+), 139 deletions(-)
 rename src/api/produce/manage_sheep/{add_sheep => }/add_sheep.js (100%)
 rename src/api/produce/manage_sheep/{trans_group => }/trans_group.js (100%)
 rename src/api/produce/manage_sheep/{transition_info => }/transition_info.js (100%)
 rename src/api/produce/other/{castrate => }/castrate.js (100%)
 rename src/api/produce/other/{fixHoof => }/fixHoof.js (100%)

diff --git a/src/api/produce/manage_sheep/add_sheep/add_sheep.js b/src/api/produce/manage_sheep/add_sheep.js
similarity index 100%
rename from src/api/produce/manage_sheep/add_sheep/add_sheep.js
rename to src/api/produce/manage_sheep/add_sheep.js
diff --git a/src/api/produce/manage_sheep/trans_group/trans_group.js b/src/api/produce/manage_sheep/trans_group.js
similarity index 100%
rename from src/api/produce/manage_sheep/trans_group/trans_group.js
rename to src/api/produce/manage_sheep/trans_group.js
diff --git a/src/api/produce/manage_sheep/transition_info/transition_info.js b/src/api/produce/manage_sheep/transition_info.js
similarity index 100%
rename from src/api/produce/manage_sheep/transition_info/transition_info.js
rename to src/api/produce/manage_sheep/transition_info.js
diff --git a/src/api/produce/other/castrate/castrate.js b/src/api/produce/other/castrate.js
similarity index 100%
rename from src/api/produce/other/castrate/castrate.js
rename to src/api/produce/other/castrate.js
diff --git a/src/api/produce/other/fixHoof/fixHoof.js b/src/api/produce/other/fixHoof.js
similarity index 100%
rename from src/api/produce/other/fixHoof/fixHoof.js
rename to src/api/produce/other/fixHoof.js
diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue
index 5d603c5..9de243f 100644
--- a/src/views/biosafety/quarantine/index.vue
+++ b/src/views/biosafety/quarantine/index.vue
@@ -72,36 +72,135 @@
       </el-table-column>
     </el-table>
 
-    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
-      @pagination="getList" />
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 添加或修改检疫记录对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="quarantineRef" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="羊只" prop="sheepId">
-          <el-input v-model="form.sheepId" placeholder="请输入羊只" />
-        </el-form-item>
-        <el-form-item label="检疫日期" prop="datetime">
-          <el-date-picker clearable v-model="form.datetime" type="date" value-format="YYYY-MM-DD" placeholder="请选择检疫日期">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="检疫结果" prop="result">
-          <el-select v-model="form.result" placeholder="请选择检疫结果">
-            <el-option v-for="dict in quar_result" :key="dict.value" :label="dict.label"
-              :value="parseInt(dict.value)"></el-option>
+    <!-- 新增检疫记录对话框 -->
+    <el-dialog :title="'新增检疫记录'" v-model="addOpen" width="700px" append-to-body>
+      <el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="羊只耳号" prop="sheepIds" required>
+              <div>
+                <el-input v-model="addForm.sheepIdInput" placeholder="请输入羊只耳号，按回车验证" @keyup.enter="validateSheepId"
+                  :disabled="isInputDisabled" />
+                <div v-if="invalidSheepId" style="color: red; margin-top: 5px;">
+                  该羊只耳号不存在
+                </div>
+                <div v-if="validSheepId" style="color: green; margin-top: 5px;">
+                  该羊只耳号已存在
+                </div>
+                <div style="margin-top: 10px;">
+                  <el-tag v-for="(id, index) in addForm.sheepIds" :key="index" closable @close="removeSheepId(index)"
+                    style="margin-right: 10px; margin-bottom: 10px;">
+                    {{ id }}
+                  </el-tag>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检疫日期" prop="datetime">
+              <el-date-picker clearable v-model="addForm.datetime" type="date" value-format="YYYY-MM-DD"
+                placeholder="请选择检疫日期" :default-value="new Date()"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="检疫项目" prop="quarantineItems">
+              <el-select v-model="addForm.quarItems" placeholder="请选择检疫项目">
+                <el-option v-for="item in quarantineItems" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="样品类型" prop="sampleType">
+              <el-select v-model="addForm.sampleType" placeholder="请选择样品类型">
+                <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
+                  :value="item.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="采样员" prop="sampler">
+              <el-input v-model="addForm.sampler" placeholder="请输入采样员姓名"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫员" prop="quarantineOfficer">
+              <el-input v-model="addForm.quarantineOfficer" placeholder="请输入检疫员姓名"></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="12">
+          <el-form-item label="检疫结果" prop="result">
+            <el-select v-model="editForm.result" placeholder="请选择检疫结果" style="width: 200px;">
+              <el-option v-for="items in quar_result" :key="items.id" :label="items.label"
+                :value="items.value"></el-option>
+            </el-select>
+          </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
+          <el-col :span="24">
+            <el-form-item label="选择羊舍" prop="barnIds">
+              <el-select v-model="addForm.barnIds" multiple filterable placeholder="请选择羊舍" @change="handleBarnChange">
+                <el-option v-for="barn in barns" :key="barn.id" :label="barn.label" :value="barn.value"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitAddForm">确 定</el-button>
+          <el-button @click="cancelAdd">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 修改检疫记录对话框 -->
+    <el-dialog :title="'修改检疫记录'" v-model="editOpen" width="500px" append-to-body>
+      <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="100px">
+        <el-form-item label="检疫状态" prop="status">
+          <el-select v-model="editForm.status" placeholder="请选择检疫状态">
+            <el-option label="未检疫" value="未检疫"></el-option>
+            <el-option label="检疫中" value="检疫中"></el-option>
+            <el-option label="检疫完成" value="检疫完成"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="状态" prop="status">
-          <el-radio-group v-model="form.status">
-            <el-radio v-for="dict in quar_status" :key="dict.value"
-              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
-          </el-radio-group>
+        <el-form-item label="检疫类型" prop="quarantineType">
+          <el-select v-model="editForm.quarantineType" placeholder="请选择检疫类型">
+            <el-option label="常规检疫" value="常规检疫"></el-option>
+            <el-option label="疫病检疫" value="疫病检疫"></el-option>
+            <el-option label="进出口检疫" value="进出口检疫"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="检疫结果" prop="result">
+          <el-select v-model="editForm.result" placeholder="请选择检疫结果">
+            <el-option label="阴性" value="阴性"></el-option>
+            <el-option label="阳性" value="阳性"></el-option>
+            <el-option label="待定" value="待定"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="editForm.remark" type="textarea" placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
+          <el-button type="primary" @click="submitEditForm">确 定</el-button>
+          <el-button @click="cancelEdit">取 消</el-button>
         </div>
       </template>
     </el-dialog>
@@ -109,29 +208,110 @@
 </template>
 
 <script setup name="Quarantine">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from "@/api/biosafety/quarantine"
-import { listItems } from "@/api/biosafety/items"
-import { listSample } from "@/api/biosafety/sample"
-import { useRoute, useRouter } from "vue-router"
-const route = useRoute()
-const router = useRouter()
+import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from "@/api/biosafety/quarantine";
+import { listItems } from "@/api/biosafety/items";
+import { listSample } from "@/api/biosafety/sample";
+import request from '@/utils/request'
 
-const { proxy } = getCurrentInstance()
-const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status')
+import { useRoute, useRouter } from "vue-router";
+const route = useRoute();
+const router = useRouter();
 
-const quarantineList = 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 total = ref(0)
-const title = ref("")
-const daterangeDatetime = ref([])
+const { proxy } = getCurrentInstance();
+const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status');
 
+const quarantineList = 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 total = ref(0);
+const title = ref("");
+const daterangeDatetime = ref([]);
+
+// 检疫项目
+const quarantineItems = ref([]);
+function getItems() {
+  listItems().then(response => { 
+    
+    console.log("检疫项目列表获取成功", quarantineItems.value);
+    quarantineItems.value = response.rows.map(item => ({
+      label: item.name,
+      value: item.id
+    }));
+ 
+  });
+}
+
+// 样品类型
+const sampleTypes = ref([]);
+
+function getSample() {
+  listSample().then(response => {
+    sampleTypes.value = response.rows.map(item => ({
+      label: item.name,
+      value: item.id
+    }));
+  });
+}
+
+// 羊舍列表
+const barns = ref([]);
+/** 获取羊舍列表 */
+function getBarns() {
+  request.get("/sheepfold_management/sheepfold_management/list").then(response => {
+    barns.value = response.rows.map(item => ({
+      label: item.sheepfoldName,
+      value: item.id
+    }));
+    
+  });
+}
+
+// 新增相关
+const addOpen = ref(false);
+const addForm = ref({
+  sheepIds: [], // 存储已验证的羊只耳号列表
+  sheepIdInput: '', // 单行输入框绑定的值
+  datetime: new Date().toISOString().slice(0, 10), // 设置默认日期为今天
+  quarantineType: '',
+  quarItems: "",
+  sampleType: '',
+  sampler: '',
+  quarantineOfficer: '',
+  barnIds: ""
+});
+
+const addRules = {
+  sheepIds: [{ required: true, message: "请至少添加一个有效的羊只耳号", trigger: "blur" }],
+  datetime: [{ required: true, message: "请选择检疫日期", trigger: "change" }],
+  quarItem: [{ required: true, message: "请选择检疫类型", trigger: "change" }],
+  sampleType: [{ required: true, message: "请选择样品类型", trigger: "change" }]
+};
+const addQuarantineRef = ref(null);
+const invalidSheepId = ref(false); // 当前输入的耳号是否无效
+const validSheepId = ref(false); // 当前输入的耳号是否已存在
+const isInputDisabled = ref(false); // 输入框是否禁用
+
+// 修改相关
+const editOpen = ref(false);
+const editForm = ref({
+  id: null,
+  status: '',
+  quarantineType: '',
+  result: '',
+  remark: ''
+});
+const editRules = {
+  status: [{ required: true, message: "请选择检疫状态", trigger: "change" }],
+  quarantineType: [{ required: true, message: "请选择检疫类型", trigger: "change" }]
+};
+const editQuarantineRef = ref(null);
+
+// 查询相关
 const data = reactive({
-  form: {},
   queryParams: {
     pageNum: 1,
     pageSize: 10,
@@ -143,144 +323,246 @@ const data = reactive({
     quarOfficer: null,
     result: null,
     status: null,
-  },
-  rules: {
-    sheepId: [
-      { required: true, message: "羊只不能为空", trigger: "blur" }
-    ],
-    quarItem: [
-      { required: true, message: "检疫项目不能为空", trigger: "change" }
-    ],
-    sampleType: [
-      { required: true, message: "样品类型不能为空", trigger: "change" }
-    ],
   }
-})
+});
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams } = toRefs(data);
 
 /** 查询检疫记录列表 */
 function getList() {
-  loading.value = true
-  queryParams.value.params = {}
-  if (null != daterangeDatetime && '' != daterangeDatetime) {
-    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0]
-    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1]
+  loading.value = true;
+  queryParams.value.params = {};
+  if (null != daterangeDatetime.value && daterangeDatetime.value.length === 2) {
+    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0];
+    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1];
   }
   listQuarantine(queryParams.value).then(response => {
-    quarantineList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+    quarantineList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false
-  reset()
+  open.value = false;
 }
 
 // 表单重置
 function reset() {
-  form.value = {
-    id: null,
-    sheepId: null,
-    datetime: null,
-    quarItem: null,
-    sampleType: null,
-    sampler: null,
-    quarOfficer: null,
-    result: null,
-    status: null,
-    updateBy: null,
-    updateTime: null,
-    createBy: null,
-    createTime: null
-  }
-  proxy.resetForm("quarantineRef")
+  addForm.value = {
+    sheepIds: [],
+    sheepIdInput: '',
+    datetime: new Date().toISOString().slice(0, 10), // 重置时也设置默认日期
+    quarantineType: '',
+    quarItems: "",
+    sampleType: '',
+    sampler: '',
+    quarantineOfficer: '',
+    barnIds: []
+  };
+  invalidSheepId.value = false;
+  validSheepId.value = false;
+  proxy.resetForm("addQuarantineRef");
 }
 
-/** 搜索按钮操作 */
+/** 搜索功能 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+  queryParams.value.pageNum = 1;
+  getList();
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  daterangeDatetime.value = []
-  proxy.resetForm("queryRef")
-  handleQuery()
+  daterangeDatetime.value = [];
+  proxy.resetForm("queryRef");
+  handleQuery();
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加检疫记录"
+  reset();
+  addOpen.value = true;
+}
+
+// 校验单个羊只耳号
+function validateSheepId() {
+  if (!addForm.value.sheepIdInput.trim()) return;
+
+  invalidSheepId.value = false;
+  validSheepId.value = false;
+
+  // 禁用输入框，防止重复提交
+  isInputDisabled.value = true;
+
+  request.get(`/sheep/sheep/${addForm.value.sheepIdInput.trim()}`).then(response => {
+    if (response.exists) {
+      // 耳号存在，添加到列表
+      if (!addForm.value.sheepIds.includes(addForm.value.sheepIdInput.trim())) {
+        addForm.value.sheepIds.push(addForm.value.sheepIdInput.trim());
+        validSheepId.value = true;
+      } else {
+        proxy.$modal.msgWarning("该羊只耳号已添加");
+      }
+    } else {
+      // 耳号不存在
+      invalidSheepId.value = true;
+    }
+  }).finally(() => {
+    // 清空输入框并启用
+    addForm.value.sheepIdInput = '';
+    isInputDisabled.value = false;
+  });
+}
+
+// 移除羊只耳号
+function removeSheepId(index) {
+  addForm.value.sheepIds.splice(index, 1);
+}
+
+// 处理羊舍变更
+function handleBarnChange(barnIds) {
+  if (!barnIds || barnIds.length === 0) return;
+
+  // 这里需要调用接口获取选中羊舍中的所有羊只耳号
+  // 并将它们添加到输入框中
+  // 示例代码，实际接口可能不同
+  let allSheepIds = addForm.value.sheepIds;
+
+  barnIds.forEach(barnId => {
+    // 模拟从羊舍获取耳号，实际应替换为真实接口
+    const barnSheepIds = getSheepIdsFromBarn(barnId);
+    barnSheepIds.forEach(sheepId => {
+      if (!allSheepIds.includes(sheepId)) {
+        // 验证耳号有效性
+        request.get(`/sheep/sheep/${sheepId}`).then(response => {
+          if (response.exists && !allSheepIds.includes(sheepId)) {
+            allSheepIds.push(sheepId);
+            addForm.value.sheepIds = [...allSheepIds];
+          }
+        });
+      }
+    });
+  });
+}
+
+/** 模拟从羊舍获取耳号（实际应替换为接口调用） */
+function getSheepIdsFromBarn(barnId) {
+  // 模拟数据，实际应从接口获取
+  const barnSheepMap = {
+    1: ['E001', 'E002', 'E003'],
+    2: ['E004', 'E005'],
+    3: ['E006']
+  };
+  return barnSheepMap[barnId] || [];
+}
+
+/** 提交新增表单 */
+function submitAddForm() {
+  addQuarantineRef.value.validate(valid => {
+    if (valid) {
+      if (addForm.value.sheepIds.length === 0) {
+        proxy.$modal.msgError("请至少添加一个有效的羊只耳号");
+        return;
+      }
+
+      const data = {
+        ...addForm.value,
+        sheepIds: addForm.value.sheepIds,
+        quarItems: addForm.value.quarItems.join(','),
+      };
+
+      addQuarantine(data).then(response => {
+        proxy.$modal.msgSuccess("新增成功");
+        addOpen.value = false;
+        getList();
+      });
+    }
+  });
+}
+
+/** 取消新增 */
+function cancelAdd() {
+  addOpen.value = false;
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
+  resetEditForm();
+  const _id = row.id || ids.value;
   getQuarantine(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改检疫记录"
-  })
+    editForm.value = {
+      ...response.data,
+      status: response.data.status,
+      quarantineType: response.data.quarantineType,
+      result: response.data.result,
+      remark: response.data.remark
+    };
+    editOpen.value = true;
+  });
 }
 
-/** 提交按钮 */
-function submitForm() {
-  proxy.$refs["quarantineRef"].validate(valid => {
+/** 重置修改表单 */
+function resetEditForm() {
+  editForm.value = {
+    id: null,
+    status: '',
+    quarantineType: '',
+    result: '',
+    remark: ''
+  };
+  proxy.resetForm("editQuarantineRef");
+}
+
+/** 提交修改表单 */
+function submitEditForm() {
+  editQuarantineRef.value.validate(valid => {
     if (valid) {
-      if (form.value.id != null) {
-        updateQuarantine(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        addQuarantine(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
+      updateQuarantine(editForm.value).then(response => {
+        proxy.$modal.msgSuccess("修改成功");
+        editOpen.value = false;
+        getList();
+      });
     }
-  })
+  });
+}
+
+/** 取消修改 */
+function cancelEdit() {
+  editOpen.value = false;
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _ids = row.id || ids.value
+  const _ids = row.id || ids.value;
   proxy.$modal.confirm('是否确认删除检疫记录编号为"' + _ids + '"的数据项？').then(function () {
-    return delQuarantine(_ids)
+    return delQuarantine(_ids);
   }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => { })
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => { });
 }
 
 /** 导出按钮操作 */
 function handleExport() {
   proxy.download('bisosafety/quarantine/export', {
     ...queryParams.value
-  }, `quarantine_${new Date().getTime()}.xlsx`)
+  }, `quarantine_${new Date().getTime()}.xlsx`);
 }
 
 function gotoTreatment(row) {
-  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id,sId:row.sheepId } })
+  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } });
 }
 
-
-getList()
+getList();
+getItems(); // 获取检疫项目列表
+getSample(); // 获取样品类型列表
+getBarns(); // 获取羊舍列表
 </script>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/add_sheep/index.vue b/src/views/produce/manage_sheep/add_sheep/index.vue
index dddd5f8..03b1f96 100644
--- a/src/views/produce/manage_sheep/add_sheep/index.vue
+++ b/src/views/produce/manage_sheep/add_sheep/index.vue
@@ -135,7 +135,7 @@
 <script setup>
 import { ref, onMounted } from 'vue'
 import request from '@/utils/request'
-import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep/add_sheep'
+import { addSheep, exportSheepForm } from '@/api/produce/manage_sheep/add_sheep'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import { getToken } from '@/utils/auth'
 import { getCurrentInstance } from 'vue'
@@ -273,10 +273,10 @@ function handleImportError(err) {
 
 
 /* -------------------- 初始化 -------------------- */
-onMounted(() => {
+
   getSheepfoldOptions()
   getVarietyOptions()
-})
+
 </script>
 
 <style scoped>
diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index 238686b..2ab497f 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -175,7 +175,7 @@ import {
   delTrans_group,
   addTrans_group,
   updateTrans_group
-} from '@/api/produce/manage_sheep/trans_group/trans_group'
+} from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import request from '@/utils/request'
 
@@ -375,9 +375,8 @@ function getVarietyOptions() {
 }
 
 /* -------------------- 初始化 -------------------- */
-onMounted(() => {
+
   loadSheepfold()
   getVarietyOptions()
   getList()
-})
 </script>
\ No newline at end of file
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
index 3119219..3789c4c 100644
--- a/src/views/produce/manage_sheep/transition_info/index.vue
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -210,7 +210,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info"
 
 const { proxy } = getCurrentInstance()
 const { status, trans_type } = proxy.useDict('status', 'trans_type')
@@ -409,5 +409,7 @@ function handleApproveReject() {
     proxy.$modal.msgError(`审批失败：${error}`);
   });
 }
+
 getList()
+
 </script>
diff --git a/src/views/produce/other/castrate/index.vue b/src/views/produce/other/castrate/index.vue
index f4f9f8f..59e6109 100644
--- a/src/views/produce/other/castrate/index.vue
+++ b/src/views/produce/other/castrate/index.vue
@@ -110,7 +110,7 @@
 </template>
 
 <script setup name="castrate">
-import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate/castrate'
+import { listCastrate, getCastrate, delCastrate, addCastrate, updateCastrate } from '@/api/produce/other/castrate'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import request from '@/utils/request'
 
@@ -276,9 +276,9 @@ function getVarietyOptions() {
   })
 }
 
-onMounted(() => {
+
   getList()
   getSheepfoldOptions()
   getVarietyOptions()
-})
+
 </script>
\ No newline at end of file
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index 028e4ca..7f91889 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -118,7 +118,7 @@
 </template>
 
 <script setup name="FixHoof">
-import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from '@/api/produce/other/fixHoof/fixHoof'
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof } from '@/api/produce/other/fixHoof'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import request from '@/utils/request'
 
@@ -287,9 +287,9 @@ function getVarietyOptions () {
 }
 
 /* 只保留一个 onMounted */
-onMounted(() => {
+
   getList()
   getSheepfoldOptions()
   getVarietyOptions()
-})
+
 </script>
\ No newline at end of file
diff --git a/src/views/variety/variety/index.vue b/src/views/variety/variety/index.vue
index dc7e6a1..5631399 100644
--- a/src/views/variety/variety/index.vue
+++ b/src/views/variety/variety/index.vue
@@ -97,6 +97,7 @@
 <script setup name="Variety">
 import { listVariety, getVariety, delVariety, addVariety, updateVariety } from "@/api/variety/variety"
 
+
 const { proxy } = getCurrentInstance()
 
 const varietyList = ref([])

From a48cd552f69643a675d808813f8071f6612e7a29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Fri, 18 Jul 2025 18:37:51 +0800
Subject: [PATCH 2/5] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage_sheep/trans_group/index.vue        |  2 +-
 .../manage_sheep/transition_info/index.vue    | 83 +------------------
 src/views/produce/other/fixHoof/index.vue     |  2 +-
 3 files changed, 3 insertions(+), 84 deletions(-)

diff --git a/src/views/produce/manage_sheep/trans_group/index.vue b/src/views/produce/manage_sheep/trans_group/index.vue
index 9d02969..9107167 100644
--- a/src/views/produce/manage_sheep/trans_group/index.vue
+++ b/src/views/produce/manage_sheep/trans_group/index.vue
@@ -169,7 +169,7 @@
 </template>
 
 <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 { listTrans_group, getTrans_group, delTrans_group, addTrans_group, updateTrans_group } from '@/api/produce/manage_sheep/trans_group'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 import request from '@/utils/request'
 
diff --git a/src/views/produce/manage_sheep/transition_info/index.vue b/src/views/produce/manage_sheep/transition_info/index.vue
index a8d3236..cc85810 100644
--- a/src/views/produce/manage_sheep/transition_info/index.vue
+++ b/src/views/produce/manage_sheep/transition_info/index.vue
@@ -167,7 +167,7 @@
 </template>
 
 <script setup name="Transition_info">
-import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info/transition_info"
+import { listTransition_info, getTransition_info, delTransition_info, addTransition_info, updateTransition_info } from "@/api/produce/manage_sheep/transition_info"
 import request from '@/utils/request'
 
 const { proxy } = getCurrentInstance()
@@ -310,87 +310,6 @@ function handleDelete(row) {
       proxy.$modal.msgSuccess("删除成功")
     })
 }
-function handleExport() {
-  proxy.download('/produce/manage_sheep/transition_info/export',
-    { ...queryParams.value },
-    `transition_info_${new Date().getTime()}.xlsx`)
-}
-
-/* -------------------- 审批 -------------------- */
-function handleApprove(row) {
-  approveForm.value = { ...row }
-  approveDialog.value = true
-}
-function getTransTypeLabel(val) {
-  const hit = trans_type.value.find(item => Number(item.value) === val)
-  return hit ? hit.label : val
-}
-function handleApproveAgree() {
-  approveForm.value.status = 1
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为同意")
-    getList()
-  })
-}
-function handleApproveReject() {
-  approveForm.value.status = 2
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false
-    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回")
-    getList()
-  })
-}
-
-/* -------------------- 下拉 -------------------- */
-function getVarietyOptions() {
-  request({
-    url: '/base/variety/list',
-    method: 'get',
-    params: { pageNum: 1, pageSize: 9999 }
-  }).then(res => { varietyOptions.value = res.rows || [] })
-}
-
-/** 导出按钮操作 */
-function handleExport() {
-  proxy.download('/produce/manage_sheep/transition_info/export', {
-    ...queryParams.value
-  }, `transition_info_${new Date().getTime()}.xlsx`)
-}
-// 审批记录的对话框
-const approveDialog = ref(false);
-const approveForm = ref({});
-
-// 审批按钮操作
-function handleApprove(row) {
-  // 打开审批对话框
-  approveForm.value = { ...row };
-  approveDialog.value = true;
-}
-
-// 同意审批
-function handleApproveAgree() {
-  approveForm.value.status = 1; // 状态设置为同意
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess("审批成功，状态已更新为同意");
-    getList();
-  }).catch((error) => {
-    proxy.$modal.msgError(`审批失败：${error}`);
-  });
-}
-
-// 驳回审批
-function handleApproveReject() {
-  approveForm.value.status = 2; // 状态设置为驳回
-  updateTransition_info(approveForm.value).then(() => {
-    approveDialog.value = false;
-    proxy.$modal.msgSuccess("审批成功，状态已更新为驳回");
-    getList();
-  }).catch((error) => {
-    proxy.$modal.msgError(`审批失败：${error}`);
-  });
-}
 
 getList()
 
diff --git a/src/views/produce/other/fixHoof/index.vue b/src/views/produce/other/fixHoof/index.vue
index 195ebd7..fa9beba 100644
--- a/src/views/produce/other/fixHoof/index.vue
+++ b/src/views/produce/other/fixHoof/index.vue
@@ -111,7 +111,7 @@
 </template>
 
 <script setup name="FixHoof">
-import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof/fixHoof'
+import { listFixHoof, getFixHoof, delFixHoof, addFixHoof, updateFixHoof, checkSheepByManageTags, getVarietyOptions } from '@/api/produce/other/fixHoof'
 import { listSheepfold_management as listSheepfold } from '@/api/fileManagement/sheepfold_management'
 // import request from '@/utils/request'
 

From 0a39ee23a6e69f2b343b404f4038be49574464fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BC=82=E6=B3=8A?= <1913856125@qq.com>
Date: Sun, 20 Jul 2025 14:07:48 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E6=A3=80=E7=96=AB=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/biosafety/quarantine/index.vue | 806 ++++++++++-------------
 1 file changed, 362 insertions(+), 444 deletions(-)

diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue
index 9de243f..b0ad772 100644
--- a/src/views/biosafety/quarantine/index.vue
+++ b/src/views/biosafety/quarantine/index.vue
@@ -1,49 +1,42 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- 查询表单 -->
+    <el-form :model="queryParams" ref="queryRef" inline v-show="showSearch" label-width="68px">
       <el-form-item label="羊只" prop="sheepId">
-        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只" clearable @keyup.enter="handleQuery" />
+        <el-input v-model="queryParams.sheepId" placeholder="请输入羊只耳号" clearable @keyup.enter="getList" />
       </el-form-item>
-      <el-form-item label="检疫日期" style="width: 308px">
-        <el-date-picker v-model="daterangeDatetime" value-format="YYYY-MM-DD" type="daterange" range-separator="-"
-          start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+      <el-form-item label="检疫日期">
+        <el-date-picker v-model="daterangeDatetime" type="daterange" range-separator="-" start-placeholder="开始日期"
+          end-placeholder="结束日期" value-format="YYYY-MM-DD" />
       </el-form-item>
       <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button type="primary" icon="Search" @click="getList">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
 
+    <!-- 按钮行 -->
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Plus" @click="handleAdd"
-          v-hasPermi="['bisosafety:quarantine:add']">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
-          v-hasPermi="['bisosafety:quarantine:edit']">修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
-          v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="Download" @click="handleExport"
-          v-hasPermi="['bisosafety:quarantine:export']">导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <el-button type="primary" plain icon="Plus" @click="handleAdd"
+        v-hasPermi="['bisosafety:quarantine:add']">新增</el-button>
+      <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
+        v-hasPermi="['bisosafety:quarantine:edit']">修改</el-button>
+      <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete"
+        v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
+      <el-button type="warning" plain icon="Download" @click="handleExport"
+        v-hasPermi="['bisosafety:quarantine:export']">导出</el-button>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" />
     </el-row>
 
+    <!-- 表格 -->
     <el-table v-loading="loading" :data="quarantineList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="羊只" align="center" prop="sheepNo" />
-      <el-table-column label="检疫日期" align="center" prop="datetime" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
-        </template>
+      <el-table-column label="羊只耳号" align="center" prop="sheepNo" />
+      <el-table-column label="检疫日期" align="center" prop="datetime" width="180"
+        :formatter="(_, __, v) => parseTime(v, '{y}-{m}-{d}')" />
+      <el-table-column label="羊只性别" align="center" prop="gender" >
+         <template #default="scope"><dict-tag :options="sheep_gender" :value="scope.row.gender" /></template>
       </el-table-column>
-      <el-table-column label="羊只性别" align="center" prop="gender" />
-
       <el-table-column label="羊只类别" align="center" prop="sheepType" />
       <el-table-column label="月龄" align="center" prop="monthAge" />
       <el-table-column label="繁育状态" align="center" prop="breed" />
@@ -52,20 +45,19 @@
       <el-table-column label="采样员" align="center" prop="sampler" />
       <el-table-column label="检疫员" align="center" prop="quarOfficer" />
       <el-table-column label="检疫结果" align="center" prop="result">
-        <template #default="scope">
-          <dict-tag :options="quar_result" :value="scope.row.result" />
-        </template>
+        <template #default="scope"><dict-tag :options="quar_result" :value="scope.row.result" /></template>
       </el-table-column>
       <el-table-column label="状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :options="quar_status" :value="scope.row.status" />
-        </template>
+        <template #default="scope"><dict-tag :options="quar_status" :value="scope.row.status" /></template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200px">
+      <el-table-column label="备注" align="center" prop="comment" />
+      <el-table-column label="操作" align="center" width="200">
         <template #default="scope">
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)"
             v-hasPermi="['bisosafety:quarantine:edit']">检疫</el-button>
-          <el-button link type="success" @click="gotoTreatment(scope.row)" v-if="scope.row.result == 1">治疗</el-button>
+          <el-button v-if="String(scope.row.result) === '1'" link type="success" @click="gotoTreatment(scope.row)">
+            治疗
+          </el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)"
             v-hasPermi="['bisosafety:quarantine:remove']">删除</el-button>
         </template>
@@ -75,494 +67,420 @@
     <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
-    <!-- 新增检疫记录对话框 -->
-    <el-dialog :title="'新增检疫记录'" v-model="addOpen" width="700px" append-to-body>
+    <!-- 新增弹窗 -->
+    <el-dialog title="新增检疫记录" v-model="addOpen" width="700px" append-to-body>
       <el-form ref="addQuarantineRef" :model="addForm" :rules="addRules" label-width="100px">
-        <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="羊只耳号" prop="sheepIds" required>
-              <div>
-                <el-input v-model="addForm.sheepIdInput" placeholder="请输入羊只耳号，按回车验证" @keyup.enter="validateSheepId"
-                  :disabled="isInputDisabled" />
-                <div v-if="invalidSheepId" style="color: red; margin-top: 5px;">
-                  该羊只耳号不存在
-                </div>
-                <div v-if="validSheepId" style="color: green; margin-top: 5px;">
-                  该羊只耳号已存在
-                </div>
-                <div style="margin-top: 10px;">
-                  <el-tag v-for="(id, index) in addForm.sheepIds" :key="index" closable @close="removeSheepId(index)"
-                    style="margin-right: 10px; margin-bottom: 10px;">
-                    {{ id }}
-                  </el-tag>
-                </div>
+        <el-form-item label="羊只耳号" prop="sheepIds" required>
+          <el-input v-model="addForm.sheepIdInput" placeholder="输入耳号后回车验证" @keyup.enter="validateSheepId">
+            <template #suffix>
+              <div style="display: flex; align-items: center; height: 100%; margin-left: 8px;">
+                <span v-if="invalidSheepId" style="color: red; font-size: 12px;">耳号不存在</span>
+                <span v-else-if="validSheepId" style="color: green; font-size: 12px;">已添加</span>
+                <span v-else-if="alreadySelected" style="color: orange; font-size: 12px;">该羊只已选择</span>
               </div>
-            </el-form-item>
-          </el-col>
-        </el-row>
+            </template>
+          </el-input>
+
+          <el-tag v-for="(id, i) in addForm.sheepIds" :key="i" closable @close="addForm.sheepIds.splice(i, 1)"
+            style="margin: 5px 5px 0 0">
+            {{ id }}
+          </el-tag>
+        </el-form-item>
+
         <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="检疫日期" prop="datetime">
-              <el-date-picker clearable v-model="addForm.datetime" type="date" value-format="YYYY-MM-DD"
-                placeholder="请选择检疫日期" :default-value="new Date()"></el-date-picker>
+              <el-date-picker v-model="addForm.datetime" type="date" value-format="YYYY-MM-DD" />
             </el-form-item>
           </el-col>
-
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="检疫项目" prop="quarantineItems">
-              <el-select v-model="addForm.quarItems" placeholder="请选择检疫项目">
-                <el-option v-for="item in quarantineItems" :key="item.value" :label="item.label"
-                  :value="item.value"></el-option>
+            <el-form-item label="检疫项目" prop="quarItem">
+              <el-select v-model="addForm.quarItem" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row>
+
+        <el-row :gutter="20">
           <el-col :span="12">
             <el-form-item label="样品类型" prop="sampleType">
-              <el-select v-model="addForm.sampleType" placeholder="请选择样品类型">
-                <el-option v-for="item in sampleTypes" :key="item.value" :label="item.label"
-                  :value="item.value"></el-option>
+              <el-select v-model="addForm.sampleType" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="12">
-            <el-form-item label="采样员" prop="sampler">
-              <el-input v-model="addForm.sampler" placeholder="请输入采样员姓名"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="检疫员" prop="quarantineOfficer">
-              <el-input v-model="addForm.quarantineOfficer" placeholder="请输入检疫员姓名"></el-input>
+            <el-form-item label="羊舍" prop="barnIds">
+              <el-select v-model="addForm.barnIds" multiple collapse-tags placeholder="可多选" @change="handleBarnChange">
+                <el-option v-for="b in barns" :key="b.value" :label="b.label" :value="b.value" />
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row :gutter="20">
           <el-col :span="12">
-          <el-form-item label="检疫结果" prop="result">
-            <el-select v-model="editForm.result" placeholder="请选择检疫结果" style="width: 200px;">
-              <el-option v-for="items in quar_result" :key="items.id" :label="items.label"
-                :value="items.value"></el-option>
-            </el-select>
-          </el-form-item>
+            <el-form-item label="采样员" prop="sampler"><el-input v-model="addForm.sampler" /></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫员" prop="quarOfficer"><el-input v-model="addForm.quarOfficer" /></el-form-item>
           </el-col>
         </el-row>
-
         <el-row :gutter="20">
-          <el-col :span="24">
-            <el-form-item label="选择羊舍" prop="barnIds">
-              <el-select v-model="addForm.barnIds" multiple filterable placeholder="请选择羊舍" @change="handleBarnChange">
-                <el-option v-for="barn in barns" :key="barn.id" :label="barn.label" :value="barn.value"></el-option>
+          <el-col :span="12">
+            <el-form-item label="检疫结果" prop="result">
+              <el-select v-model="editForm.result" placeholder="检疫结果">
+                <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
               </el-select>
             </el-form-item>
           </el-col>
+
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="22">
+            <el-form-item label="备注" prop="comment">
+              <el-input type="textarea" :rows="3" resize="vertical" v-model="addForm.comment" placeholder="请输入备注信息"
+                maxlength="500" show-word-limit />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
+
       <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitAddForm">确 定</el-button>
-          <el-button @click="cancelAdd">取 消</el-button>
-        </div>
+        <el-button type="primary" @click="submitAddForm">确 定</el-button>
+        <el-button @click="addOpen = false">取 消</el-button>
       </template>
     </el-dialog>
 
-    <!-- 修改检疫记录对话框 -->
-    <el-dialog :title="'修改检疫记录'" v-model="editOpen" width="500px" append-to-body>
-      <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="100px">
-        <el-form-item label="检疫状态" prop="status">
-          <el-select v-model="editForm.status" placeholder="请选择检疫状态">
-            <el-option label="未检疫" value="未检疫"></el-option>
-            <el-option label="检疫中" value="检疫中"></el-option>
-            <el-option label="检疫完成" value="检疫完成"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检疫类型" prop="quarantineType">
-          <el-select v-model="editForm.quarantineType" placeholder="请选择检疫类型">
-            <el-option label="常规检疫" value="常规检疫"></el-option>
-            <el-option label="疫病检疫" value="疫病检疫"></el-option>
-            <el-option label="进出口检疫" value="进出口检疫"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="检疫结果" prop="result">
-          <el-select v-model="editForm.result" placeholder="请选择检疫结果">
-            <el-option label="阴性" value="阴性"></el-option>
-            <el-option label="阳性" value="阳性"></el-option>
-            <el-option label="待定" value="待定"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="editForm.remark" type="textarea" placeholder="请输入备注"></el-input>
-        </el-form-item>
+    <el-dialog title="修改检疫记录" v-model="editOpen" width="560px" append-to-body :lock-scroll="false">
+
+      <!-- 2. 表单主体 -->
+      <el-form ref="editQuarantineRef" :model="editForm" :rules="editRules" label-width="72px" size="default">
+        <!-- 1. 羊只基本信息（只读） -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="羊只耳号">
+              <span>{{ editForm.sheepNo }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只性别">
+              <dict-tag :options="sheep_gender" :value="editForm.gender" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="羊只类别">
+              <span>{{ editForm.sheepType }}</span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="月龄">
+              <span>{{ editForm.monthAge }} </span>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="繁育状态">
+              <span>{{ editForm.breed }}</span>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="检疫日期">
+              <el-input :value="parseTime(editForm.datetime, '{y}-{m}-{d}')" readonly />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫项目">
+              <el-select v-model="editForm.quarItem" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in quarantineItems" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="样品类型">
+              <el-select v-model="editForm.sampleType" placeholder="请选择" filterable clearable>
+                <el-option v-for="i in sampleTypes" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="采样员">
+              <el-input v-model="editForm.sampler" />
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="12">
+            <el-form-item label="检疫员">
+              <el-input v-model="editForm.quarOfficer" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="检疫结果" prop="result">
+              <el-select v-model="editForm.result" placeholder="请选择" clearable style="width: 100%">
+                <el-option v-for="i in quar_result" :key="i.value" :label="i.label" :value="i.value" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="24">
+            <el-form-item label="备注" prop="remark">
+              <el-input type="textarea" v-model="editForm.remark" :rows="3" maxlength="200" show-word-limit />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
+
       <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitEditForm">确 定</el-button>
-          <el-button @click="cancelEdit">取 消</el-button>
-        </div>
+        <el-button @click="editOpen = false">取 消</el-button>
+        <el-button type="primary" @click="submitEditForm">确 定</el-button>
       </template>
     </el-dialog>
   </div>
 </template>
 
 <script setup name="Quarantine">
-import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from "@/api/biosafety/quarantine";
-import { listItems } from "@/api/biosafety/items";
-import { listSample } from "@/api/biosafety/sample";
+import { listQuarantine, getQuarantine, delQuarantine, addQuarantine, updateQuarantine } from '@/api/biosafety/quarantine'
+import { listItems } from '@/api/biosafety/items'
+import { listSample } from '@/api/biosafety/sample'
 import request from '@/utils/request'
+import { parseTime } from '@/utils/ruoyi'
+import { useRouter } from 'vue-router'
 
-import { useRoute, useRouter } from "vue-router";
-const route = useRoute();
-const router = useRouter();
+const { proxy } = getCurrentInstance()
+const { quar_result, quar_status,sheep_gender} = proxy.useDict('quar_result', 'quar_status',"sheep_gender")
+const router = useRouter()
 
-const { proxy } = getCurrentInstance();
-const { quar_result, quar_status } = proxy.useDict('quar_result', 'quar_status');
+/* 基础数据 */
+const loading = ref(true)
+const showSearch = ref(true)
+const total = ref(0)
+const quarantineList = ref([])
+const daterangeDatetime = ref([])
 
-const quarantineList = 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 total = ref(0);
-const title = ref("");
-const daterangeDatetime = ref([]);
+/* 查询参数 */
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  sheepId: null
+})
 
-// 检疫项目
-const quarantineItems = ref([]);
+/* 多选 */
+const ids = ref([])
+const single = ref(true)
+const multiple = ref(true)
+function handleSelectionChange(sel) {
+  ids.value = sel.map(s => s.id)
+  single.value = sel.length !== 1
+  multiple.value = !sel.length
+}
+
+/* 下拉数据 */
+const quarantineItems = ref([])
+const sampleTypes = ref([])
+const barns = ref([])
+
+/* 获取基础下拉 */
 function getItems() {
-  listItems().then(response => { 
-    
-    console.log("检疫项目列表获取成功", quarantineItems.value);
-    quarantineItems.value = response.rows.map(item => ({
-      label: item.name,
-      value: item.id
-    }));
- 
-  });
+  listItems().then(res => quarantineItems.value = res.rows.map(i => ({ label: i.name, value: i.id })))
 }
-
-// 样品类型
-const sampleTypes = ref([]);
-
 function getSample() {
-  listSample().then(response => {
-    sampleTypes.value = response.rows.map(item => ({
-      label: item.name,
-      value: item.id
-    }));
-  });
+  listSample().then(res => sampleTypes.value = res.rows.map(i => ({ label: i.name, value: i.id })))
 }
-
-// 羊舍列表
-const barns = ref([]);
-/** 获取羊舍列表 */
 function getBarns() {
-  request.get("/sheepfold_management/sheepfold_management/list").then(response => {
-    barns.value = response.rows.map(item => ({
-      label: item.sheepfoldName,
-      value: item.id
-    }));
-    
-  });
+  request.get('/sheepfold_management/sheepfold_management/list').then(res =>
+    barns.value = res.rows.map(b => ({ label: b.sheepfoldName, value: b.id }))
+  )
 }
 
-// 新增相关
-const addOpen = ref(false);
-const addForm = ref({
-  sheepIds: [], // 存储已验证的羊只耳号列表
-  sheepIdInput: '', // 单行输入框绑定的值
-  datetime: new Date().toISOString().slice(0, 10), // 设置默认日期为今天
-  quarantineType: '',
-  quarItems: "",
-  sampleType: '',
-  sampler: '',
-  quarantineOfficer: '',
-  barnIds: ""
-});
-
-const addRules = {
-  sheepIds: [{ required: true, message: "请至少添加一个有效的羊只耳号", trigger: "blur" }],
-  datetime: [{ required: true, message: "请选择检疫日期", trigger: "change" }],
-  quarItem: [{ required: true, message: "请选择检疫类型", trigger: "change" }],
-  sampleType: [{ required: true, message: "请选择样品类型", trigger: "change" }]
-};
-const addQuarantineRef = ref(null);
-const invalidSheepId = ref(false); // 当前输入的耳号是否无效
-const validSheepId = ref(false); // 当前输入的耳号是否已存在
-const isInputDisabled = ref(false); // 输入框是否禁用
-
-// 修改相关
-const editOpen = ref(false);
-const editForm = ref({
-  id: null,
-  status: '',
-  quarantineType: '',
-  result: '',
-  remark: ''
-});
-const editRules = {
-  status: [{ required: true, message: "请选择检疫状态", trigger: "change" }],
-  quarantineType: [{ required: true, message: "请选择检疫类型", trigger: "change" }]
-};
-const editQuarantineRef = ref(null);
-
-// 查询相关
-const data = reactive({
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    sheepId: null,
-    datetime: null,
-    quarItem: null,
-    sampleType: null,
-    sampler: null,
-    quarOfficer: null,
-    result: null,
-    status: null,
-  }
-});
-
-const { queryParams } = toRefs(data);
-
-/** 查询检疫记录列表 */
+/* 列表查询 */
 function getList() {
-  loading.value = true;
-  queryParams.value.params = {};
-  if (null != daterangeDatetime.value && daterangeDatetime.value.length === 2) {
-    queryParams.value.params["beginDatetime"] = daterangeDatetime.value[0];
-    queryParams.value.params["endDatetime"] = daterangeDatetime.value[1];
+  loading.value = true
+  queryParams.params = {}
+  if (daterangeDatetime.value.length === 2) {
+    queryParams.params.beginDatetime = daterangeDatetime.value[0]
+    queryParams.params.endDatetime = daterangeDatetime.value[1]
   }
-  listQuarantine(queryParams.value).then(response => {
-    quarantineList.value = response.rows;
-    total.value = response.total;
-    loading.value = false;
-  });
+  listQuarantine(queryParams).then(res => {
+    quarantineList.value = res.rows
+    total.value = res.total
+    loading.value = false
+  })
+}
+function resetQuery() {
+  daterangeDatetime.value = []
+  proxy.resetForm('queryRef')
+  getList()
 }
 
-// 取消按钮
-function cancel() {
-  open.value = false;
+/* 新增相关 */
+const addOpen = ref(false)
+const addForm = ref({})
+const addRules = {
+  sheepIds: [{ required: true, message: '请至少添加一个耳号', trigger: 'blur' }],
+  datetime: [{ required: true, message: '请选择日期', trigger: 'change' }],
+  quarItem: [{ required: true, message: '请选择项目', trigger: 'change' }],
+  sampleType: [{ required: true, message: '请选择样品类型', trigger: 'change' }]
 }
 
-// 表单重置
-function reset() {
-  addForm.value = {
+const invalidSheepId = ref(false)
+const validSheepId = ref(false)
+const alreadySelected = ref(false)
+
+const barnSheepMap = reactive({})
+
+function handleBarnChange(selectedBarnIds) {
+  const oldBarnIds = Object.keys(barnSheepMap).map(Number)
+  const newBarnIds = selectedBarnIds || []
+
+  // 移除旧羊舍的耳号和ID
+  oldBarnIds.forEach(barnId => {
+    if (!newBarnIds.includes(barnId)) {
+      const { tags = [], ids = [] } = barnSheepMap[barnId] || {}
+      tags.forEach(tag => {
+        const index = addForm.value.sheepIds.indexOf(tag)
+        if (index !== -1) addForm.value.sheepIds.splice(index, 1)
+      })
+      ids.forEach(id => {
+        const index = addForm.value.ids.indexOf(id)
+        if (index !== -1) addForm.value.ids.splice(index, 1)
+      })
+      delete barnSheepMap[barnId]
+    }
+  })
+
+  // 添加新羊舍的耳号和ID
+  newBarnIds.forEach(barnId => {
+    if (!barnSheepMap[barnId]) {
+      request.get('/sheepfold_management/sheepfold_management/getSheepById', { params: { id: barnId } })
+        .then(res => {
+          const sheepList = res.data || []
+          const tags = sheepList.map(s => s.manageTags)
+          const ids = sheepList.map(s => s.id)
+
+          barnSheepMap[barnId] = { tags, ids }
+
+          tags.forEach(tag => {
+            if (tag && !addForm.value.sheepIds.includes(tag)) {
+              addForm.value.sheepIds.push(tag)
+            }
+          })
+
+          ids.forEach(id => {
+            if (id && !addForm.value.ids.includes(id)) {
+              addForm.value.ids.push(id)
+            }
+          })
+        })
+    }
+  })
+}
+
+function validateSheepId() {
+  const id = addForm.value.sheepIdInput.trim()
+  if (!id) return
+
+  invalidSheepId.value = false
+  validSheepId.value = false
+  alreadySelected.value = false
+
+  if (addForm.value.sheepIds.includes(id)) {
+    alreadySelected.value = true
+    addForm.value.sheepIdInput = ''
+    return
+  }
+
+  request.get(`/sheep/sheep/byManageTags/${id}`).then(res => {
+    if (res.data) {
+      addForm.value.sheepIds.push(id)
+      validSheepId.value = true
+    } else {
+      invalidSheepId.value = true
+    }
+    addForm.value.sheepIdInput = ''
+  })
+}
+
+function submitAddForm() {
+
+    addQuarantine(addForm.value).then(() => {
+      proxy.$modal.msgSuccess('新增成功')
+      addOpen.value = false
+      getList()
+    })
+
+}
+
+function handleAdd() {
+  Object.assign(addForm.value, {
     sheepIds: [],
+    ids:[],
     sheepIdInput: '',
-    datetime: new Date().toISOString().slice(0, 10), // 重置时也设置默认日期
-    quarantineType: '',
-    quarItems: "",
+    datetime: new Date().toISOString().slice(0, 10),
+    quarItems: '',
     sampleType: '',
     sampler: '',
-    quarantineOfficer: '',
-    barnIds: []
-  };
-  invalidSheepId.value = false;
-  validSheepId.value = false;
-  proxy.resetForm("addQuarantineRef");
+    quarOfficer: '',
+    result: '',}
+  )
+  Object.keys(barnSheepMap).forEach(k => delete barnSheepMap[k])
+  invalidSheepId.value = false
+  validSheepId.value = false
+  alreadySelected.value = false
+  addOpen.value = true
 }
 
-/** 搜索功能 */
-function handleQuery() {
-  queryParams.value.pageNum = 1;
-  getList();
+/* 修改相关 */
+const editOpen = ref(false)
+const editForm = ref({})
+const editRules = {
+  status: [{ required: true, message: '请选择状态', trigger: 'change' }],
+  quarantineType: [{ required: true, message: '请选择类型', trigger: 'change' }]
 }
-
-/** 重置按钮操作 */
-function resetQuery() {
-  daterangeDatetime.value = [];
-  proxy.resetForm("queryRef");
-  handleQuery();
-}
-
-// 多选框选中数据
-function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id);
-  single.value = selection.length != 1;
-  multiple.value = !selection.length;
-}
-
-/** 新增按钮操作 */
-function handleAdd() {
-  reset();
-  addOpen.value = true;
-}
-
-// 校验单个羊只耳号
-function validateSheepId() {
-  if (!addForm.value.sheepIdInput.trim()) return;
-
-  invalidSheepId.value = false;
-  validSheepId.value = false;
-
-  // 禁用输入框，防止重复提交
-  isInputDisabled.value = true;
-
-  request.get(`/sheep/sheep/${addForm.value.sheepIdInput.trim()}`).then(response => {
-    if (response.exists) {
-      // 耳号存在，添加到列表
-      if (!addForm.value.sheepIds.includes(addForm.value.sheepIdInput.trim())) {
-        addForm.value.sheepIds.push(addForm.value.sheepIdInput.trim());
-        validSheepId.value = true;
-      } else {
-        proxy.$modal.msgWarning("该羊只耳号已添加");
-      }
-    } else {
-      // 耳号不存在
-      invalidSheepId.value = true;
-    }
-  }).finally(() => {
-    // 清空输入框并启用
-    addForm.value.sheepIdInput = '';
-    isInputDisabled.value = false;
-  });
-}
-
-// 移除羊只耳号
-function removeSheepId(index) {
-  addForm.value.sheepIds.splice(index, 1);
-}
-
-// 处理羊舍变更
-function handleBarnChange(barnIds) {
-  if (!barnIds || barnIds.length === 0) return;
-
-  // 这里需要调用接口获取选中羊舍中的所有羊只耳号
-  // 并将它们添加到输入框中
-  // 示例代码，实际接口可能不同
-  let allSheepIds = addForm.value.sheepIds;
-
-  barnIds.forEach(barnId => {
-    // 模拟从羊舍获取耳号，实际应替换为真实接口
-    const barnSheepIds = getSheepIdsFromBarn(barnId);
-    barnSheepIds.forEach(sheepId => {
-      if (!allSheepIds.includes(sheepId)) {
-        // 验证耳号有效性
-        request.get(`/sheep/sheep/${sheepId}`).then(response => {
-          if (response.exists && !allSheepIds.includes(sheepId)) {
-            allSheepIds.push(sheepId);
-            addForm.value.sheepIds = [...allSheepIds];
-          }
-        });
-      }
-    });
-  });
-}
-
-/** 模拟从羊舍获取耳号（实际应替换为接口调用） */
-function getSheepIdsFromBarn(barnId) {
-  // 模拟数据，实际应从接口获取
-  const barnSheepMap = {
-    1: ['E001', 'E002', 'E003'],
-    2: ['E004', 'E005'],
-    3: ['E006']
-  };
-  return barnSheepMap[barnId] || [];
-}
-
-/** 提交新增表单 */
-function submitAddForm() {
-  addQuarantineRef.value.validate(valid => {
-    if (valid) {
-      if (addForm.value.sheepIds.length === 0) {
-        proxy.$modal.msgError("请至少添加一个有效的羊只耳号");
-        return;
-      }
-
-      const data = {
-        ...addForm.value,
-        sheepIds: addForm.value.sheepIds,
-        quarItems: addForm.value.quarItems.join(','),
-      };
-
-      addQuarantine(data).then(response => {
-        proxy.$modal.msgSuccess("新增成功");
-        addOpen.value = false;
-        getList();
-      });
-    }
-  });
-}
-
-/** 取消新增 */
-function cancelAdd() {
-  addOpen.value = false;
-}
-
-/** 修改按钮操作 */
+const editQuarantineRef = ref(null)
 function handleUpdate(row) {
-  resetEditForm();
-  const _id = row.id || ids.value;
-  getQuarantine(_id).then(response => {
-    editForm.value = {
-      ...response.data,
-      status: response.data.status,
-      quarantineType: response.data.quarantineType,
-      result: response.data.result,
-      remark: response.data.remark
-    };
-    editOpen.value = true;
-  });
+  Object.assign(editForm.value, row)  
+  editOpen.value = true
 }
 
-/** 重置修改表单 */
-function resetEditForm() {
-  editForm.value = {
-    id: null,
-    status: '',
-    quarantineType: '',
-    result: '',
-    remark: ''
-  };
-  proxy.resetForm("editQuarantineRef");
-}
-
-/** 提交修改表单 */
 function submitEditForm() {
   editQuarantineRef.value.validate(valid => {
-    if (valid) {
-      updateQuarantine(editForm.value).then(response => {
-        proxy.$modal.msgSuccess("修改成功");
-        editOpen.value = false;
-        getList();
-      });
-    }
-  });
+    if (!valid) return
+    updateQuarantine(editForm.value).then(() => {
+      proxy.$modal.msgSuccess('修改成功')
+      editOpen.value = false
+      getList()
+    })
+  })
 }
 
-/** 取消修改 */
-function cancelEdit() {
-  editOpen.value = false;
-}
-
-/** 删除按钮操作 */
+/* 删除 */
 function handleDelete(row) {
-  const _ids = row.id || ids.value;
-  proxy.$modal.confirm('是否确认删除检疫记录编号为"' + _ids + '"的数据项？').then(function () {
-    return delQuarantine(_ids);
-  }).then(() => {
-    getList();
-    proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => { });
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm(`是否确认删除记录编号为"${_ids}"的数据？`)
+    .then(() => delQuarantine(_ids))
+    .then(() => {
+      getList()
+      proxy.$modal.msgSuccess('删除成功')
+    })
 }
 
-/** 导出按钮操作 */
+/* 导出 */
 function handleExport() {
-  proxy.download('bisosafety/quarantine/export', {
-    ...queryParams.value
-  }, `quarantine_${new Date().getTime()}.xlsx`);
+  proxy.download('bisosafety/quarantine/export', queryParams, `quarantine_${Date.now()}.xlsx`)
 }
 
+/* 跳转治疗 */
 function gotoTreatment(row) {
-  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } });
+  router.push({ path: '/biosafety/treatment/add', query: { qId: row.id, sId: row.sheepId } })
 }
 
-getList();
-getItems(); // 获取检疫项目列表
-getSample(); // 获取样品类型列表
-getBarns(); // 获取羊舍列表
+/* 初始化 */
+getList()
+getItems()
+getSample()
+getBarns()
 </script>
\ No newline at end of file

From 0d0a3f08c8380e6ad4e107d2c5e8bd44747d66ec Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Mon, 21 Jul 2025 10:17:18 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=B2=9C=E5=A5=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../freshMilkTest/freshMilkTest.js            |  44 ++
 .../freshMilkTest/freshMilkTest/index.vue     | 434 ++++++++++++++++++
 2 files changed, 478 insertions(+)
 create mode 100644 src/api/dairyProducts/freshMilkTest/freshMilkTest.js
 create mode 100644 src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue

diff --git a/src/api/dairyProducts/freshMilkTest/freshMilkTest.js b/src/api/dairyProducts/freshMilkTest/freshMilkTest.js
new file mode 100644
index 0000000..53036f3
--- /dev/null
+++ b/src/api/dairyProducts/freshMilkTest/freshMilkTest.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询鲜奶生产，成品检验记录列表
+export function listFreshMilkTest(query) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询鲜奶生产，成品检验记录详细
+export function getFreshMilkTest(id) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/' + id,
+    method: 'get'
+  })
+}
+
+// 新增鲜奶生产，成品检验记录
+export function addFreshMilkTest(data) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改鲜奶生产，成品检验记录
+export function updateFreshMilkTest(data) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除鲜奶生产，成品检验记录
+export function delFreshMilkTest(id) {
+  return request({
+    url: '/freshMilkTest/freshMilkTest/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
new file mode 100644
index 0000000..9d36fb3
--- /dev/null
+++ b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
@@ -0,0 +1,434 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="来源" prop="source">
+        <el-input
+          v-model="queryParams.source"
+          placeholder="请输入来源"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="检测日期" prop="datetime">
+        <el-date-picker clearable
+          v-model="queryParams.datetime"
+          type="date"
+          value-format="YYYY-MM-DD"
+          placeholder="请选择检测日期">
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item label="脂肪g/100g" prop="fat">
+        <el-input
+          v-model="queryParams.fat"
+          placeholder="请输入脂肪g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="蛋白质g/100g" prop="protein">
+        <el-input
+          v-model="queryParams.protein"
+          placeholder="请输入蛋白质g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="非脂g/100g" prop="nonFat">
+        <el-input
+          v-model="queryParams.nonFat"
+          placeholder="请输入非脂g/100g"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="酸度oT" prop="acidity">
+        <el-input
+          v-model="queryParams.acidity"
+          placeholder="请输入酸度oT"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数CFU/ml_1" prop="bacterialColony1">
+        <el-input
+          v-model="queryParams.bacterialColony1"
+          placeholder="请输入菌落总数CFU/ml_1"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数CFU/ml_2" prop="bacterialColony2">
+        <el-input
+          v-model="queryParams.bacterialColony2"
+          placeholder="请输入菌落总数CFU/ml_2"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数CFU/ml_3" prop="bacterialColony3">
+        <el-input
+          v-model="queryParams.bacterialColony3"
+          placeholder="请输入菌落总数CFU/ml_3"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数CFU/ml_4" prop="bacterialColony4">
+        <el-input
+          v-model="queryParams.bacterialColony4"
+          placeholder="请输入菌落总数CFU/ml_4"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="菌落总数CFU/ml_5" prop="bacterialColony5">
+        <el-input
+          v-model="queryParams.bacterialColony5"
+          placeholder="请输入菌落总数CFU/ml_5"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="大肠菌群CFU/ml" prop="coli">
+        <el-input
+          v-model="queryParams.coli"
+          placeholder="请输入大肠菌群CFU/ml"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="乳铁蛋白" prop="lactoferrin">
+        <el-input
+          v-model="queryParams.lactoferrin"
+          placeholder="请输入乳铁蛋白"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="免疫球蛋白" prop="ig">
+        <el-input
+          v-model="queryParams.ig"
+          placeholder="请输入免疫球蛋白"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="commnet">
+        <el-input
+          v-model="queryParams.commnet"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="Plus"
+          @click="handleAdd"
+          v-hasPermi="['freshMilkTest:freshMilkTest:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="Edit"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['freshMilkTest:freshMilkTest:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="Delete"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['freshMilkTest:freshMilkTest:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="Download"
+          @click="handleExport"
+          v-hasPermi="['freshMilkTest:freshMilkTest:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="freshMilkTestList" @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="来源" align="center" prop="source" />
+      <el-table-column label="检测日期" align="center" prop="datetime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="脂肪g/100g" align="center" prop="fat" />
+      <el-table-column label="蛋白质g/100g" align="center" prop="protein" />
+      <el-table-column label="非脂g/100g" align="center" prop="nonFat" />
+      <el-table-column label="酸度oT" align="center" prop="acidity" />
+      <el-table-column label="菌落总数CFU/ml_1" align="center" prop="bacterialColony1" />
+      <el-table-column label="菌落总数CFU/ml_2" align="center" prop="bacterialColony2" />
+      <el-table-column label="菌落总数CFU/ml_3" align="center" prop="bacterialColony3" />
+      <el-table-column label="菌落总数CFU/ml_4" align="center" prop="bacterialColony4" />
+      <el-table-column label="菌落总数CFU/ml_5" align="center" prop="bacterialColony5" />
+      <el-table-column label="大肠菌群CFU/ml" align="center" prop="coli" />
+      <el-table-column label="乳铁蛋白" align="center" prop="lactoferrin" />
+      <el-table-column label="免疫球蛋白" align="center" prop="ig" />
+      <el-table-column label="备注" align="center" prop="commnet" />
+      <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="['freshMilkTest:freshMilkTest:edit']">修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['freshMilkTest:freshMilkTest:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    
+    <pagination
+      v-show="total>0"
+      :total="total"
+      v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改鲜奶生产，成品检验记录对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="freshMilkTestRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="来源" prop="source">
+          <el-input v-model="form.source" placeholder="请输入来源" />
+        </el-form-item>
+        <el-form-item label="检测日期" prop="datetime">
+          <el-date-picker clearable
+            v-model="form.datetime"
+            type="date"
+            value-format="YYYY-MM-DD"
+            placeholder="请选择检测日期">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="脂肪g/100g" prop="fat">
+          <el-input v-model="form.fat" placeholder="请输入脂肪g/100g" />
+        </el-form-item>
+        <el-form-item label="蛋白质g/100g" prop="protein">
+          <el-input v-model="form.protein" placeholder="请输入蛋白质g/100g" />
+        </el-form-item>
+        <el-form-item label="非脂g/100g" prop="nonFat">
+          <el-input v-model="form.nonFat" placeholder="请输入非脂g/100g" />
+        </el-form-item>
+        <el-form-item label="酸度oT" prop="acidity">
+          <el-input v-model="form.acidity" placeholder="请输入酸度oT" />
+        </el-form-item>
+        <el-form-item label="菌落总数CFU/ml_1" prop="bacterialColony1">
+          <el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数CFU/ml_1" />
+        </el-form-item>
+        <el-form-item label="菌落总数CFU/ml_2" prop="bacterialColony2">
+          <el-input v-model="form.bacterialColony2" placeholder="请输入菌落总数CFU/ml_2" />
+        </el-form-item>
+        <el-form-item label="菌落总数CFU/ml_3" prop="bacterialColony3">
+          <el-input v-model="form.bacterialColony3" placeholder="请输入菌落总数CFU/ml_3" />
+        </el-form-item>
+        <el-form-item label="菌落总数CFU/ml_4" prop="bacterialColony4">
+          <el-input v-model="form.bacterialColony4" placeholder="请输入菌落总数CFU/ml_4" />
+        </el-form-item>
+        <el-form-item label="菌落总数CFU/ml_5" prop="bacterialColony5">
+          <el-input v-model="form.bacterialColony5" placeholder="请输入菌落总数CFU/ml_5" />
+        </el-form-item>
+        <el-form-item label="大肠菌群CFU/ml" prop="coli">
+          <el-input v-model="form.coli" placeholder="请输入大肠菌群CFU/ml" />
+        </el-form-item>
+        <el-form-item label="乳铁蛋白" prop="lactoferrin">
+          <el-input v-model="form.lactoferrin" placeholder="请输入乳铁蛋白" />
+        </el-form-item>
+        <el-form-item label="免疫球蛋白" prop="ig">
+          <el-input v-model="form.ig" placeholder="请输入免疫球蛋白" />
+        </el-form-item>
+        <el-form-item label="备注" prop="commnet">
+          <el-input v-model="form.commnet" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="FreshMilkTest">
+import { listFreshMilkTest, getFreshMilkTest, delFreshMilkTest, addFreshMilkTest, updateFreshMilkTest } from "@/api/dairyProducts/freshMilkTest/freshMilkTest.js"
+
+const { proxy } = getCurrentInstance()
+
+const freshMilkTestList = 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 total = ref(0)
+const title = ref("")
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    source: null,
+    datetime: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    acidity: null,
+    bacterialColony1: null,
+    bacterialColony2: null,
+    bacterialColony3: null,
+    bacterialColony4: null,
+    bacterialColony5: null,
+    coli: null,
+    lactoferrin: null,
+    ig: null,
+    commnet: null,
+  },
+  rules: {
+  }
+})
+
+const { queryParams, form, rules } = toRefs(data)
+
+/** 查询鲜奶生产，成品检验记录列表 */
+function getList() {
+  loading.value = true
+  listFreshMilkTest(queryParams.value).then(response => {
+    freshMilkTestList.value = response.rows
+    total.value = response.total
+    loading.value = false
+  })
+}
+
+// 取消按钮
+function cancel() {
+  open.value = false
+  reset()
+}
+
+// 表单重置
+function reset() {
+  form.value = {
+    id: null,
+    source: null,
+    datetime: null,
+    fat: null,
+    protein: null,
+    nonFat: null,
+    acidity: null,
+    bacterialColony1: null,
+    bacterialColony2: null,
+    bacterialColony3: null,
+    bacterialColony4: null,
+    bacterialColony5: null,
+    coli: null,
+    lactoferrin: null,
+    ig: null,
+    commnet: null,
+    createBy: null,
+    createTime: null
+  }
+  proxy.resetForm("freshMilkTestRef")
+}
+
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef")
+  handleQuery()
+}
+
+// 多选框选中数据
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.id)
+  single.value = selection.length != 1
+  multiple.value = !selection.length
+}
+
+/** 新增按钮操作 */
+function handleAdd() {
+  reset()
+  open.value = true
+  title.value = "添加鲜奶生产，成品检验记录"
+}
+
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset()
+  const _id = row.id || ids.value
+  getFreshMilkTest(_id).then(response => {
+    form.value = response.data
+    open.value = true
+    title.value = "修改鲜奶生产，成品检验记录"
+  })
+}
+
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["freshMilkTestRef"].validate(valid => {
+    if (valid) {
+      if (form.value.id != null) {
+        updateFreshMilkTest(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功")
+          open.value = false
+          getList()
+        })
+      } else {
+        addFreshMilkTest(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功")
+          open.value = false
+          getList()
+        })
+      }
+    }
+  })
+}
+
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const _ids = row.id || ids.value
+  proxy.$modal.confirm('是否确认删除鲜奶生产，成品检验记录编号为"' + _ids + '"的数据项？').then(function() {
+    return delFreshMilkTest(_ids)
+  }).then(() => {
+    getList()
+    proxy.$modal.msgSuccess("删除成功")
+  }).catch(() => {})
+}
+
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download('freshMilkTest/freshMilkTest/export', {
+    ...queryParams.value
+  }, `freshMilkTest_${new Date().getTime()}.xlsx`)
+}
+
+getList()
+</script>

From 0391d9dfe7628e070d96c60dc8df668993cbc6d4 Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Mon, 21 Jul 2025 15:55:30 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E9=B2=9C=E5=A5=B6=E6=A3=80=E9=AA=8C?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../freshMilkTest/freshMilkTest.js            |   1 +
 .../freshMilkTest/freshMilkTest/index.vue     | 605 +++++++++++-------
 2 files changed, 375 insertions(+), 231 deletions(-)

diff --git a/src/api/dairyProducts/freshMilkTest/freshMilkTest.js b/src/api/dairyProducts/freshMilkTest/freshMilkTest.js
index 53036f3..0781458 100644
--- a/src/api/dairyProducts/freshMilkTest/freshMilkTest.js
+++ b/src/api/dairyProducts/freshMilkTest/freshMilkTest.js
@@ -42,3 +42,4 @@ export function delFreshMilkTest(id) {
     method: 'delete'
   })
 }
+
diff --git a/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
index 9d36fb3..4db694e 100644
--- a/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
+++ b/src/views/dairyProducts/freshMilkTest/freshMilkTest/index.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+    <!-- 简化查询表单 -->
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="80px">
       <el-form-item label="来源" prop="source">
         <el-input
           v-model="queryParams.source"
@@ -17,110 +18,6 @@
           placeholder="请选择检测日期">
         </el-date-picker>
       </el-form-item>
-      <el-form-item label="脂肪g/100g" prop="fat">
-        <el-input
-          v-model="queryParams.fat"
-          placeholder="请输入脂肪g/100g"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="蛋白质g/100g" prop="protein">
-        <el-input
-          v-model="queryParams.protein"
-          placeholder="请输入蛋白质g/100g"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="非脂g/100g" prop="nonFat">
-        <el-input
-          v-model="queryParams.nonFat"
-          placeholder="请输入非脂g/100g"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="酸度oT" prop="acidity">
-        <el-input
-          v-model="queryParams.acidity"
-          placeholder="请输入酸度oT"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菌落总数CFU/ml_1" prop="bacterialColony1">
-        <el-input
-          v-model="queryParams.bacterialColony1"
-          placeholder="请输入菌落总数CFU/ml_1"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菌落总数CFU/ml_2" prop="bacterialColony2">
-        <el-input
-          v-model="queryParams.bacterialColony2"
-          placeholder="请输入菌落总数CFU/ml_2"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菌落总数CFU/ml_3" prop="bacterialColony3">
-        <el-input
-          v-model="queryParams.bacterialColony3"
-          placeholder="请输入菌落总数CFU/ml_3"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菌落总数CFU/ml_4" prop="bacterialColony4">
-        <el-input
-          v-model="queryParams.bacterialColony4"
-          placeholder="请输入菌落总数CFU/ml_4"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="菌落总数CFU/ml_5" prop="bacterialColony5">
-        <el-input
-          v-model="queryParams.bacterialColony5"
-          placeholder="请输入菌落总数CFU/ml_5"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="大肠菌群CFU/ml" prop="coli">
-        <el-input
-          v-model="queryParams.coli"
-          placeholder="请输入大肠菌群CFU/ml"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="乳铁蛋白" prop="lactoferrin">
-        <el-input
-          v-model="queryParams.lactoferrin"
-          placeholder="请输入乳铁蛋白"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="免疫球蛋白" prop="ig">
-        <el-input
-          v-model="queryParams.ig"
-          placeholder="请输入免疫球蛋白"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="备注" prop="commnet">
-        <el-input
-          v-model="queryParams.commnet"
-          placeholder="请输入备注"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
         <el-button icon="Refresh" @click="resetQuery">重置</el-button>
@@ -166,31 +63,115 @@
           v-hasPermi="['freshMilkTest:freshMilkTest:export']"
         >导出</el-button>
       </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="Operation"
+          @click="columnShowDialogVisible = true"
+        >列显示</el-button>
+      </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
+    <!-- 表格显示，使用列选择功能 -->
     <el-table v-loading="loading" :data="freshMilkTestList" @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="来源" align="center" prop="source" />
-      <el-table-column label="检测日期" align="center" prop="datetime" width="180">
+      <el-table-column 
+        label="来源" 
+        align="center" 
+        prop="source" 
+        v-if="selectedColumns.includes('source')" />
+      <el-table-column 
+        label="检测日期" 
+        align="center" 
+        prop="datetime" 
+        width="180"
+        v-if="selectedColumns.includes('datetime')">
         <template #default="scope">
-          <span>{{ parseTime(scope.row.datetime, '{y}-{m}-{d}') }}</span>
+          <span>{{ formatDate(scope.row.datetime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column 
+        label="脂肪g/100g" 
+        align="center" 
+        prop="fat" 
+        v-if="selectedColumns.includes('fat')" />
+      <el-table-column 
+        label="蛋白质g/100g" 
+        align="center" 
+        prop="protein" 
+        v-if="selectedColumns.includes('protein')" />
+      <el-table-column 
+        label="非脂g/100g" 
+        align="center" 
+        prop="nonFat" 
+        v-if="selectedColumns.includes('nonFat')" />
+      <el-table-column 
+        label="酸度oT" 
+        align="center" 
+        prop="acidity" 
+        v-if="selectedColumns.includes('acidity')" />
+      <el-table-column 
+        label="菌落总数1" 
+        align="center" 
+        prop="bacterialColony1" 
+        v-if="selectedColumns.includes('bacterialColony1')" />
+      <el-table-column 
+        label="菌落总数2" 
+        align="center" 
+        prop="bacterialColony2" 
+        v-if="selectedColumns.includes('bacterialColony2')" />
+      <el-table-column 
+        label="菌落总数3" 
+        align="center" 
+        prop="bacterialColony3" 
+        v-if="selectedColumns.includes('bacterialColony3')" />
+      <el-table-column 
+        label="菌落总数4" 
+        align="center" 
+        prop="bacterialColony4" 
+        v-if="selectedColumns.includes('bacterialColony4')" />
+      <el-table-column 
+        label="菌落总数5" 
+        align="center" 
+        prop="bacterialColony5" 
+        v-if="selectedColumns.includes('bacterialColony5')" />
+      <el-table-column 
+        label="大肠菌群(CFU/ml)" 
+        align="center" 
+        prop="coli" 
+        v-if="selectedColumns.includes('coli')" />
+      <el-table-column 
+        label="乳铁蛋白(mg/L)" 
+        align="center" 
+        prop="lactoferrin" 
+        v-if="selectedColumns.includes('lactoferrin')" />
+      <el-table-column 
+        label="免疫球蛋白(mg/L)" 
+        align="center" 
+        prop="ig" 
+        v-if="selectedColumns.includes('ig')" />
+      <el-table-column 
+        label="备注" 
+        align="center" 
+        prop="commnet" 
+        v-if="selectedColumns.includes('commnet')" />
+      <el-table-column 
+        label="创建人" 
+        align="center" 
+        prop="createBy" 
+        v-if="selectedColumns.includes('createBy')" />
+      <el-table-column 
+        label="创建时间" 
+        align="center" 
+        prop="createTime" 
+        width="180"
+        v-if="selectedColumns.includes('createTime')">
+        <template #default="scope">
+          <span>{{ formatDateTime(scope.row.createTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="脂肪g/100g" align="center" prop="fat" />
-      <el-table-column label="蛋白质g/100g" align="center" prop="protein" />
-      <el-table-column label="非脂g/100g" align="center" prop="nonFat" />
-      <el-table-column label="酸度oT" align="center" prop="acidity" />
-      <el-table-column label="菌落总数CFU/ml_1" align="center" prop="bacterialColony1" />
-      <el-table-column label="菌落总数CFU/ml_2" align="center" prop="bacterialColony2" />
-      <el-table-column label="菌落总数CFU/ml_3" align="center" prop="bacterialColony3" />
-      <el-table-column label="菌落总数CFU/ml_4" align="center" prop="bacterialColony4" />
-      <el-table-column label="菌落总数CFU/ml_5" align="center" prop="bacterialColony5" />
-      <el-table-column label="大肠菌群CFU/ml" align="center" prop="coli" />
-      <el-table-column label="乳铁蛋白" align="center" prop="lactoferrin" />
-      <el-table-column label="免疫球蛋白" align="center" prop="ig" />
-      <el-table-column label="备注" align="center" prop="commnet" />
       <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="['freshMilkTest:freshMilkTest:edit']">修改</el-button>
@@ -207,9 +188,9 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改鲜奶生产，成品检验记录对话框 -->
+    <!-- 新增/修改对话框 -->
     <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="freshMilkTestRef" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="freshMilkTestRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="来源" prop="source">
           <el-input v-model="form.source" placeholder="请输入来源" />
         </el-form-item>
@@ -218,7 +199,8 @@
             v-model="form.datetime"
             type="date"
             value-format="YYYY-MM-DD"
-            placeholder="请选择检测日期">
+            placeholder="请选择检测日期"
+            style="width: 100%">
           </el-date-picker>
         </el-form-item>
         <el-form-item label="脂肪g/100g" prop="fat">
@@ -233,32 +215,38 @@
         <el-form-item label="酸度oT" prop="acidity">
           <el-input v-model="form.acidity" placeholder="请输入酸度oT" />
         </el-form-item>
-        <el-form-item label="菌落总数CFU/ml_1" prop="bacterialColony1">
-          <el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数CFU/ml_1" />
+        <el-form-item label="菌落总数1" prop="bacterialColony1">
+          <el-input v-model="form.bacterialColony1" placeholder="请输入菌落总数1" />
         </el-form-item>
-        <el-form-item label="菌落总数CFU/ml_2" prop="bacterialColony2">
-          <el-input v-model="form.bacterialColony2" placeholder="请输入菌落总数CFU/ml_2" />
+        <el-form-item label="菌落总数2" prop="bacterialColony2">
+          <el-input v-model="form.bacterialColony2" placeholder="请输入菌落总数2" />
         </el-form-item>
-        <el-form-item label="菌落总数CFU/ml_3" prop="bacterialColony3">
-          <el-input v-model="form.bacterialColony3" placeholder="请输入菌落总数CFU/ml_3" />
+        <el-form-item label="菌落总数3" prop="bacterialColony3">
+          <el-input v-model="form.bacterialColony3" placeholder="请输入菌落总数3" />
         </el-form-item>
-        <el-form-item label="菌落总数CFU/ml_4" prop="bacterialColony4">
-          <el-input v-model="form.bacterialColony4" placeholder="请输入菌落总数CFU/ml_4" />
+        <el-form-item label="菌落总数4" prop="bacterialColony4">
+          <el-input v-model="form.bacterialColony4" placeholder="请输入菌落总数4" />
         </el-form-item>
-        <el-form-item label="菌落总数CFU/ml_5" prop="bacterialColony5">
-          <el-input v-model="form.bacterialColony5" placeholder="请输入菌落总数CFU/ml_5" />
+        <el-form-item label="菌落总数5" prop="bacterialColony5">
+          <el-input v-model="form.bacterialColony5" placeholder="请输入菌落总数5" />
         </el-form-item>
-        <el-form-item label="大肠菌群CFU/ml" prop="coli">
-          <el-input v-model="form.coli" placeholder="请输入大肠菌群CFU/ml" />
+        <el-form-item label="大肠菌群(CFU/ml)" prop="coli">
+          <el-input v-model="form.coli" placeholder="请输入大肠菌群(CFU/ml)" />
         </el-form-item>
-        <el-form-item label="乳铁蛋白" prop="lactoferrin">
-          <el-input v-model="form.lactoferrin" placeholder="请输入乳铁蛋白" />
+        <el-form-item label="乳铁蛋白(mg/L)" prop="lactoferrin">
+          <el-input v-model="form.lactoferrin" placeholder="请输入乳铁蛋白(mg/L)" />
         </el-form-item>
-        <el-form-item label="免疫球蛋白" prop="ig">
-          <el-input v-model="form.ig" placeholder="请输入免疫球蛋白" />
+        <el-form-item label="免疫球蛋白(mg/L)" prop="ig">
+          <el-input v-model="form.ig" placeholder="请输入免疫球蛋白(mg/L)" />
         </el-form-item>
         <el-form-item label="备注" prop="commnet">
-          <el-input v-model="form.commnet" placeholder="请输入备注" />
+          <el-input v-model="form.commnet" placeholder="请输入备注" type="textarea" />
+        </el-form-item>
+        <el-form-item label="创建人" v-if="form.id">
+          <el-input v-model="form.createBy" disabled />
+        </el-form-item>
+        <el-form-item label="创建时间" v-if="form.id">
+          <el-input v-model="form.createTime" disabled />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -268,70 +256,164 @@
         </div>
       </template>
     </el-dialog>
+
+    <!-- 列显示设置对话框 -->
+    <el-dialog title="列显示设置" v-model="columnShowDialogVisible" width="500px">
+      <el-checkbox-group v-model="selectedColumns">
+        <el-checkbox label="source">来源</el-checkbox>
+        <el-checkbox label="datetime">检测日期</el-checkbox>
+        <el-checkbox label="fat">脂肪g/100g</el-checkbox>
+        <el-checkbox label="protein">蛋白质g/100g</el-checkbox>
+        <el-checkbox label="nonFat">非脂g/100g</el-checkbox>
+        <el-checkbox label="acidity">酸度oT</el-checkbox>
+        <el-checkbox label="bacterialColony1">菌落总数1</el-checkbox>
+        <el-checkbox label="bacterialColony2">菌落总数2</el-checkbox>
+        <el-checkbox label="bacterialColony3">菌落总数3</el-checkbox>
+        <el-checkbox label="bacterialColony4">菌落总数4</el-checkbox>
+        <el-checkbox label="bacterialColony5">菌落总数5</el-checkbox>
+        <el-checkbox label="coli">大肠菌群(CFU/ml)</el-checkbox>
+        <el-checkbox label="lactoferrin">乳铁蛋白(mg/L)</el-checkbox>
+        <el-checkbox label="ig">免疫球蛋白(mg/L)</el-checkbox>
+        <el-checkbox label="commnet">备注</el-checkbox>
+        <el-checkbox label="createBy">创建人</el-checkbox>
+        <el-checkbox label="createTime">创建时间</el-checkbox>
+      </el-checkbox-group>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="columnShowDialogVisible = false">确 定</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup name="FreshMilkTest">
-import { listFreshMilkTest, getFreshMilkTest, delFreshMilkTest, addFreshMilkTest, updateFreshMilkTest } from "@/api/dairyProducts/freshMilkTest/freshMilkTest.js"
+<script setup>
+import { ref, reactive, onMounted } from 'vue';
+import { listFreshMilkTest, getFreshMilkTest, delFreshMilkTest, addFreshMilkTest, updateFreshMilkTest } from "@/api/dairyProducts/freshMilkTest/freshMilkTest.js";
+import { ElMessage, ElMessageBox } from 'element-plus';
 
-const { proxy } = getCurrentInstance()
+const freshMilkTestList = 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 total = ref(0);
+const title = ref("");
+const columnShowDialogVisible = ref(false);
+const freshMilkTestRef = ref(null);
 
-const freshMilkTestList = 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 total = ref(0)
-const title = ref("")
+// 默认显示的列
+const selectedColumns = ref([
+  'source', 'datetime', 'fat', 'protein', 'nonFat', 'acidity', 
+  'bacterialColony1', 'bacterialColony2', 'bacterialColony3', 
+  'bacterialColony4', 'bacterialColony5', 'coli', 'lactoferrin', 
+  'ig', 'commnet', 'createBy', 'createTime'
+]);
 
-const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    source: null,
-    datetime: null,
-    fat: null,
-    protein: null,
-    nonFat: null,
-    acidity: null,
-    bacterialColony1: null,
-    bacterialColony2: null,
-    bacterialColony3: null,
-    bacterialColony4: null,
-    bacterialColony5: null,
-    coli: null,
-    lactoferrin: null,
-    ig: null,
-    commnet: null,
-  },
-  rules: {
-  }
-})
+// 查询参数
+const queryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  source: null,
+  datetime: null,
+});
 
-const { queryParams, form, rules } = toRefs(data)
+// 表单数据
+const form = reactive({
+  id: null,
+  source: null,
+  datetime: null,
+  fat: null,
+  protein: null,
+  nonFat: null,
+  acidity: null,
+  bacterialColony1: null,
+  bacterialColony2: null,
+  bacterialColony3: null,
+  bacterialColony4: null,
+  bacterialColony5: null,
+  coli: null,
+  lactoferrin: null,
+  ig: null,
+  commnet: null,
+  createBy: null,
+  createTime: null
+});
 
-/** 查询鲜奶生产，成品检验记录列表 */
+// 验证规则
+const rules = reactive({
+  source: [
+    { required: true, message: "来源不能为空", trigger: "blur" }
+  ],
+  datetime: [
+    { required: true, message: "检测日期不能为空", trigger: "blur" }
+  ]
+});
+
+/** 获取当前用户名 */
+const getCurrentUsername = () => {
+  const userInfo = JSON.parse(localStorage.getItem('userInfo') || '{}')
+  return userInfo.userName || userInfo.username || userInfo.nickName || 'admin'
+}
+
+/** 查询列表 */
 function getList() {
-  loading.value = true
-  listFreshMilkTest(queryParams.value).then(response => {
-    freshMilkTestList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+  loading.value = true;
+  listFreshMilkTest(queryParams).then(response => {
+    freshMilkTestList.value = response.rows || [];
+    total.value = response.total || 0;
+    loading.value = false;
+  }).catch(error => {
+    console.error("获取数据失败:", error);
+    loading.value = false;
+    ElMessage.error("获取数据失败");
+  });
+}
+
+// 日期格式化函数
+function formatDate(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  } catch (e) {
+    console.error("日期格式化错误:", e);
+    return dateString;
+  }
+}
+
+// 日期时间格式化
+function formatDateTime(dateString) {
+  if (!dateString) return '';
+  try {
+    const date = new Date(dateString);
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    const seconds = String(date.getSeconds()).padStart(2, '0');
+    return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+  } catch (e) {
+    console.error("日期时间格式化错误:", e);
+    return dateString;
+  }
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false
-  reset()
+  open.value = false;
+  resetForm();
 }
 
 // 表单重置
-function reset() {
-  form.value = {
+function resetForm() {
+  Object.assign(form, {
     id: null,
     source: null,
     datetime: null,
@@ -350,85 +432,146 @@ function reset() {
     commnet: null,
     createBy: null,
     createTime: null
+  });
+  
+  if (freshMilkTestRef.value) {
+    freshMilkTestRef.value.resetFields();
   }
-  proxy.resetForm("freshMilkTestRef")
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+  queryParams.pageNum = 1;
+  getList();
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  proxy.resetForm("queryRef")
-  handleQuery()
+  Object.assign(queryParams, {
+    source: null,
+    datetime: null,
+  });
+  handleQuery();
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.id)
-  single.value = selection.length != 1
-  multiple.value = !selection.length
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length !== 1;
+  multiple.value = !selection.length;
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加鲜奶生产，成品检验记录"
+  resetForm();
+  open.value = true;
+  title.value = "添加鲜奶检验记录";
+  
+  // 设置创建人和创建时间
+  form.createBy = getCurrentUsername();
+  form.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
-  const _id = row.id || ids.value
-  getFreshMilkTest(_id).then(response => {
-    form.value = response.data
-    open.value = true
-    title.value = "修改鲜奶生产，成品检验记录"
-  })
+  resetForm();
+  const id = row.id || (ids.value.length ? ids.value[0] : null);
+  if (!id) {
+    ElMessage.error("请选择要修改的数据");
+    return;
+  }
+  
+  getFreshMilkTest(id).then(response => {
+    Object.assign(form, response.data);
+    open.value = true;
+    title.value = "修改鲜奶检验记录";
+  }).catch(error => {
+    console.error("获取详情失败:", error);
+    ElMessage.error("获取详情失败");
+  });
 }
 
 /** 提交按钮 */
 function submitForm() {
-  proxy.$refs["freshMilkTestRef"].validate(valid => {
+  freshMilkTestRef.value.validate(valid => {
     if (valid) {
-      if (form.value.id != null) {
-        updateFreshMilkTest(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
+      const submitData = { ...form };
+      if (!submitData.id) {
+        submitData.createBy = getCurrentUsername();
+        submitData.createTime = new Date().toISOString().replace('T', ' ').substring(0, 19);
       } else {
-        addFreshMilkTest(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
+        delete submitData.createBy;
+        delete submitData.createTime;
       }
+      
+      const request = submitData.id 
+        ? updateFreshMilkTest(submitData) 
+        : addFreshMilkTest(submitData);
+      
+      request.then(response => {
+        ElMessage.success(submitData.id ? "修改成功" : "新增成功");
+        open.value = false;
+        getList();
+      }).catch(error => {
+        console.error("操作失败:", error);
+        ElMessage.error("操作失败");
+      });
     }
-  })
+  });
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _ids = row.id || ids.value
-  proxy.$modal.confirm('是否确认删除鲜奶生产，成品检验记录编号为"' + _ids + '"的数据项？').then(function() {
-    return delFreshMilkTest(_ids)
+  const deleteIds = row.id ? [row.id] : ids.value;
+  if (!deleteIds.length) {
+    ElMessage.error("请选择要删除的数据");
+    return;
+  }
+  
+  ElMessageBox.confirm('是否确认删除选中的记录？', '警告', {
+    confirmButtonText: '确定',
+    cancelButtonText: '取消',
+    type: 'warning'
   }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+    return delFreshMilkTest(deleteIds);
+  }).then(() => {
+    getList();
+    ElMessage.success("删除成功");
+  }).catch(error => {
+    console.error("删除失败:", error);
+    if (error !== 'cancel') {
+      ElMessage.error("删除失败");
+    }
+  });
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download('freshMilkTest/freshMilkTest/export', {
-    ...queryParams.value
-  }, `freshMilkTest_${new Date().getTime()}.xlsx`)
+  const params = new URLSearchParams();
+  for (const key in queryParams) {
+    if (queryParams[key] !== null && queryParams[key] !== undefined) {
+      params.append(key, queryParams[key]);
+    }
+  }
+  
+  const url = `/freshMilkTest/freshMilkTest/export?${params.toString()}`;
+  window.location.href = url;
 }
 
-getList()
+// 初始化加载
+onMounted(() => {
+  getList();
+});
 </script>
+
+<style scoped>
+.app-container {
+  padding: 20px;
+}
+.el-form-item {
+  margin-bottom: 15px;
+}
+.el-dialog__body {
+  padding: 15px 20px;
+}
+</style>
\ No newline at end of file