From ca9f7c4a1a6165d724cf7456bbf15adacf2d8c0a Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Fri, 6 Mar 2026 11:12:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E5=8F=AA=E9=94=80=E5=94=AEBUg?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/api/sale/saleRecord/saleRecord.js | 15 ++-
.../sale/saleRecord/saleRecord/index.vue | 117 ++++++++++++++----
2 files changed, 107 insertions(+), 25 deletions(-)
diff --git a/src/api/sale/saleRecord/saleRecord.js b/src/api/sale/saleRecord/saleRecord.js
index d5517e6..88569f7 100644
--- a/src/api/sale/saleRecord/saleRecord.js
+++ b/src/api/sale/saleRecord/saleRecord.js
@@ -1,11 +1,11 @@
import request from '@/utils/request'
-// 增加模糊搜索耳号 API
-export function searchEarNumbers(query) {
+// 【修改】增加 sheepfoldId 过滤参数
+export function searchEarNumbers(query, sheepfoldId) {
return request({
url: '/saleRecord/saleRecord/searchEarNumbers',
method: 'get',
- params: { query }
+ params: { query, sheepfoldId }
})
}
@@ -82,3 +82,12 @@ export function getSheepInfo(bsManageTags) {
params: { bsManageTags }
})
}
+
+// 【新增】查询已销售的羊只耳号（用于查询栏）
+export function searchSoldEarNumbers(query) {
+ return request({
+ url: '/saleRecord/saleRecord/searchSoldEarNumbers',
+ method: 'get',
+ params: { query }
+ })
+}
diff --git a/src/views/sale/saleRecord/saleRecord/index.vue b/src/views/sale/saleRecord/saleRecord/index.vue
index 7b40aba..138d3a2 100644
--- a/src/views/sale/saleRecord/saleRecord/index.vue
+++ b/src/views/sale/saleRecord/saleRecord/index.vue
@@ -29,10 +29,22 @@
reserve-keyword
placeholder="输入耳号搜索，支持多选"
:remote-method="searchEarNumberMethod"
- :loading="earNumberLoading"
+ @focus="handleQueryEarNumberFocus" :loading="earNumberLoading"
style="width: 100%"
clearable
>
+
+
-
+ @change="handleTagChange"
+ @focus="handleEarNumberFocus">
+
+
+
@@ -455,13 +489,14 @@
import { ref, reactive, toRefs, computed, getCurrentInstance, onMounted } from 'vue'
import {
listSaleRecord, getSaleRecord, delSaleRecord, addSaleRecord, updateSaleRecord,
- getSheepInfo, listSheepInventory, searchEarNumbers
+ getSheepInfo, listSheepInventory, searchEarNumbers, searchSoldEarNumbers // <- 引入新增的 API
} from '@/api/sale/saleRecord/saleRecord'
import { listSheepfold_management } from '@/api/fileManagement/sheepfold_management'
import { listUser } from '@/api/system/user'
import { listCustomer } from '@/api/sale/customer/customer'
import { regionData } from 'element-china-area-data'
+const formEarNumberLoading = ref(false)
const { proxy } = getCurrentInstance()
const { disease_type } = proxy.useDict('disease_type')
@@ -609,20 +644,35 @@ function handleQueryAreaChange(val) {
}
}
-// 【新增】远程搜索耳号方法
+// 2. 【修改】顶部搜索栏耳号查询方法
function searchEarNumberMethod(query) {
- if (query !== '') {
- earNumberLoading.value = true
- searchEarNumbers(query).then(res => {
- earNumberQueryOptions.value = res.data || []
- earNumberLoading.value = false
- }).catch(() => {
- earNumberQueryOptions.value = []
- earNumberLoading.value = false
- })
- } else {
+ earNumberLoading.value = true
+ // 这里允许传入空字符串，后端会返回前50条已售耳号
+ searchSoldEarNumbers(query).then(res => {
+ earNumberQueryOptions.value = res.data || []
+ earNumberLoading.value = false
+ }).catch(() => {
earNumberQueryOptions.value = []
- }
+ earNumberLoading.value = false
+ })
+}
+
+// 【新增】表单内的耳号远程搜索方法
+function formSearchEarNumberMethod(query) {
+ formEarNumberLoading.value = true
+ // 将表单当前选中的羊舍ID传给后端。如果没有选，此处会传 null/undefined，后端将查询全库
+ searchEarNumbers(query, form.value.sheepfoldId).then(res => {
+ earTagOptions.value = res.data || []
+ formEarNumberLoading.value = false
+ }).catch(() => {
+ earTagOptions.value = []
+ formEarNumberLoading.value = false
+ })
+}
+
+// 【新增】下拉框获取焦点时，如果还没数据，加载一下默认数据（前50条）
+function handleEarNumberFocus() {
+ formSearchEarNumberMethod('')
}
// 【新增】移除单个查询耳号
@@ -649,6 +699,8 @@ function handleSheepfoldChange(val) {
console.error("获取耳号失败", err)
})
}
+ // 切换羊舍后，立刻用空关键字查一下该羊舍下的耳号，更新下拉列表
+ formSearchEarNumberMethod('')
}
function handleTagChange(tags) {
@@ -776,10 +828,23 @@ function handleDelete(row) {
}).catch(() => {})
}
+// 【修改】导出功能：支持勾选导出与全量导出
function handleExport() {
- proxy.download('saleRecord/saleRecord/export', {
- ...queryParams.value
- }, `saleRecord_${new Date().getTime()}.xlsx`)
+ // 组装要传给后端的查询参数
+ const exportParams = { ...queryParams.value }
+ let msg = "是否确认导出所有符合查询条件的销售记录？"
+
+ // 如果用户在表格中勾选了数据，就把勾选的ID集合塞进参数里，并改变提示语
+ if (ids.value.length > 0) {
+ exportParams.exportIds = ids.value
+ msg = `是否确认导出选中的 ${ids.value.length} 条销售记录？`
+ }
+
+ // 给用户一个明确的二次确认弹窗
+ proxy.$modal.confirm(msg).then(() => {
+ // 确认后调用导出接口，附带时间戳作为文件名
+ proxy.download('saleRecord/saleRecord/export', exportParams, `羊只销售记录_${new Date().getTime()}.xlsx`)
+ }).catch(() => {})
}
function cancel() {
@@ -804,6 +869,14 @@ function diseaseTypeFormat(row) {
// 如果静态选项 label 和 value 一样，则直接返回即可
return row.diseaseType
}
+
+// 3. 【新增】输入框获取焦点时，如果还没数据，自动查询
+function handleQueryEarNumberFocus() {
+ // 为了防止每次点击都发请求，判断如果没有输入内容且下拉框为空，才去查默认数据
+ if (earNumberQueryOptions.value.length === 0) {
+ searchEarNumberMethod('')
+ }
+}