From 439a0afb41b185001f48236dc7e85ea7be4f0dab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B7=BB=E7=A0=96-JAVA=5CAdministrator?= <591141169@qq.com>
Date: Fri, 23 Aug 2024 14:37:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9Q2=E9=80=9A=E7=9F=A5=E5=8D=95?=
 =?UTF-8?q?=E9=99=84=E4=BB=B6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/qms/inspectionQ2/index.vue           |  4 ++--
 .../qms/inspectionQ2/inspectionQ2.data.ts      |  2 +-
 .../purchasereturnRequestMainNew/index.vue     | 18 ++++++++++++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue
index a624b9859..518e78a42 100644
--- a/src/views/qms/inspectionQ2/index.vue
+++ b/src/views/qms/inspectionQ2/index.vue
@@ -466,7 +466,8 @@ const openForm = (type: string, row?: any) => {
       }
     })
   }
-  
+
+  basicFormRef.value.open(type, row)
   if(!row || !row.claimAmount){
    nextTick(() => {
       basicFormRef.value.formRef.setValues({
@@ -502,7 +503,6 @@ const openForm = (type: string, row?: any) => {
     )
     uploadFile['componentProps']['modelValue'] = row.filePathListView
   }
-  basicFormRef.value.open(type, row)
 }
 
 // form表单提交
diff --git a/src/views/qms/inspectionQ2/inspectionQ2.data.ts b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
index 408786daf..39e526e7e 100644
--- a/src/views/qms/inspectionQ2/inspectionQ2.data.ts
+++ b/src/views/qms/inspectionQ2/inspectionQ2.data.ts
@@ -25,7 +25,7 @@ export const Q2Rules = reactive({
   supplierCode: [{ required: true, message: '请选择供应商代码', trigger: 'change' }],
   purchaseReceiptNumber: [
     { required: true, message: '请选择采购收货单号', trigger: 'change' },
-    { max: 50, message: '不得超过50个字符', trigger: 'blur' }
+    { max: 255, message: '不得超过255个字符', trigger: 'blur' }
   ],
   claimTime: [{ required: true, message: '请选择索赔日期', trigger: 'change' }],
   lightItemCode: [{ required: true, message: '请选择整灯物料代码', trigger: 'change' }],
diff --git a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
index 0a32f2981..5b99c542c 100644
--- a/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
+++ b/src/views/wms/purchasereceiptManage/purchasereturn/purchasereturnRequestMainNew/index.vue
@@ -465,7 +465,10 @@ const butttondata = (row, $index) => {
     defaultButtons.mainListEditBtn({
       hide: isShowMainButton(row, ['1']),
       hasPermi: 'wms:purchasereturn-request-main:update'
-    }) // 编辑
+    }),// 编辑
+    defaultButtons.mainListDocumentPrintBtn({
+      hide: isShowMainButton(row, ['8']) 
+    })// 打印标签
     // {
     //   label: '生成标签',
     //   name: 'ssbq',
@@ -511,12 +514,23 @@ const buttonTableClick = async (val, row) => {
     genLabelId.value = row.masterId
     await getDetailList()
     formLabelRef.value.open('create', row, null, 'createLabel') //创建标签页面 createLabel 标题
-  } else if (val == 'point') {
+  }
+  else if (val == 'documentPrint') {
+    // 单据打印
+    handleDocumentPrint(row.number,row.itemCode)
+  }else if (val == 'point') {
     // 标签打印
     labelPrint(row)
   }
 }
 
+// 单据打印
+const BASE_URL2 = getJmreportBaseUrl()
+const documentSrc = ref(BASE_URL2 + '/jmreport/view/920874172025987072?token=' + getAccessToken())
+const handleDocumentPrint = async (number,itemCode) => {
+  window.open(documentSrc.value + '&requestNumber=' + number +'&itemCode=' + itemCode)
+}
+
 /** 添加/修改操作 */
 const formRef = ref()
 const openForm = async (type: string, row?: Object) => {