diff --git a/src/views/biosafety/deworm/index.vue b/src/views/biosafety/deworm/index.vue index bda6153..bc8fc06 100644 --- a/src/views/biosafety/deworm/index.vue +++ b/src/views/biosafety/deworm/index.vue @@ -27,7 +27,8 @@ - + @@ -40,8 +41,8 @@ - - + + @@ -54,7 +55,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -297,9 +298,11 @@ const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 20, sheepNo: null, - technical: null + technical: null, + orderByColumn: null, // 新增 + isAsc: null // 新增 }) const ids = ref([]) @@ -327,6 +330,17 @@ multiple.value = !selection.length } + function handleSortChange({ prop, order }) { + if (!order) { // 取消排序 + queryParams.orderByColumn = null + queryParams.isAsc = null + } else { + queryParams.orderByColumn = prop // monthAge 或 parity + queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc' + } + getList() + } + function handleQuery() { queryParams.pageNum = 1 getList() diff --git a/src/views/biosafety/diagnosis/index.vue b/src/views/biosafety/diagnosis/index.vue index 90db5f7..aa67350 100644 --- a/src/views/biosafety/diagnosis/index.vue +++ b/src/views/biosafety/diagnosis/index.vue @@ -106,7 +106,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -228,7 +228,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, sheepNo: null, datetime: null, diseasePid: null, diff --git a/src/views/biosafety/disease/index.vue b/src/views/biosafety/disease/index.vue index 28a3979..7838b19 100644 --- a/src/views/biosafety/disease/index.vue +++ b/src/views/biosafety/disease/index.vue @@ -6,10 +6,10 @@ + :props="{ value: 'id', label: 'name', children: 'children' }" value-key="id" placeholder="请选择" + check-strictly /> - + 搜索 重置 @@ -35,8 +35,10 @@ diff --git a/src/views/biosafety/disinfect/index.vue b/src/views/biosafety/disinfect/index.vue index 8652be6..e90cb10 100644 --- a/src/views/biosafety/disinfect/index.vue +++ b/src/views/biosafety/disinfect/index.vue @@ -68,7 +68,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -85,8 +85,7 @@ - + @@ -190,10 +189,9 @@ - + - + @@ -303,7 +301,7 @@ const daterangeDatetime = ref([]) const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 20, sheepfoldId: null, technician: null }) diff --git a/src/views/biosafety/health/index.vue b/src/views/biosafety/health/index.vue index 00b5021..d6a1922 100644 --- a/src/views/biosafety/health/index.vue +++ b/src/views/biosafety/health/index.vue @@ -27,7 +27,8 @@ - + @@ -40,8 +41,9 @@ - - + + + @@ -55,7 +57,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -298,9 +300,11 @@ const daterangeDatetime = ref([]) const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 20, sheepNo: null, - technical: null + technical: null, + orderByColumn: null, // 新增 + isAsc: null // 新增 }) const ids = ref([]) @@ -328,6 +332,18 @@ function handleSelectionChange(selection) { multiple.value = !selection.length } + +function handleSortChange({ prop, order }) { + if (!order) { // 取消排序 + queryParams.orderByColumn = null + queryParams.isAsc = null + } else { + queryParams.orderByColumn = prop // monthAge 或 parity + queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc' + } + getList() +} + function handleQuery() { queryParams.pageNum = 1 getList() diff --git a/src/views/biosafety/immunity/index.vue b/src/views/biosafety/immunity/index.vue index 2a9b430..bb3d4b1 100644 --- a/src/views/biosafety/immunity/index.vue +++ b/src/views/biosafety/immunity/index.vue @@ -27,7 +27,8 @@ - + @@ -40,8 +41,8 @@ - - + + @@ -54,7 +55,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -297,9 +298,11 @@ const daterangeDatetime = ref([]) const queryParams = reactive({ pageNum: 1, - pageSize: 10, + pageSize: 20, sheepNo: null, - technical: null + technical: null, + orderByColumn: null, // 新增 + isAsc: null // 新增 }) const ids = ref([]) @@ -327,6 +330,18 @@ function handleSelectionChange(selection) { multiple.value = !selection.length } + +function handleSortChange({ prop, order }) { + if (!order) { // 取消排序 + queryParams.orderByColumn = null + queryParams.isAsc = null + } else { + queryParams.orderByColumn = prop // monthAge 或 parity + queryParams.isAsc = order === 'ascending' ? 'asc' : 'desc' + } + getList() +} + function handleQuery() { queryParams.pageNum = 1 getList() diff --git a/src/views/biosafety/medicine/index.vue b/src/views/biosafety/medicine/index.vue index 1c1657d..94b5940 100644 --- a/src/views/biosafety/medicine/index.vue +++ b/src/views/biosafety/medicine/index.vue @@ -25,7 +25,8 @@ - 新增 + 新增 + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -113,7 +114,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, medica: null, name: null, medicType: null, diff --git a/src/views/biosafety/prescription/index.vue b/src/views/biosafety/prescription/index.vue index 24699d4..63ff46f 100644 --- a/src/views/biosafety/prescription/index.vue +++ b/src/views/biosafety/prescription/index.vue @@ -71,7 +71,7 @@ + v-model:limit="queryParams.pageSize" :page-sizes="[20, 50, 100, 200, 500, 1000, 2000]" @pagination="getList" /> @@ -228,7 +228,7 @@ const data = reactive({ form: {}, queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, no: null, name: null, persType: null, diff --git a/src/views/biosafety/quarantine/index.vue b/src/views/biosafety/quarantine/index.vue index f789d5f..a04006e 100644 --- a/src/views/biosafety/quarantine/index.vue +++ b/src/views/biosafety/quarantine/index.vue @@ -80,6 +80,7 @@ +