From b5a4c4677b10ddcc5de003611e166d0367642c24 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Tue, 18 Jun 2024 22:01:58 +0800
Subject: [PATCH] fix feeding record

---
 src/views/mes/feedingplan/index.vue           | 107 ++++++------------
 .../mes/feedingrecord/FeedingRecordForm.vue   |  51 +++------
 .../components/FeedingRecordDetailForm.vue    |  92 +++++++++------
 .../components/FeedingRecordDetailList.vue    |  24 +---
 src/views/mes/feedingrecord/index.vue         |  86 +++-----------
 5 files changed, 131 insertions(+), 229 deletions(-)

diff --git a/src/views/mes/feedingplan/index.vue b/src/views/mes/feedingplan/index.vue
index 0bd1e077..df020699 100644
--- a/src/views/mes/feedingplan/index.vue
+++ b/src/views/mes/feedingplan/index.vue
@@ -8,60 +8,35 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="记录id" prop="recordId">
+      <el-form-item label="记录" prop="recordId">
         <el-input
           v-model="queryParams.recordId"
-          placeholder="请输入记录id"
+          placeholder="请输入记录"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="记录明细id" prop="recordDetailId">
-        <el-input
-          v-model="queryParams.recordDetailId"
-          placeholder="请输入记录明细id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="计划id" prop="planId">
+
+      <el-form-item label="计划" prop="planId">
         <el-input
           v-model="queryParams.planId"
-          placeholder="请输入计划id"
+          placeholder="请输入计划"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="原料id" prop="itemId">
+      <el-form-item label="原料" prop="itemId">
         <el-input
           v-model="queryParams.itemId"
-          placeholder="请输入原料id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </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="unitId">
-        <el-input
-          v-model="queryParams.unitId"
-          placeholder="请输入单位"
+          placeholder="请输入原料"
           clearable
           @keyup.enter="handleQuery"
           class="!w-240px"
         />
       </el-form-item>
+
       <el-form-item label="记录人" prop="userId">
         <el-input
           v-model="queryParams.userId"
@@ -82,28 +57,18 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          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>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
-        <el-button
-          type="primary"
-          plain
-          @click="openForm('create')"
-          v-hasPermi="['mes:feeding-record-plan:create']"
-        >
-          <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          @click="openForm('create')"-->
+<!--          v-hasPermi="['mes:feeding-record-plan:create']"-->
+<!--        >-->
+<!--          <Icon icon="ep:plus" class="mr-5px" /> 新增-->
+<!--        </el-button>-->
         <el-button
           type="success"
           plain
@@ -121,13 +86,13 @@
   <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="recordId" />
-      <el-table-column label="记录明细id" align="center" prop="recordDetailId" />
-      <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="recordCode" />
+      <el-table-column label="记录明细" align="center" prop="recordDetailId" />
+      <el-table-column label="计划" align="center" prop="planCode" />
+      <el-table-column label="原料" align="center" prop="itemName" />
       <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="unitName" />
+      <el-table-column label="记录人" align="center" prop="userName" />
       <el-table-column
         label="投料时间"
         align="center"
@@ -135,23 +100,17 @@
         :formatter="dateFormatter"
         width="180px"
       />
-      <el-table-column
-        label="创建时间"
-        align="center"
-        prop="createTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
+
       <el-table-column label="操作" align="center">
         <template #default="scope">
-          <el-button
-            link
-            type="primary"
-            @click="openForm('update', scope.row.id)"
-            v-hasPermi="['mes:feeding-record-plan:update']"
-          >
-            编辑
-          </el-button>
+<!--          <el-button-->
+<!--            link-->
+<!--            type="primary"-->
+<!--            @click="openForm('update', scope.row.id)"-->
+<!--            v-hasPermi="['mes:feeding-record-plan:update']"-->
+<!--          >-->
+<!--            编辑-->
+<!--          </el-button>-->
           <el-button
             link
             type="danger"
@@ -269,4 +228,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index e2b756cd..4404d552 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="800px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -7,19 +7,10 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="单号" prop="feedingRecordCode">
-        <el-input v-model="formData.feedingRecordCode" placeholder="请输入单号" />
+      <el-form-item label="单号:" prop="feedingRecordCode">
+        <el-input disabled v-model="formData.feedingRecordCode" placeholder="保存自动生成单号" />
       </el-form-item>
