From dfbe8c385227ec4fa6dca8f39bc3934a7adc1eab Mon Sep 17 00:00:00 2001
From: zhang_li <li.zhang@ccwin-in.com>
Date: Mon, 31 Mar 2025 14:53:22 +0800
Subject: [PATCH] =?UTF-8?q?YT-2316=E5=8F=B7=E5=8F=A3=E5=93=81=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=E7=94=B3=E8=AF=B7=EF=BC=8C=E5=AF=BC=E5=85=A5=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=EF=BC=8C25=E6=9D=A1=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=88=9B=E5=BB=BA=E6=A0=87=E7=AD=BE=E5=8F=AA?=
 =?UTF-8?q?=E6=9C=8920=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/productreceiptRequestDetail/index.ts  |  4 +++
 .../index.vue                                 | 26 +++++++++++--------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/api/wms/productreceiptRequestDetail/index.ts b/src/api/wms/productreceiptRequestDetail/index.ts
index 7b21ba14b..2c445c597 100644
--- a/src/api/wms/productreceiptRequestDetail/index.ts
+++ b/src/api/wms/productreceiptRequestDetail/index.ts
@@ -53,6 +53,10 @@ export const getProductreceiptRequestDetailPageAssemble = async (params) => {
     return await request.get({ url: `/wms/productreceipt-request-detail/page`, params })
   }
 }
+// 查询制品收货申请子所有列表
+export const getProductreceiptRequestDetailAllList = async (number) => {
+  return await request.get({ url: `/wms/productreceipt-request-detail/allList?number=` + number })
+}
 
 // 查询报废收货申请子列表
 export const getProductreceiptRequestDetailPageScrap = async (params) => {
diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
index 5e3994892..df67a0517 100644
--- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
+++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue
@@ -96,7 +96,7 @@
       @success="getList"
       :tableAllSchemas="detailListTableColumns"
       :tableFormRules="ProductreceiptRequestLabelRules"
-      :tableData="detatableData.tableList"
+      :tableData="detatableData"
       :isBusiness="true"
       :isShowButton="false"
       @handleAddTable="handleAddTable"
@@ -187,12 +187,16 @@ const buttondataTable = ref([{
 const detailListTableColumns = ProductreceiptRequestLabel.allSchemas
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
-const labelType = ref('') // 标签类别 采购还是制造等 
-const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
-  getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble
-})
-const { getList:getDetailList } = detatableMethods
-
+const labelType = ref('') // 标签类别 采购还是制造等
+// const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+//   getListApi: ProductreceiptRequestDetailApi.getProductreceiptRequestDetailPageAssemble
+// })
+// const { getList:getDetailList } = detatableMethods
+// 获取创建标签上数据
+const detatableData =ref([])
+const getProductreceiptRequestDetailAllList =async (number) => {
+  detatableData.value = await ProductreceiptRequestDetailApi.getProductreceiptRequestDetailAllList(number)
+}
 // Bom查看
 const DialogTitle = ref('Bom信息')
 const bomModelVisible = ref(false)
@@ -459,10 +463,10 @@ const buttonTableClick = async (val, row) => {
       message.warning('已创建过标签！！！')
       return
     }
-    detatableData.params = {
-      masterId:row.masterId
-    }
-    await getDetailList()
+    // detatableData.params = {
+    //   masterId:row.masterId
+    // }
+    await getProductreceiptRequestDetailAllList(row.number)
     // 打开创建标签页面
     // dialogVisible.value = true
     formLabelRef.value.open('create', row)