From 20701187a8ebadd96369ac25e449d8a78cdfb79c Mon Sep 17 00:00:00 2001
From: kkk-ops <1050738955@qq.com>
Date: Thu, 25 Dec 2025 15:38:50 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E8=AE=A1=E5=88=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.prod                                     |   2 +-
 src/api/mes/task/index.ts                     |   1 +
 src/api/mes/zjproduct/index.ts                |  45 ++++
 .../erp/stock/warehouse/WarehouseForm.vue     |   4 +-
 .../mes/machine/MachineComponentForm.vue      |   4 +-
 .../mes/organization/OrganizationForm.vue     |  21 +-
 src/views/mes/organization/index.vue          |  28 +-
 src/views/mes/plan/PlanForm.vue               |  37 +--
 src/views/mes/plan/components/Paigong.vue     |  77 ++++--
 src/views/mes/plan/index.vue                  |  42 +--
 src/views/mes/task/TaskForm.vue               |  18 +-
 .../mes/task/components/TaskDetailForm.vue    |  51 ++--
 .../mes/task/components/TaskDetailList.vue    |   9 +-
 .../mes/task/components/TaskDetailView.vue    |  10 +-
 src/views/mes/task/index.vue                  |   4 +-
 .../tasksummary/components/TaskDetailList.vue |  12 +-
 src/views/mes/tasksummary/index.vue           |  12 +-
 src/views/mes/workteam/WorkTeamForm.vue       |  10 +-
 .../components/WorkTeamDetailForm.vue         |   4 +-
 .../components/WorkTeamDetailList.vue         |   3 +-
 src/views/mes/zjproduct/ProductForm.vue       | 243 +++++++++++++++++
 .../zjproduct/components/ZjProductForm.vue    | 132 ++++++++++
 .../zjproduct/components/ZjProductList.vue    | 248 ++++++++++++++++++
 src/views/mes/zjproduct/index.vue             | 201 ++++++++++++++
 src/views/system/post/PostForm.vue            |   5 +-
 25 files changed, 1078 insertions(+), 145 deletions(-)
 create mode 100644 src/api/mes/zjproduct/index.ts
 create mode 100644 src/views/mes/zjproduct/ProductForm.vue
 create mode 100644 src/views/mes/zjproduct/components/ZjProductForm.vue
 create mode 100644 src/views/mes/zjproduct/components/ZjProductList.vue
 create mode 100644 src/views/mes/zjproduct/index.vue

diff --git a/.env.prod b/.env.prod
index 1a6841b0..7243794d 100644
--- a/.env.prod
+++ b/.env.prod
@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://192.168.5.119:48081'
+VITE_BASE_URL='http://192.168.5.119:48081'  
 
 # 文件上传类型：server - 后端上传， client - 前端直连上传，仅支持S3服务
 VITE_UPLOAD_TYPE=server
diff --git a/src/api/mes/task/index.ts b/src/api/mes/task/index.ts
index 6ea315de..42eef4f8 100644
--- a/src/api/mes/task/index.ts
+++ b/src/api/mes/task/index.ts
@@ -43,6 +43,7 @@ export interface TaskDetailVO {
   arriveDate: Date // 到达时间
   barCode: string // 条码
   attachment: string // 附件
+  taskDetailId: string
 }
 // 生产任务单 API
 export const TaskApi = {
diff --git a/src/api/mes/zjproduct/index.ts b/src/api/mes/zjproduct/index.ts
new file mode 100644
index 00000000..e928986a
--- /dev/null
+++ b/src/api/mes/zjproduct/index.ts
@@ -0,0 +1,45 @@
+import request from '@/config/axios'
+
+// 质量管理-质检参数 VO
+export interface ZjProductVO {
+  id: number // ID
+  type: string // 工序
+  name: string // 名称
+  unit: string // 单位
+  upperVal: number // 上限值
+  lowerVal: number // 下限值
+  remark: string // 备注
+}
+
+// 质量管理-质检参数 API
+export const ZjProductApi = {
+  // 查询质量管理-质检参数分页
+  getZjProductPage: async (params: any) => {
+    return await request.get({ url: `/mes/zj-product/page`, params })
+  },
+
+  // 查询质量管理-质检参数详情
+  getZjProduct: async (id: number) => {
+    return await request.get({ url: `/mes/zj-product/get?id=` + id })
+  },
+
+  // 新增质量管理-质检参数
+  createZjProduct: async (data: ZjProductVO) => {
+    return await request.post({ url: `/mes/zj-product/create`, data })
+  },
+
+  // 修改质量管理-质检参数
+  updateZjProduct: async (data: ZjProductVO) => {
+    return await request.put({ url: `/mes/zj-product/update`, data })
+  },
+
+  // 删除质量管理-质检参数
+  deleteZjProduct: async (id: number) => {
+    return await request.delete({ url: `/mes/zj-product/delete?id=` + id })
+  },
+
+  // 导出质量管理-质检参数 Excel
+  exportZjProduct: async (params) => {
+    return await request.download({ url: `/mes/zj-product/export-excel`, params })
+  },
+}
\ No newline at end of file
diff --git a/src/views/erp/stock/warehouse/WarehouseForm.vue b/src/views/erp/stock/warehouse/WarehouseForm.vue
index ea88a18c..597c169d 100644
--- a/src/views/erp/stock/warehouse/WarehouseForm.vue
+++ b/src/views/erp/stock/warehouse/WarehouseForm.vue
@@ -25,7 +25,7 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="仓储费" prop="warehousePrice">
+      <!-- <el-form-item label="仓储费" prop="warehousePrice">
         <el-input-number
           v-model="formData.warehousePrice"
           placeholder="请输入仓储费，单位：元/天/KG"
@@ -42,7 +42,7 @@
           :precision="2"
           class="!w-1/1"
         />
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="负责人" prop="principal">
         <el-input v-model="formData.principal" placeholder="请输入负责人" />
       </el-form-item>
diff --git a/src/views/mes/machine/MachineComponentForm.vue b/src/views/mes/machine/MachineComponentForm.vue
index bf33c1de..f166d211 100644
--- a/src/views/mes/machine/MachineComponentForm.vue
+++ b/src/views/mes/machine/MachineComponentForm.vue
@@ -201,8 +201,8 @@
           </el-row>
         </el-collapse-item>
       </el-collapse>
-      <el-form-item label="出厂报告" prop="outgoingReport">
-        <Editor v-model="formData.outgoingReport" height="150px" />
+      <el-form-item label="出厂报告" prop="outgoingReport" style="margin-top:20px">
+        <Editor v-model="formData.outgoingReport" height="180px" />
       </el-form-item>
     </el-form>
     <template #footer>
diff --git a/src/views/mes/organization/OrganizationForm.vue b/src/views/mes/organization/OrganizationForm.vue
index 44e1b84e..1b2be623 100644
--- a/src/views/mes/organization/OrganizationForm.vue
+++ b/src/views/mes/organization/OrganizationForm.vue
@@ -7,12 +7,17 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="编码" prop="code">
+      <el-form-item prop="code">
+        <template #label>
+            <span>
+              编码
+              <el-tooltip content="生产任务单编码规则" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
         <el-input disabled v-model="formData.code" placeholder="保存自动生成" />
       </el-form-item>
-      <el-form-item label="组织名称" prop="name">
-        <el-input v-model="formData.name" placeholder="请输入组织名称" />
-      </el-form-item>
       <el-form-item label="父组织" prop="parentId">
         <el-tree-select
           v-model="formData.parentId"
@@ -23,6 +28,9 @@
           placeholder="请选择父组织"
         />
       </el-form-item>
+      <el-form-item label="组织名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入组织名称" />
+      </el-form-item>
       <el-form-item label="组织等级" prop="orgClass">
         <el-radio-group v-model="formData.orgClass">
           <el-radio
@@ -81,7 +89,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="组织状态" prop="status">
+      <!-- <el-form-item label="组织状态" prop="status">
         <el-radio-group v-model="formData.status">
           <el-radio
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_STATUS)"
@@ -91,8 +99,7 @@
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
-      </el-form-item>
-
+      </el-form-item> -->
     </el-form>
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index b3174792..5904d2b0 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -17,15 +17,6 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="组织名称" prop="name">
-        <el-input
-          v-model="queryParams.name"
-          placeholder="请输入组织名称"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
       <el-form-item label="父组织" prop="parentId">
         <el-tree-select
           v-model="queryParams.parentId"
