From b2e4879158ec00894af38c4dd983f8394665fd94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 22 Apr 2024 11:19:57 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E4=BA=BA=E5=B7=A5?=
 =?UTF-8?q?=E6=B3=A8=E5=A1=91=E7=94=B3=E8=AF=B7=E4=BB=BB=E5=8A=A1-?=
 =?UTF-8?q?=E4=B8=AD=E6=AD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../materialIssueManage/ZS/IssueJobZS.vue     | 36 +++++++++++++++---
 .../materialIssueManage/ZS/IssueNoteZS.vue    |  2 +-
 .../materialIssueManage/ZS/IssueRequestZS.vue | 37 +++++++++++++++----
 3 files changed, 61 insertions(+), 14 deletions(-)

diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
index 7cc3bd343..7b0b46e7d 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueJobZS.vue
@@ -60,6 +60,7 @@
 </template>
 <script>
 import { getDetailed } from "@/api/wms-api"
+import { close } from "@/api/wms-job"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -77,15 +78,21 @@ export default {
   computed: {
     //按钮显示
     hideButton: function () {
-      return function () {
-        return this.propsData.status
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
       }
     },
   },
   data () {
     let _this = this;
     return {
-      URL: 'wms/store/injection-job',
+      URL: 'wms/store/injection-issue-job',
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
@@ -98,8 +105,7 @@ export default {
         {
           type: 'danger',
           label: '中止',
-          // todo:状态确定
-          hide: () => { return this.hideButton([2,6])},
+          hide: () => { return this.hideButton([1,2,4])},
           name: "break",
           size: 'mini'
         },
@@ -122,7 +128,25 @@ export default {
     drawerbuttonHandle (val) {
       // 中止
       if(val == 'break'){
-        
+        this.$confirm('是否确定中止任务?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          close(this.URL,this.propsData).then(res => {
+            this.$successMsg('已中止任务')
+            this.Loading.appMainLoading = false
+            getDetailed(this.propsData.id, this.URL).then(res => {
+              this.propsData = res
+            })
+            this.paging();
+          }).catch(err => {
+            this.Loading.appMainLoading = false
+          })
+        })
       } else {
         this.drawerbutton(val, this)
       }
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
index d95587a82..e30222a04 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueNoteZS.vue
@@ -63,7 +63,7 @@ export default {
   ],
   data () {
     return {
-      URL: 'wms/store/injection-note',
+      URL: 'wms/store/injection-issue-note',
       //常用按钮数据
       currenButtonData: [
         this.defaultExportBtn(),//导出
diff --git a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
index 2c0b50456..fffe9a4fa 100644
--- a/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
+++ b/fe/PC/src/views/materialIssueManage/ZS/IssueRequestZS.vue
@@ -59,7 +59,7 @@
   </div>
 </template>
 <script>
-import { getDetailed } from "@/api/wms-api"
+import { getDetailed,postAbort } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -77,15 +77,21 @@ export default {
   computed: {
     //按钮显示
     hideButton: function () {
-      return function () {
-        return this.propsData.status
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.requestStatus == key) {
+            data = false
+          }
+        })
+        return data
       }
     },
   },
   data () {
     let _this = this;
     return {
-      URL: 'wms/store/injection-request',
+      URL: 'wms/store/injection-issue-request',
       //常用按钮数据
       currenButtonData: [
         // this.defaultImportBtn(),//导入
@@ -98,8 +104,7 @@ export default {
         {
           type: 'danger',
           label: '中止',
-          // todo:状态确定
-          hide: () => { return this.hideButton([2,6])},
+          hide: () => { return this.hideButton([1,4,9])},
           name: "break",
           size: 'mini'
         },
@@ -122,7 +127,25 @@ export default {
     drawerbuttonHandle (val) {
       // 中止
       if(val == 'break'){
-        
+        this.$confirm('是否确定中止请求?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          postAbort(this.propsData.id, this.URL).then(res => {
+            this.$successMsg('已中止请求')
+            this.Loading.appMainLoading = false
+            getDetailed(this.propsData.id, this.URL).then(res => {
+              this.propsData = res
+            })
+            this.paging();
+          }).catch(err => {
+            this.Loading.appMainLoading = false
+          })
+        })
       } else {
         this.drawerbutton(val, this)
       }