-      <el-form-item label="产品id" prop="productId">
-        <el-input v-model="formData.productId" placeholder="请输入产品id" />
-      </el-form-item>
-      <el-form-item label="计划id" prop="planId">
-        <el-input v-model="formData.planId" placeholder="请输入计划id" />
-      </el-form-item>
-      <el-form-item label="原料id" prop="itemId">
-        <el-input v-model="formData.itemId" placeholder="请输入原料id" />
-      </el-form-item>
-      <el-form-item label="制浆线" prop="feedingPipeline">
+      <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)"
@@ -30,7 +21,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="投料类型" prop="feedingType">
+      <el-form-item label="投料类型:" prop="feedingType">
         <el-radio-group v-model="formData.feedingType">
           <el-radio
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_TYPE)"
@@ -41,10 +32,11 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="重量" prop="weight">
-        <el-input v-model="formData.weight" placeholder="请输入重量" />
+      <el-form-item  label="重量(kg):" prop="weight" v-if="formData.feedingType !='org'">
+        <el-input-number v-model="formData.weight" :min="0" :precision="2" class="!w-1/1" placeholder="请输入重量"
+        />
       </el-form-item>
-      <el-form-item label="投料时间" prop="feedingTime">
+      <el-form-item label="投料时间:" prop="feedingTime">
         <el-date-picker
           v-model="formData.feedingTime"
           type="date"
@@ -52,26 +44,13 @@
           placeholder="选择投料时间"
         />
       </el-form-item>
-      <el-form-item label="记录人" prop="userId">
-        <el-input v-model="formData.userId" placeholder="请输入记录人" />
-      </el-form-item>
-      <el-form-item label="备注" prop="remark">
+      <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-tabs v-model="subTabsName" v-if="formData.feedingType=='org'">
       <el-tab-pane label="投料记录明细" name="feedingRecordDetail">
         <FeedingRecordDetailForm ref="feedingRecordDetailFormRef" :record-id="formData.id" />
       </el-tab-pane>
