Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into intex

src/views/wms/deliversettlementManage/moldAllocation/customerStatement/index.vue

@@ -175,7 +175,7 @@ routeName.value = route.name
 const tableColumns = ref(CustomerStatementMain.allSchemas.tableColumns)
 
 const apiPage = ref(CustomerStatementDetailApi.getCustomerStatementDetailPage)
-const DetailAllSchemas = ref(CustomerStatementShareReconciliation.allSchemas)
+const DetailAllSchemas = ref(CustomerStatementDetail.allSchemas)
 
 const tabsExtend = ref(false)
 const tableObjectExtend = ref()

src/views/wms/inventoryManage/balance/balance.data.ts

@@ -74,6 +74,7 @@ export const Balance = useCrudSchemas(
       label: '供应商批次',
       field: 'altBatch',
       sort: 'custom',
+      isTable: false,
       table: {
         width: 150
       },

src/views/wms/inventoryManage/package/index.vue

@@ -369,8 +369,15 @@ const handlePoint = async (row) => {
     }
     if (res.cgLabel) {
       //采购标签
-      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      // const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
-      window.open(src.value+'&asn_number='+res.cgLabel)
+      // window.open(src.value+'&asn_number='+res.cgLabel)
+       PackageApi.getPrintingLableId({packingNumbers:[row.number]}).then(res => {
+        console.log(res)
+        window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+      }).catch(err => {
+        console.log(err)
+        message.error('创建标签失败')
+      })
     }
     if(!res.cgLabel&&!res.zzLabel){
       message.warning('包装不存在，无法打印或者是线边物料数据不生成包装!')

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/index.vue

@@ -135,7 +135,7 @@ const tableColumns = ref([...ProductionreturnRequestMain.allSchemas.tableColumns
 
 //创建标签
 const detailListTableColumns =cloneDeep(ProductionreturnRequestDetailLabel.allSchemas) 
-const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabel) 
+const detailListTableColumnsRules =cloneDeep(ProductionreturnRequestDetailLabelRules) 
 const isCreateLabel = ref(false)
 const formLabelRef = ref()
 const labelType = ref('') // 标签类别 采购还是制造等
@@ -704,20 +704,51 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
+  let array = []//存储可采购数据
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  let array1 = []//存储可制造数据
-      console.log(res)
+  let packingNumbers = []
-      if (labelType.value == 'cg') {
+  val.forEach((item,index) => {
-        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    packingNumbers.push(item.number)
-        window.open(src.value+'&asn_number='+res)
+   
-      } else {
+    if (item.itemType == '可采购') {
-        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      array.push(item)
-        window.open(src.value+'&asn_number='+res)
+    }
-      }
+    if (item.itemType == '可制造') {
-  }).catch(err => {
+      array1.push(item)
-    console.log(err)
+    }
-    message.error('创建标签失败')
   })
+  if (array.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  if (array1.length > 0) {
+    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
+      console.log(res)
+      const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+      window.open(src.value + '&asn_number=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  // 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('创建标签失败')
+  // })
 }
 
 // 获取部门 用于详情 部门回显

src/views/wms/issueManage/productionreturn/productionreturnRequestMain/productionreturnRequestMain.data.ts

@@ -1478,6 +1478,8 @@ export const ProductionreturnRequestDetailLabel = useCrudSchemas(reactive<CrudSc
     },
     tableForm: {
       disabled: true,
+      type: 'FormDate',
+      format: 'YYYYMMDD',
       valueFormat: 'YYYYMMDD',
     },
     form: {
@@ -1670,7 +1672,11 @@ export const ProductionreturnRequestDetailLabelRules = reactive({
   ],
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+  ],
+  batch: [
+    { required: true, message: '请输入批次', trigger: ['blur', 'change'] }
+  ],
+ 
 })
 
 
@@ -1724,6 +1730,13 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-
+{
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
 ]))
 

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue

@@ -255,6 +255,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
     if (fromInventoryStatus.value) {
       item.tableForm.searchCondition = [
       {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },
+        {
         key: 'businessType',
         value: businessType.value ,
         isMainValue: false
@@ -268,6 +274,12 @@ InventorymoveRequestDetail.allSchemas.tableFormColumns.map(item => {
      ]
     } else if (fromInventoryStatus.value == null) {
       item.tableForm.searchCondition = [
+      {
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },
       {
         key: 'businessType',
         value: businessType.value ,

src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/inventorymoveRequestMain.data.ts

@@ -527,6 +527,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
       searchTitle: '库存余额信息',
       searchAllSchemas: BalancePopWindow.allSchemas,
       searchPage: BalanceApi.selectLocationTypeToBalance,
+      searchCondition: [{
+        key:'fromWarehouseCode',
+        value:'fromWarehouseCode',
+        message: '请选择从仓库代码！',
+        isMainValue: true
+      },{
+        key: 'available',
+        value: 'TRUE',
+        isMainValue: false
+      }],
     },
     form: {
       // labelMessage: '信息提示说明！！！',
@@ -537,6 +547,16 @@ export const InventorymoveRequestDetail = useCrudSchemas(reactive<CrudSchema[]>(
         searchTitle: '库存余额信息',
         searchAllSchemas: BalancePopWindow.allSchemas,
         searchPage: BalanceApi.selectLocationTypeToBalance,
+        searchCondition: [{
+          key:'fromWarehouseCode',
+          value:'fromWarehouseCode',
+          message: '请选择从仓库代码！',
+          isMainValue: true
+        },{
+          key: 'available',
+          value: 'TRUE',
+          isMainValue: false
+        }],
       }
     }
   },

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -195,6 +195,7 @@ import * as ConfigApi from '@/api/infra/config'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
 import {exportProductreceiptRequestMainPredict} from "@/api/wms/productreceiptRequestMain";
 import * as ItemPackageApi from "@/api/wms/itempackage";
+import * as ruleApi  from '@/api/wms/rule/index'
 const { loadStart, loadDone } = usePageLoading()
 // 制品收货申请
 // 预生产收货申请
@@ -481,6 +482,7 @@ const butttondata = (row, $index) => {
   ]
 }
 
+let toManagementPrecision =  ref('')
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') {
@@ -622,6 +624,19 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
+      ruleApi.getManagementPrecision({
+        	itemCodes: [item['itemCode']],
+		      locationCode: item.toLocationCode
+        }).then((res) => {
+          toManagementPrecision.value = res[0].ManagementPrecision
+        })
+        if ( toManagementPrecision.value == 'BY_BATCH') {
+          // row['fromBatchFormItemType'] = 'FormDate'
+          row['disabled_batch'] = false
+        } else {
+          // row['fromBatchFormItemType'] = ''
+          row['disabled_batch'] = true
+        }
     })
   } else if (val == 'mainHandle') {
     // 处理
@@ -959,22 +974,52 @@ const searchTableSuccessLabel = async (formField, searchField, val, formRef, typ
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
+let array = []//存储可采购数据
+  let array1 = []//存储可制造数据
+    let packingNumbers = []
+  val.forEach((item,index) => {
+    packingNumbers.push(item.number)
    
-  await PackageApi.batchPrintingLable(val.map((item1) => item1.number).join(','))
+    if (item.itemType == '可采购') {
-    .then((res) => {
+      array.push(item)
+    }
+    if (item.itemType == '可制造') {
+      array1.push(item)
+    }
+  })
+  if (array.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
       console.log(res)
-      if (labelType.value == 'cg') {
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
-        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    }).catch(err => {
-        window.open(src.value + '&asn_number=' + res)
+      console.log(err)
-      } else {
+      message.error('创建标签失败')
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
-        window.open(src.value + '&asn_number=' + res)
-      }
     })
-    .catch((err) => {
+  }
+  if (array1.length > 0) {
+    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value + '&asn_number=' + res)
+    }).catch(err => {
       console.log(err)
       message.error('创建标签失败')
     })
+  }
+  // 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/922734157577715712?token=' + getAccessToken())
+  //       window.open(src.value + '&asn_number=' + res)
+  //     }
+  //   })
+  //   .catch((err) => {
+  //     console.log(err)
+  //     message.error('创建标签失败')
+  //   })
 }
 const getDefaultWorkshopCode = async () => {
   const data = await ConfigApi.getConfigPage({

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/productreceiptRequestMain.data.ts

@@ -1727,8 +1727,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled: true
+      disabled: true,
-    }
+      type: 'FormDate',
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
   },
   {
     label: '数量',
@@ -2131,6 +2135,9 @@ export const ProductreceiptRequestLabelRules = reactive({
   ],
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+  ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: ['change','blur'] }
+  ],
 })
 

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue

@@ -155,6 +155,7 @@ import { formatDate } from '@/utils/formatTime'
 import * as WorkshopApi from '@/api/wms/workshop'
 import * as ConfigApi from '@/api/infra/config'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+import * as ruleApi  from '@/api/wms/rule/index'
 const { loadStart, loadDone } = usePageLoading()
 // 装配收货申请
 // 号口品收货申请
@@ -381,6 +382,7 @@ const butttondata = (row,$index) => {
 
 
 // 列表-操作按钮事件
+const toManagementPrecision = ref('')
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
@@ -505,6 +507,19 @@ const buttonTableClick = async (val, row) => {
           return
         }
       })
+      ruleApi.getManagementPrecision({
+        	itemCodes: [item['itemCode']],
+		      locationCode: item.toLocationCode
+        }).then((res) => {
+          toManagementPrecision.value = res[0].ManagementPrecision
+          if ( toManagementPrecision.value == 'BY_BATCH') {
+          // row['fromBatchFormItemType'] = 'FormDate'
+          item['disabled_batch'] = true
+        } else if(toManagementPrecision.value == 'BY_QUANTITY') {
+          // row['fromBatchFormItemType'] = ''
+            item['disabled_batch'] = false
+        }
+     })  
     })
 
   } else if (val == 'mainHandle') { // 处理
@@ -818,20 +833,50 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
+let array = []//存储可采购数据
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  let array1 = []//存储可制造数据
-      console.log(res)
+    let packingNumbers = []
-      if (labelType.value == 'cg') {
+  val.forEach((item,index) => {
-        const src = ref(BASE_URL + '/jmreport/view/922729953438072832?token=' + getAccessToken())
+    packingNumbers.push(item.number)
-        window.open(src.value+'&asn_number='+res)
+   
-      } else {
+    if (item.itemType == '可采购') {
-        const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      array.push(item)
-        window.open(src.value+'&asn_number='+res)
+    }
-      }
+    if (item.itemType == '可制造') {
-  }).catch(err => {
+      array1.push(item)
-    console.log(err)
+    }
-    message.error('创建标签失败')
   })
+  if (array.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  if (array1.length > 0) {
+    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
+      const src = ref(BASE_URL + '/jmreport/view/922734157577715712?token=' + getAccessToken())
+      window.open(src.value + '&asn_number=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  // 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/922734157577715712?token=' + getAccessToken())
+  //       window.open(src.value+'&asn_number='+res)
+  //     }
+  // }).catch(err => {
+  //   console.log(err)
+  //   message.error('创建标签失败')
+  // })
 }
 const getDefaultWorkshopCode = async () => {
   const data = await ConfigApi.getConfigPage({

src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/productreceiptAssembleRequestMain.data.ts

@@ -1732,8 +1732,12 @@ export const ProductreceiptRequestLabel = useCrudSchemas(reactive<CrudSchema[]>(
       width: 150
     },
     tableForm: {
-      disabled:true
+      disabled: true,
-    }
+      type:'FormDate',
+      placeholder: '请选择从批次',
+      valueFormat: 'YYYYMMDD',
+      format: 'YYYYMMDD',
+    },
   },
   {
     label: '数量',
@@ -2090,6 +2094,9 @@ export const ProductreceiptRequestLabelRules = reactive({
   ],
   productionLineCodePackage: [
     { required: true, message: '请选择生产线', trigger: 'change' }
-  ]
+  ],
+  batch: [
+    { required: true, message: '请选择批次', trigger: ['change', 'blur'] }
+  ],
 })
 

src/views/wms/purchasereceiptManage/developpurchasereceipt/developPurchasereceiptRequestMain/index.vue

@@ -168,11 +168,11 @@ import {
   PurchasereceiptRequestDetail,
   PurchasereceiptRequestDetailRules,
   PurchasereceiptRequestDetailLabel,
-  PurchasereceiptRequestDetailPackingNumber
+  PurchasereceiptRequestDetailPackingNumber,
- } from './purchasereceiptRequestMain.data'
+} from './purchasereceiptRequestMain.data'
  import { 
-  SupplierdeliverRequestPackage
+  PurchasereceiptRequestPackage
-} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+ } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data'
  import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
  import * as PackageApi from '@/api/wms/package'
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
@@ -559,7 +559,7 @@ const labelPrint = async (row) => {
   const { getList:getListPrint } = tableMethods
   await getListPrint()
   tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width
   })
