From a52c6cfb9e06a67c44cd8d9ad92ba81d9e1ac373 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 21 May 2024 10:44:13 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/dept/index.vue                                  | 1 +
 .../supplierdeliverInspectionDetail.data.ts                      | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 8b1e3d86c..10639a1e3 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -32,6 +32,7 @@
   <ContentWrap>
     <el-table v-loading="loading" :data="list" row-key="id" :default-expand-all="isExpandAll" v-if="refreshTable">
       <el-table-column prop="name" label="部门名称" />
+      <el-table-column prop="id" label="部门编号" />
       <el-table-column prop="leader" align="center" label="负责人">
         <template #default="scope">
           {{ userList.find((user) => user.id === scope.row.leaderUserId)?.nickname }}
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
index 34c890aa4..02ea8131c 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverInspectionDetail/supplierdeliverInspectionDetail.data.ts
@@ -16,7 +16,6 @@ export const SupplierdeliverInspectionDetail = useCrudSchemas(reactive<CrudSchem
           tableName: 'SupplierdeliverInspectionDetail',
         },
         fileType:['pdf','png','jpg','jpeg'],
-        limit:1,
         fileSize:100
       }
     },

From 75ce8c24d0ebcedd7ff1c8adfa80c21be383a323 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Tue, 21 May 2024 11:29:14 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E8=B4=A8=E6=A3=80?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E7=8E=AF=E5=A2=83=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.test                       | 5 ++++-
 src/router/modules/remaining.ts | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.env.test b/.env.test
index 27d463213..53100a20f 100644
--- a/.env.test
+++ b/.env.test
@@ -37,4 +37,7 @@ VITE_INTERFACE_URL='http://dev.ccwin-in.com:25310/magic/web/index.html'
 VITE_JMREPORT_BASE_URL='http://dev.ccwin-in.com:25310'
 
 # 租户配置
