Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-ui into master_hella

src/api/wms/issueJobMain/index.ts

@@ -99,7 +99,7 @@ export const abandonIssueMain = async (id) => {
 
 // 关闭发料任务
 export const closeIssueMain = async (id) => {
-  return await request.get({ url: `/wms/issue-job-main/close?id=` + id })
+  return await request.put({ url: `/wms/issue-job-main/close?id=` + id })
 }
 
 // 执行发料任务

src/views/wms/issueManage/issue/issueJobMain/index.vue

@@ -268,13 +268,17 @@ const buttonTableClick = async (val, row) => {
           }]
       }]
     }
-    IssueJobMainApi.executeIssueMain(aaa)
+    await IssueJobMainApi.executeIssueMain(aaa)
+    getList()
   } else if (val == 'mainJobAba') { // 放弃
-    IssueJobMainApi.abandonIssueMain(row.masterId)
+    await IssueJobMainApi.abandonIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobClo') { // 关闭
-    IssueJobMainApi.closeIssueMain(row.masterId)
+    await IssueJobMainApi.closeIssueMain(row.masterId)
+    getList()
   } else if (val == 'mainJobAcc') { // 承接
-    IssueJobMainApi.acceptIssueMain(row.masterId)
+    await IssueJobMainApi.acceptIssueMain(row.masterId)
+    getList()
   }
 }
 // 获取部门 用于详情 部门回显