From fa58647e5994a0d32a6f22f48c82b9dd156164e6 Mon Sep 17 00:00:00 2001
From: kkk-ops <1050738955@qq.com>
Date: Tue, 30 Dec 2025 17:46:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/mes/paigongrecord/index.ts            |  51 ++++
 .../mes/paigongrecord/PaigongRecordForm.vue   | 116 +++++++++
 .../components/PaigongRecordList.vue          |  81 ++++++
 src/views/mes/paigongrecord/index.vue         | 239 ++++++++++++++++++
 src/views/mes/plan/components/TypePaigong.vue | 145 +++++++++++
 5 files changed, 632 insertions(+)
 create mode 100644 src/api/mes/paigongrecord/index.ts
 create mode 100644 src/views/mes/paigongrecord/PaigongRecordForm.vue
 create mode 100644 src/views/mes/paigongrecord/components/PaigongRecordList.vue
 create mode 100644 src/views/mes/paigongrecord/index.vue
 create mode 100644 src/views/mes/plan/components/TypePaigong.vue

diff --git a/src/api/mes/paigongrecord/index.ts b/src/api/mes/paigongrecord/index.ts
new file mode 100644
index 00000000..8387336d
--- /dev/null
+++ b/src/api/mes/paigongrecord/index.ts
@@ -0,0 +1,51 @@
+import request from '@/config/axios'
+
+// 计划派工记录 VO
+export interface PaigongRecordVO {
+  id: number // id
+  planId: number // 关联计划id
+  pipeline: number // 生产线
+  paigongNum: number // 派工数量
+  isPreProduction: number // 是否试生产
+  paigongTime: Date // 派工时间
+}
+
+// 计划派工记录 API
+export const PaigongRecordApi = {
+  // 查询计划派工记录分页
+  getPaigongRecordPage: async (params: any) => {
+    return await request.get({ url: `/mes/paigong-record/page`, params })
+  },
+
+  // 查询计划派工记录详情
+  getPaigongRecord: async (id: number) => {
+    return await request.get({ url: `/mes/paigong-record/get?id=` + id })
+  },
+
+  // 新增计划派工记录
+  createPaigongRecord: async (data: PaigongRecordVO) => {
+    return await request.post({ url: `/mes/paigong-record/create`, data })
+  },
+
+  // 修改计划派工记录
+  updatePaigongRecord: async (data: PaigongRecordVO) => {
+    return await request.put({ url: `/mes/paigong-record/update`, data })
+  },
+
+  // 删除计划派工记录
+  deletePaigongRecord: async (id: number) => {
+    return await request.delete({ url: `/mes/paigong-record/delete?id=` + id })
+  },
+
+  // 导出计划派工记录 Excel
+  exportPaigongRecord: async (params) => {
+    return await request.download({ url: `/mes/paigong-record/export-excel`, params })
+  },
+
+  // ==================== 子表（领料明细） ====================
+  
+    // 获得领料明细列表
+    getPaigongRecordListByPlanId: async (planId) => {
+      return await request.get({ url: `/mes/paigong-record/list-by-item-plan-id?planId=` + planId })
+    }
+}
diff --git a/src/views/mes/paigongrecord/PaigongRecordForm.vue b/src/views/mes/paigongrecord/PaigongRecordForm.vue
new file mode 100644
index 00000000..33ce9c34
--- /dev/null
+++ b/src/views/mes/paigongrecord/PaigongRecordForm.vue
@@ -0,0 +1,116 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="关联计划id" prop="planId">
+        <el-input v-model="formData.planId" placeholder="请输入关联计划id" />
+      </el-form-item>
+      <el-form-item label="生产线" prop="pipeline">
+        <el-input v-model="formData.pipeline" placeholder="请输入生产线" />
+      </el-form-item>
+      <el-form-item label="派工数量" prop="paigongNum">
+        <el-input v-model="formData.paigongNum" placeholder="请输入派工数量" />
+      </el-form-item>
+      <el-form-item label="是否试生产" prop="isPreProduction">
+        <el-input v-model="formData.isPreProduction" placeholder="请输入是否试生产" />
+      </el-form-item>
+      <el-form-item label="派工时间" prop="paigongTime">
+        <el-date-picker
+          v-model="formData.paigongTime"
+          type="date"
+          value-format="x"
+          placeholder="选择派工时间"
+        />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { PaigongRecordApi, PaigongRecordVO } from '@/api/mes/paigongrecord'
+
+/** 计划派工记录 表单 */
+defineOptions({ name: 'PaigongRecordForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+  id: undefined,
+  planId: undefined,
+  pipeline: undefined,
+  paigongNum: undefined,
+  isPreProduction: undefined,
+  paigongTime: undefined,
+})
+const formRules = reactive({
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await PaigongRecordApi.getPaigongRecord(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as PaigongRecordVO
+    if (formType.value === 'create') {
+      await PaigongRecordApi.createPaigongRecord(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await PaigongRecordApi.updatePaigongRecord(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    planId: undefined,
+    pipeline: undefined,
+    paigongNum: undefined,
+    isPreProduction: undefined,
+    paigongTime: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/paigongrecord/components/PaigongRecordList.vue b/src/views/mes/paigongrecord/components/PaigongRecordList.vue
new file mode 100644
index 00000000..e8789fee
--- /dev/null
+++ b/src/views/mes/paigongrecord/components/PaigongRecordList.vue
@@ -0,0 +1,81 @@
+<template>
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+      <el-table-column label="生产线" align="center" prop="pipelineName" />
+      <el-table-column label="派工数量" align="center" prop="paigongNum" />
+      <el-table-column label="是否试生产" align="center" prop="isPreProduction" >
+      <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_PRE_PRODUCTION" :value="scope.row.isPreProduction" />
+        </template>
+      </el-table-column> 
+      <el-table-column
+        label="派工时间"
+        align="center"
+        prop="paigongTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { PaigongRecordApi, PaigongRecordVO } from '@/api/mes/paigongrecord'
+import { DICT_TYPE } from '@/utils/dict'
+
+/** 计划派工记录 列表 */
+const props = defineProps<{
+  planId?: number // 计划ID（主表的关联字段）
+}>()
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PaigongRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  planId: undefined,
+  pipeline: undefined,
+  paigongNum: undefined,
+  isPreProduction: undefined,
+  paigongTime: [],
+  createTime: [],
+})
+
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    list.value = await PaigongRecordApi.getPaigongRecordListByPlanId(props.planId)
+  } finally {
+    loading.value = false
+  }
+}
+
+
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/mes/paigongrecord/index.vue b/src/views/mes/paigongrecord/index.vue
new file mode 100644
index 00000000..153aabaf
--- /dev/null
+++ b/src/views/mes/paigongrecord/index.vue
@@ -0,0 +1,239 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <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="生产线" prop="pipeline">
+        <el-input
+          v-model="queryParams.pipeline"
+          placeholder="请输入生产线"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="派工数量" prop="paigongNum">
+        <el-input
+          v-model="queryParams.paigongNum"
+          placeholder="请输入派工数量"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="是否试生产" prop="isPreProduction">
+        <el-input
+          v-model="queryParams.isPreProduction"
+          placeholder="请输入是否试生产"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="派工时间" prop="paigongTime">
+        <el-date-picker
+          v-model="queryParams.paigongTime"
+          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-220px"
+        />
+      </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-220px"
+        />
+      </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:paigong-record:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['mes:paigong-record:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <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="planId" />
+      <el-table-column label="生产线" align="center" prop="pipeline" />
+      <el-table-column label="派工数量" align="center" prop="paigongNum" />
+      <el-table-column label="是否试生产" align="center" prop="isPreProduction" />
+      <el-table-column
+        label="派工时间"
+        align="center"
+        prop="paigongTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      />
+      <el-table-column label="操作" align="center" min-width="120px">
+        <template #default="scope">
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['mes:paigong-record:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['mes:paigong-record:delete']"
+          >
+            删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <PaigongRecordForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { PaigongRecordApi, PaigongRecordVO } from '@/api/mes/paigongrecord'
+import PaigongRecordForm from './PaigongRecordForm.vue'
+
+/** 计划派工记录 列表 */
+defineOptions({ name: 'PaigongRecord' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<PaigongRecordVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  planId: undefined,
+  pipeline: undefined,
+  paigongNum: undefined,
+  isPreProduction: undefined,
+  paigongTime: [],
+  createTime: [],
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await PaigongRecordApi.getPaigongRecordPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await PaigongRecordApi.deletePaigongRecord(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await PaigongRecordApi.exportPaigongRecord(queryParams)
+    download.excel(data, '计划派工记录.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+})
+</script>
\ No newline at end of file
diff --git a/src/views/mes/plan/components/TypePaigong.vue b/src/views/mes/plan/components/TypePaigong.vue
new file mode 100644
index 00000000..ce49f757
--- /dev/null
+++ b/src/views/mes/plan/components/TypePaigong.vue
@@ -0,0 +1,145 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+    <el-form-item label="生产线" prop="pipeline">
+        <el-tree-select
+                  v-model="formData.pipeline"
+                  :data="organizationTree"
+                  :props="defaultProps"
+                  check-strictly
+                  default-expand-all
+                  placeholder="请选择生产线"
+                />
+      </el-form-item>
+      <el-form-item label="派工数量" prop="paigongNum">
+        <el-input v-model="formData.paigongNum" placeholder="请输入数量" />
+      </el-form-item>
+      <el-form-item label="是否试生产" prop="isPreProduction">
+        <el-radio-group v-model="formData.isPreProduction">
+          <el-radio
+            v-for="dict in getIntDictOptions(DICT_TYPE.MES_PRE_PRODUCTION)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-form>
+
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">提 交</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { ItemRequisitionVO } from '@/api/mes/itemrequisition'
+import {PlanApi} from "@/api/mes/plan";
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
+import * as UserApi from "@/api/system/user";
+import {WorkTeamApi} from "@/api/mes/workteam";
+import { OrganizationApi } from '@/api/mes/organization'
+import { defaultProps, handleTree } from '@/utils/tree'
+
+
+/** 生产领料 表单 */
+defineOptions({ name: 'TypePaigong' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+const organizationTree = ref() // 树形结构
+
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const userList = ref<UserApi.UserVO[]>([]) // 用户列表
+const formData = ref({
+  requisitionDate: undefined,
+  deliveryDate: undefined,
+  planId: undefined,
+  workerId: undefined,
+  remark: undefined,
+  feedingPipeline: undefined,
+  pipeline: undefined,
+  paigongNum: undefined,
+  isPreProduction: undefined
+})
+const formRules = reactive({
+  pipeline: [{ required: true, message: '生产线不能为空', trigger: 'blur' }],
+  isPreProduction: [{ required: true, message: '试生产不能为空', trigger: 'blur' }],
+  paigongNum: [{ required: true, message: '派工数量不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (planCode: string, planId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = "计划派工："+planCode
+  resetForm()
+  formLoading.value = true
+  try {
+    formData.value.planId = planId
+  } finally {
+    formLoading.value = false
+  }
+  // 获得制浆工人列表
+  userList.value = await WorkTeamApi.getUserList("zhijiang", '')
+  await getOrganizationTree()
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as ItemRequisitionVO
+
+    await PlanApi.arrangePlanNum(data)
+    message.success("派工成功！")
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    requisitionDate: undefined,
+    deliveryDate: undefined,
+    workerId: undefined,
+    feedingPipeline: undefined,
+    planId: undefined,
+    remark: undefined,
+    pipeline: undefined,
+    paigongNum: undefined,
+    isPreProduction: 0,
+  }
+  formRef.value?.resetFields()
+}
+
+/** 获得产线工位树 */
+const getOrganizationTree = async () => {
+  organizationTree.value = []
+  const req = {orgClass:'pipeline'}
+  const data = await OrganizationApi.getOrganizationList(req)
+  const root: Tree = { id: 0, name: '顶级产线工位', children: [] }
+  root.children = handleTree(data, 'id', 'parentId')
+  organizationTree.value.push(root)
+}
+</script>