refactor (views/feed) 完善配料清单和饲喂量统计页面

+ 修改了配料清单和饲喂量统计页面的部分页面逻辑

src/views/feed/FeedList/index.vue

@@ -19,9 +19,9 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['feed:FeedList:add']">新增</el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate"
           v-hasPermi="['feed:FeedList:edit']">修改</el-button>
@@ -49,11 +49,11 @@
           <span>{{ scope.row.rootPlan ? parseTime(scope.row.rootPlan.planDate, '{y}-{m}-{d}') : '' }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="配料日期" align="center" prop="deployDate" width="180">
+      <!-- <el-table-column label="配料日期" align="center" prop="deployDate" width="180">
         <template #default="scope">
           <span>{{ parseTime(scope.row.deployDate, '{y}-{m}-{d}') }}</span>
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
           <el-button link type="primary" icon="View" @click="handleView(scope.row)">详情</el-button>
@@ -75,11 +75,11 @@
         <el-form-item label="饲草班人员" prop="zookeeper">
           <el-input v-model="form.zookeeper" placeholder="请输入饲草班人员名称" />
         </el-form-item>
-        <el-form-item label="配料日期" prop="deployDate">
+        <!-- <el-form-item label="配料日期" prop="deployDate">
           <el-date-picker clearable v-model="form.deployDate" type="date" value-format="YYYY-MM-DD"
             placeholder="请选择配料日期">
           </el-date-picker>
-        </el-form-item>
+        </el-form-item> -->
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -102,7 +102,7 @@
 
       <el-divider content-position="left">配料列表</el-divider>
 
-      <el-table :data="showFeedList.formulaList" stripe border style="width: 100%" max-height="300">
+      <el-table :data="showFeedList.rootFormula.sgFormulaList" stripe border style="width: 100%" max-height="300">
         <el-table-column label="序号" type="index" width="60" align="center" />
         <!-- <el-table-column label="原料编号" prop="materialId" align="center" /> -->
         <el-table-column label="原料" align="center">
@@ -186,6 +186,7 @@
     openModel.value = "view"
     title.value = "配料清单详情"
     console.log("查看配料清单", row)
+    console.log("HandView", showFeedList.value)
   }
 
   /** 查询配料清单列表 */

src/views/feed/FeedStatistic/index.vue

@@ -35,7 +35,7 @@
 
     <el-table v-loading="loading" :data="FeedStatisticList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="UUID" align="center" prop="id" />
+      <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" />
@@ -93,7 +93,7 @@
             <el-col :span="12">
               <el-form-item label="日期" prop="planDate">
                 <el-date-picker clearable v-model="showFeedStatistic.feedDate" type="date" value-format="YYYY-MM-DD"
-                  placeholder="请选择时间">
+                  placeholder="请选择时间" @change="handleDeployDateChange(showFeedStatistic, $event)">
                 </el-date-picker>
               </el-form-item>
             </el-col>
@@ -102,7 +102,11 @@
 
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" icon="Plus" @click="handleAddMaterial()">添加</el-button>
+              <el-button type="primary" icon="Plus" @click="handleAddMaterial()" 
+              :disabled="
+              showFeedStatistic.feedDate == null 
+              || showFeedStatistic.formulaId === null 
+              || showFeedStatistic.formulaBatchId == null">添加</el-button>
             </el-col>
 
           </el-row>
@@ -152,7 +156,11 @@
 
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5">
-              <el-button type="primary" icon="Plus" @click="handleAddSheep()">添加</el-button>
+              <el-button type="primary" icon="Plus" @click="handleAddSheep()"               
+              :disabled ="
+              showFeedStatistic.feedDate == null 
+              || showFeedStatistic.formulaId == null 
+              || showFeedStatistic.formulaBatchId == null">添加</el-button>
             </el-col>
 
             <el-table :data="showFeedStatistic.sheepFoldList" :rules="rules"
@@ -231,6 +239,7 @@
   const openModel = ref('')
   // 编辑状态
   const isEdit = ref(true)
+
   const showFeedStatistic = ref({})
 
   // 用于存储羊舍名称的字典
@@ -362,9 +371,10 @@
 
   // 处理配方批号变化 & 当确定批号时加载初始数据
   function handleFormulaBatchIdChange(row, $event) {
-    if (row.formulaId && row.formulaBatchId) {
+    if (row.formulaId && row.formulaBatchId && row.feedDate) {
       queryParams.value.formulaId = row.formulaId
       queryParams.value.formulaBatchId = row.formulaBatchId
+      queryParams.value.feedDate = row.feedDate
       queryParams.value.id = null // 清空 ID，防止影响查询
       // console.log("加载初始数据，查询参数：", queryParams.value)
       initFeedStatistic(queryParams.value).then(response => {
@@ -374,6 +384,13 @@
       })
     }
   }
+
+  function handleDeployDateChange(showFeedStatistic, event) {
+    // 日期改变时回调
+    if (showFeedStatistic.feedDate) {
+      handleFormulaBatchIdChange(showFeedStatistic, event);
+    }
+  }
   // 查看详情
   function handleMaterialView(row) {
     showFeedStatistic.value = row