@@ -580,14 +580,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
+let array = []//存储可采购数据
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  let array1 = []//存储可制造数据
+    let packingNumbers = []
+  val.forEach((item,index) => {
+    packingNumbers.push(item.number)
+   
+    if (item.itemType == '可采购') {
+      array.push(item)
+    }
+    if (item.itemType == '可制造') {
+      array1.push(item)
+    }
+  })
+  if (array.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  if (array1.length > 0) {
+    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
       window.open(src.value + '&asn_number=' + res)
-  }).catch(err => {
+    }).catch(err => {
-    console.log(err)
+      console.log(err)
-    message.error('创建标签失败')
+      message.error('创建标签失败')
-  })
+    })
+  }
+  // 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('创建标签失败')
+  // })
 }
 
 const updateTableData = (tableList)=>{

src/views/wms/purchasereceiptManage/toolpurchasereceipt/toolPurchasereceiptRequestMain/index.vue

@@ -171,8 +171,8 @@ import {
   PurchasereceiptRequestDetailPackingNumber
  } from './purchasereceiptRequestMain.data'
  import { 
-  SupplierdeliverRequestPackage
+  PurchasereceiptRequestPackage
-} from '../../supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data'
+ } from '@/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data'
  import { PurchaseDetail } from '../../supplierdeliver/purchaseMain/purchaseMain.data'
  import * as PackageApi from '@/api/wms/package'
 import * as PurchasereceiptRequestMainApi from '@/api/wms/purchasereceiptRequestMain'