@@ -38,9 +29,17 @@
           placeholder="请选择父组织"
           class="!w-240px"
         />
-
       </el-form-item>
-      <el-form-item label="组织状态" prop="status">
+      <el-form-item label="组织名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入组织名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <!-- <el-form-item label="组织状态" prop="status">
         <el-select
           v-model="queryParams.status"
           placeholder="请选择组织状态"
@@ -54,7 +53,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="组织等级" prop="orgClass">
         <el-select
           v-model="queryParams.orgClass"
@@ -130,12 +129,11 @@
       <el-table-column label="显示顺序" align="center" prop="sort" />
 <!--      <el-table-column label="负责人" align="center" prop="workerUserId" />-->
       <el-table-column label="关联设备" align="center" prop="machineName" />
-
-      <el-table-column label="组织状态" align="center" prop="status">
+      <!-- <el-table-column label="组织状态" align="center" prop="status">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_STATUS" :value="scope.row.status" />
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="组织等级" align="center" prop="orgClass">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_ORG_CLASS" :value="scope.row.orgClass" />
diff --git a/src/views/mes/plan/PlanForm.vue b/src/views/mes/plan/PlanForm.vue
index 4cf4b147..43d83866 100644
--- a/src/views/mes/plan/PlanForm.vue
+++ b/src/views/mes/plan/PlanForm.vue
@@ -7,12 +7,9 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="计划编码" prop="code">
-        <el-input  v-model="formData.code" placeholder="请输入计划编码" />
-      </el-form-item>
-      <el-form-item label="任务单" prop="taskId">
+    <el-form-item label="任务单" prop="taskId">
         <el-select
-          :disabled='editDisable'
+          disabled
           v-model="formData.taskId"
           clearable
           filterable
@@ -29,7 +26,7 @@
       </el-form-item>
       <el-form-item label="明细项" prop="taskId">
         <el-select
-          :disabled='editDisable'
+          disabled
           v-model="formData.taskDetailId"
           clearable
           filterable
@@ -44,6 +41,9 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="计划编码" prop="code">
+        <el-input  v-model="formData.code" placeholder="请输入计划编码" />
+      </el-form-item>   
 <!--      <el-form-item label="产品" prop="productId">-->
 <!--        <el-select-->
 <!--          :disabled='editDisable'-->
@@ -83,7 +83,7 @@
           placeholder="选择计划结束时间"
         />
       </el-form-item>
-      <el-form-item label="班别" prop="groupType">
+      <!-- <el-form-item label="班别" prop="groupType">
         <el-radio-group v-model="formData.groupType">
           <el-radio
             v-for="dict in getIntDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
@@ -93,7 +93,7 @@
             {{ dict.label }}
           </el-radio>
         </el-radio-group>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="备注" prop="remark">
         <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
