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) => {