@@ -112,6 +91,7 @@ const formData = ref({
   recordStatus: undefined,
 })
 const formRules = reactive({
+  feedingType: [{ required: true, message: '投料类型不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
@@ -124,7 +104,10 @@ const open = async (type: string, id?: number) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
+
   resetForm()
+  formData.value.feedingType = 'org'
+  formData.value.feedingPipeline = 'zhijiang2'
   // 修改时，设置数据
   if (id) {
     formLoading.value = true
@@ -188,4 +171,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
index 845f20a7..27b80af9 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -9,49 +9,57 @@
   >
     <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 label="原料" min-width="150">
+         <template #default="{ row, $index }">
+           <el-form-item :prop="`${$index}.itemId`" :rules="formRules.itemId" class="mb-0px!">
+             <el-select
+               v-model="row.itemId"
+               clearable
+               filterable
+               placeholder="请选择原料"
+             >
+               <el-option
+                 v-for="item in productList"
+                 :key="item.id"
+                 :label="item.name"
+                 :value="item.id"
+               />
+             </el-select>
+           </el-form-item>
+         </template>
       </el-table-column>
-      <el-table-column label="单位" min-width="150">
+      <el-table-column label="单位" min-width="80">
         <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-select
+              v-model="row.unitId"
+              clearable
+              filterable
+              placeholder="请选择原料"
+            >
+              <el-option
+                v-for="item in unitList"
+                :key="item.id"
+                :label="item.name"
+                :value="item.id"
+              />
+            </el-select>
           </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}.feedingTime`" :rules="formRules.feedingTime" class="mb-0px!">
-            <el-date-picker
-              v-model="row.feedingTime"
-              type="date"
-              value-format="x"
-              placeholder="选择投料时间"
+          <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-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>
+          <el-button @click="handleDelete($index)" link type="danger">
+            <Icon icon="ep:delete" />
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -62,6 +70,11 @@
 </template>
 <script setup lang="ts">
 import { FeedingRecordApi } from '@/api/mes/feedingrecord'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+import {ProductApi, ProductVO} from "@/api/erp/product/product";
+
+const unitList = ref<ProductUnitVO[]>([]) // 单位列表
+const productList = ref<ProductVO[]>([]) // 原料列表
 
 const props = defineProps<{
   recordId: undefined // 记录id（主表的关联字段）
@@ -69,9 +82,24 @@ const props = defineProps<{
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
+  itemId: [{ required: true, message: '原料不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  weight: [{ required: true, message: '重量不能为空', trigger: 'blur' }]
 })
 const formRef = ref() // 表单 Ref
 
+/** 初始化 */
+onMounted(async () => {
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+  productList.value = await ProductApi.getItemSimpleList()
+  // 默认添加一个
+  if (formData.value.length === 0) {
+    handleAdd()
+  }
+})
+
+
 /** 监听主表的关联字段的变化，加载对应的子表数据 */
 watch(
   () => props.recordId,
@@ -99,7 +127,7 @@ const handleAdd = () => {
     recordId: undefined,
     itemId: undefined,
     weight: undefined,
-    unitId: undefined,
+    unitId: 3,
     userId: undefined,
     feedingTime: undefined,
   }
@@ -123,4 +151,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
index 68edfa64..1099d1b3 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue
@@ -2,25 +2,11 @@
   <!-- 列表 -->
   <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="itemName" />
       <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-column label="单位" align="center" prop="unitName" />
+
     </el-table>
   </ContentWrap>
 </template>
@@ -57,4 +43,4 @@ const handleQuery = () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index 4e4768fc..753bad95 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -17,33 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="产品id" prop="productId">
-        <el-input
-          v-model="queryParams.productId"
-          placeholder="请输入产品id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="计划id" prop="planId">
-        <el-input
-          v-model="queryParams.planId"
-          placeholder="请输入计划id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="原料id" prop="itemId">
-        <el-input
-          v-model="queryParams.itemId"
-          placeholder="请输入原料id"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
+
       <el-form-item label="制浆线" prop="feedingPipeline">
         <el-select
           v-model="queryParams.feedingPipeline"
@@ -74,7 +48,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="重量" prop="weight">
+      <el-form-item label="重量(kg)" prop="weight">
         <el-input
           v-model="queryParams.weight"
           placeholder="请输入重量"
@@ -112,32 +86,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="状态" prop="recordStatus">
-        <el-select
-          v-model="queryParams.recordStatus"
-          placeholder="请选择状态"
-          clearable
-          class="!w-240px"
-        >
-          <el-option
-            v-for="dict in getStrDictOptions(DICT_TYPE.MES_FEEDING_RECORD_STATUS)"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间" prop="createTime">
-        <el-date-picker
-          v-model="queryParams.createTime"
-          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>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -175,11 +123,7 @@
           </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="产品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" />
@@ -190,14 +134,7 @@
           <dict-tag :type="DICT_TYPE.MES_FEEDING_TYPE" :value="scope.row.feedingType" />
         </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="重量(kg)" align="center" prop="weight" />
       <el-table-column label="记录人" align="center" prop="userId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="recordStatus">
@@ -206,12 +143,19 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="创建时间"
+        label="投料时间"
         align="center"
-        prop="createTime"
+        prop="feedingTime"
         :formatter="dateFormatter"
         width="180px"
       />
+<!--      <el-table-column-->
+<!--        label="创建时间"-->
+<!--        align="center"-->
+<!--        prop="createTime"-->
+<!--        :formatter="dateFormatter"-->
+<!--        width="180px"-->
+<!--      />-->
       <el-table-column label="操作" align="center">
         <template #default="scope">
           <el-button
@@ -219,6 +163,7 @@
             type="primary"
             @click="openForm('update', scope.row.id)"
             v-hasPermi="['mes:feeding-record:update']"
+            v-if="scope.row.recordStatus=='1'"
           >
             编辑
           </el-button>
@@ -227,6 +172,7 @@
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['mes:feeding-record:delete']"
+            v-if="scope.row.recordStatus=='1'"
           >
             删除
           </el-button>
@@ -243,7 +189,7 @@
   </ContentWrap>
 
   <!-- 表单弹窗：添加/修改 -->
-  <FeedingRecordForm ref="formRef" @success="getList" />
+  <FeedingRecordForm ref="formRef" @success="getList"  />
 </template>
 
 <script setup lang="ts">
@@ -344,4 +290,4 @@ const handleExport = async () => {
 onMounted(() => {
   getList()
 })
-</script>
\ No newline at end of file
+</script>