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

src/api/wms/supplierdeliverRequestMain/index.ts

@@ -83,10 +83,18 @@ export const appSupplierdeliverRequestMain = async (id: number) => {
 export const rejSupplierdeliverRequestMain = async (id: number) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/rej?id=` + id })
 }
+
+// 校验是否上传自检报告
+export const selfCheckReport = async (id) => {
+  return await request.post({ url: `/wms/supplierdeliver-request-main/selfCheckReport?id=` + id })
+}
+
 // 生成标签
 export const genLabel = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genLabel?id=` + id })
 }
+
+
 // 生成记录
 export const genRecordsSupplierdeliverRequestMain = async (id) => {
   return await request.post({ url: `/wms/supplierdeliver-request-main/genRecords?id=` + id })

src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue

@@ -543,8 +543,18 @@ const genLabelId = ref()
 // 生成标签
 const pointRef = ref()
 const handlePoint = async (row) => {
+  await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(res => {
+    console.log(row.id)
+    if(!res){
+        message.warning("请先上传自检报告!")
+        return
+    }else{
       pointRef.value.openPoint(row.id)
     }
+  }).catch(err => {
+    console.log("自检报告校验异常",err)
+  })
+}
 // 标签打印
 const labelPrint = async (row) => {
   window.open(src.value + '&asn_number=' + row.asnNumber)