From 9db47424dd7daeb48f396b61bd15bdde914ced52 Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Thu, 13 Jun 2024 16:41:44 +0800
Subject: [PATCH] fix order task

---
 src/api/mes/saleorder/index.ts                |  20 +-
 .../mes/bom/components/BomDetailForm.vue      |   3 +-
 src/views/mes/task/TaskAddSaleForm.vue        |  57 ++---
 .../mes/task/components/SaleOrderIndex.vue    | 233 ++++++++++--------
 .../task/components/SaleOrderItemsList.vue    |  79 ------
 .../task/components/TaskAddSaleDetailForm.vue |  99 +++++---
 6 files changed, 239 insertions(+), 252 deletions(-)
 delete mode 100644 src/views/mes/task/components/SaleOrderItemsList.vue

diff --git a/src/api/mes/saleorder/index.ts b/src/api/mes/saleorder/index.ts
index 49b4cd56..7de85a8c 100644
--- a/src/api/mes/saleorder/index.ts
+++ b/src/api/mes/saleorder/index.ts
@@ -12,7 +12,21 @@ export interface SaleOrderVO {
   totalProductPrice: number // 合计产品价格，单位：元
   remark: string // 备注
 }
-
+// ERP 销售订单项 VO
+export interface SaleOrderItemsVO {
+  id: number // 编号
+  orderId: number // 销售订单编号
+  productId: number // 产品编号
+  productName: number // 产品编号
+  productUnitId: number // 产品单位单位
+  unitName: number // 产品单位单位
+  productPrice: number // 产品单价
+  count: number // 数量
+  totalPrice: number // 总价
+  remark: string // 备注
+  outCount: number // 销售出库数量
+  returnCount: number // 销售退货数量
+}
 // 销售订单 API
 export const SaleOrderApi = {
   // 查询销售订单分页
@@ -70,4 +84,8 @@ export const SaleOrderApi = {
   getSaleOrderItems: async (id: number) => {
     return await request.get({ url: `/mes/sale-order/sale-order-items/get?id=` + id })
   },
+  // 获得销售订单项
+  getSaleOrderItemsByOrderId: async (orderId: number) => {
+    return await request.get({ url: `/mes/sale-order/sale-order-items/getByOrderId?orderId=` + orderId })
+  },
 }
diff --git a/src/views/mes/bom/components/BomDetailForm.vue b/src/views/mes/bom/components/BomDetailForm.vue
index 19eae9b8..0d54824c 100644
--- a/src/views/mes/bom/components/BomDetailForm.vue
+++ b/src/views/mes/bom/components/BomDetailForm.vue
@@ -46,7 +46,8 @@
        <el-table-column label="用量" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.usageNumber`" :rules="formRules.usageNumber" class="mb-0px!">
-            <el-input v-model="row.usageNumber" placeholder="请输入用量" />
+            <el-input-number v-model="row.usageNumber" :min="0" :precision="2" class="!w-1/1" placeholder="请输入用量"
+            />
           </el-form-item>
         </template>
       </el-table-column>
diff --git a/src/views/mes/task/TaskAddSaleForm.vue b/src/views/mes/task/TaskAddSaleForm.vue
index c873460e..f535af18 100644
--- a/src/views/mes/task/TaskAddSaleForm.vue
+++ b/src/views/mes/task/TaskAddSaleForm.vue
@@ -1,34 +1,16 @@
 <template>
-  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1000px">
+  <Dialog :title="dialogTitle" v-model="dialogVisible" width="1200px">
     <el-form
       ref="formRef"
       :model="formData"
       :rules="formRules"
-      label-width="100px"
+      label-width="80px"
       v-loading="formLoading"
     >
       <el-row :gutter="20">
         <el-col :span="8">
           <el-form-item label="编码" prop="code">
-            <el-input v-model="formData.code" placeholder="请输入编码" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="备注" prop="remark">
-            <el-input v-model="formData.remark" placeholder="请输入备注" />
-          </el-form-item>
-        </el-col>
-
-      </el-row>
-      <el-row :gutter="20">
-        <el-col :span="8">
-          <el-form-item label="下达日期" prop="orderDate">
-            <el-date-picker
-              v-model="formData.orderDate"
-              type="date"
-              value-format="x"
-              placeholder="选择下达日期"
-            />
+            <el-input v-model="formData.code" placeholder="请输入任务单编码" />
           </el-form-item>
         </el-col>
         <el-col :span="8">
@@ -42,7 +24,27 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="是否启用" prop="isEnable">
+          <el-form-item label="备注" prop="remark">
+            <el-input v-model="formData.remark" placeholder="请输入备注" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="20">
+        <el-col :span="16">
+          <el-form-item label="状态" prop="status">
+            <el-radio-group v-model="formData.status">
+              <el-radio
+                v-for="dict in getIntDictOptions(DICT_TYPE.MES_TASK_STATUS)"
+                :key="dict.value"
+                :label="dict.value"
+              >
+                {{ dict.label }}
+              </el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="启用" prop="isEnable">
             <el-radio-group v-model="formData.isEnable">
               <el-radio
                 v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
@@ -55,17 +57,6 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-form-item label="状态" prop="status">
-        <el-radio-group v-model="formData.status">
-          <el-radio
-            v-for="dict in getIntDictOptions(DICT_TYPE.MES_TASK_STATUS)"
-            :key="dict.value"
-            :label="dict.value"
-          >
-            {{ dict.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
     </el-form>
     <!-- 子表的表单 -->
     <el-tabs v-model="subTabsName">
diff --git a/src/views/mes/task/components/SaleOrderIndex.vue b/src/views/mes/task/components/SaleOrderIndex.vue
index c4c9971e..af64ce3f 100644
--- a/src/views/mes/task/components/SaleOrderIndex.vue
+++ b/src/views/mes/task/components/SaleOrderIndex.vue
@@ -9,97 +9,130 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="销售单编号" prop="no">
-        <el-input
-          v-model="queryParams.no"
-          placeholder="请输入销售单编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="客户编号" prop="customerId">
-        <el-input
-          v-model="queryParams.customerId"
-          placeholder="请输入客户编号"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-240px"
-        />
-      </el-form-item>
-      <el-form-item label="下单时间" prop="orderTime">
-        <el-date-picker
-          v-model="queryParams.orderTime"
-          value-format="YYYY-MM-DD HH:mm:ss"
-          type="daterange"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
-          class="!w-240px"
-        />
-      </el-form-item>
-
-      <el-form-item label="备注" prop="remark">
-        <el-input
-          v-model="queryParams.remark"
-          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-form-item>
+      <el-row :gutter="20">
+        <el-col :span="5">
+          <el-form-item label="销售单" prop="no">
+            <el-input
+              v-model="queryParams.no"
+              placeholder="请输入销售单编号"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-150px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="客户" prop="customerId">
+            <el-input
+              v-model="queryParams.customerId"
+              placeholder="请输入客户编号"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-150px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="5">
+          <el-form-item label="备注" prop="remark">
+            <el-input
+              v-model="queryParams.remark"
+              placeholder="请输入备注"
+              clearable
+              @keyup.enter="handleQuery"
+              class="!w-150px"
+            />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="下单时间" prop="orderTime">
+            <el-date-picker
+              v-model="queryParams.orderTime"
+              value-format="YYYY-MM-DD HH:mm:ss"
+              type="daterange"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+              class="!w-240px"
+            />
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      <el-row align="middle">
+        <el-form-item  class="!w-240px">
+          <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-form-item>
+      </el-row>
+
     </el-form>
   </ContentWrap>
 
   <!-- 列表 -->
-  <ContentWrap>
-    <el-table
-      v-loading="loading"
-      :data="list"
-      :stripe="true"
-      :show-overflow-tooltip="true"
-      highlight-current-row
-      @current-change="handleCurrentChange"
-    >
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="销售单编号" align="center" prop="no" />
-      <el-table-column label="销售状态" align="center" prop="status">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="客户" align="center" prop="customerName" />
-      <el-table-column label="合计数量" align="center" prop="totalCount" />
-      <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column
-        label="下单时间"
-        align="center"
-        prop="orderTime"
-        :formatter="dateFormatter"
-        width="180px"
-      />
-    </el-table>
-    <!-- 分页 -->
-    <Pagination
-      :total="total"
-      v-model:page="queryParams.pageNo"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-  </ContentWrap>
 
+    <ContentWrap>
+      <el-table
+        v-loading="loading"
+        :data="list"
+        :stripe="true"
+        :show-overflow-tooltip="true"
+        highlight-current-row
+        @current-change="handleCurrentChange"
+      >
+
+        <el-table-column label="销售单编号" align="center" prop="no" />
+        <el-table-column label="销售状态" align="center" prop="status">
+          <template #default="scope">
+            <dict-tag :type="DICT_TYPE.ERP_AUDIT_STATUS" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="客户" align="center" prop="customerName" />
+        <el-table-column label="合计数量" align="center" prop="totalCount" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column
+          label="下单时间"
+          align="center"
+          prop="orderTime"
+          :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="saleOrderItems">
-      <el-tab-pane label="销售订单项" name="saleOrderItems">
-        <SaleOrderItemsList ref="saleOrderItemsListRef" :order-id="currentRow.id" />
+      <el-tab-pane label="销售单明细项" name="saleOrderItems">
+        <el-table
+          v-loading="loading" :data="listDetail"
+          :stripe="true" :show-overflow-tooltip="true" @selection-change="handleSelectionChange"
+        >
+          <el-table-column width="30" label="选择" type="selection" />
+          <el-table-column label="产品" align="center" prop="productName" />
+          <el-table-column label="数量" align="center" prop="count" />
+          <el-table-column label="单位" align="center" prop="unitName" />
+          <el-table-column label="单价" align="center" prop="productPrice" />
+          <el-table-column label="总价" align="center" prop="totalPrice" />
+          <el-table-column label="备注" align="center" prop="remark" />
+
+          <el-table-column
+            label="创建时间"
+            align="center"
+            prop="createTime"
+            :formatter="dateFormatter"
+            width="180px"
+          />
+
+        </el-table>
       </el-tab-pane>
     </el-tabs>
-  </ContentWrap>
+
+
     <template #footer>
       <el-button @click="submitForm" type="primary" :disabled="loading">确 定</el-button>
       <el-button @click="dialogVisible = false">取 消</el-button>
@@ -110,8 +143,8 @@
 <script setup lang="ts">
 import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
-import { SaleOrderApi, SaleOrderVO } from '@/api/mes/saleorder'
-import SaleOrderItemsList from './SaleOrderItemsList.vue'
+import {SaleOrderApi, SaleOrderItemsVO, SaleOrderVO} from '@/api/mes/saleorder'
+
 
 /** 销售订单 列表 */
 defineOptions({ name: 'SaleOrder' })
@@ -133,20 +166,16 @@ const queryParams = reactive({
   status: undefined,
   customerId: undefined,
   orderTime: [],
-  totalCount: undefined,
-  totalPrice: undefined,
-  totalProductPrice: undefined,
   remark: undefined,
-  createTime: [],
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
-const saleOrderItemsListRef = ref()
 
 /** 查询列表 */
 const getList = async () => {
   loading.value = true
+  listDetail.value = null
   try {
     queryParams.status = 20
     const data = await SaleOrderApi.getSaleOrderPage(queryParams)
@@ -171,30 +200,32 @@ const resetQuery = () => {
 
 /** 选中行操作 */
 const currentRow = ref({}) // 选中行
-const handleCurrentChange = (row) => {
+const handleCurrentChange = async (row) => {
   currentRow.value = row
+  loading.value = true
+  try {
+    listDetail.value = await SaleOrderApi.getSaleOrderItemsByOrderId(row.id)
+  } finally {
+    loading.value = false
+  }
 }
 
 /** 打开弹窗 */
 const open = async () => {
   dialogVisible.value = true
-  dialogTitle.value = "选择销售单"
-  // 产品单位
-  console.log("I'm in sale order list!")
+  dialogTitle.value = "选择销售单明细项"
+  listDetail.value = null
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
 /** 提交表单 */
 const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
 const submitForm = async () => {
-  //校验是否选中数据
-
   // 提交请求
   try {
     dialogVisible.value = false
-    console.log(currentRow.value)
     // 发送操作成功的事件
-    emit('success', currentRow.value)
+    emit('success', selectionList.value)
   } finally {
     console.log("-----submitForm----")
   }
@@ -205,4 +236,12 @@ const submitForm = async () => {
 onMounted(() => {
   getList()
 })
+
+/** 选中操作 */
+const selectionList = ref<SaleOrderItemsVO[]>([])
+const handleSelectionChange = (rows: SaleOrderItemsVO[]) => {
+  selectionList.value = rows
+  //console.log(selectionList.value[0].productName)
+}
+
 </script>
diff --git a/src/views/mes/task/components/SaleOrderItemsList.vue b/src/views/mes/task/components/SaleOrderItemsList.vue
deleted file mode 100644
index 8f7c82b0..00000000
--- a/src/views/mes/task/components/SaleOrderItemsList.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-
-  <!-- 列表 -->
-  <ContentWrap>
-    <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="编号" align="center" prop="id" />
-      <el-table-column label="产品" align="center" prop="productName" />
-      <el-table-column label="数量" align="center" prop="count" />
-      <el-table-column label="单位" align="center" prop="unitName" />
-      <el-table-column label="单价" align="center" prop="productPrice" />
-      <el-table-column label="总价" align="center" prop="totalPrice" />
-      <el-table-column label="备注" align="center" prop="remark" />
-
-      <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 { SaleOrderApi } from '@/api/mes/saleorder'
-
-const { t } = useI18n() // 国际化
-const message = useMessage() // 消息弹窗
-
-const props = defineProps<{
-  orderId?: number // 销售订单编号（主表的关联字段）
-}>()
-const loading = ref(false) // 列表的加载中
-const list = ref([]) // 列表的数据
-const total = ref(0) // 列表的总页数
-const queryParams = reactive({
-  pageNo: 1,
-  pageSize: 100,
-  orderId: undefined
-})
-
-/** 监听主表的关联字段的变化，加载对应的子表数据 */
-watch(
-  () => props.orderId,
-  (val: number) => {
-    if (!val) {
-      return
-    }
-    queryParams.orderId = val
-    queryParams.pageNo = 1
-    getList()
-  },
-    { immediate: true, deep: true }
-)
-
-/** 查询列表 */
-const getList = async () => {
-  loading.value = true
-  try {
-    const data = await SaleOrderApi.getSaleOrderItemsPage(queryParams)
-    list.value = data.list
-    total.value = data.total
-  } finally {
-    loading.value = false
-  }
-}
-
-
-</script>
diff --git a/src/views/mes/task/components/TaskAddSaleDetailForm.vue b/src/views/mes/task/components/TaskAddSaleDetailForm.vue
index c27a5667..4213eb85 100644
--- a/src/views/mes/task/components/TaskAddSaleDetailForm.vue
+++ b/src/views/mes/task/components/TaskAddSaleDetailForm.vue
@@ -7,8 +7,8 @@
     label-width="0px"
     :inline-message="true"
   >
-    <el-table :data="formData" class="-mt-10px">
-      <el-table-column label="序号" type="index" width="100" />
+    <el-table :data="formData" class="-mt-10px" :show-overflow-tooltip="true" highlight-current-row>
+      <el-table-column label="序号" type="index" width="80" />
       <el-table-column label="产品" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.productId`" :rules="formRules.productId" class="mb-0px!">
@@ -28,7 +28,7 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="单位" min-width="150">
+      <el-table-column label="单位" min-width="100">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.unitId`" :rules="formRules.unitId" class="mb-0px!">
             <el-select v-model="row.unitId" clearable filterable placeholder="请选择单位" class="w-1/1">
@@ -43,21 +43,28 @@
 
         </template>
       </el-table-column>
-      <el-table-column label="数量" min-width="150">
+      <el-table-column label="数量" min-width="180">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.number`" :rules="formRules.number" class="mb-0px!">
-            <el-input v-model="row.number" placeholder="请输入数量" />
+            <el-input-number v-model="row.number" :min="0" class="!w-1/1" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="打包要求(每包/个)" min-width="150">
+      <el-table-column label="每包/个" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.packageSize`" :rules="formRules.packageSize" class="mb-0px!">
-            <el-input v-model="row.packageSize" placeholder="请输入打包要求(每包/个)" />
+            <el-input-number v-model="row.packageSize" :min="0"  class="!w-1/1" />
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="项目名称" min-width="150">
+      <el-table-column label="打包数量" min-width="150">
+        <template #default="{ row, $index }">
+          <el-form-item :prop="`${$index}.packageNumber`" :rules="formRules.packageNumber" class="mb-0px!">
+            <el-input-number v-model="row.packageNumber" :min="0" class="!w-1/1" />
+          </el-form-item>
+        </template>
+      </el-table-column>
+      <el-table-column label="项目名称" min-width="100">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.projectName`" :rules="formRules.projectName" class="mb-0px!">
             <el-input v-model="row.projectName" placeholder="请输入项目名称" />
@@ -78,13 +85,6 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="打包数量" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.packageNumber`" :rules="formRules.packageNumber" class="mb-0px!">
-            <el-input v-model="row.packageNumber" placeholder="请输入打包数量" />
-          </el-form-item>
-        </template>
-      </el-table-column>
       <el-table-column label="工厂完成" min-width="150">
         <template #default="{ row, $index }">
           <el-form-item :prop="`${$index}.finishDate`" :rules="formRules.finishDate" class="mb-0px!">
@@ -128,13 +128,13 @@
           </el-form-item>
         </template>
       </el-table-column>
-      <el-table-column label="附件" min-width="150">
-        <template #default="{ row, $index }">
-          <el-form-item :prop="`${$index}.attachment`" :rules="formRules.attachment" class="mb-0px!">
-            <UploadFile v-model="row.attachment" :is-show-tip = "false" :limit = "1"/>
-          </el-form-item>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="附件" min-width="150">-->
+<!--        <template #default="{ row, $index }">-->
+<!--          <el-form-item :prop="`${$index}.attachment`" :rules="formRules.attachment" class="mb-0px!">-->
+<!--            <UploadFile v-model="row.attachment" :is-show-tip = "false" :limit = "1"/>-->
+<!--          </el-form-item>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column align="center" fixed="right" label="操作" width="60">
         <template #default="{ $index }">
           <el-button type="danger" @click="handleDelete($index)" link>
@@ -157,23 +157,22 @@ import { TaskApi } from '@/api/mes/task'
 import { ProductUnitApi, ProductUnitVO } from '@/api/erp/product/unit'
 import {ProductApi, ProductVO} from "@/api/erp/product/product";
 import SaleOrderIndex from './SaleOrderIndex.vue'
-import {SaleOrderApi, SaleOrderVO} from "@/api/mes/saleorder";
+import {SaleOrderApi, SaleOrderItemsVO, SaleOrderVO} from "@/api/mes/saleorder";
 
 const unitList = ref<ProductUnitVO[]>([]) // 产品单位列表
 const productList = ref<ProductVO[]>([]) // 产品列表
 
 const props = defineProps<{
-  taskId: undefined // task ID（主表的关联字段）
+  taskId?: undefined // task ID（主表的关联字段）
 }>()
 const formLoading = ref(false) // 表单的加载中
 const formData = ref([])
 const formRules = reactive({
-  productId: [{ required: true, message: '产品ID不能为空', trigger: 'blur' }],
-  unitId: [{ required: true, message: '单位ID不能为空', trigger: 'blur' }],
-  taskId: [{ required: true, message: 'task ID不能为空', trigger: 'blur' }],
+  productId: [{ required: true, message: '产品不能为空', trigger: 'blur' }],
+  unitId: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  taskId: [{ required: true, message: '生产任务不能为空', trigger: 'blur' }],
   number: [{ required: true, message: '数量不能为空', trigger: 'blur' }],
-  packageSize: [{ required: true, message: '打包要求(每包/个)不能为空', trigger: 'blur' }],
-  isEnable: [{ required: true, message: '是否启用不能为空', trigger: 'blur' }],
+
 })
 const formRef = ref() // 表单 Ref
 
@@ -183,21 +182,35 @@ const openOrderItemsList = () => {
   orderItemsRef.value.open()
 }
 
+const selectionList = ref<SaleOrderItemsVO[]>([])
 /** 表单值 */
 const dealOrder = async (e)  => {
-  let queryParams = {
-    pageNo: 1,
-    pageSize: 100,
-    orderId: undefined
+  selectionList.value = e
+  if(selectionList.value.length > 0){
+    selectionList.value.forEach((item, index) => {
+      console.log(`Item ${index}:`, item);
+      // 在这里处理每个item
+      const row = {
+        id: undefined,
+        productId: item.productId,
+        unitId: item.productUnitId,
+        taskId: props.taskId,
+        number: item.count,
+        packageSize: undefined,
+        projectName: undefined,
+        techRequirements: undefined,
+        remark: item.remark,
+        isEnable: true,
+        packageNumber: undefined,
+        finishDate: undefined,
+        boxingDate: undefined,
+        arriveDate: undefined,
+        barCode: undefined,
+        attachment: undefined,
+      }
+      formData.value.push(row)
+    });
   }
-  queryParams.orderId = e.id
-  console.log(e.no)
-
-  const data = await SaleOrderApi.getSaleOrderItemsPage(queryParams)
-  let orderItems = data.list
-
-  console.log(orderItems)
-  console.log(e)
 }
 /** 初始化 */
 onMounted(async () => {
@@ -206,6 +219,8 @@ onMounted(async () => {
   productList.value = await ProductApi.getMesProductSimpleList()
   // 默认添加一个
   if (formData.value.length === 0) {
+    // 1. 重置表单
+    formData.value = []
     handleAdd()
   }
 })
@@ -221,6 +236,8 @@ watch(
       return;
     }
     try {
+      console.log("props.taskId:"+props.taskId)
+      console.log("val:"+val)
       formLoading.value = true
       formData.value = await TaskApi.getTaskDetailListByTaskId(val)
     } finally {