制品回收--主子表合并

src/views/wms/productionManage/productredress/productredressJobMain/index.vue

@@ -120,7 +120,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 

src/views/wms/productionManage/productredress/productredressRequestMain/index.vue

@@ -233,7 +233,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductredressRequestMainApi.close(row.id).then(() => {
+    ProductredressRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -244,7 +244,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductredressRequestMainApi.reAdd(row.id).then(() => {
+    ProductredressRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -255,7 +255,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductredressRequestMainApi.submit(row.id).then(() => {
+    ProductredressRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -266,7 +266,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductredressRequestMainApi.refused(row.id).then(() => {
+    ProductredressRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -277,7 +277,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductredressRequestMainApi.agree(row.id).then(() => {
+    ProductredressRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -288,7 +288,7 @@ const buttonTableClick = async (val, row) => {
   }
   else if (val == 'mainHandle') { // 处理
     tableObject.loading = true
-    ProductredressRequestMainApi.handle(row.id).then(() => {
+    ProductredressRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -298,7 +298,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   }
 }
 
@@ -446,7 +446,7 @@ const searchFormClick = (searchData) => {
 //     bomModelVisible.value = true
 //     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
 //     detatableDataBom.params = {
-//       masterId: row.id
+//       masterId: row.masterId
 //     }
 //     await getDetailListBom()
 //   }