From 482d5473300423afc8d122a76a2855f60c489563 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Wed, 12 Jun 2024 17:16:38 +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=E7=94=B3=E8=AF=B7=E5=8F=96=E6=B6=88=EF=BC=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E4=B8=AD=E6=AD=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 fe/PC/src/api/wms-api.js                      |  8 +++
 fe/PC/src/utils/detailsTableColumns/index.js  | 10 ++--
 .../ThirdLocationManage/ThirdLocationJob.vue  | 55 ++++++++++++++++++-
 .../ThirdLocationRequest.vue                  | 55 ++++++++++++++++++-
 4 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/fe/PC/src/api/wms-api.js b/fe/PC/src/api/wms-api.js
index 5af8feadb..2427834ab 100644
--- a/fe/PC/src/api/wms-api.js
+++ b/fe/PC/src/api/wms-api.js
@@ -761,6 +761,14 @@ export function getGrabimagePost(data) {
   })
 }
 
+// 三方库-关闭任务
+export function postCloseJob(id,url) {
+  return request({
+    url: baseURL + url + '/close-job/' + id,
+    method: 'post'
+  })
+}
+
 // 客户退拆任务-完成 todo
 // export async function productionRecycleJobComplete(id) {
 //   return request({
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index d5bd1bf5d..aba3dc8a5 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -1739,8 +1739,8 @@ export const materialReturnNote =  [
   { label: "配置", prop: "item_configurationFromFE" },
   { label: "领料数量", prop: "qty" },
   { label: "箱码", prop: "packingCode" },
-  { label: "调出库位", prop: "locationCode" },
-  { label: "调出"+_Names.locationErpCode, prop: 'locationErpCode' },
+  { label: "入库库位", prop: "locationCode" },
+  { label: _Names.locationErpCode, prop: 'locationErpCode' },
   { label: "专案代码", prop: 'caseCode' },
   { label: "项目分类", prop: 'projCapacityCode' },
   { label: "任务编号", prop: 'number' },
@@ -2123,7 +2123,7 @@ export const lineSideWarehousePaymentRequest =  [
   { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
   { label: "目标库位", prop: "locationCode" },
-  { label: "目标"+_Names.locationErpCode, prop: "locationErpCode" },
+  { label: _Names.toErpCode, prop: "locationErpCode" },
   // { label: "单位", prop: "uom" },
   // { label: "返线数量", prop: "returnQty" },
   // { label: "调出库区", prop: "rawArea" },
@@ -2152,8 +2152,8 @@ export const lineSideWarehousePaymentNote =  [
   { label: "物品描述2", prop: "itemDesc2" },
   { label: "配置", prop: "item_configurationFromFE" },
   { label: "数量", prop: "qty" },
-  { label: "目标库位", prop: "handledToLocationCode" },
-  { label: _Names.toErpCode, prop: "handledToLocationErpCode" },
+  { label: "目标库位", prop: "locationCode" },
+  { label: _Names.toErpCode, prop: "locationErpCode" },
   // todo:底盘号
   { label: "底盘号", prop: "identityNo" },
   { label: "标包数量", prop: 'stdPackQty' },
diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
index 24a3e67c4..76026b770 100644
--- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
+++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationJob.vue
@@ -30,9 +30,9 @@
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
-      :Butttondata="[]"
+      :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
+      @drawerbutton="drawerbuttonHandle"
       @close-value="closeValue"
       :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
+import { materialRequestByType,getDetailed,postCloseJob } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -67,6 +67,18 @@ export default {
         return this.displayDialog.newDialog || this.displayDialog.editDialog;
       },
     },
+    //按钮显示
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.jobStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
   },
   data () {
     let _this = this;
@@ -81,11 +93,48 @@ export default {
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
+      DrawerButtonData: [
+        // {
+        //   type: 'danger',
+        //   label: '中止',
+        //   hide: () => { return this.hideButton([4])},//部分完成
+        //   name: "close",
+        //   size: 'mini'
+        // },
+      ],
     };
   },
   mounted () {
     this.paging()
   },
+  methods:{
+    drawerbuttonHandle (val) {
+      // 中止
+      if(val == 'close'){
+        this.$confirm('是否确定中止任务?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          postCloseJob(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)
+      }
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>
diff --git a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
index c21fcbb91..4b625ae53 100644
--- a/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
+++ b/fe/PC/src/views/ThirdLocationManage/ThirdLocationRequest.vue
@@ -30,9 +30,9 @@
       :drawer="displayDialog.detailsDialog"
       :propsData="propsData"
       :tabsDesTions="tabsDesTions"
-      :Butttondata="[]"
+      :Butttondata="DrawerButtonData"
       @drawerShut="(val) => (displayDialog.detailsDialog = val)"
-      @drawerbutton="drawerbutton"
+      @drawerbutton="drawerbuttonHandle"
       @close-value="closeValue"
       :currenButtonData="currenButtonData"
       :tableColumns="detailsTableColumns"
@@ -44,7 +44,7 @@
   </div>
 </template>
 <script>
-import { materialRequestByType,processRequest,getDetailed } from "@/api/wms-api"
+import { materialRequestByType,getDetailed,postCancel } from "@/api/wms-api"
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -67,6 +67,18 @@ export default {
         return this.displayDialog.newDialog || this.displayDialog.editDialog;
       },
     },
+    //按钮显示
+    hideButton: function () {
+      return function (val) {
+        let data = true
+        val.forEach(key => {
+          if (this.propsData.requestStatus == key) {
+            data = false
+          }
+        })
+        return data
+      }
+    },
   },
   data () {
     let _this = this;
@@ -81,11 +93,48 @@ export default {
         this.defaultFreshBtn(),//刷新
         this.defaultFilterBtn(),//筛选
       ],
+      DrawerButtonData: [
+        {
+          type: 'danger',
+          label: '取消',
+          hide: () => { return this.hideButton([1,5])},//新增，执行中
+          name: "cancel",
+          size: 'mini'
+        },
+      ],
     };
   },
   mounted () {
     this.paging()
   },
+  methods:{
+    drawerbuttonHandle (val) {
+      // 取消
+      if(val == 'cancel'){
+        this.$confirm('是否确定取消请求?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          distinguishCancelAndClose: true,
+          closeOnClickModal: false,
+          type: 'warning'
+        }).then(() => {
+          this.Loading.appMainLoading = true
+          postCancel(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)
+      }
+    },
+  }
 };
 </script>
 <style lang="scss" scoped>