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

feat: 为多个表格列添加排序功能

Browse Source
This commit is contained in:
HashMap 2025-11-01 16:52:57 +08:00
parent 95888a0907
commit bdf8d97267
7 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/feed/FeedList/index.vue
View File

@ -113,18 +113,18 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="配量" align="center" prop="ratio">
<el-table-column label="上午" align="center" prop="ratio">
<el-table-column label="配量" align="center" prop="ratio" >
<el-table-column label="上午" align="center" prop="ratio" sortable>
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planMorningSize).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="中午" align="center" prop="ratio">
<el-table-column label="中午" align="center" prop="ratio" sortable>
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planNoonSize).toFixed(2) }}
</template>
</el-table-column>
<el-table-column label="下午" align="center" prop="ratio">
<el-table-column label="下午" align="center" prop="ratio" sortable>
<template #default="scope">
{{ (scope.row.ratio / 100 * showFeedList.rootPlan.planAfternoonSize).toFixed(2) }}
</template>

14
src/views/feed/FeedPlan/index.vue
View File

@ -46,16 +46,16 @@
</template>
</el-table-column>
<el-table-column label="羊只数量" align="center" prop="sheepCount" />
<el-table-column label="日均计划量" align="center" prop="planDailySize" />
<el-table-column label="羊只数量" align="center" prop="sheepCount" sortable />
<el-table-column label="日均计划量" align="center" prop="planDailySize" sortable />
<el-table-column label="上午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planMorningSize">
<el-table-column label="计划量" align="center" prop="planMorningSize" sortable>
<template #default="{ row }">
{{ row.planMorningSize ? row.planMorningSize.toFixed(2) : '0.00' }}
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planMorningTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualMorningSize" />
<el-table-column label="实际量" align="center" prop="actualMorningSize" sortable/>
</el-table-column>
<!-- <el-table-column label="中午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planNoonSize">
@ -67,13 +67,13 @@
<el-table-column label="实际量" align="center" prop="actualNoonSize" />
</el-table-column> -->
<el-table-column label="下午" prop="materialId" align="center">
<el-table-column label="计划量" align="center" prop="planAfternoonSize">
<el-table-column label="计划量" align="center" prop="planAfternoonSize" sortable >
<template #default="{ row }">
{{ row.planAfternoonSize ? row.planAfternoonSize.toFixed(2) : '0.00' }}
</template>
</el-table-column>
<!-- <el-table-column label="计划总量" align="center" prop="planAfternoonTotal" /> -->
<el-table-column label="实际量" align="center" prop="actualAfternoonSize" />
<el-table-column label="实际量" align="center" prop="actualAfternoonSize" sortable/>
</el-table-column>
<!-- <el-table-column label="饲喂比例(%)" align="center" prop="ratioTotal">
<el-table-column label="上午" align="center" prop="ratioMorning" />
@ -81,7 +81,7 @@
<el-table-column label="下午" align="center" prop="ratioAfternoon" />
</el-table-column> -->
<el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" />
<el-table-column label="计划饲喂总量" align="center" prop="planFeedTotal" sortable/>
<el-table-column label="饲草班人员" align="center" prop="zookeeper" />
<el-table-column label="饲喂计划日期" align="center" prop="planDate" width="180">
<template #default="scope">

6
src/views/feed/FeedStatistic/index.vue
View File

@ -38,10 +38,10 @@
<el-table-column label="UID" align="center" prop="id" />
<el-table-column label="配方编号" align="center" prop="formulaId" />
<el-table-column label="配方批号" align="center" prop="formulaBatchId" />
<el-table-column label="羊只数量" align="center" prop="sheepFoldCount" />
<el-table-column label="羊只数量" align="center" prop="sheepFoldCount" sortable/>
<!-- <el-table-column label="青贮损耗比例" align="center" prop="silageLossRate" /> -->
<el-table-column label="总饲喂量" align="center" prop="feedTotalSize" />
<el-table-column label="日均饲喂量" align="center" prop="feedDailySize" />
<el-table-column label="总饲喂量" align="center" prop="feedTotalSize" sortable/>
<el-table-column label="日均饲喂量" align="center" prop="feedDailySize" sortable/>
<el-table-column label="时间" align="center" prop="createTime" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">

2
src/views/feed/FormulaManagement/index.vue
View File

