From 503461030ab07657fcbfc56a827c3882a82b56c8 Mon Sep 17 00:00:00 2001
From: songguoqiang <yiran_zhao6@163.com>
Date: Wed, 12 Feb 2025 15:16:09 +0800
Subject: [PATCH] =?UTF-8?q?YT-1928=EF=BC=9A=E5=A4=87=E6=96=99=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issueRequestMain/issueRequestMain.data.ts | 22 +++++++------
 .../preparetoissueMain/index.vue              | 31 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
index 4b3f79820..792d78634 100644
--- a/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
+++ b/src/views/wms/issueManage/issue/issueRequestMain/issueRequestMain.data.ts
@@ -339,16 +339,18 @@ export const IssueRequestMain = useCrudSchemas(
         value: '1'
       }
     },
-    // {
-    //   label: '备料计划单据号',
-    //   field: 'preparetoissuePlanNumber',
-    //   isSearch: false,
-    //   isTable: true,
-    //   sort: 'custom',
-    //   table: {
-    //     width: 150
-    //   },
-    // },
+    {
+      label: '备料计划单据号',
+      field: 'preparetoissuePlanNumber',
+      isSearch: false,
+      isTable: true,
+      sort: 'custom',
+      isForm:false,
+      isTableForm:false,
+      table: {
+        width: 150
+      },
+    },
     {
       label: '从库区类型范围',
       field: 'fromAreaTypes',
diff --git a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
index e4e3c1aff..079fe5ebb 100644
--- a/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
+++ b/src/views/wms/issueManage/preparetoissueplan/preparetoissueMain/index.vue
@@ -503,14 +503,14 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'scflsq') {
     // 生成发料申请
     if (row.available == 'FALSE') return message.warning('当前数据：【不可用】')
-    await message.confirm('确认要生成发料申请吗？')
+    //await message.confirm('确认要生成发料申请吗？')
     tableObject.loading = true
 
     await PreparetoissueMainApi.generateIssueRequest(row.number)
       .then((res) => {
         console.log('返回数据', res)
         if (res.status == '2') {
-          message.error(t('common.trialResultFail'))
+          message.error(res.message)
         } else {
           message.success(t('common.trialResultSuccess'))
         }
@@ -746,22 +746,23 @@ const resetShow = async () => {
 
 const src = ref(BASE_URL + '/jmreport/view/924811818898698240?token=' + getAccessToken())
 const srcPoint = ref(BASE_URL + '/jmreport/view/940818992169918464?token=' + getAccessToken())
-
+const masterIds = new Set();
 // 批量打印
-const handleSelectionPoint = async ()=>{
-  let rows:any = []
+const handleSelectionPoint =  ()=>{
   selectionRows.value.forEach(item=>{
-    rows = [...rows,...item.selectionRows.map(item1=>item1.id)]
-  })
-  console.log('批量打印',rows.join(','))
-  await PackageApi.batchPrintingLable(rows.join(',')).then(res => {
-      console.log(res)
-      window.open(srcPoint.value+'&relateNumber='+res)
-      message.success('创建标签成功')
-  }).catch(err => {
-    console.log(err)
-    message.error('创建标签失败')
+    item.selectionRows.forEach(obj => {
+        if (obj.masterId) {
+            masterIds.add(obj.masterId);
+        }
+    });
   })
+   // 将 masterIds 转换为数组
+   const idsArray = Array.from(masterIds);
+
+// 循环打开每个窗口
+idsArray.forEach(id => {
+    window.open(documentSrc.value + '&id=' + id);
+});
 }
 
 // 批量试算