-VITE_TENANT='["长春","成都"]'
\ No newline at end of file
+VITE_TENANT='["长春","成都"]'
+
+# 查看质检报告环境
+VITE_REPORT_URL = 'http://dev.ccwin-in.com:25400'
diff --git a/src/router/modules/remaining.ts b/src/router/modules/remaining.ts
index 3f156883c..bc2dd67f4 100644
--- a/src/router/modules/remaining.ts
+++ b/src/router/modules/remaining.ts
@@ -247,7 +247,7 @@ const remainingRouter: AppRouteRecordRaw[] = [
   {
     path: '/purchasereceiptReport',
     component: () => import('@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptReport/index.vue'),
-    name: 'NoFound',
+    name: 'purchasereceiptReport',
     meta: {
       hidden: true,
       title: t('ts.查看质检报告'),

From 35a160832d5e3a67078bbbd17373f84b98f276d9 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 21 May 2024 12:46:54 +0800
Subject: [PATCH 3/6] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-21-001?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 517596a90..419a49955 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-20-001
+## dev发布2024-05-21-001
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {

From 56392d1aa0a0e6c93755296d4805444a9d7f1e26 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 21 May 2024 13:25:45 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=B1=95=E7=A4=BA=E7=A9=BA=E7=9A=84=E6=9D=A5?=
 =?UTF-8?q?=E6=BA=90=E5=BA=93=E4=BD=8D=E7=94=A8=E4=BA=8E=E6=89=8B=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../purchasereturnRequestMain/index.vue       |  8 ++++----
 .../purchasereturnRequestMain.data.ts         | 20 +++++++++----------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index f9096474d..083e6b2d1 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -220,7 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
       row['supplierQty'] = val[0]['supplierQty']
       row['supplierUom'] = val[0]['supplierUom']
       row['inventoryStatus'] = val[0]['inventoryStatus']
-      row['fromLocationCode'] = val[0]['toLocationCode']
+      // row['fromLocationCode'] = val[0]['toLocationCode']
       row['toLocationCode'] = val[0]['toLocationCode']
       row['fromLocationGroupCode'] = val[0]['locationGroupCode']
       row['toLocationGroupCode'] = null
@@ -246,7 +246,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
         row['containerNumber'] = val[0]['toContainerNumber']
         row['containerNumber'] = val[0]['containerNumber']
         row['containerNumber'] = val[0]['containerNumber']
-        row['fromLocationCode'] = val[0]['fromLocationCode']
+        // row['fromLocationCode'] = val[0]['fromLocationCode']
         row['toLocationCode'] = val[0]['toLocationCode']
       }
     } else {
@@ -336,7 +336,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
       setV['supplierQty'] = val[0]['supplierQty']
       setV['supplierUom'] = val[0]['supplierUom']
       setV['inventoryStatus'] = val[0]['inventoryStatus']
-      setV['fromLocationCode'] = val[0]['toLocationCode']
+      // setV['fromLocationCode'] = val[0]['toLocationCode']
       setV['toLocationCode'] = val[0]['toLocationCode']
       setV['fromLocationGroupCode'] = val[0]['locationGroupCode']
       setV['toLocationGroupCode'] = null
@@ -362,7 +362,7 @@ const searchTableSuccessDetail = (formField, searchField, val, formRef) => {
         setV['containerNumber'] = val[0]['toContainerNumber']
         setV['containerNumber'] = val[0]['containerNumber']
         setV['containerNumber'] = val[0]['containerNumber']
-        setV['fromLocationCode'] = val[0]['fromLocationCode']
+        // setV['fromLocationCode'] = val[0]['fromLocationCode']
         setV['toLocationCode'] = val[0]['toLocationCode']
       }
     }else {
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
index 2dbadc3fe..daf309ff7 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/purchasereturnRequestMain.data.ts
@@ -823,16 +823,6 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    isTable: false,
-    isTableForm: true
-  },
   {
     label: '替代批次',
     field: 'altBatch',
@@ -1002,6 +992,16 @@ export const PurchasereturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    }, 
+    hiddenInMain: true,
+    isTable: false,
+  },
   {
     label: '到库位代码',
     field: 'toLocationCode',

From 2207046196f7c7c1613f83a3154ff4e0408e3ec4 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Tue, 21 May 2024 13:33:26 +0800
Subject: [PATCH 5/6] =?UTF-8?q?dev=E5=8F=91=E5=B8=832024-05-21-002?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 419a49955..7787e8e4a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## dev发布2024-05-21-001
+## dev发布2024-05-21-002
 **xxxx.data.ts 文件配置说明**
 **form表单查询弹窗配置**
 form: {

From 6f0033323221638f65318434618a7b3e320abf32 Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Tue, 21 May 2024 13:51:57 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/customerreturnRequestMain/index.ts    |   7 +-
 .../relegateRequestMain.data.ts               |   2 -
 .../customerreturnRequestMain.data.ts         | 261 +++++++++++++++++-
 .../customerreturnRequestMain/index.vue       |  98 ++++++-
 .../purchasereturnRequestMain/index.vue       |   2 +-
 5 files changed, 363 insertions(+), 7 deletions(-)

diff --git a/src/api/wms/customerreturnRequestMain/index.ts b/src/api/wms/customerreturnRequestMain/index.ts
index 35a99a1fc..873bb25a4 100644
--- a/src/api/wms/customerreturnRequestMain/index.ts
+++ b/src/api/wms/customerreturnRequestMain/index.ts
@@ -117,4 +117,9 @@ export const pageItemCodeToBalance = async (params) => {
   } else {
     return request.get({ url: `/wms/customerreturn-request-main/pageItemCodeToBalance`, params })
   }
-}
\ No newline at end of file
+}
+
+// 生成标签
+export const genLabel = async (data) => {
+  return await request.post({ url: `/wms/customerreturn-request-main/genLabel`, data })
+}
diff --git a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
index a08b7c74e..96493a335 100644
--- a/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
+++ b/src/views/wms/basicDataManage/itemManage/relegate/relegateRequest/relegateRequestMain.data.ts
@@ -304,7 +304,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '物料代码',
     field: 'itemCode',
     sort: 'custom',
-    isSearch: true,
     form: {
       componentProps: {
         isSearchList: true,
@@ -379,7 +378,6 @@ export const RelegateRequestDetail = useCrudSchemas(reactive<CrudSchema[]>([
           isMainValue: false
         }]
     },
-    isSearch: true,
     table: {
       width: 150
     },
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index e6c424e58..8c3e40df6 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -1064,4 +1064,263 @@ export const CustomerreturnRequestDetailRules = reactive({
     { max: 50, message: '不得超过50个字符', trigger: 'blur' }
   ],
   
-})
\ No newline at end of file
+})
+
+export const CustomerReturnRequestDetailLabel = useCrudSchemas(reactive<CrudSchema[]>([
+  {
+    label: '物料代码',
+    field: 'itemCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    },
+    form: {
+      componentProps: {
+        disabled: true
+      }
+    }
+  },
+  {
+    label: '物料名称',
+    field: 'itemName',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述1',
+    field: 'itemDesc1',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+  },
+  {
+    label: '物料描述2',
+    field: 'itemDesc2',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '包装号',
+    field: 'packingNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '器具号',
+    field: 'containerNumber',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '数量',
+    field: 'qty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      component: 'InputNumber',
+      componentProps: {
+        disabled:true,
+        min: 1,
+        precision: 6
+      },
+    },
+    tableForm: {
+      disabled:true,
+      type: 'InputNumber',
+      min: 1,
+      precision: 6
+    }
+  },
+  {
+    label: '计量单位',
+    field: 'uom',
+    dictType: DICT_TYPE.UOM,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm: {
+      type: 'Select',
+      disabled: true
+    }
+  },
+  {
+    label: '从库位代码',
+    field: 'fromLocationCode',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '生产日期',
+    field: 'produceDate',
+    formatter: dateFormatter2,
+    detail: {
+      dateFormat: 'YYYY-MM-DD'
+    },
+    sort: 'custom',
+    table: {
+      width: 180
+    },
+    form: {
+      component: 'DatePicker',
+      componentProps: {
+        disabled:true,
+        style: {width: '100%'},
+        type: 'date',
+        dateFormat: 'YYYY-MM-DD',
+        valueFormat: 'x',
+      }
+    },
+    tableForm:{
+      disabled:true,
+      type:'FormDate',
+      placeholder: '请选择生产日期',
+      valueFormat: 'x',
+    },
+  },
+  {
+    label: '批次',
+    field: 'batch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    tableForm:{
+      disabled: true
+    }
+  },
+  {
+    label: '替代批次',
+    field: 'altBatch',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false
+  },
+  {
+    label: '库存状态',
+    field: 'inventoryStatus',
+    dictType: DICT_TYPE.INVENTORY_STATUS,
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    isTableForm: false,
+    isForm: false,
+    tableForm: {
+      type: 'Select'
+    }
+  },
+  {
+    label: '包装数量',
+    field: 'packQty',
+    sort: 'custom',
+    table: {
+      width: 150
+    },
+    form: {
+      componentProps: {
+        disabled: true,
+        isSearchList: true,
+        searchListPlaceholder: '请选择包装',
+        searchField: 'packQty',
+        searchTitle: '物品包装信息',
+        searchAllSchemas: Itempackaging.allSchemas,
+        searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+        searchCondition: [
+          {
+            key: 'itemCode',
+            value: 'itemCode',
+            message: '请选择订单行',
+            isMainValue: true
+          },
+          {
+            key: 'available',
+            value: 'TRUE',
+            isMainValue: false
+          }
+
+        ]
+      }
+    },
+    tableForm: {
+      disabled: true,
+      isInpuFocusShow: true,
+      searchListPlaceholder: '请选择包装',
+      searchField: 'packQty',
+      searchTitle: '物品包装信息',
+      searchAllSchemas: Itempackaging.allSchemas,
+      searchPage: ItemPackageApi.getItempackagingPageBySupplierdeliver,
+      searchCondition: [
+        {
+          key: 'itemCode',
+          value: 'itemCode',
+          message: '请选择订单行',
+          isMainValue: true
+        },
+        {
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }]
+    },
+    isTableForm: true,
+    isForm: true
+  },
+  {
+    label: '包装规格',
+    field: 'packUnit',
+    dictClass: 'string',
+    isTable: true,
+    sort: 'custom',
+    table: {
+      width: 150,
+      componentProps: {
+        disabled: true
+      }
+    },
+    tableForm:{
+      disabled:true
+    },
+    isTableForm: true,
+    isForm: true
+  },
+]))
\ No newline at end of file
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index 8aad48d77..4ed29a7e3 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -76,6 +76,21 @@
     :detailButtonIsShowDelete="trueFalse"
     @detailOpenForm="detailOpenForm"
   />
