From 14891f8ddb5f04e086e133ceaac0cee5e21f7593 Mon Sep 17 00:00:00 2001
From: kkk-ops <1050738955@qq.com>
Date: Tue, 6 Jan 2026 15:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/plan/index.ts                     |  4 ++++
 src/locales/zh-CN.ts                          |  4 ++--
 .../mes/feedingrecord/FeedingRecordForm.vue   | 23 +++++++++++++++++--
 .../components/FeedingRecordDetailForm.vue    |  8 +++----
 src/views/mes/itemrequisition/index.vue       | 18 +++++++++++----
 src/views/mes/plan/index.vue                  | 19 +++++++++++----
 6 files changed, 59 insertions(+), 17 deletions(-)

diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 5478fd5f..9225484f 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -84,4 +84,8 @@ export const PlanApi = {
   updatePlanZjStatus: async (data: PlanVO) => {
     return await request.put({ url: `/mes/plan/updatePlanZjStatus`, data })
   },
+  // 根据状态查询生产计划详情
+  getPlanByStatus: async (status: number) => {
+    return await request.get({ url: `/mes/plan/getByStatus?status=` + status })
+  },
 }
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 271cdf04..3bc473da 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -114,8 +114,8 @@ export default {
     small: '小'
   },
   login: {
-    welcome: '欢迎使用本系统',
-    message: '开箱即用的中后台管理系统',
+    welcome: '欢迎使用必硕生产运营管理系统',
+    message: '必硕智能“纸”为绿色生活',
     tenantname: '租户名称',
     username: '用户名',
     password: '密码',
diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue
index bdab575f..64af09e4 100644
--- a/src/views/mes/feedingrecord/FeedingRecordForm.vue
+++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue
@@ -10,7 +10,7 @@
       <el-form-item label="单号:" prop="feedingRecordCode">
         <el-input disabled v-model="formData.feedingRecordCode" placeholder="保存自动生成单号" />
       </el-form-item>
-      <el-form-item label="制浆线:" prop="feedingPipeline">
+      <!-- <el-form-item label="制浆线:" prop="feedingPipeline">
           <el-tree-select
                   v-model="formData.feedingPipeline"
                   :data="organizationTree"
@@ -19,7 +19,23 @@
                   default-expand-all
                   placeholder="请选择制浆线"
                 />
-      </el-form-item>
+      </el-form-item> -->
+      <el-form-item label="生产计划" prop="planId">
+            <el-select
+              v-model="formData.planId"
+              @change="handleQuery"
+              clearable
+              filterable
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="item in planList"
+                :key="item.id"
+                :label="item.code"
+                :value="item.id"
+              />
+            </el-select>
+          </el-form-item>
       <el-form-item prop="feedingType">
         <template #label>
             <span>
@@ -91,6 +107,8 @@ import FeedingRecordDetailForm from './components/FeedingRecordDetailForm.vue'
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
 import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
 import { defaultProps, handleTree } from '@/utils/tree'
+import {PlanApi, PlanVO} from "@/api/mes/plan";
+const planList = ref<PlanVO[]>([]) // 列表
 
 /** 投料记录 表单 */
 defineOptions({ name: 'FeedingRecordForm' })
@@ -148,6 +166,7 @@ const open = async (type: string, id?: number) => {
   productList.value = await ProductApi.getMesProductSimpleList()
   // 加载组织
   await getOrganizationTree()
+  planList.value = await PlanApi.getPlanByStatus(1)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
index 0a9db05a..f431e608 100644
--- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
+++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue
@@ -55,18 +55,18 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column align="center" fixed="right" label="操作" width="60">
+      <!-- <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
           <el-button @click="handleDelete($index)" link type="danger">
             <Icon icon="ep:delete" />
           </el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
   </el-form>
-  <el-row justify="center" class="mt-3">
+  <!-- <el-row justify="center" class="mt-3">
     <el-button @click="handleAdd" round>+ 添加投料明细</el-button>
-  </el-row>
+  </el-row> -->
 </template>
 <script setup lang="ts">
 import { FeedingRecordApi } from '@/api/mes/feedingrecord'
diff --git a/src/views/mes/itemrequisition/index.vue b/src/views/mes/itemrequisition/index.vue
index d593abdd..41fd4110 100644
--- a/src/views/mes/itemrequisition/index.vue
+++ b/src/views/mes/itemrequisition/index.vue
@@ -71,12 +71,12 @@
 
   <!-- 列表 -->
   <ContentWrap>
-    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+    <!-- <el-tabs v-model="activeName" @tab-click="handleTabClick">
     <el-tab-pane label="所有" name="" />
     <el-tab-pane label="下达" name="2" />
     <el-tab-pane label="投料" name="3" />
     <el-tab-pane label="完成" name="4" />
-  </el-tabs>
+  </el-tabs> -->
 
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <!-- 子表的列表 -->
@@ -96,9 +96,9 @@
           <dict-tag :type="DICT_TYPE.MES_PRODUCE_ITEM_REQUISITION" :value="scope.row.status" />
         </template>
       </el-table-column>
-      <el-table-column label="制浆线" align="center" prop="feedingPipelineName"/>
+      <el-table-column label="生产线" align="center" prop="feedingPipelineName"/>
+      <el-table-column label="领料人" align="center" prop="workerName"/>
       <el-table-column label="备注" align="center" prop="remark" />
-
       <el-table-column
         label="计划下料"
         align="center"
@@ -123,7 +123,15 @@
         width="180px"
         sortable
       />
-
+<el-table-column label="操作" align="center" fixed="right" width="350">
+          <el-button
+            link
+            type="primary"
+            v-hasPermi="['mes:item-requisition:update']"
+          >
+            领料
+          </el-button>
+      </el-table-column>
     </el-table>
     <!-- 分页 -->
     <Pagination
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index e77599e3..f26f2e30 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -237,6 +237,7 @@
             link
             type="primary"
             v-hasPermi="['mes:plan:update']"
+            @click="openBaogongForm(scope.row.code, scope.row.id)"
             v-if="scope.row.status === 2"
           >
             报工
@@ -299,6 +300,9 @@
 
     <!-- 工序派工弹出 -->
   <TypePaigong ref="typePaiFormRef" @success="getList" />
+
+    <!-- 报工弹出 -->
+  <Baogong ref="baogongFormRef" @success="getList" />
 </template>
 
 <script setup lang="ts">
@@ -443,14 +447,21 @@ const openTypePaiForm = (planCode: string, planId: number) => {
   typePaiFormRef.value.open(planCode, planId)
 }
 
+/** 工序派工 */
+const baogongFormRef = ref()
+const openBaogongForm = (planCode: string, planId: number) => {
+  baogongFormRef.value.open(planCode, planId)
+}
+
 /** 开工 */
 const handleStatus = async (planCode:string, id: number,
                            type:string, status:number, tip:string, isZj: number) => {
   try {
-    if((isZj === 0 || isZj === null) && tip === "量产") {
-      message.alertError("请先完成检验")
-      return
-    }
+    // if((isZj === 0 || isZj === null) && tip === "量产") {
+    //   // message.alertError("请先完成检验")
+    //   // 二次确认
+    // await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode)
+    // }
     // 二次确认
     await message.confirm("计划："+planCode+"确定"+tip+"吗?",planCode)
     // 发起