fix bugs

src/api/mes/plan/index.ts

@@ -72,4 +72,8 @@ export const PlanApi = {
   getStartAndFinishPlanProduct: async () => {
     return await request.get({ url: `/mes/plan/getProductByStatus` })
   },
+  // 查询正在开工和完工的计划的产品列表
+  getStartPlanProduct: async (orgType) => {
+    return await request.get({ url: `/mes/app/org-worker/getPlanProductList?orgType=`+orgType })
+  },
 }

src/views/Home/Index.vue

@@ -46,7 +46,9 @@
       </el-skeleton>
     </el-card>
   </div>
-
+  <div>
+    <img alt=""  src="@/assets/imgs/workflow.png" />
+  </div>
   <el-row class="mt-8px" :gutter="8" justify="space-between">
     <el-col :xl="16" :lg="16" :md="24" :sm="24" :xs="24" class="mb-8px">
       <el-card shadow="never">
@@ -402,4 +404,11 @@ getAllApi()
   margin-bottom: 15px;
   max-width: 600px;
 }
+
+img{
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+}
+
 </style>

src/views/mes/feedingrecord/index.vue

@@ -120,7 +120,7 @@
         </template>
       </el-table-column>
       <el-table-column label="重量(kg)" align="center" prop="weight" />
-      <el-table-column label="记录人" align="center" prop="userId" />
+      <el-table-column label="记录人" align="center" prop="userName" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="状态" align="center" prop="recordStatus">
         <template #default="scope">

src/views/mes/producereport/ProduceReportForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1400px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -102,7 +102,7 @@
     <!-- 子表的表单 -->
     <el-tabs v-model="subTabsName">
       <el-tab-pane label="生产报工明细" name="produceReportDetail">
-        <ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" />
+        <ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" :org-type="formData.orgType"/>
       </el-tab-pane>
     </el-tabs>
     <template #footer>

src/views/mes/producereport/components/AdminReplaceForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1400px">
     <el-form
       ref="formRef"
       :model="formData"
@@ -118,7 +118,7 @@
     <!-- 子表的表单 -->
     <el-tabs v-model="subTabsName">
       <el-tab-pane label="生产报工明细" name="produceReportDetail">
-        <ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" />
+        <ProduceReportDetailForm ref="produceReportDetailFormRef" :report-id="formData.id" :org-type="formData.orgType"/>
       </el-tab-pane>
     </el-tabs>
     <template #footer>

src/views/mes/producereport/components/ProduceReportDetailForm.vue

@@ -9,15 +9,15 @@
   >
     <el-table :data="formData" class="-mt-10px">
       <el-table-column label="序号" type="index" width="70" />
-      <el-table-column label="产品" min-width="180">
+      <el-table-column label="产品" min-width="220">
         <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
-            <el-select v-model="row.productId"  clearable filterable placeholder="请选择" >
+          <el-form-item :prop="`${$index}.productId`" :rules="formRules.planId" class="mb-0px!">
+            <el-select v-model="row.planId"  clearable filterable placeholder="请选择" >
               <el-option
                 v-for="item in productList"
-                :key="item.id"
-                :label="item.name"
-                :value="item.id"
+                :key="item.value"
+                :label="item.text"
+                :value="item.value"
               />
             </el-select>
           </el-form-item>
@@ -87,6 +87,7 @@ import {PlanApi} from "@/api/mes/plan";
 
 const props = defineProps<{
   reportId: undefined // 报工单id（主表的关联字段）
+  orgType?: undefined //工序类型
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
@@ -100,7 +101,7 @@ const productList = ref<ProductVO[]>([]) // 产品列表
 /** 初始化 */
 onMounted(async () => {
   // 产品单位
-  productList.value = await PlanApi.getStartAndFinishPlanProduct()
+  productList.value = await PlanApi.getStartPlanProduct(props.orgType)
 
   // 默认添加一个
   if (formData.value.length === 0) {
@@ -129,7 +130,23 @@ watch(
   },
   { immediate: true }
 )
-
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.orgType,
+  async (val) => {
+    console.log(val)
+    if (!val) {
+      return;
+    }
+    try {
+      formLoading.value = true
+      productList.value = await PlanApi.getStartPlanProduct(props.orgType)
+    } finally {
+      formLoading.value = false
+    }
+  },
+  { immediate: true }
+)
 /** 新增按钮操作 */
 const handleAdd = () => {
   const row = {