From 7080ff23b3db1821c7435daed6c48dc7b02d7695 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 16 May 2024 17:56:45 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=8B=A8=E5=85=A5=E5=BA=93?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../transferreceiptJobMain.data.ts            | 38 +++++++++++-----
 .../transferreceiptRecordMain.data.ts         | 43 +++++++------------
 .../transferreceiptRequestMain.data.ts        | 18 ++++++--
 3 files changed, 59 insertions(+), 40 deletions(-)

diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
index e11a049d3..e3e3fff81 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptJobMain/transferreceiptJobMain.data.ts
@@ -196,6 +196,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级',
     field: 'priority',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -207,6 +208,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '优先级增量',
     field: 'priorityIncrement',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -218,6 +220,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -226,6 +229,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -234,6 +238,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -243,7 +248,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'autoComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -262,7 +267,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyLocation',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -281,7 +286,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -300,7 +305,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowBiggerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -319,7 +324,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowSmallerQty',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -338,7 +343,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyInventoryStatus',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -357,7 +362,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowContinuousScanning',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -376,7 +381,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowPartialComplete',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -395,7 +400,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyBatch',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -414,7 +419,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'allowModifyPackingNumber',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -439,6 +444,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -452,6 +458,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '承接人',
     field: 'acceptUserId',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -467,6 +474,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -480,6 +488,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '完成人',
     field: 'completeUserId',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -491,6 +500,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     detail: {
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
+    isTable: false,
     sort: 'custom',
     table: {
       width: 180
@@ -508,6 +518,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -523,6 +534,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -536,6 +548,7 @@ export const TransferreceiptJobMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '最后更新者',
     field: 'updater',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -621,6 +634,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -677,6 +691,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -734,6 +749,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -742,6 +758,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -750,6 +767,7 @@ export const TransferreceiptJobDetail = useCrudSchemas(reactive<CrudSchema[]>([
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
index e9acb88d2..7ad4cddb8 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRecordMain/transferreceiptRecordMain.data.ts
@@ -213,6 +213,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -221,6 +222,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '入库事务类型',
     field: 'inTransactionType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -229,6 +231,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '业务类型',
     field: 'businessType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -237,6 +240,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -246,7 +250,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -256,6 +260,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '备注',
     field: 'remark',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
@@ -268,6 +273,7 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
       dateFormat: 'YYYY-MM-DD HH:mm:ss'
     },
     sort: 'custom',
+    isTable: false,
     table: {
       width: 180
     },
@@ -284,25 +290,18 @@ export const TransferreceiptRecordMain = useCrudSchemas(reactive<CrudSchema[]>([
     label: '创建者',
     field: 'creator',
     sort: 'custom',
+    isTable: false,
     table: {
       width: 150
     },
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '是否可用',
     field: 'available',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
     isSearch: true,
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -384,6 +383,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '单据号',
     field: 'number',
     sort: 'custom',
+    hiddenInMain:true,
     table: {
       width: 180
     },
@@ -478,6 +478,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '从器具号',
     field: 'fromContainerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -486,6 +487,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '到器具号',
     field: 'toContainerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -521,6 +523,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -583,6 +586,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -591,6 +595,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -600,7 +605,7 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
     field: 'interfaceType',
     dictType: DICT_TYPE.INTERFACE_TYPE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     sort: 'custom',
     table: {
       width: 150
@@ -614,14 +619,6 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '创建时间',
     field: 'createTime',
@@ -650,14 +647,6 @@ export const TransferreceiptRecordDetail = useCrudSchemas(reactive<CrudSchema[]>
       width: 150
     },
   },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
 ]))
 
 //表单校验
diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
index 58fa9a02a..33fabc87e 100644
--- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
+++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/transferreceiptRequestMain.data.ts
@@ -190,6 +190,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable:false,
     form: {
       value: 'TransferReceipt',
       componentProps: {
@@ -201,6 +202,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '部门',
     field: 'departmentCode',
     sort: 'custom',
+    isTable:false,
     isForm: false,
     table: {
       width: 150
@@ -235,7 +237,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoCommit',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -256,7 +258,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoAgree',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -277,7 +279,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     field: 'autoExecute',
     dictType: DICT_TYPE.TRUE_FALSE,
     dictClass: 'string',
-    isTable: true,
+    isTable: false,
     isForm: false,
     sort: 'custom',
     table: {
@@ -325,6 +327,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 180
     },
+    isTable: false,
     form: {
       component: 'DatePicker',
       componentProps: {
@@ -342,6 +345,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -363,6 +367,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
         valueFormat: 'x',
       }
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -372,6 +377,7 @@ export const TransferreceiptRequestMain = useCrudSchemas(reactive<CrudSchema[]>(
     table: {
       width: 150
     },
+    isTable: false,
     isForm: false,
   },
   {
@@ -437,6 +443,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     table: {
       width: 180
     },
+    hiddenInMain:true,
     isTableForm: false,
     form: {
       componentProps: {
@@ -496,6 +503,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -553,6 +561,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '项目代码',
     field: 'projectCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -561,6 +570,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '从货主代码',
     field: 'fromOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -569,6 +579,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
     label: '到货主代码',
     field: 'toOwnerCode',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -676,6 +687,7 @@ export const TransferreceiptRequestDetail = useCrudSchemas(reactive<CrudSchema[]
       width: 150,
       fixed: 'right'
     },
+    hiddenInMain:true,
     isTableForm:false,
   }
 ]))

From 35e421aba16a71bd9c9c1ad7dd0f94d9ffa8548e Mon Sep 17 00:00:00 2001
From: chenfang <chenfang@chenrise.com>
Date: Thu, 16 May 2024 18:16:45 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E7=BF=BB=E5=8C=85=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wms/deliverRecordDetail/index.ts      |  2 +-
 .../wms/purchasereceiptRecordDetail/index.ts  |  2 +-
 .../packageoverRequestMain/index.vue          | 87 ++++++++++++++++++-
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/src/api/wms/deliverRecordDetail/index.ts b/src/api/wms/deliverRecordDetail/index.ts
index 28ea53b04..99890101c 100644
--- a/src/api/wms/deliverRecordDetail/index.ts
+++ b/src/api/wms/deliverRecordDetail/index.ts
@@ -77,5 +77,5 @@ export const importTemplate = () => {
 
 // 查询发货记录子列表
 export const getDeliverRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/deliver-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/deliver-record-detail/listToRepeatDeliverReceipt`, params })
 }
\ No newline at end of file
diff --git a/src/api/wms/purchasereceiptRecordDetail/index.ts b/src/api/wms/purchasereceiptRecordDetail/index.ts
index 17503b4e7..352eeb112 100644
--- a/src/api/wms/purchasereceiptRecordDetail/index.ts
+++ b/src/api/wms/purchasereceiptRecordDetail/index.ts
@@ -101,7 +101,7 @@ export const getPurchasereceiptRecordDetailList = async (params) => {
 
 // 查询采购收货记录子列表
 export const getPurchasereceiptRecordDetailListToRepeat = async (params) => {
-  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeat`, params })
+  return await request.get({ url: `/wms/purchasereceipt-record-detail/listToRepeatPurchaseReceipt`, params })
 }
 
 // 查询采购收货记录子详情
diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
index 95af0ae92..b05a91479 100644
--- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
+++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue
@@ -74,6 +74,8 @@
   <!-- 导入 -->
   <ImportForm ref="importFormRef" url="/wms/packageover-request-main/import" :importTemplateData="importTemplateData" @success="importSuccess" 
   :updateIsDisable="true" :coverIsDisable="true" :mode="2"/>
+  <!-- 标签打印 -->
+  <SearchTable style="width:905px" ref="searchTableRef" @searchTableSuccess="searchTableSuccess1" />
 </template>
 
 <script setup lang="ts">
@@ -83,6 +85,8 @@ import { PackageoverRequestMain,PackageoverRequestMainRules, PackageoverRequestD
 import * as PackageoverRequestMainApi from '@/api/wms/packageoverRequestMain'
 import * as PackageoverRequestDetailApi from '@/api/wms/packageoverRequestDetail'
 import * as defaultButtons from '@/utils/disposition/defaultButtons'
+import * as PackageApi from '@/api/wms/package'
+import { getAccessToken } from '@/utils/auth'
 
 defineOptions({ name: 'PackageoverRequestMain' })
 
@@ -93,7 +97,7 @@ const route = useRoute() // 路由信息
 const routeName = ref()
 routeName.value = route.name
 const tableColumns = ref([...PackageoverRequestMain.allSchemas.tableColumns,...PackageoverRequestDetail.allSchemas.tableMainColumns])
-
+const isCreateLabel = ref(false)
 // 字段设置 更新主列表字段
 const updataTableColumns = (val) => {
   tableColumns.value = val
@@ -188,6 +192,8 @@ const HeadButttondata = [
   // },
 ]
 
+const labelType = ref('') // 标签类别 采购还是制造等 
+
 // 头部按钮事件
 const buttonBaseClick = (val, item) => {
   if (val == 'add') { // 新增
@@ -311,6 +317,8 @@ const buttonTableClick = async (val, row) => {
     openForm('update', row)
   } else if (val == 'delete') { // 删除
     handleDelete(row.masterId)
+  }else if (val == 'point') { // 标签打印
+    handlePoint(row)
   }
 }
 
@@ -321,6 +329,34 @@ const openForm =async (type: string, row?: number) => {
   formRef.value.open(type, row)
 }
 
+// 批量打印--生产退料
+const searchTableSuccess1 = async (formField, searchField, val, formRef, type, row) => {
+  console.log('批量打印',val)
+  // let rows:any = []
+  // val.forEach(item=>{
+  //   rows = [...rows,...item.selectionRows.map(item1=>item1.number)]
+  // })
+  if(val.length == 0){
+    message.warning("请先选择要打印的数据!")
+    return
+  }
+  // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+
+  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      if (labelType.value == 'cg') {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      } else {
+        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+        window.open(src.value+'&asn_number='+res)
+      }
+  }).catch(err => {
+    console.log(err)
+    message.error('创建标签失败')
+  })
+}
+
 // 获取部门 用于详情 部门回显
 const { wsCache } = useCache()
 /** 详情操作 */
@@ -410,6 +446,55 @@ const submitForm = async (formType, data) => {
   }
 }
 
+const BASE_URL = import.meta.env.VITE_JMREPORT_BASE_URL
+// 标签打印
+const handlePoint = async (row) => {
+  // 查询是否已创建过标签
+  await PackageApi.getPackagePage({
+    requestNumber: row.number
+  }).then((res) => {
+    if(res.list.length > 0) {
+      isCreateLabel.value = true
+      if (res.list[0].productionLineCode != null) {
+        labelType.value = 'zz'
+      } else {
+        labelType.value = 'cg'
+      }
+    } else {
+      isCreateLabel.value = false
+    }
+  }).catch(err => {
+    isCreateLabel.value = false
+    console.log(err)
+  })
+  // 判断是采购还是制造
+  if (isCreateLabel.value) {
+    labelPrint(row)
+  } else {
+    message.warning('请先创建标签')
+  }
+}
+
+const searchTableRef = ref()
+const labelPrint = async (row) => {
+  tableObject.loading = true
+  const defaultParams = {'moduleName':'productreturn_predict','recordNumber':row.number}
+  const {tableObject:tableObjectPrint ,tableMethods} = useTable({
+    defaultParams,
+    getListApi: PackageApi.getLabelDetailPage  // 分页接口
+  })
+
+  // 获得表格的各种操作
+  const { getList:getListPrint } = tableMethods
+  getListPrint()
+  tableObject.loading = false
+  const tableColumns = PackageoverRequestMain.allSchemas.tableFormColumns
+  tableColumns.forEach((item) => {
+    item.width = item.table?.width || 150
+  })
+  searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true)
+}
+
 /** 导入 */
 const importFormRef = ref()
 const handleImport = () => {

From 27aec3b3e1d55688ae8ab443fb3f423df9f16e79 Mon Sep 17 00:00:00 2001
From: zhaoxuebing <1291173720@qq.com>
Date: Thu, 16 May 2024 18:33:31 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=8B=86=E8=A7=A3bom=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productdismantleRecordMain.data.ts        | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
index b1dcbbd0c..57dc8d479 100644
--- a/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
+++ b/src/views/wms/productionManage/productdismantle/productdismantleRecordMain/productdismantleRecordMain.data.ts
@@ -53,6 +53,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '出库事务类型',
     field: 'outTransactionType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -61,6 +62,7 @@ export const ProductdismantleRecordMain = useCrudSchemas(reactive<CrudSchema[]>(
     label: '入库事务类型',
     field: 'inTransactionType',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -370,6 +372,7 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     label: '器具号',
     field: 'containerNumber',
     sort: 'custom',
+    isTable:false,
     table: {
       width: 150
     },
@@ -532,22 +535,6 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
       width: 150
     },
   },
-  // {
-  //   label: '任务明细ID',
-  //   field: 'jobDetailId',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
-  // {
-  //   label: '代码',
-  //   field: 'code',
-  //   sort: 'custom',
-  //   table: {
-  //     width: 150
-  //   },
-  // },
   {
     label: '接口类型',
     field: 'interfaceType',
@@ -599,8 +586,9 @@ export const ProductdismantleRecordDetaila = useCrudSchemas(reactive<CrudSchema[
     label: '操作',
     field: 'action',
     isDetail: false,
-    isForm: false ,
-    isTable:false,
+    isForm: false,
+    hiddenInMain:true,
+    isTable:true,
     table: {
       width: 150,
       fixed: 'right'

From e31be196b3eb373fcc325e5b21d1644d97792f75 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Thu, 16 May 2024 18:35:24 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9logo=E5=A4=A7=E5=B0=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Logo/src/Logo.vue | 2 +-
 src/views/login/login.vue               | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/layout/components/Logo/src/Logo.vue b/src/layout/components/Logo/src/Logo.vue
index be91491c5..1400ee4f2 100644
--- a/src/layout/components/Logo/src/Logo.vue
+++ b/src/layout/components/Logo/src/Logo.vue
@@ -78,7 +78,7 @@ watch(
       to="/"
     >
     <img
-        class="h-24px w-160px h-40px"
+        class="h-24px w-144px h-36px"
         src="@/assets/imgs/logo_white.png"
       />
       <!-- <img
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index 7954d6066..b9bf1709d 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -9,7 +9,7 @@
       >
         <!-- 左上角的 logo + 系统标题 -->
         <div class="relative flex items-center text-white">
-          <img alt="" class="mr-10px h-40px w-160px" src="@/assets/imgs/logo_white.png" />
+          <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
           <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
         </div>
         <!-- 左边的背景图 + 欢迎语 -->
@@ -33,7 +33,7 @@
           class="flex items-center justify-between text-white at-2xl:justify-end at-xl:justify-end"
         >
           <div class="flex items-center at-2xl:hidden at-xl:hidden">
-            <img alt="" class="mr-10px h-40px w-160px" src="@/assets/imgs/logo_white.png" />
+            <img alt="" class="mr-10px w-144px h-36px" src="@/assets/imgs/logo_white.png" />
             <span class="text-20px font-bold">{{ underlineToHump(appStore.getTitle) }}</span>
           </div>
           <div class="flex items-center justify-end space-x-10px">