From 49312f12a716232b367140e29dcb4b27c4f178f5 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 18 Jun 2024 16:21:08 +0800
Subject: [PATCH] add feeding record

---
 src/api/mes/feedingrecord/index.ts            |   7 +
 .../mes/feedingrecord/FeedingRecordForm.vue   |  33 ++++-
 .../components/FeedingRecordDetailForm.vue    | 126 ++++++++++++++++++
 .../components/FeedingRecordDetailList.vue    |  60 +++++++++
 src/views/mes/feedingrecord/index.vue         |  59 ++++++--
 5 files changed, 273 insertions(+), 12 deletions(-)
 create mode 100644 src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
 create mode 100644 src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue

diff --git a/src/api/mes/feedingrecord/index.ts b/src/api/mes/feedingrecord/index.ts
index 23dd9b1a..b6a2d6a5 100644
--- a/src/api/mes/feedingrecord/index.ts
+++ b/src/api/mes/feedingrecord/index.ts
@@ -47,4 +47,11 @@ export const FeedingRecordApi = {
   exportFeedingRecord: async (params) => {
     return await request.download({ url: `/mes/feeding-record/export-excel`, params })
   },
+
+// ==================== 子表（投料记录明细） ====================
+
+  // 获得投料记录明细列表
+  getFeedingRecordDetailListByRecordId: async (recordId) => {
+    return await request.get({ url: `/mes/feeding-record/feeding-record-detail/list-by-record-id?recordId=` + recordId })
+  },
 }
\ No newline at end of file
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index 26bc2c67..e2b756cd 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -58,7 +58,24 @@
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
+      <el-form-item label="状态" prop="recordStatus">
+        <el-radio-group v-model="formData.recordStatus">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_RECORD_STATUS)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
     </el-form>
+    <!-- 子表的表单 -->
+    <el-tabs v-model="subTabsName">
+      <el-tab-pane label="投料记录明细" name="feedingRecordDetail">
+        <FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" />
+      </el-tab-pane>
+    </el-tabs>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -68,6 +85,7 @@
 <script setup lang="ts">
 import { getStrDictOptions, DICT_TYPE } from '@/utils/dict'
 import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
+import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
 
 /** 投料记录 表单 */
 defineOptions({ name: 'FeedingRecordForm' })
@@ -97,6 +115,10 @@ const formRules = reactive({
 })
 const formRef = ref() // 表单 Ref
 
