diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
index 1a697012a..bf1e93890 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/customerreturnRequestMain.data.ts
@@ -882,47 +882,47 @@ export const CustomerreturnRequestDetail = useCrudSchemas(reactive<CrudSchema[]>
       }
     }
   },
-  {
-    label: '包装号',
-    field: 'packingNumber',
-    sort: 'custom',
-    table: {
-      width: 150
-    },
-    tableForm:{
-      isInpuFocusShow: true, // 开启查询弹窗
-      searchListPlaceholder: '请选择包装号',
-      searchField: 'packingNumber',
-      searchTitle: '库存余额信息',
-      searchAllSchemas: Balance.allSchemas,
-      searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-      searchCondition: [{
-        key:'customerCode', // 查询列表中字段
-        value:'customerCode', // 指主表某字段
-        message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-        isMainValue: true // 表示查询条件是主表的字段的值
-      }
-    ]
-    },
-    form: {
-      // labelMessage: '信息提示说明！！！',
-      componentProps: {
-        isSearchList: true, // 开启查询弹窗
-        searchListPlaceholder: '请选择包装号',
-        searchField: 'packingNumber',
-        searchTitle: '库存余额信息',
-        searchAllSchemas: Balance.allSchemas,
-        searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
-        searchCondition: [{
-          key:'customerCode', // 查询列表中字段
-          value:'customerCode', // 指主表某字段
-          message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
-          isMainValue: true // 表示查询条件是主表的字段的值
-        }
-      ]
-      }
-    }
-  },
+  // {
+  //   label: '包装号',
+  //   field: 'packingNumber',
+  //   sort: 'custom',
+  //   table: {
+  //     width: 150
+  //   },
+  //   tableForm:{
+  //     isInpuFocusShow: true, // 开启查询弹窗
+  //     searchListPlaceholder: '请选择包装号',
+  //     searchField: 'packingNumber',
+  //     searchTitle: '库存余额信息',
+  //     searchAllSchemas: Balance.allSchemas,
+  //     searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //     searchCondition: [{
+  //       key:'customerCode', // 查询列表中字段
+  //       value:'customerCode', // 指主表某字段
+  //       message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //       isMainValue: true // 表示查询条件是主表的字段的值
+  //     }
+  //   ]
+  //   },
+  //   form: {
+  //     // labelMessage: '信息提示说明！！！',
+  //     componentProps: {
+  //       isSearchList: true, // 开启查询弹窗
+  //       searchListPlaceholder: '请选择包装号',
+  //       searchField: 'packingNumber',
+  //       searchTitle: '库存余额信息',
+  //       searchAllSchemas: Balance.allSchemas,
+  //       searchPage: CustomerreturnRequestApi.pageItemCodeToBalance,
+  //       searchCondition: [{
+  //         key:'customerCode', // 查询列表中字段
+  //         value:'customerCode', // 指主表某字段
+  //         message: '请选择客户代码！', // 当前置条件为空时 弹出信息提示
+  //         isMainValue: true // 表示查询条件是主表的字段的值
+  //       }
+  //     ]
+  //     }
+  //   }
+  // },
   // {
   //   label: '器具号',
   //   field: 'containerNumber',
diff --git a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
index b46e6663e..a6b1b8c67 100644
--- a/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
+++ b/src/views/wms/deliversettlementManage/customerreturn/customerreturnRequestMain/index.vue
@@ -220,6 +220,7 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row ) =>
             value = obj.fromLocationCode
             obj.fromLocationCode = obj.toLocationCode
             obj.toLocationCode = ''
+            obj.packingNumber = '' // 包装号所有为空
             CustomerreturnRequestDetail.allSchemas.tableFormColumns.map(item =>{
               if(item.field == 'packingNumber') {
               item.isInpuFocusShow = false
@@ -319,6 +320,7 @@ const isShowMainButton = (row,val) => {
   }
 }
 
+
 // 列表-操作按钮
 const butttondata = (row,$index) => {
   const findIndex = row['masterId']?tableObject.tableList.findIndex(item=>item['masterId'] == row['masterId']):-1
@@ -336,7 +338,8 @@ const butttondata = (row,$index) => {
         {
       label: '生成标签',
       name: 'ssbq',
-      hide: isShowMainButton(row, ['3','6']),
+      // hide: isShowMainButton(row, ['3','6']),
+      hide: isShowMainButton(row, ['3']),
       type: 'primary',
       icon: '',
       color: '',
@@ -407,6 +410,19 @@ const buttonTableClick = async (val, row) => {
       console.log(err)
     })
   } else if (val == 'mainHandle') { // 处理
+    // 判断 是否已创建标签
+    let isCreateLabel = false
+    await PackageApi.getPackagePage({
+      requestNumber: row.number
+    }).then(res => {
+      if (res) {
+        if (res.list.length > 0) isCreateLabel = true
+      }
+    })
+    if (!isCreateLabel) {
+      message.warning('请先创建标签')
+      return
+    }
     await message.confirm('确认要处理吗？')
     tableObject.loading = true
     CustomerreturnRequestMainApi.handle(row.masterId).then(() => {