@ -156,7 +156,7 @@
</template>
</el-table-column>
</el-table-column>
<el-table-column label="比例" align="center" prop="ratio" />
<el-table-column label="比例" align="center" prop="ratio" sortable/>
<el-table-column label="类型" prop="isSupplement" align="center">
<template #default="scope">
<dict-tag :options="materialType" :value="scope.row.isSupplement" />

2
src/views/stock/in/index.vue
View File

@ -68,7 +68,7 @@
<el-table-column label="存货" align="center" prop="materialName" />
<el-table-column label="规格型号" align="center" prop="materialSpecification" />
<el-table-column label="计量单位" align="center" prop="materialUnit" />
<el-table-column label="实收数量" align="center" prop="count" />
<el-table-column label="实收数量" align="center" prop="count" sortable/>
<el-table-column label="入库调整" align="center" prop="stockInAdjustRemark" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
<template #default="scope">

2
src/views/stock/management/index.vue
View File

@ -48,7 +48,7 @@
<el-table-column label="批号" align="center" prop="batchId" />
<el-table-column label="规格型号" align="center" prop="materialSpecification" />
<el-table-column label="主计量" align="center" prop="materialUnit" />
<el-table-column label="现存量(主)" align="center" prop="currentStock" />
<el-table-column label="现存量(主)" align="center" prop="currentStock" sortable/>
<el-table-column label="库存预警" align="center" prop="stockAlarm" />
<el-table-column label="生产日期" align="center" prop="productionDate" />
<el-table-column label="失效日期" align="center" prop="expirationDate" />

29
src/views/stock/out/index.vue
View File

@ -21,7 +21,8 @@
<el-row :gutter="10" class="mb8">
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:out:add']" v-show="false">新增</el-button>
<el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['stock:out:add']"
v-show="false">新增</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
@ -35,13 +36,15 @@
<el-button type="warning" plain icon="Download" @click="handleExport"
v-hasPermi="['stock:out:export']">导出</el-button>
</el-col>
<el-col :span="1.5">
<el-button type="info" plain icon="Upload" @click="handleImport" v-hasPermi="['stock:out:import']">导入</el-button>
<el-col :span="1.5">
<el-button type="info" plain icon="Upload" @click="handleImport"
v-hasPermi="['stock:out:import']">导入</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table v-loading="loading" :data="outList" @selection-change="handleSelectionChange">
<el-table v-loading="loading" :data="outList" @selection-change="handleSelectionChange"
@sort-change="handleSortChange" ref="tableRef">
<el-table-column type="selection" width="55" align="center" />
<el-table-column label="序号" align="center" prop="stockOutCode" />
<el-table-column label="单据日期" align="center" prop="docDate" />
@ -67,7 +70,7 @@
<el-table-column label="材料名称" align="center" prop="materialName" />
<el-table-column label="材料规格" align="center" prop="materialSpecification" />
<el-table-column label="计量单位" align="center" prop="materialUnit" />
<el-table-column label="数量" align="center" prop="count" />
<el-table-column label="数量" align="center" prop="count" sortable="custom" />
<el-table-column label="批号" align="center" prop="batchId" />
<el-table-column label="生产日期" align="center" prop="productionDate" />
<el-table-column label="保质期" align="center" prop="shelfLife" />
@ -84,8 +87,8 @@
</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>
@ -99,7 +102,7 @@
</template>
</el-dialog>
<!-- 入库记录导入对话框 -->
<!-- 入库记录导入对话框 -->
<el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
<el-upload ref="uploadRef" :limit="1" accept=".xlsx, .xls" :headers="upload.headers"
:action="upload.url + '?updateSupport=' + upload.updateSupport" :disabled="upload.isUploading"
@ -169,6 +172,15 @@
url: import.meta.env.VITE_APP_BASE_API + "/stock/out/importData"
})
/** 字段排序 */
// 保存原始数据以便排序还原 - 在初始化部分赋值
const originalOutList = ref([])
const tableRef = ref(null)
function handleSortChange(event) {
}
/** 导入按钮操作 */
function handleImport() {
upload.title = "出库记录导入"
@ -201,6 +213,7 @@
loading.value = true
listOut(queryParams.value).then(response => {
outList.value = response.rows
originalOutList.value = response.rows // 保存原始数据的副本
total.value = response.total
loading.value = false
})