From 6a69b073fad4042917777edead93c43dc3a4bd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com>
Date: Mon, 17 Apr 2023 11:49:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=B7=A5=E6=8A=A5=E5=BA=9F=E7=94=B3?=
 =?UTF-8?q?=E8=AF=B7=E5=8F=8A=E8=AE=B0=E5=BD=95=E4=BF=AE=E6=94=B9=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProductReceiptScrapNote.vue               | 19 +++++++++++++++++++
 .../ProductReceiptScrapRequest.vue            | 19 +++++++++++++++++++
 .../lineSideWarehouseScrappingNote.vue        |  2 +-
 .../lineSideWarehouseScrappingRequest.vue     |  2 +-
 .../rawMaterialManage/scrap/ScrapNote.vue     |  2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue
index 1863f8e3e..e7f2bf29c 100644
--- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue
+++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapNote.vue
@@ -46,6 +46,7 @@
   </div>
 </template>
 <script>
+import { materialRequestByType } from '@/api/wms-api'
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -75,6 +76,24 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    //渲染数据
+    paging() {
+      this.Loading.tableLoading = true;
+      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
+      let params = {
+        type: 'Scrap_Product'
+      }
+      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
+        this.tableData = res.items
+        this.totalCount = res.totalCount
+        this.pagingCallback()
+      }).catch(err => {
+        this.Loading.tableLoading = false
+      })
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue
index d7c89ec20..ca3e48e44 100644
--- a/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue
+++ b/fe/PC/src/views/finishedProductManage/productReceipt/ProductReceiptScrapRequest.vue
@@ -60,6 +60,7 @@
   </div>
 </template>
 <script>
+import { materialRequestByType } from '@/api/wms-api'
 import { tableMixins } from "@/mixins/TableMixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { drawerMixins } from "@/mixins/drawerMixins"
@@ -112,6 +113,24 @@ export default {
   mounted () {
     this.paging();
   },
+  methods: {
+    //渲染数据
+    paging() {
+      this.Loading.tableLoading = true;
+      this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
+      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
+      let params = {
+        type: 'Scrap_Product'
+      }
+      materialRequestByType(this.PageListParams, this.URL + '/by-type', params).then(res => {
+        this.tableData = res.items
+        this.totalCount = res.totalCount
+        this.pagingCallback()
+      }).catch(err => {
+        this.Loading.tableLoading = false
+      })
+    }
+  },
 };
 </script>
 <style lang="scss" scoped>
diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue
index 8451155de..ee8146f9e 100644
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingNote.vue
@@ -98,7 +98,7 @@ export default {
     paging() {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP;
+      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
       let params = {
         type: 'Scrap_WIP'
       }
diff --git a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue
index 8856fc6ea..df8ab0c2b 100644
--- a/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue
+++ b/fe/PC/src/views/inventoryManage/lineSideWarehouseScrapping/lineSideWarehouseScrappingRequest.vue
@@ -97,7 +97,7 @@ export default {
     paging() {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP;
+      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP; 完工报废:Scrap_Product
       let params = {
         type: 'Scrap_WIP'
       }
diff --git a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue
index 633338421..ed48df8cb 100644
--- a/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue
+++ b/fe/PC/src/views/rawMaterialManage/scrap/ScrapNote.vue
@@ -82,7 +82,7 @@ export default {
     paging() {
       this.Loading.tableLoading = true;
       this.PageListParams.SkipCount = (this.oldSkipCount - 1) * this.PageListParams.MaxResultCount
-      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP;
+      // 报废请求类型: 人工报废:Scrap_Manual;  线边报废:Scrap_WIP;  完工报废:Scrap_Product
       let params = {
         type: 'Scrap_Manual'
       }