@@ -115,7 +115,7 @@ import {getIntDictOptions,DICT_TYPE} from "@/utils/dict";
 /** 生产计划 表单 */
 defineOptions({ name: 'PlanForm' })
 const userList = ref<UserApi.UserVO[]>([]) // 用户列表
-const productList = ref<ProductVO[]>([]) // 用户列表
+const productList = ref<ProductVO[]>([]) // 产品列表
 const taskList = ref<TaskVO[]>([]) // 用户列表
 const taskDetailList = ref<TaskDetailVO[]>([]) // 用户列表
 
@@ -159,23 +159,28 @@ const formRef = ref() // 表单 Ref
 
 /** 打开弹窗 */
 const open = async (type: string, id?: number,
-                    taskId?: number, productId?: number, number?: number, taskDetailId?:number) => {
+                    taskId?: number, productId?: number, number?: number, taskDetailId?:string) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   editDisable.value = false
   resetForm()
-  if(taskId)
-    formData.value.taskId = taskId
+  if(taskId) {
+   formData.value.taskId = taskId
+    taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
+   if(taskDetailId){
+    const taskDetails = taskDetailList.value.filter(item => item.id === Number(taskDetailId.split(',')[0]))
+    if(taskDetails && taskDetails.length > 0 && taskDetails[0].id) {
+        formData.value.taskDetailId = taskDetails[0].id
+    }      
+  }  
+  } 
   if(productId)
     formData.value.productId = productId
   if(number){
     formData.value.planNumber = number
     formData.value.reyaNumber = number
   }
-  if(taskDetailId){
-    formData.value.taskDetailId = taskDetailId
-  }
   if(type==='update'){
     editDisable.value = true
   }