+<!-- 创建标签 -->
+<BasicForm
+    ref="formLabelRef"
+    @success="getList"
+    :tableAllSchemas="CustomerReturnRequestDetailLabel.allSchemas"
+    :tableFormRules="CustomerreturnRequestDetailRules"
+    :tableData="detatableData.tableList"
+    :isBusiness="true"
+    :isShowButton="false"
+    :isShowReduceButton="false"
+    @submitForm="submitFormLabel"
+    @searchTableSuccess="searchTableSuccess"
+  />
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="showLabelRef" @searchTableSuccess="showLabelSuccess" />
 
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/customerreturn-request-main/import" :importTemplateData="importTemplateData" 
@@ -85,12 +100,16 @@
 <script setup lang="ts">
 import download from '@/utils/download'
 import { CACHE_KEY, useCache } from '@/hooks/web/useCache'
-import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,CustomerreturnRequestDetail,CustomerreturnRequestDetailRules } from './customerreturnRequestMain.data'
+import { CustomerreturnRequestMain,CustomerreturnRequestMainRules,CustomerreturnRequestDetail,CustomerreturnRequestDetailRules,CustomerReturnRequestDetailLabel } from './customerreturnRequestMain.data'
 import * as CustomerreturnRequestMainApi from '@/api/wms/customerreturnRequestMain'
 import * as CustomerreturnRequestDetailApi from '@/api/wms/customerreturnRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
 import * as DeliverRecordDetailApi from '@/api/wms/deliverRecordDetail'
