预生产收货--主子表合并

src/views/wms/productionManage/productreceipt/productreceiptJobMain/index.vue

@@ -262,11 +262,11 @@ const buttonTableClick = async (val, row) => {
     }
     ProductreceiptJobMainApi.executeProductreceiptMain(aaa)
   } else if (val == 'mainJobAba') { // 放弃
-    ProductreceiptJobMainApi.abandonProductreceiptMain(row.id)
+    ProductreceiptJobMainApi.abandonProductreceiptMain(row.masterId)
   } else if (val == 'mainJobClo') { // 关闭
-    ProductreceiptJobMainApi.closeProductreceiptMain(row.id)
+    ProductreceiptJobMainApi.closeProductreceiptMain(row.masterId)
   } else if (val == 'mainJobAcc') { // 承接
-    ProductreceiptJobMainApi.acceptProductreceiptMain(row.id)
+    ProductreceiptJobMainApi.acceptProductreceiptMain(row.masterId)
   }
 }
 // 获取部门 用于详情 部门回显

src/views/wms/productionManage/productreceipt/productreceiptRecordMain/index.vue

@@ -223,7 +223,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.id
+      masterId: row.masterId
     }
     await getDetailListBom()
   }

src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue

@@ -295,7 +295,7 @@ const buttonTableClick = async (val, row) => {
   if (val == 'mainClose') { // 关闭
     await message.confirm('确认要关闭吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.close(row.id).then(() => {
+    ProductreceiptRequestMainApi.close(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -306,7 +306,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainReAdd') { // 重新添加
     await message.confirm('确认要重新添加吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.reAdd(row.id).then(() => {
+    ProductreceiptRequestMainApi.reAdd(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -317,7 +317,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainSubmit') { // 提交审批
     await message.confirm('确认要提交审批吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.submit(row.id).then(() => {
+    ProductreceiptRequestMainApi.submit(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -328,7 +328,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainTurnDown') { // 驳回
     await message.confirm('确认要驳回吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.refused(row.id).then(() => {
+    ProductreceiptRequestMainApi.refused(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -339,7 +339,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'mainApprove') { // 审批通过
     await message.confirm('确认要审批通过吗？')
     tableObject.loading = true
-    ProductreceiptRequestMainApi.agree(row.id).then(() => {
+    ProductreceiptRequestMainApi.agree(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -363,7 +363,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     detatableData.params = {
-      masterId:row.id
+      masterId:row.masterId
     }
     await getDetailList()
     // 打开创建标签页面
@@ -432,7 +432,7 @@ const buttonTableClick = async (val, row) => {
       return
     }
     tableObject.loading = true
-    ProductreceiptRequestMainApi.handle(row.id).then(() => {
+    ProductreceiptRequestMainApi.handle(row.masterId).then(() => {
       message.success(t('common.updateSuccess'))
       tableObject.loading = false
       getList()
@@ -442,7 +442,7 @@ const buttonTableClick = async (val, row) => {
   } else if (val == 'edit') { // 编辑
     openForm('update', row)
   } else if (val == 'delete') { // 删除
-    handleDelete(row.id)
+    handleDelete(row.masterId)
   } else if (val == 'point') { // 标签打印
     handlePoint(row)
   }
@@ -615,7 +615,7 @@ const tableFormButton = async (val , row) => {
     bomModelVisible.value = true
     DialogTitle.value = '物料代码【' + row.itemCode + '】——Bom信息'
     detatableDataBom.params = {
-      masterId: row.id
+      masterId: row.masterId
     }
     await getDetailListBom()
   }