+/** 子表的表单 */
+const subTabsName = ref('feedingRecordDetail')
+const feedingRecordDetailFormRef = ref()
+
 /** 打开弹窗 */
 const open = async (type: string, id?: number) => {
   dialogVisible.value = true
@@ -120,10 +142,19 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
+  // 校验子表单
+  try {
+    await feedingRecordDetailFormRef.value.validate()
+  } catch (e) {
+    subTabsName.value = 'feedingRecordDetail'
+    return
+  }
   // 提交请求
   formLoading.value = true
   try {
     const data = formData.value as unknown as FeedingRecordVO
+    // 拼接子表的数据
+    data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
     if (formType.value === 'create') {
       await FeedingRecordApi.createFeedingRecord(data)
       message.success(t('common.createSuccess'))
@@ -157,4 +188,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
+</script>
\ No newline at end of file
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
new file mode 100644
index 00000000..845f20a7
--- /dev/null
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -0,0 +1,126 @@
+<template>
+  <el-form
+    ref="formRef"
+    :model="formData"
+    :rules="formRules"
+    v-loading="formLoading"
+    label-width="0px"
+    :inline-message="true"
+  >
+    <el-table :data="formData" class="-mt-10px">
+      <el-table-column label="序号" type="index" width="100" />
+       <el-table-column label="原料id" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.itemId`" :rules="formRules.itemId" class="mb-0px!">
+            <el-input v-model="row.itemId" placeholder="请输入原料id" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="重量" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.weight`" :rules="formRules.weight" class="mb-0px!">
+            <el-input v-model="row.weight" placeholder="请输入重量" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="单位" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!">
+            <el-input v-model="row.unitId" placeholder="请输入单位" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="记录人" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.userId`" :rules="formRules.userId" class="mb-0px!">
+            <el-input v-model="row.userId" placeholder="请输入记录人" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="投料时间" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.feedingTime`" :rules="formRules.feedingTime" class="mb-0px!">
+            <el-date-picker
+              v-model="row.feedingTime"
+              type="date"
+              value-format="x"
+              placeholder="选择投料时间"
+            />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column align="center" fixed="right" label="操作" width="60">
+        <template #default="{ $index }">
+          <el-button @click="handleDelete($index)" link>—</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </el-form>
+  <el-row justify="center" class="mt-3">
+    <el-button @click="handleAdd" round>+ 添加投料记录明细</el-button>
+  </el-row>
+</template>
+<script setup lang="ts">
+import { FeedingRecordApi } from '@/api/mes/feedingrecord'
+
+const props = defineProps<{
+  recordId: undefined // 记录id（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.recordId,
+  async (val) => {
+    // 1. 重置表单
+    formData.value = []
+    // 2. val 非空，则加载数据
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      formData.value = await FeedingRecordApi.getFeedingRecordDetailListByRecordId(val)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  const row = {
+    id: undefined,
+    recordId: undefined,
+    itemId: undefined,
+    weight: undefined,
+    unitId: undefined,
+    userId: undefined,
+    feedingTime: undefined,
+  }
+  row.recordId = props.recordId
+  formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+  formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+  return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+  return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
\ No newline at end of file
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
new file mode 100644
index 00000000..68edfa64
--- /dev/null
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
@@ -0,0 +1,60 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="id" align="center" prop="id" />
+       <el-table-column label="原料id" align="center" prop="itemId" />
+      <el-table-column label="重量" align="center" prop="weight" />
+      <el-table-column label="单位" align="center" prop="unitId" />
+      <el-table-column label="记录人" align="center" prop="userId" />
+      <el-table-column
+        label="投料时间"
+        align="center"
+        prop="feedingTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+  </ContentWrap>
+</template>
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { FeedingRecordApi } from '@/api/mes/feedingrecord'
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const props = defineProps<{
+  recordId?: number // 记录id（主表的关联字段）
+}>()
+const loading = ref(false) // 列表的加载中
+const list = ref([]) // 列表的数据
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await FeedingRecordApi.getFeedingRecordDetailListByRecordId(props.recordId)
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 33e0fcf2..4e4768fc 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -20,13 +20,13 @@
       <el-form-item label="产品id" prop="productId">
         <el-input
           v-model="queryParams.productId"
-          placeholder="请输入产品"
+          placeholder="请输入产品id"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="计划" prop="planId">
+      <el-form-item label="计划id" prop="planId">
         <el-input
           v-model="queryParams.planId"
           placeholder="请输入计划id"
@@ -35,7 +35,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="原料" prop="itemId">
+      <el-form-item label="原料id" prop="itemId">
         <el-input
           v-model="queryParams.itemId"
           placeholder="请输入原料id"
@@ -74,7 +74,26 @@
           />
         </el-select>
       </el-form-item>
-
+      <el-form-item label="重量" prop="weight">
+        <el-input
+          v-model="queryParams.weight"
+          placeholder="请输入重量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="投料时间" prop="feedingTime">
+        <el-date-picker
+          v-model="queryParams.feedingTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          class="!w-240px"
+        />
+      </el-form-item>
       <el-form-item label="记录人" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -108,7 +127,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="投料时间" prop="createTime">
+      <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -146,10 +165,21 @@
   <!-- 列表 -->
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <!-- 子表的列表 -->
+      <el-table-column type="expand">
+        <template #default="scope">
+          <el-tabs model-value="feedingRecordDetail">
+            <el-tab-pane label="投料记录明细" name="feedingRecordDetail">
+              <FeedingRecordDetailList :record-id="scope.row.id" />
+            </el-tab-pane>
+          </el-tabs>
+        </template>
+      </el-table-column>
+      <el-table-column label="id" align="center" prop="id" />
       <el-table-column label="单号" align="center" prop="feedingRecordCode" />
-      <el-table-column label="产品" align="center" prop="productId" />
-      <el-table-column label="计划" align="center" prop="planId" />
-      <el-table-column label="原料" align="center" prop="itemId" />
+      <el-table-column label="产品id" align="center" prop="productId" />
+      <el-table-column label="计划id" align="center" prop="planId" />
+      <el-table-column label="原料id" align="center" prop="itemId" />
       <el-table-column label="制浆线" align="center" prop="feedingPipeline">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
@@ -161,7 +191,13 @@
         </template>
       </el-table-column>
       <el-table-column label="重量" align="center" prop="weight" />
-
+      <el-table-column
+        label="投料时间"
+        align="center"
+        prop="feedingTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
       <el-table-column label="记录人" align="center" prop="userId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="recordStatus">
@@ -170,7 +206,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="投料时间"
+        label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
@@ -216,6 +252,7 @@ import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { FeedingRecordApi, FeedingRecordVO } from '@/api/mes/feedingrecord'
 import FeedingRecordForm from './FeedingRecordForm.vue'
+import FeedingRecordDetailList from './components/FeedingRecordDetailList.vue'
 
 /** 投料记录 列表 */
 defineOptions({ name: 'FeedingRecord' })
@@ -307,4 +344,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
+</script>
\ No newline at end of file