生产退料打印标签

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

@@ -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 = []//存储可采购数据
+  let array1 = []//存储可制造数据
+  let packingNumbers = []
+  val.forEach((item,index) => {
+    packingNumbers.push(item.number)
    
-  await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => {
+    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)
-      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)
+      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

@@ -1724,6 +1724,13 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive<CrudSchema[
       width: 150,
     },
   },
-
+  {
+    label: '物料类型',
+    field: 'itemType',
+    sort: 'custom',
+    tableForm: {
+      disabled: true
+    }
+  },
 ]))