@@ -194,8 +199,6 @@ const open = async (type: string, id?: number,
   //productList.value = await ProductApi.getMesProductSimpleList()
   // 列表
   taskList.value = await TaskApi.getPlanTaskList()
-  if(taskId)
-    taskDetailList.value =await TaskApi.getTaskDetailListByTaskId(formData.value.taskId)
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
diff --git a/src/views/mes/plan/components/Paigong.vue b/src/views/mes/plan/components/Paigong.vue
index 473bc32e..8db50af0 100644
--- a/src/views/mes/plan/components/Paigong.vue
+++ b/src/views/mes/plan/components/Paigong.vue
@@ -7,20 +7,20 @@
       label-width="100px"
       v-loading="formLoading"
     >
-
+    <el-collapse v-model="activeNames">
+        <el-collapse-item title="下料派工" name="1">
       <el-form-item v-show="false" label="计划" prop="planId">
         <el-input v-model="formData.planId" placeholder="请输入计划ID" />
       </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 label="制浆线" prop="feedingPipeline">
+        <el-tree-select
+                  v-model="formData.feedingPipeline"
+                  :data="organizationTree"
+                  :props="defaultProps"
+                  check-strictly
+                  default-expand-all
+                  placeholder="请选择制浆线"
+                />
       </el-form-item>
       <el-form-item label="领料人" prop="workerId">
         <el-select
@@ -28,7 +28,6 @@
           clearable
           filterable
           placeholder="请选择工人"
-          class="!w-240px"
         >
           <el-option
             v-for="item in userList"
@@ -46,11 +45,37 @@
           placeholder="选择下料时间"
         />
       </el-form-item>
-
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
       </el-form-item>
-
+    </el-collapse-item>
+    <el-collapse-item title="工序派工" name="2">
+      <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 >
+          <el-radio
+            v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+            :key="dict.value"
+            :label="dict.value"
+          >
+            {{ dict.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+    </el-collapse-item>
+</el-collapse>
     </el-form>
 
     <template #footer>
@@ -62,9 +87,11 @@
 <script setup lang="ts">
 import { ItemRequisitionApi, ItemRequisitionVO } from '@/api/mes/itemrequisition'
 import {PlanApi} from "@/api/mes/plan";
-import {DICT_TYPE, getStrDictOptions} from "@/utils/dict";
+import {DICT_TYPE, getBoolDictOptions} from "@/utils/dict";
 import * as UserApi from "@/api/system/user";
 import {WorkTeamApi} from "@/api/mes/workteam";
+import { OrganizationApi, OrganizationVO } from '@/api/mes/organization'
+import { defaultProps, handleTree } from '@/utils/tree'
 
 
 /** 生产领料 表单 */
@@ -72,19 +99,24 @@ defineOptions({ name: 'Paigong' })
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+const organizationTree = ref() // 树形结构
+// 默认展开 name="1" 和 name="2" 的项
+const activeNames = ref(['1', '2'])
 
 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
+  feedingPipeline: undefined,
+  pipeline: undefined,
+  paigongNum: undefined,
+  isPreProduction: undefined
 })
 const formRules = reactive({
   planId: [{ required: true, message: '计划不能为空', trigger: 'blur' }],
@@ -106,6 +138,7 @@ const open = async (planCode: string, planId: number) => {
   }
   // 获得制浆工人列表
   userList.value = await WorkTeamApi.getUserList("zhijiang", '')
+  await getOrganizationTree()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -142,4 +175,14 @@ const resetForm = () => {
   }
   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>
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index c0d8043e..7416831a 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -8,8 +8,6 @@
       :inline="true"
       label-width="68px"
     >
-      <el-row>
-        <el-col :span="6">
           <el-form-item label="任务单" prop="taskId">
             <el-select
               v-model="queryParams.taskId"
@@ -27,8 +25,6 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="计划编码" prop="code">
             <el-input
               v-model="queryParams.code"
@@ -38,8 +34,6 @@
               class="!w-180px"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="产品" prop="productId">
             <el-select
               v-model="queryParams.productId"
@@ -57,8 +51,6 @@
               />
             </el-select>
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="备注" prop="remark">
             <el-input
               v-model="queryParams.remark"
@@ -68,10 +60,6 @@
               class="!w-180px"
             />
           </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="6">
           <el-form-item label="计划开始" prop="planStartTime">
             <el-date-picker
               v-model="queryParams.planStartTime"
@@ -81,11 +69,9 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-              class="!w-160px"
+              class="!w-240px"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="6">
           <el-form-item label="计划结束" prop="planEndTime">
             <el-date-picker
               v-model="queryParams.planEndTime"
@@ -95,22 +81,20 @@
               start-placeholder="开始日期"
               end-placeholder="结束日期"
               :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-              class="!w-160px"
+              class="!w-240px"
             />
           </el-form-item>
-        </el-col>
-        <el-col :span="12">
           <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
+            <!-- <el-button
               type="primary"
               plain
               @click="openForm('create')"
               v-hasPermi="['mes:plan:create']"
             >
               <Icon icon="ep:plus" class="mr-5px" /> 新增
-            </el-button>
+            </el-button> -->
             <el-button
               type="success"
               plain
@@ -121,18 +105,16 @@
               <Icon icon="ep:download" class="mr-5px" /> 导出
             </el-button>
           </el-form-item>
-        </el-col>
-      </el-row>
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
   <ContentWrap>
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
-      <el-tab-pane label="所有" name="" />
-      <el-tab-pane label="计划" name="0" />
-      <el-tab-pane label="派工" name="1" />
-      <el-tab-pane label="开工" name="2" />
+      <!-- <el-tab-pane label="所有" name="" /> -->
+      <el-tab-pane label="派工" name="0" />
+      <el-tab-pane label="开工" name="1" />
+      <el-tab-pane label="生产" name="2" />
       <el-tab-pane label="暂停" name="3" />
       <el-tab-pane label="完工" name="4" />
       <el-tab-pane label="入库" name="5" />
@@ -269,6 +251,7 @@ import {TaskApi, TaskVO} from "@/api/mes/task";
 import ItemNeedIndex from "@/views/mes/bom/ItemNeedIndex.vue";
 import Paigong from "./components/Paigong.vue";
 import ItemRequisitionDetailList from "@/views/mes/itemrequisition/components/ItemRequisitionDetailList.vue";
+import router from '@/router'
 
 
 const productList = ref<ProductVO[]>([]) // 产品列表
@@ -364,9 +347,9 @@ const handleExport = async () => {
   }
 }
 
+
 /** 初始化 **/
 onMounted(async () => {
-
   //处理其他页面跳转过来的参数
   if(query.taskId)
     queryParams.taskId = String(query.taskId)
@@ -375,6 +358,9 @@ onMounted(async () => {
   // 加载产品、任务单
   productList.value = await ProductApi.getMesProductSimpleList()
   taskList.value = await TaskApi.getTaskList()
+  if(!query.taskId || !query.productId) {
+     queryParams.status = '0'
+  }
   await getList()
 
 })
@@ -410,7 +396,7 @@ const handleStatus = async (planCode:string, id: number,
 }
 
 /** tab 切换 */
-let activeName = ''
+let activeName = '0'
 const handleTabClick = (tab: TabsPaneContext) => {
   queryParams.status = tab.paneName
   handleQuery()
diff --git a/src/views/mes/task/TaskForm.vue b/src/views/mes/task/TaskForm.vue
index 025e0f90..907541a7 100644
--- a/src/views/mes/task/TaskForm.vue
+++ b/src/views/mes/task/TaskForm.vue
@@ -7,7 +7,15 @@
       label-width="100px"
       v-loading="formLoading"
     >
-      <el-form-item label="编码" prop="code">
+      <el-form-item prop="code">
+        <template #label>
+            <span>
+              编码
+              <el-tooltip content="生产任务单编码规则" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
         <el-input :disabled="formType==='create'" v-model="formData.code" placeholder="编码保存后自动生成" />
       </el-form-item>
       <el-form-item label="交货日期" prop="deliveryDate">
@@ -19,6 +27,14 @@
         />
       </el-form-item>
       <el-form-item label="任务类型" prop="taskType">
+        <template #label>
+            <span>
+              类型
+              <el-tooltip content="来源：数据字典-任务单类型" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
         <el-radio-group v-model="formData.taskType">
           <el-radio
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_TASK_TYPE)"
diff --git a/src/views/mes/task/components/TaskDetailForm.vue b/src/views/mes/task/components/TaskDetailForm.vue
index ca6404ab..ea5b69e6 100644
--- a/src/views/mes/task/components/TaskDetailForm.vue
+++ b/src/views/mes/task/components/TaskDetailForm.vue
@@ -15,6 +15,7 @@
               v-model="formData.productId"
               clearable
               filterable
+              @change="onChangeProduct(formData.productId)"
               placeholder="请选择产品"
             >
               <el-option
@@ -27,21 +28,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="单位" prop="unitId">
-            <el-select
-              disabled
-              v-model="formData.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 label="单位" prop="unitName">
+            <el-input v-model="formData.unitName" disabled/>
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -62,17 +50,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="每包/个" prop="packageSize">
+          <el-form-item label="每包数量" prop="packageSize">
             <el-input-number
               v-model="formData.packageSize"
               :min="0"
               class="!w-1/1"
-              placeholder="请输入打包要求(每包/个)"
+              placeholder="请输入打包要求"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="打包数/包" prop="packageNumber">
+          <el-form-item label="打包数量" prop="packageNumber">
             <el-input-number
               v-model="formData.packageNumber"
               :min="0"
@@ -83,11 +71,11 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="条码" prop="barCode">
             <el-input v-model="formData.barCode" placeholder="请输入条码" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="技术要求" prop="techRequirements">
             <el-input v-model="formData.techRequirements" placeholder="请输入技术要求" />
@@ -158,6 +146,7 @@ const formData = ref({
   id: undefined,
   productId: undefined,
   unitId: undefined,
+  unitName: undefined,
   taskId: undefined,
   number: undefined,
   packageSize: undefined,
@@ -199,13 +188,13 @@ const open = async (type: string, id?: number, taskId: number) => {
   }
   // 产品单位
   //unitList.value = await ProductUnitApi.getProductUnitSimpleList()
-  unitList.value= [
-    {
-      id: 5,
-      name: '个',
-    },
-  ]
-  formData.value.unitId = 5
+  // unitList.value= [
+  //   {
+  //     id: 5,
+  //     name: '个',
+  //   },
+  // ]
+  // formData.value.unitId = 5
   productList.value = await ProductApi.getMesProductSimpleList()
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
@@ -234,6 +223,14 @@ const submitForm = async () => {
   }
 }
 
+/** 处理产品变更 */
+const onChangeProduct = (productId) => {
+  const product = productList.value.find((item) => item.id === productId)
+  if (product) {
+    formData.value.unitName = product.unitName
+  }
+}
+
 /** 重置表单 */
 const resetForm = () => {
   formData.value = {
diff --git a/src/views/mes/task/components/TaskDetailList.vue b/src/views/mes/task/components/TaskDetailList.vue
index a968c14b..4e06e2d5 100644
--- a/src/views/mes/task/components/TaskDetailList.vue
+++ b/src/views/mes/task/components/TaskDetailList.vue
@@ -10,13 +10,14 @@
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="产品"  prop="productName" width="220px" sortable/>
-<!--      <el-table-column label="单位" align="center" prop="unitName" />-->
-       <el-table-column label="数量/个" align="center" prop="number" />
+      <el-table-column label="产品编码"  prop="barCode"/>
+      <el-table-column label="产品名称"  prop="productName" sortable/>
+     <el-table-column label="单位" align="center" prop="unitName" />
+       <el-table-column label="数量" align="center" prop="number" />
       <el-table-column label="已计划" align="center" prop="planNumber" />
 <!--      <el-table-column label="每包/个" align="center" prop="packageSize" />-->
       <el-table-column label="交货日期" align="center" prop="finishDate" :formatter="dateFormatter2"/>
-      <el-table-column label="项目名称" align="center" prop="projectName" />
+      <!-- <el-table-column label="项目名称" align="center" prop="projectName" /> -->
       <el-table-column label="技术要求" align="center" prop="techRequirements" />
 
       <el-table-column label="操作" align="center" width="300px">
diff --git a/src/views/mes/task/components/TaskDetailView.vue b/src/views/mes/task/components/TaskDetailView.vue
index 1d0cf93a..5089f81c 100644
--- a/src/views/mes/task/components/TaskDetailView.vue
+++ b/src/views/mes/task/components/TaskDetailView.vue
@@ -62,17 +62,17 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="每包/个" prop="packageSize">
+          <el-form-item label="每包数量" prop="packageSize">
             <el-input-number
               v-model="formData.packageSize"
               :min="0"
               class="!w-1/1"
-              placeholder="请输入打包要求(每包/个)"
+              placeholder="请输入打包要求"
             />
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="打包数/包" prop="packageNumber">
+          <el-form-item label="打包数量" prop="packageNumber">
             <el-input-number
               v-model="formData.packageNumber"
               :min="0"
@@ -83,11 +83,11 @@
         </el-col>
       </el-row>
       <el-row>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="条码" prop="barCode">
             <el-input v-model="formData.barCode" placeholder="请输入条码" />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <el-col :span="8">
           <el-form-item label="技术要求" prop="techRequirements">
             <el-input v-model="formData.techRequirements" placeholder="请输入技术要求" />
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index fff2e3e4..5a8432e9 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -134,9 +134,9 @@
             物料
           </el-button>
           <!-- 下达后不可更改-->
-          <el-button v-if="scope.row.status<2" link type="success" @click="openSaleForm(scope.row.id)" v-hasPermi="['mes:task:update']">
+          <!-- <el-button v-if="scope.row.status<2" link type="success" @click="openSaleForm(scope.row.id)" v-hasPermi="['mes:task:update']">
             销售单
-          </el-button>
+          </el-button> -->
           <el-button v-if="scope.row.status<2" link type="primary" @click="openForm('update', scope.row.id)" v-hasPermi="['mes:task:update']">
             编辑
           </el-button>
diff --git a/src/views/mes/tasksummary/components/TaskDetailList.vue b/src/views/mes/tasksummary/components/TaskDetailList.vue
index 5d269426..fa520c7d 100644
--- a/src/views/mes/tasksummary/components/TaskDetailList.vue
+++ b/src/views/mes/tasksummary/components/TaskDetailList.vue
@@ -4,7 +4,8 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
       <el-table-column label="任务单" align="center" prop="taskCode" />
-      <el-table-column label="产品" align="center" prop="productName" sortable/>
+      <el-table-column label="产品编码" align="center" prop="barCode" />
+      <el-table-column label="产品名称" align="center" prop="productName" sortable/>
        <el-table-column label="任务总数" align="center" prop="totalNumber" />
       <el-table-column label="已计划" align="center" prop="planNumber" />
       <el-table-column label="未计划" align="center">
@@ -37,7 +38,7 @@
             link
             type="success"
             @click="addPlanForm(scope.row.taskId, scope.row.productId,
-            scope.row.totalNumber - scope.row.planNumber)"
+            scope.row.totalNumber - scope.row.planNumber,scope.row.taskDetailIds)"
             v-hasPermi="['mes:task:plan']"
           >
             新增计划
@@ -102,18 +103,19 @@ const handleQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const addPlanForm = (taskId: number, productId: number, number?: number) => {
+const addPlanForm = (taskId: number, productId: number, number?: number, taskDetailIds?: string) => {
   if (!props.taskId) {
     message.error('请选择一个生产任务单')
     return
   }
-  formRef.value.open('create', undefined, taskId, productId, number)
+  formRef.value.open('create', undefined, taskId, productId, number,taskDetailIds)
 }
+const route = useRoute()
 /** 跳转生产计划页面**/
 const openPlan = (taskId: number, productId: number) => {
   // 跳转页面并设置请求参数，使用 `query` 属性
+  route.matched.filter(item => item.meta?.title)[1].meta.title = String(taskId) + String(productId)
   push('/mes/plan?taskId=' + taskId + '&productId=' + productId)
-
 }
 
 /** 物料需求 */
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index 178d616d..5a4e31ce 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -6,9 +6,9 @@
       :model="queryParams"
       ref="queryFormRef"
       :inline="true"
-      label-width="68px"
+      label-width="85px"
     >
-      <el-form-item label="编码" prop="code">
+      <el-form-item label="任务单编码" prop="code">
         <el-input
           v-model="queryParams.code"
           placeholder="请输入编码"
@@ -17,7 +17,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="下达" prop="orderDate">
+      <el-form-item label="下达时间" prop="orderDate">
         <el-date-picker
           v-model="queryParams.orderDate"
           @change="handleQuery"
@@ -29,7 +29,7 @@
           class="!w-240px"
         />
       </el-form-item>
-      <el-form-item label="交货" prop="deliveryDate">
+      <el-form-item label="交货时间" prop="deliveryDate">
         <el-date-picker
           v-model="queryParams.deliveryDate"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -115,9 +115,9 @@
           <el-button link type="primary" @click="openPlan(scope.row.id)" v-hasPermi="['mes:plan:query']">
             查看计划
           </el-button>
-          <el-button link v-if="scope.row.status<5" type="success" @click="openTaskPlanForm(scope.row.id, scope.row.code)" v-hasPermi="['mes:task:plan']">
+          <!-- <el-button link v-if="scope.row.status<5" type="success" @click="openTaskPlanForm(scope.row.id, scope.row.code)" v-hasPermi="['mes:task:plan']">
             排产
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
diff --git a/src/views/mes/workteam/WorkTeamForm.vue b/src/views/mes/workteam/WorkTeamForm.vue
index 9d6e396c..aa8db1e0 100644
--- a/src/views/mes/workteam/WorkTeamForm.vue
+++ b/src/views/mes/workteam/WorkTeamForm.vue
@@ -29,7 +29,15 @@
           </el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="班组类型" prop="groupType">
+      <el-form-item prop="groupType">
+        <template #label>
+            <span>
+              班组类型
+              <el-tooltip content="来源：数据字典-班组类型" placement="top">
+                <Icon icon="ep:question-filled" />
+              </el-tooltip>
+            </span>
+        </template>
         <el-radio-group v-model="formData.groupType">
           <el-radio
             v-for="dict in getStrDictOptions(DICT_TYPE.MES_GROUP_TYPE)"
diff --git a/src/views/mes/workteam/components/WorkTeamDetailForm.vue b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
index b9253aa8..0c14a07f 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailForm.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailForm.vue
@@ -7,8 +7,8 @@
       label-width="100px"
       v-loading="formLoading"
     >
-       <el-form-item label="成员" prop="userId">
-         <el-select v-model="formData.userId" clearable filterable placeholder="请输入成员">
+       <el-form-item label="工号" prop="userId">
+         <el-select v-model="formData.userId" clearable filterable placeholder="请选择工号">
            <el-option
              v-for="item in userList"
              :key="item.id"
diff --git a/src/views/mes/workteam/components/WorkTeamDetailList.vue b/src/views/mes/workteam/components/WorkTeamDetailList.vue
index 6cd9f0a0..e4bc43fd 100644
--- a/src/views/mes/workteam/components/WorkTeamDetailList.vue
+++ b/src/views/mes/workteam/components/WorkTeamDetailList.vue
@@ -11,7 +11,8 @@
     </el-button>
     <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="成员" align="center" prop="userName" />
+      <el-table-column label="工号" align="center" prop="nickName" />
+      <!-- <el-table-column label="成员名称" align="center" prop="userName" /> -->
       <el-table-column label="角色" align="center" prop="userRole">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.MES_WORK_TEAM_USER_ROLE" :value="scope.row.userRole" />
diff --git a/src/views/mes/zjproduct/ProductForm.vue b/src/views/mes/zjproduct/ProductForm.vue
new file mode 100644
index 00000000..f42c3e94
--- /dev/null
+++ b/src/views/mes/zjproduct/ProductForm.vue
@@ -0,0 +1,243 @@
+<!-- ERP 产品的新增/修改 -->
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+      <el-row :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="编码" prop="barCode">
+            <el-input v-model="formData.barCode" placeholder="请输入编码" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="名称" prop="name">
+            <el-input v-model="formData.name" placeholder="请输入名称" />
+          </el-form-item>
+        </el-col>       
+        <el-col :span="12">
+          <el-form-item label="分类" prop="categoryId">
+            <el-tree-select
+              v-model="formData.categoryId"
+              :data="categoryList"
+              :props="defaultProps"
+              check-strictly
+              default-expand-all
+              placeholder="请选择分类"
+              class="w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="单位" prop="unitId">
+            <el-select v-model="formData.unitId" clearable placeholder="请选择单位" class="w-1/1">
+              <el-option
+                v-for="unit in unitList"
+                :key="unit.id"
+                :label="unit.name"
+                :value="unit.id"
+              />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="规格" prop="standard">
+            <el-input v-model="formData.standard" placeholder="请输入规格" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="保质期天数" prop="expiryDay">
+            <el-input-number
+              v-model="formData.expiryDay"
+              placeholder="请输入保质期天数"
+              :min="0"
+              :precision="0"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="重量（g）" prop="weight">
+            <el-input-number
+              v-model="formData.weight"
+              placeholder="请输入重量（g）"
+              :min="0"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="采购价格" prop="purchasePrice">
+            <el-input-number
+              v-model="formData.purchasePrice"
+              placeholder="请输入采购价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="销售价格" prop="salePrice">
+            <el-input-number
+              v-model="formData.salePrice"
+              placeholder="请输入销售价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="最低价格" prop="minPrice">
+            <el-input-number
+              v-model="formData.minPrice"
+              placeholder="请输入最低价格，单位：元"
+              :min="0"
+              :precision="2"
+              class="!w-1/1"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="24">
+          <el-form-item label="备注" prop="remark">
+            <el-input type="textarea" v-model="formData.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+    </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 { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
+import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
+import { CommonStatusEnum } from '@/utils/constants'
+import { defaultProps, handleTree } from '@/utils/tree'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+
+/** ERP 产品 表单 */
+defineOptions({ name: 'ProductForm' })
+
+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,
+  name: undefined,
+  barCode: undefined,
+  categoryId: undefined,
+  unitId: undefined,
+  status: undefined,
+  standard: undefined,
+  remark: undefined,
+  expiryDay: undefined,
+  weight: undefined,
+  purchasePrice: undefined,
+  salePrice: undefined,
+  minPrice: undefined,
+  safetyNumber: undefined
+})
+const formRules = reactive({
+  name: [{ required: true, message: '产品名称不能为空', trigger: 'blur' }],
+  barCode: [{ required: true, message: '产品条码不能为空', trigger: 'blur' }],
+  categoryId: [{ required: true, message: '产品分类编号不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位编号不能为空', trigger: 'blur' }],
+  status: [{ required: true, message: '产品状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
+const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
+
+/** 打开弹窗 */
+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 ProductApi.getProduct(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+  // 产品分类
+  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
+  categoryList.value = handleTree(categoryData, 'id', 'parentId')
+  // 产品单位
+  unitList.value = await ProductUnitApi.getProductUnitSimpleList()
+}
+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 ProductVO
+    if (formType.value === 'create') {
+      await ProductApi.createProduct(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ProductApi.updateProduct(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    name: undefined,
+    barCode: undefined,
+    categoryId: undefined,
+    unitId: undefined,
+    status: CommonStatusEnum.ENABLE,
+    standard: undefined,
+    remark: undefined,
+    expiryDay: undefined,
+    weight: undefined,
+    purchasePrice: undefined,
+    salePrice: undefined,
+    minPrice: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mes/zjproduct/components/ZjProductForm.vue b/src/views/mes/zjproduct/components/ZjProductForm.vue
new file mode 100644
index 00000000..7b8704f7
--- /dev/null
+++ b/src/views/mes/zjproduct/components/ZjProductForm.vue
@@ -0,0 +1,132 @@
+<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="type">
+       <el-select
+              v-model="formData.type"
+              placeholder="请选择工序"
+              clearable
+            >
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input v-model="formData.name" placeholder="请输入名称" />
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input v-model="formData.unit" placeholder="请输入单位" />
+      </el-form-item>
+      <el-form-item label="上限值" prop="upperVal">
+        <el-input v-model="formData.upperVal" placeholder="请输入上限值" />
+      </el-form-item>
+      <el-form-item label="下限值" prop="lowerVal">
+        <el-input v-model="formData.lowerVal" placeholder="请输入下限值" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" 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 { ZjProductApi, ZjProductVO } from '@/api/mes/zjproduct'
+import {DICT_TYPE,getStrDictOptions} from '@/utils/dict'
+
+/** 质量管理-质检参数 表单 */
+defineOptions({ name: 'ZjProductForm' })
+
+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,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  remark: undefined,
+  productId: undefined,
+})
+const formRules = reactive({
+  type: [{ required: true, message: '工序不能为空', trigger: 'change' }],
+  name: [{ required: true, message: '名称不能为空', trigger: 'blur' }],
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number, productId: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  formData.value.productId = productId
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await ZjProductApi.getZjProduct(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 ZjProductVO
+    if (formType.value === 'create') {
+      await ZjProductApi.createZjProduct(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await ZjProductApi.updateZjProduct(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    type: undefined,
+    name: undefined,
+    unit: undefined,
+    upperVal: undefined,
+    lowerVal: undefined,
+    remark: undefined,
+  }
+  formRef.value?.resetFields()
+}
+</script>
\ No newline at end of file
diff --git a/src/views/mes/zjproduct/components/ZjProductList.vue b/src/views/mes/zjproduct/components/ZjProductList.vue
new file mode 100644
index 00000000..7b935c63
--- /dev/null
+++ b/src/views/mes/zjproduct/components/ZjProductList.vue
@@ -0,0 +1,248 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="工序" prop="type">
+        <el-select
+              v-model="queryParams.type"
+              placeholder="请选择工序"
+              clearable
+              class="!w-180px"
+            >
+              <el-option
+                v-for="dict in getStrDictOptions(DICT_TYPE.MES_ORG_TYPE)"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+              />
+            </el-select>
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input
+          v-model="queryParams.remark"
+          placeholder="请输入备注"
+          clearable
+          @keyup.enter="handleQuery"
+          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-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="['erp:product:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:product: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="工序" align="center" prop="type">
+      <template #default="scope">
+          <dict-tag :type="DICT_TYPE.MES_ORG_TYPE" :value="scope.row.type" />
+        </template>
+      </el-table-column>  
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="单位" align="center" prop="unit" />
+      <el-table-column label="上限值" align="center" prop="upperVal" />
+      <el-table-column label="下限值" align="center" prop="lowerVal" />
+      <el-table-column label="备注" align="center" prop="remark" />
+      <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="['erp:product:update']"
+          >
+            编辑
+          </el-button>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['erp:product: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <ZjProductForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ZjProductApi, ZjProductVO } from '@/api/mes/zjproduct'
+import ZjProductForm from './ZjProductForm.vue'
+import {DICT_TYPE,getStrDictOptions} from '@/utils/dict'
+
+/** 质量管理-质检参数 列表 */
+defineOptions({ name: 'ZjProductList' })
+
+const props = defineProps<{
+  productId?: number // 型号id（主表的关联字段）
+}>()
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(false) // 列表的加载中
+const list = ref<ZjProductVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  type: undefined,
+  name: undefined,
+  unit: undefined,
+  upperVal: undefined,
+  lowerVal: undefined,
+  remark: undefined,
+  createTime: [],
+  productId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+  () => props.productId,
+  (val: number) => {
+    if (!val) {
+      return
+    }
+    queryParams.productId = val
+    handleQuery()
+  },
+    { immediate: true, deep: true }
+)
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ZjProductApi.getZjProductPage(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) => {
+  if (!props.productId) {
+    message.error('请选择一个产品')
+    return
+  }
+  formRef.value.open(type, id,props.productId)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await ZjProductApi.deleteZjProduct(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ZjProductApi.exportZjProduct(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/zjproduct/index.vue b/src/views/mes/zjproduct/index.vue
new file mode 100644
index 00000000..65b52477
--- /dev/null
+++ b/src/views/mes/zjproduct/index.vue
@@ -0,0 +1,201 @@
+<!-- ERP 产品列表 -->
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter="handleQuery"
+          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="['erp:product:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button>
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['erp:product:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button> -->
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-tabs v-model="activeName" @tab-click="handleTabClick">
+      <el-tab-pane label="产品" name="2" />
+      <el-tab-pane label="原料" name="1" />
+    </el-tabs>
+    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" @current-change="handleCurrentChange">
+      <el-table-column label="编码" align="center" prop="barCode" />
+      <el-table-column label="名称" align="left" prop="name"  width="220px"/>
+      <el-table-column label="规格" align="center" prop="standard" />
+      <el-table-column label="分类" align="center" prop="subCategoryName" />
+      <el-table-column label="单位" align="center" prop="unitName" />
+      <el-table-column label="状态" align="center" prop="status">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <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>
+  <!-- 子表的列表 -->
+  <ContentWrap>
+    <el-tabs model-value="product">
+      <el-tab-pane label="质检参数" name="product">
+        <ZjProductList :productId="currentRow.id"/>
+      </el-tab-pane>
+    </el-tabs>
+  </ContentWrap>
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { ProductApi, ProductVO } from '@/api/erp/product/product'
+import { ProductCategoryApi, ProductCategoryVO } from '@/api/erp/product/category'
+import { DICT_TYPE } from '@/utils/dict'
+import { defaultProps, handleTree } from '@/utils/tree'
+import ZjProductList from './components/ZjProductList.vue'
+/** 产品质检列表 */
+defineOptions({ name: 'ZjProduct' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<ProductVO[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  name: undefined,
+  categoryId: undefined
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+const categoryList = ref<ProductCategoryVO[]>([]) // 产品分类列表
+
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await ProductApi.getProductPage(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 ProductApi.deleteProduct(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await ProductApi.exportProduct(queryParams)
+    download.excel(data, '产品.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  queryParams.categoryId = 2
+  await getList()
+  // 产品分类
+  const categoryData = await ProductCategoryApi.getProductCategorySimpleList()
+  categoryList.value = handleTree(categoryData, 'id', 'parentId')
+})
+
+/** tab 切换 */
+let activeName = '2'
+const handleTabClick = (tab: TabsPaneContext) => {
+  queryParams.categoryId = tab.paneName
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const bomFormRef = ref()
+const openBomForm = (type: string, id?: number) => {
+  bomFormRef.value.open(type, id)
+}
+
+/** 选中行操作 */
+const currentRow = ref({}) // 选中行
+const handleCurrentChange = (row) => {
+  currentRow.value = row
+}
+</script>
diff --git a/src/views/system/post/PostForm.vue b/src/views/system/post/PostForm.vue
index 3124d113..849c1d8f 100644
--- a/src/views/system/post/PostForm.vue
+++ b/src/views/system/post/PostForm.vue
@@ -59,8 +59,9 @@ const formData = ref({
   remark: ''
 })
 const formRules = reactive({
-  name: [{ required: true, message: '岗位标题不能为空', trigger: 'blur' }],
+  name: [{ required: true, message: '岗位名称不能为空', trigger: 'blur' }],
   code: [{ required: true, message: '岗位编码不能为空', trigger: 'change' }],
+  sort: [{ required: true, message: '岗位顺序不能为空', trigger: 'blur' }],
   status: [{ required: true, message: '岗位状态不能为空', trigger: 'change' }],
   remark: [{ required: false, message: '岗位内容不能为空', trigger: 'blur' }]
 })
@@ -116,7 +117,7 @@ const resetForm = () => {
     id: undefined,
     name: '',
     code: '',
-    sort: undefined,
+    sort: 0,
     status: CommonStatusEnum.ENABLE,
     remark: ''
   } as any