From 6a128239cc62e513e4c2750e8baf3f36c710cfd9 Mon Sep 17 00:00:00 2001
From: ll <1079863556@qq.com>
Date: Thu, 31 Jul 2025 23:15:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=8A=E5=A5=B6=E5=87=BA=E5=85=A5=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../milkInOutStore/milkInOutStore.js          |  33 +++
 .../sheepMilkAnalysis/sheepMilkAnalysis.js    |  44 ++++
 .../milkInOutStore/milkInOutStore/index.vue   | 157 ++++++++++++++
 .../dairyProducts/sheepMilkAnalysis/index.vue | 194 ++++++++++++++++++
 4 files changed, 428 insertions(+)
 create mode 100644 src/api/dairyProducts/milkInOutStore/milkInOutStore.js
 create mode 100644 src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
 create mode 100644 src/views/dairyProducts/milkInOutStore/milkInOutStore/index.vue
 create mode 100644 src/views/dairyProducts/sheepMilkAnalysis/index.vue

diff --git a/src/api/dairyProducts/milkInOutStore/milkInOutStore.js b/src/api/dairyProducts/milkInOutStore/milkInOutStore.js
new file mode 100644
index 0000000..fd5f947
--- /dev/null
+++ b/src/api/dairyProducts/milkInOutStore/milkInOutStore.js
@@ -0,0 +1,33 @@
+import request from '@/utils/request'
+
+export function getList(params) {
+  return request({
+    url: '/milkInOutStore/list',
+    method: 'get',
+    params
+  })
+}
+
+export function importExcel(file) {
+  const data = new FormData()
+  data.append('file', file)
+  return request({
+    url: '/milkInOutStore/import',
+    method: 'post',
+    data,
+    headers: { 'Content-Type': 'multipart/form-data' }
+  })
+}
+
+export function exportExcel(params) {
+  return request({
+    url: '/milkInOutStore/export',
+    method: 'post',
+    params,
+    responseType: 'blob'
+  })
+}
+
+export function getColumns() {
+  return request({ url: '/milkInOutStore/columns', method: 'get' })
+}
diff --git a/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js b/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
new file mode 100644
index 0000000..8e90017
--- /dev/null
+++ b/src/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询羊奶出入库列表
+export function listMilkInOutStore(query) {
+  return request({
+    url: '/milkInOutStore/milkInOutStore/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询羊奶出入库详细
+export function getMilkInOutStore(id) {
+  return request({
+    url: '/milkInOutStore/milkInOutStore/' + id,
+    method: 'get'
+  })
+}
+
+// 新增羊奶出入库
+export function addMilkInOutStore(data) {
+  return request({
+    url: '/milkInOutStore/milkInOutStore',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改羊奶出入库
+export function updateMilkInOutStore(data) {
+  return request({
+    url: '/milkInOutStore/milkInOutStore',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除羊奶出入库
+export function delMilkInOutStore(id) {
+  return request({
+    url: '/milkInOutStore/milkInOutStore/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/dairyProducts/milkInOutStore/milkInOutStore/index.vue b/src/views/dairyProducts/milkInOutStore/milkInOutStore/index.vue
new file mode 100644
index 0000000..07c6d59
--- /dev/null
+++ b/src/views/dairyProducts/milkInOutStore/milkInOutStore/index.vue
@@ -0,0 +1,157 @@
+<template>
+  <div>
+    <el-form :inline="true" :model="queryParams" class="mb-4">
+      <el-form-item label="开始日期">
+        <el-date-picker v-model="queryParams.datetimeStart" type="date" value-format="YYYY-MM-DD"/>
+      </el-form-item>
+      <el-form-item label="结束日期">
+        <el-date-picker v-model="queryParams.datetimeEnd" type="date" value-format="YYYY-MM-DD"/>
+      </el-form-item>
+      <el-button type="primary" @click="getList">查询</el-button>
+      <el-button @click="resetQuery">重置</el-button>
+    </el-form>
+
+    <el-row :gutter="10" style="margin-bottom: 16px;">
+      <el-col :span="24">
+        <el-upload :before-upload="beforeUpload" :show-file-list="false" style="display: inline-block; margin: 0 8px;">
+          <el-button type="primary">导入</el-button>
+        </el-upload>
+        <el-button type="success" @click="handleExport">导出</el-button>
+        <el-button @click="openColDialog">列设置</el-button>
+      </el-col>
+    </el-row>
+
+    <el-dialog v-model="colDialog" title="选择展示列">
+      <div>
+        <strong>饲喂来源：</strong>
+        <el-checkbox-group v-model="selectedFeed">
+          <el-checkbox v-for="f in allCols.feed" :key="f" :label="f">{{ f }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <div style="margin-top:1em">
+        <strong>销售去向：</strong>
+        <el-checkbox-group v-model="selectedSale">
+          <el-checkbox v-for="s in allCols.sale" :key="s" :label="s">{{ s }}</el-checkbox>
+        </el-checkbox-group>
+      </div>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="applyCols">确认</el-button>
+          <el-button @click="colDialog = false">取消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <el-table :data="rows" border style="margin-top:16px">
+      <!-- 前面的固定列 -->
+      <el-table-column prop="datetime" label="日期"/>
+      <el-table-column prop="num" label="羊数"/>
+      <el-table-column prop="colostSheep" label="初乳羊"/>
+      <el-table-column prop="commercialIntake" label="商乳入库"/>
+      <el-table-column prop="antiIntake" label="抗乳入库"/>
+      <el-table-column prop="colostIntake" label="初乳入库"/>
+      <el-table-column prop="intakeTotal" label="入库小计"/>
+      <el-table-column prop="commercialTest" label="商乳实验用奶"/>
+      <el-table-column prop="colostTest" label="初乳实验用奶"/>
+      <el-table-column prop="transferCommercial" label="商乳调拨出库"/>
+      <el-table-column prop="transferAnti" label="抗乳调拨出库"/>
+      <el-table-column prop="transferColost" label="初乳调拨出库"/>
+      <el-table-column prop="transferTotal" label="调拨小计"/>
+      <el-table-column prop="loss" label="损耗"/>
+      
+      <!-- 动态饲喂来源列（插入到这里） -->
+      <el-table-column v-for="f in selectedFeed" :key="'feed-'+f" :prop="f" :label="f"/>
+      <!-- 动态销售去向列 -->
+      <el-table-column v-for="s in selectedSale" :key="'sale-'+s" :prop="s" :label="s"/>
+      
+      <!-- 后面的固定列 -->
+      <el-table-column prop="stockCommercial" label="商乳库存"/>
+      <el-table-column prop="stockAnti" label="抗乳库存"/>
+      <el-table-column prop="colost" label="初乳库存"/>
+      <el-table-column prop="returnFresh" label="爱特退回鲜奶"/>
+      <el-table-column prop="returnYogurt" label="爱特退回酸奶"/>
+    </el-table>
+
+    <el-pagination
+      style="margin-top:16px; text-align:right"
+      :total="total"
+      v-model:page-size="queryParams.pageSize"
+      v-model:current-page="queryParams.pageNum"
+      @current-change="getList">
+    </el-pagination>
+
+  </div>
+</template>
+
+<script setup>
+import { ref, reactive, onMounted } from 'vue'
+import { getList as fetchList, importExcel, exportExcel, getColumns } from '@/api/dairyProducts/milkInOutStore/milkInOutStore.js'
+import { ElMessage } from 'element-plus'
+
+const queryParams = reactive({
+  datetimeStart: null,
+  datetimeEnd: null,
+  pageNum: 1,
+  pageSize: 10
+})
+const rows = ref([])
+const total = ref(0)
+const allCols = reactive({ feed: [], sale: [] })
+const selectedFeed = ref([])
+const selectedSale = ref([])
+const colDialog = ref(false)
+
+function getList() {
+  fetchList(queryParams).then(res => {
+    rows.value = res.rows
+    total.value = res.total
+  })
+}
+
+function resetQuery() {
+  queryParams.datetimeStart = null
+  queryParams.datetimeEnd = null
+  queryParams.pageNum = 1
+  getList()
+}
+
+function openColDialog() {
+  getColumns().then(res => {
+    const d = res.data[0]
+    allCols.feed = d.feed || []
+    allCols.sale = d.sale || []
+    // 默认勾选所有源/销项列
+    selectedFeed.value = [...allCols.feed]
+    selectedSale.value = [...allCols.sale]
+    colDialog.value = true
+  })
+}
+
+function applyCols() {
+  colDialog.value = false
+  getList()
+}
+
+function beforeUpload(file) {
+  importExcel(file).then(() => {
+    ElMessage.success('导入成功')
+    getList()
+  }).catch(err => {
+    ElMessage.error('导入失败：' + (err.message || err))
+  })
+  return false
+}
+
+function handleExport() {
+  exportExcel(queryParams).then(blob => {
+    const link = document.createElement('a')
+    link.href = URL.createObjectURL(blob)
+    link.download = `milk_in_out_store_${Date.now()}.xlsx`
+    link.click()
+  }).catch(err => {
+    ElMessage.error('导出失败：' + (err.message || err))
+  })
+}
+
+onMounted(() => getList())
+</script>
\ No newline at end of file
diff --git a/src/views/dairyProducts/sheepMilkAnalysis/index.vue b/src/views/dairyProducts/sheepMilkAnalysis/index.vue
new file mode 100644
index 0000000..64bc19b
--- /dev/null
+++ b/src/views/dairyProducts/sheepMilkAnalysis/index.vue
@@ -0,0 +1,194 @@
+<template>
+  <div class="app-container">
+    <!-- 查询条件 -->
+    <el-form :inline="true" :model="queryParams" class="filter-form">
+      <el-form-item label="耳号">
+        <el-input v-model="queryParams.manageEarTag" placeholder="请输入耳号" />
+      </el-form-item>
+      <el-form-item label="筛选天数">
+        <el-input-number v-model="queryParams.screenDays" :min="0" placeholder="请输入天数" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="handleQuery">查询</el-button>
+        <el-button @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作按钮行 -->
+    <div class="button-group">
+      <el-button type="success" @click="handleExport">导出</el-button>
+
+      <el-popover
+        placement="bottom"
+        width="400"
+        trigger="click"
+        >
+            <el-checkbox-group v-model="selectedFields" class="checkbox-columns">
+                <el-checkbox
+                    v-for="col in allColumns"
+                    :key="col.prop"
+                    :label="col.prop"
+                >{{ col.label }}</el-checkbox>
+            </el-checkbox-group>
+
+            <template #reference>
+                <el-button type="info">展示列</el-button>
+            </template>
+        </el-popover>
+
+    </div>
+
+    <!-- 数据表格 -->
+    <el-table :data="list" border style="width: 100%" v-loading="loading" :row-key="row => row.id">
+      <el-table-column
+        v-for="col in visibleColumns"
+        :key="col.prop"
+        :label="col.label"
+        :prop="col.prop"
+        :min-width="col.minWidth || 120"
+      />
+    </el-table>
+
+    <!-- 分页 -->
+    <el-pagination
+      v-show="total > 0"
+      :total="total"
+      :current-page="queryParams.pageNum"
+      :page-size="queryParams.pageSize"
+      @current-change="handlePageChange"
+      @size-change="handleSizeChange"
+      layout="total, sizes, prev, pager, next, jumper"
+      :page-sizes="[10, 20, 50, 100]"
+    />
+  </div>
+</template>
+
+<script>
+import { listSheepMilkAnalysis, exportSheepMilkAnalysis } from "@/api/dairyProducts/sheepMilkAnalysis/sheepMilkAnalysis.js";
+
+export default {
+  name: "SheepMilkAnalysis",
+  data() {
+    return {
+      loading: false,
+      total: 0,
+      list: [],
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        manageEarTag: null,
+        screenDays: null
+      },
+      selectedFields: [],
+      allColumns: [
+        { label: "耳号", prop: "manageEarTag" },
+        { label: "品种", prop: "variety" },
+        { label: "挤奶时间", prop: "milkingDate" },
+        { label: "干奶时间", prop: "dryDate" },
+        { label: "筛选天数", prop: "screeningDays" },
+        { label: "挤奶天数", prop: "milkingDays" },
+        { label: "校正后最大胎次", prop: "maxCorrectedParity" },
+        { label: "系统奶量之合计", prop: "systemMilkTotal" },
+        { label: "校正奶量之合计", prop: "correctedMilkTotal" },
+        { label: "校正日平均奶量", prop: "avgDailyCorrectedMilk" },
+        { label: "胎次1的总产奶量", prop: "parity1TotalMilk" },
+        { label: "胎次2的总产奶量", prop: "parity2TotalMilk" },
+        { label: "胎次3的总产奶量", prop: "parity3TotalMilk" },
+        { label: "胎次4的总产奶量", prop: "parity4TotalMilk" },
+        { label: "胎次1的日平均产量", prop: "parity1AvgDailyMilk" },
+        { label: "胎次2的日平均产量", prop: "parity2AvgDailyMilk" },
+        { label: "胎次3的日平均产量", prop: "parity3AvgDailyMilk" },
+        { label: "胎次4的日平均产量", prop: "parity4AvgDailyMilk" },
+        { label: "泌乳天数", prop: "lactationDays" },
+        { label: "过去7日日平均奶量", prop: "past7DaysAvgMilk" },
+        { label: "校正过去7日日平均奶量", prop: "past7DaysAvgCorrectedMilk" },
+        { label: "过去14日日平均奶量", prop: "past14DaysAvgMilk" },
+        { label: "过去30日日平均奶量", prop: "past30DaysAvgMilk" },
+        { label: "羊只类型", prop: "sheepType" },
+        { label: "生日", prop: "birthDate" },
+        { label: "当前胎次", prop: "currentParity" },
+        { label: "月龄", prop: "ageMonths" },
+        { label: "当前体重", prop: "currentWeight" },
+        { label: "繁育状态", prop: "breedStatus" },
+        { label: "父号", prop: "fatherTag" },
+        { label: "母号", prop: "motherTag" },
+        { label: "牧场名称", prop: "ranchName" },
+        { label: "家系", prop: "familyLine" },
+        { label: "母亲挤奶天数", prop: "motherMilkingDays" },
+        { label: "母亲校正奶量之合计", prop: "motherCorrectedMilkTotal" },
+        { label: "母亲校正后最大胎次", prop: "motherMaxCorrectedParity" },
+        { label: "母亲校正日平均奶量", prop: "motherAvgDailyCorrectedMilk" }
+      ]
+    };
+  },
+  created() {
+    this.selectedFields = this.allColumns.map(c => c.prop);
+    this.getList();
+  },
+  computed: {
+    visibleColumns() {
+      return this.allColumns.filter(col => this.selectedFields.includes(col.prop));
+    }
+  },
+  methods: {
+    getList() {
+      this.loading = true;
+      listSheepMilkAnalysis(this.queryParams).then(response => {
+        this.list = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    resetQuery() {
+      this.queryParams = {
+        pageNum: 1,
+        pageSize: 10,
+        manageEarTag: null,
+        screenDays: null
+      };
+      this.selectedFields = this.allColumns.map(c => c.prop);
+      this.getList();
+    },
+    handlePageChange(pageNum) {
+      this.queryParams.pageNum = pageNum;
+      this.getList();
+    },
+    handleSizeChange(pageSize) {
+      this.queryParams.pageSize = pageSize;
+      this.getList();
+    },
+    handleExport() {
+      exportSheepMilkAnalysis(this.queryParams).then(response => {
+        const blob = new Blob([response], { type: 'application/vnd.ms-excel' });
+        const url = window.URL.createObjectURL(blob);
+        const link = document.createElement('a');
+        link.href = url;
+        link.setAttribute('download', '羊奶分析数据.xlsx');
+        document.body.appendChild(link);
+        link.click();
+        document.body.removeChild(link);
+      });
+    }
+  }
+};
+</script>
+
+<style scoped>
+.filter-form .el-form-item {
+  margin-right: 15px;
+}
+.button-group {
+  margin-bottom: 10px;
+}
+.checkbox-columns {
+  display: flex;
+  flex-wrap: wrap;
+  gap: 10px;
+  max-height: 300px;
+  overflow-y: auto;
+}
+</style>