-
+import {
+  SupplierdeliverRequestPackage
+} from '../../../purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
 // 客户退货申请
 defineOptions({ name: 'CustomerreturnRequestMain' })
 
@@ -100,6 +119,7 @@ const { t } = useI18n() // 国际化
 const route = useRoute() // 路由信息
 const routeName = ref()
 const customerCode = ref()
+const genLabelId = ref(); //主表ID
 routeName.value = route.name
 const tableColumns = ref([...CustomerreturnRequestMain.allSchemas.tableColumns,...CustomerreturnRequestDetail.allSchemas.tableMainColumns])
 
@@ -344,8 +364,65 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  }else if(val == 'ssbq'){
+       // 生成标签
+     detatableData.params = {
+      masterId:row.masterId
+     }
+    genLabelId.value = row.masterId
+    await getDetailList()
+    formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
+  } else if (val == 'point') {
+    // 标签打印
+    labelPrint(row)
+  } 
+}
+// 生成标签
+const isCreateLabel = ref(false)
+const formLabelRef = ref()
+const { tableObject: detatableData, tableMethods: detatableMethods } =useTable({
+  getListApi: CustomerreturnRequestDetailApi.getCustomerreturnRequestDetailPage
+})
+const { getList:getDetailList } = detatableMethods
+// 生成标签按钮操作
+const submitFormLabel = async (formType, data) => {
+  try {
+    console.log("formType==",formType)
+    console.log("data==",data)
+    data.subList = detatableData.tableList
+    console.log("detatableData",detatableData)
+    await message.confirm(t('ts.是否为此数据生成标签？'))
+    await CustomerreturnRequestMainApi.genLabel(data) //genLabelId.value
+    isCreateLabel.value = true
+    message.success('创建标签成功')
+  } finally {
+    formLabelRef.value.formLoading = false
+    formLabelRef.value.dialogVisible = false
   }
 }
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+
+// 标签打印
+const showLabelRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'supplier','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  showLabelRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
 
 /** 添加/修改操作 */
 const formRef = ref()
@@ -531,6 +608,23 @@ const searchFormClick = (searchData) => {
   getList() // 刷新当前列表
 }
 
+// 批量打印---采购收货申请
+const showLabelSuccess = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      window.open(src.value + '&asn_number=' + res)
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
 /** 初始化 **/
 onMounted(async () => {
   getList()
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
index 083e6b2d1..e2920d06c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMain/index.vue
@@ -266,7 +266,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) =>
             if (res) tableData.value = res
             tableData.value.forEach((item) => {
               item.batch = item.toBatch
-              item.packingNumber = null
+              item.packingNumber = item.fromPackingNumber
               item.containerNumber = item.toContainerNumber
               item.receiptQty = item.qty
               item.toLocationGroupCode = null