From c707ebafa8bb8d09cf14a28346518aa77d96a875 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Thu, 20 Jun 2024 14:51:57 +0800
Subject: [PATCH] fix feeding

---
 src/api/mes/itemrequisition/index.ts           |  3 ++-
 .../mes/feedingrecord/FeedingRecordForm.vue    | 18 +++++++++++-------
 .../components/FeedingRecordDetailForm.vue     |  4 ++--
 .../components/FeedingRecordDetailList.vue     |  2 +-
 src/views/mes/feedingrecord/index.vue          |  2 +-
 .../itemrequisition/ItemRequisitionForm.vue    | 16 ++++++++++++++--
 src/views/mes/itemrequisition/index.vue        |  6 ++++++
 7 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/api/mes/itemrequisition/index.ts b/src/api/mes/itemrequisition/index.ts
index 9f45274a..7206cfcf 100644
--- a/src/api/mes/itemrequisition/index.ts
+++ b/src/api/mes/itemrequisition/index.ts
@@ -7,6 +7,7 @@ export interface ItemRequisitionVO {
   requisitionDate: Date // 下料时间
   deliveryDate: Date // 创建时间
   status: number // 状态
+  feedingPipeline: string,
   processInstanceId: string // 流程实例的编号
   planId: number // 计划ID
   remark: string // 备注
@@ -51,4 +52,4 @@ export const ItemRequisitionApi = {
   getItemRequisitionDetailListByItemRequisitionId: async (itemRequisitionId) => {
     return await request.get({ url: `/mes/item-requisition/item-requisition-detail/list-by-item-requisition-id?itemRequisitionId=` + itemRequisitionId })
   }
-}
\ No newline at end of file
+}
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index 4404d552..9294cb81 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -125,19 +125,23 @@ const emit = defineEmits(['success']) // 定义 success 事件，用于操作成
 const submitForm = async () => {
   // 校验表单
   await formRef.value.validate()
-  // 校验子表单
-  try {
-    await feedingRecordDetailFormRef.value.validate()
-  } catch (e) {
-    subTabsName.value = 'feedingRecordDetail'
-    return
+  if(formData.value.feedingType == 'org'){
+    // 校验子表单
+    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(formData.value.feedingType == 'org'){
+      data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData()
+    }
     if (formType.value === 'create') {
       await FeedingRecordApi.createFeedingRecord(data)
       message.success(t('common.createSuccess'))
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
index 27b80af9..21b21240 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -47,10 +47,10 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="重量" min-width="150">
+      <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-number v-model="row.weight" :min="0" :precision="2" class="!w-1/1" placeholder="请输入重量"
+            <el-input-number v-model="row.weight" :min="0" :precision="2" class="!w-1/1" placeholder=""
             />
           </el-form-item>
         </template>
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
index 1099d1b3..d4d8ab8f 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
@@ -4,7 +4,7 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
 
       <el-table-column label="原料" align="center" prop="itemName" />
-      <el-table-column label="重量" align="center" prop="weight" />
+      <el-table-column label="数量" align="center" prop="weight" />
       <el-table-column label="单位" align="center" prop="unitName" />
 
     </el-table>
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 2608d7b4..c3e58cab 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -156,7 +156,7 @@
 <!--        :formatter="dateFormatter"-->
 <!--        width="180px"-->
 <!--      />-->
-      <el-table-column label="操作" align="center">
+      <el-table-column label="操作" align="center" width="150px">
         <template #default="scope">
           <el-button
             link
diff --git a/src/views/mes/itemrequisition/ItemRequisitionForm.vue b/src/views/mes/itemrequisition/ItemRequisitionForm.vue
index f1dc58a5..3d1fb46e 100644
--- a/src/views/mes/itemrequisition/ItemRequisitionForm.vue
+++ b/src/views/mes/itemrequisition/ItemRequisitionForm.vue
@@ -29,7 +29,17 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-
+      <el-form-item label="制浆线:" prop="feedingPipeline">
+        <el-radio-group v-model="formData.feedingPipeline">
+          <el-radio
+            v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_PIPELINE)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="计划" prop="planId">
         <el-input v-model="formData.planId" placeholder="请输入计划" />
       </el-form-item>
@@ -53,7 +63,7 @@
 <script setup lang="ts">
 import { ItemRequisitionApi, ItemRequisitionVO } from '@/api/mes/itemrequisition'
 import ItemRequisitionDetailForm from './components/ItemRequisitionDetailForm.vue'
-import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import {getIntDictOptions, DICT_TYPE, getStrDictOptions} from '@/utils/dict'
 
 /** 生产领料 表单 */
 defineOptions({ name: 'ItemRequisitionForm' })
@@ -71,6 +81,7 @@ const formData = ref({
   requisitionDate: undefined,
   deliveryDate: undefined,
   status: undefined,
+  feedingPipeline: undefined,
   processInstanceId: undefined,
   planId: undefined,
   remark: undefined,
@@ -146,6 +157,7 @@ const resetForm = () => {
     requisitionDate: undefined,
     deliveryDate: undefined,
     status: undefined,
+    feedingPipeline: undefined,
     processInstanceId: undefined,
     planId: undefined,
     remark: undefined,
diff --git a/src/views/mes/itemrequisition/index.vue b/src/views/mes/itemrequisition/index.vue
index 4248fdaf..1c08129d 100644
--- a/src/views/mes/itemrequisition/index.vue
+++ b/src/views/mes/itemrequisition/index.vue
@@ -52,6 +52,7 @@
 <!--          class="!w-240px"-->
 <!--        />-->
 <!--      </el-form-item>-->
+
       <el-form-item label="备注" prop="remark">
         <el-input
           v-model="queryParams.remark"
@@ -117,6 +118,11 @@
           <dict-tag :type="DICT_TYPE.MES_PRODUCE_ITEM_REQUISITION" :value="scope.row.status" />
         </template>
       </el-table-column>
+      <el-table-column label="制浆线" align="center" prop="feedingPipeline">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_FEEDING_PIPELINE" :value="scope.row.feedingPipeline" />
+        </template>
+      </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" />
 
       <el-table-column