@@ -188,6 +188,7 @@ import { getJmreportBaseUrl } from '@/utils/systemParam'
 import { getReportUrl } from '@/utils/systemParam'
 import { dateFormatter2 } from '@/utils/formatTime'
 import { usePageLoading } from '@/hooks/web/usePageLoading'
+
 const { loadStart, loadDone } = usePageLoading()
 // 协定品收货申请
 defineOptions({ name: 'ToolPurchasereceiptRequestMain' })
@@ -559,7 +560,7 @@ const labelPrint = async (row) => {
   const { getList:getListPrint } = tableMethods
   await getListPrint()
   tableObject.loading = false
-  const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns
+  const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns
   tableColumns.forEach((item) => {
     item.width = item.table?.width
   })
@@ -580,14 +581,44 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r
     return
   }
   // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(','))
-
+let array = []//存储可采购数据
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+  let array1 = []//存储可制造数据
+    let packingNumbers = []
+  val.forEach((item,index) => {
+    packingNumbers.push(item.number)
+   
+    if (item.itemType == '可采购') {
+      array.push(item)
+    }
+    if (item.itemType == '可制造') {
+      array1.push(item)
+    }
+  })
+  if (array.length>0) {
+    await PackageApi.getPrintingLableId({packingNumbers:array.map(item1=>item1.number)}).then(res => {
+      console.log(res)
+      window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res)
+    }).catch(err => {
+      console.log(err)
+      message.error('创建标签失败')
+    })
+  }
+  if (array1.length > 0) {
+    await PackageApi.batchPrintingLable(array1.map(item1=>item1.number).join(',')).then(res => {
       console.log(res)
       window.open(src.value + '&asn_number=' + res)
-  }).catch(err => {
+    }).catch(err => {
-    console.log(err)
+      console.log(err)
-    message.error('创建标签失败')
+      message.error('创建标签失败')
-  })
+    })
+  }
+  // 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('创建标签失败')
+  // })
 }
 
 const updateTableData = (tableList)=>{