From e9c3080314052f8eb450186c7f91a662b700a2c0 Mon Sep 17 00:00:00 2001
From: yufei0306 <13417315+yufei0306@user.noreply.gitee.com>
Date: Wed, 17 Apr 2024 15:33:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=8D=A2=E4=B8=BB=E8=A1=A8id=E4=B8=BA?=
 =?UTF-8?q?masterId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sparereceiptRequestMain/index.vue         | 16 +++++------
 .../supplierdeliverRequestMain/index.vue      | 27 ++++++++++---------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
index 93cc5552a..0278bc37b 100644
--- a/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/sparereceipt/sparereceiptRequestMain/index.vue
@@ -275,25 +275,25 @@ const butttondata = (row) => {
 // 列表-操作按钮事件
 const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
-    handleClose(row.id)
+    handleClose(row.masterId)
   } else if (val == 'mainReAdd') { // 重新添加
-    handleReAdd(row.id)
+    handleReAdd(row.masterId)
   } else if (val == 'mainSubmit') { // 提交审批
-    handleSubmit(row.id)
+    handleSubmit(row.masterId)
   } else if (val == 'mainTurnDown') { // 驳回
-    handleRefused(row.id)
+    handleRefused(row.masterId)
   } else if (val == 'mainApprove') { // 审批通过
-    handleAgree(row.id)
+    handleAgree(row.masterId)
   } else if (val == 'mainHandle') { // 处理
-    handleHandle(row.id)
+    handleHandle(row.masterId)
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if(val == 'ssbq'){ // 生成标签
      // 生成标签
      detatableData.params = {
-      masterId:row.id
+      masterId:row.masterId
      }
-    genLabelId.value = row.id
+    genLabelId.value = row.masterId
     await getDetailList()
     formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
   }else if (val == 'point') {
diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
index 6951269e9..2eb63b41d 100644
--- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
+++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue
@@ -444,42 +444,42 @@ const butttondata = (row) => {
 const buttonTableClick = async (val, row) => {
   if (val == 'mainPurPlanOpe') {
     // 打开
-    handleOpe(row.id)
+    handleOpe(row.masterId)
   } else if (val == 'mainPurPlanClo') {
     // 关闭
-    handleClo(row.id)
+    handleClo(row.masterId)
   } else if (val == 'mainPlanUploadQualityReport') {
     // 上传质量报告
     handleUploadQualityReport(row)
   }  else if (val == 'mainPlanSub') {
     // 提交审批
-    handleSub(row.id)
+    handleSub(row.masterId)
   } else if (val == 'mainPlanApp') {
     // 审批通过
-    handleApp(row.id)
+    handleApp(row.masterId)
   } else if (val == 'mainPlanTur') {
     // 驳回按钮
-    handleTur(row.id)
+    handleTur(row.masterId)
   } else if (val == 'genRecords') {
     // 处理
-    genRecords(row.id)
+    genRecords(row.masterId)
   } else if (val == 'edit') {
     // 编辑
     openForm('update', row)
   } else if (val == 'delete') {
     // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   } else if (val == 'ssbq') {
-    await SupplierdeliverRequestMainApi.selfCheckReport(row.id).then(async (res) => {
+    await SupplierdeliverRequestMainApi.selfCheckReport(row.masterId).then(async (res) => {
       if(!res){
           message.warning("请先上传自检报告!")
           return
       }else{
         // 生成标签
         detatableData.params = {
-          masterId:row.id
+          masterId:row.masterId
         }
-        genLabelId.value = row.id
+        genLabelId.value = row.masterId
         await getDetailList()
         formLabelRef.value.open('create', row, null,'createLabel')//创建标签页面 createLabel 标题
       }
@@ -491,7 +491,7 @@ const buttonTableClick = async (val, row) => {
     labelPrint(row)
   } else if (val == 'documentPrint') {
     // 单据打印
-    handleDocumentPrint(row.id)
+    handleDocumentPrint(row.masterId)
   }
 }
 
@@ -598,9 +598,9 @@ const handleUploadQualityReport  = async (row) => {
   console.log('SupplierdeliverInspectionDetail',SupplierdeliverInspectionDetail.allSchemas)
   const uploadFile = SupplierdeliverInspectionDetail.allSchemas.formSchema.find(item=>item.field=='uploadFile')
   if(uploadFile){
-    uploadFile['componentProps']['upData']['tableId'] = row.id
+    uploadFile['componentProps']['upData']['tableId'] = row.masterId
   }
-  ploadQualityReportRef.value.open('create', null, {masterId:row.id},'上传质量报告')//创建标签页面 createLabel 标题
+  ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质量报告')//创建标签页面 createLabel 标题
   const tableFormKeys  = {}
   SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => {
     tableFormKeys[item.field] = item.default ? item.default : ''
@@ -736,6 +736,7 @@ const submitFormLabel = async (formType, data) => {
     await SupplierdeliverRequestMainApi.genLabel(data)
     isCreateLabel.value = true
     message.success('创建标签成功')
+    getList()
   } finally {
     formLabelRef.value.formLoading = false
     formLabelRef.value.dialogVisible = false