From 57650767a39f6c4878f22c36048c1848cd10094c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 13 Jun 2024 15:04:52 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90nev-pc=E3=80=91=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=BA=93=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?+=E9=83=A8=E5=88=86=E6=A8=A1=E5=9D=97=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      | 15 ++++++--
 .../ThirdLocationManage/ThirdLocationJob.vue  | 20 +++++------
 .../ThirdLocationRequest.vue                  | 34 +++++++++++++++++--
 .../InventoryTransferLog-Query.vue            |  2 +-
 .../intraStorageTransferNote.vue              |  2 +-
 fe/PC/src/views/labelManage/labelsList.vue    |  2 +-
 6 files changed, 58 insertions(+), 17 deletions(-)

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 2427834ab..5a91de994 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -754,10 +754,13 @@ export async function createImportExcelByFE(url,data) {
 }
 
 // 获取高拍仪
-export function getGrabimagePost(data) {
+export function getGrabimagePost() {
   return request({
     url: localStorage.getItem('grabimageURL'),
     method: 'get',
+    headers: {
+      responseType: 'html'
+    },
   })
 }
 
@@ -765,7 +768,15 @@ export function getGrabimagePost(data) {
 export function postCloseJob(id,url) {
   return request({
     url: baseURL + url + '/close-job/' + id,
-    method: 'post'
+    method: 'post',
+  })
+}
+
+// 三方库-完成申请
+export function postCompleteRequest(id,url) {
+  return request({
+    url: baseURL + url + '/complete/' + id,
+    method: 'post',
   })
 }
 
diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
index 76026b770..c531e51e1 100644
--- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
+++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
@@ -94,13 +94,13 @@ export default {
         this.defaultFilterBtn(),//筛选
       ],
       DrawerButtonData: [
-        // {
-        //   type: 'danger',
-        //   label: '中止',
-        //   hide: () => { return this.hideButton([4])},//部分完成
-        //   name: "close",
-        //   size: 'mini'
-        // },
+        {
+          type: 'success',
+          label: '完成',
+          hide: () => { return this.hideButton([4])},//部分完成
+          name: "close",
+          size: 'mini'
+        },
       ],
     };
   },
@@ -109,9 +109,9 @@ export default {
   },
   methods:{
     drawerbuttonHandle (val) {
-      // 中止
+      // 完成
       if(val == 'close'){
-        this.$confirm('是否确定中止任务?', '提示', {
+        this.$confirm('是否确定完成任务?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           distinguishCancelAndClose: true,
@@ -120,7 +120,7 @@ export default {
         }).then(() => {
           this.Loading.appMainLoading = true
           postCloseJob(this.propsData.id, this.URL).then(res => {
-            this.$successMsg('已中止任务')
+            this.$successMsg('已完成任务')
             this.Loading.appMainLoading = false
             getDetailed(this.propsData.id, this.URL).then(res => {
               this.propsData = res
diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
index 4b625ae53..1687ebdb5 100644
--- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
+++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,getDetailed,postCancel } from "@/api/wms-api"
+import { materialRequestByType,getDetailed,postCancel,postCompleteRequest } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -101,6 +101,13 @@ export default {
           name: "cancel",
           size: 'mini'
         },
+        {
+          type: 'success',
+          label: '完成',
+          hide: () => { return this.hideButton([9])},//部分完成todo
+          name: "complete",
+          size: 'mini'
+        },
       ],
     };
   },
@@ -130,7 +137,30 @@ export default {
             this.Loading.appMainLoading = false
           })
         })
-      } else {
+      }
+      // 完成 
+      else if(val == 'complete'){
+        this.$confirm('是否确定完成请求?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          postCompleteRequest(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)
       }
     },
diff --git a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
index 24643a6b0..ca4f8df6e 100644
--- a/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
+++ b/fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue
@@ -122,7 +122,7 @@ export default {
       selectionData:[],
       //常用按钮数据
       currenButtonData: [
-        this.defaultAddBtn(),//新增
+        // this.defaultAddBtn(),//新增
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
diff --git a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue
index 29508f347..f366ec958 100644
--- a/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue
+++ b/fe/PC/src/views/inventoryManage/intraStorageTransfer/intraStorageTransferNote.vue
@@ -89,7 +89,7 @@ export default {
       URL: 'wms/store/transfer-note',
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultExportBtn(),//导出
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
diff --git a/fe/PC/src/views/labelManage/labelsList.vue b/fe/PC/src/views/labelManage/labelsList.vue
index 145458518..ac50d548f 100644
--- a/fe/PC/src/views/labelManage/labelsList.vue
+++ b/fe/PC/src/views/labelManage/labelsList.vue
@@ -75,7 +75,7 @@ export default {
       URL: "label/inventory-label",
       //常用按钮数据
       currenButtonData: [
-        this.defaultImportBtn(),//导入
+        // this.defaultImportBtn(),//导入
         this.defaultFieldSettingBtn(),//字段设置
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选