From 63abfade3530cd77982808a467d0216d6b70ca5e Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Thu, 3 Nov 2022 18:05:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=A4=96=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ProcessWasteMaterialsList.vue             | 22 ++++++++-----
 .../ProcessWasteMaterialsLists.vue            | 33 ++++++++++---------
 2 files changed, 32 insertions(+), 23 deletions(-)

diff --git a/src/views/wastematerials/ProcessWasteMaterialsList.vue b/src/views/wastematerials/ProcessWasteMaterialsList.vue
index 57a5cdf..d272570 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsList.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsList.vue
@@ -184,7 +184,6 @@
           importExcelUrl: "wastematerials/processWasteMaterials/importExcel",
 
           queryLibraryName: "/libraryassociation/processLibraryAssociation/list",
-          queryListmaterials: "/wastematerials/processWasteMaterials/materialGroup"
 
         },
         dictOptions:{},
@@ -204,7 +203,13 @@
     },
     methods: {
       handleDetail(record){
-        this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',params:{descriptionId: record.descriptionId}})
+        console.log(record);
+        this.$router.push({name:'src-views-wastematerials-ProcessWasteMaterialsLists',
+          params:{
+            merchandiseNewsId: record.merchandiseNewsId,
+            materialStorageId : record.materialStorageId
+          }
+        })
       },
       initDictConfig(){
         //优先从缓存中读取字典配置
@@ -251,12 +256,13 @@
             // console.log(res.result.records);
           }
         });
-        getAction(this.url.queryListmaterials).then((res)=>{
-          if(res.success){
-            this.Listmaterials = res.result;
-            // console.log(res.result);
-          }
-        });
+
+        // getAction(this.url.queryListmaterials).then((res)=>{
+        //   if(res.success){
+        //     this.Listmaterials = res.result;
+        //     // console.log(res.result);
+        //   }
+        // });
       }
     }
   }
diff --git a/src/views/wastematerials/ProcessWasteMaterialsLists.vue b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
index b797be7..ca48963 100644
--- a/src/views/wastematerials/ProcessWasteMaterialsLists.vue
+++ b/src/views/wastematerials/ProcessWasteMaterialsLists.vue
@@ -151,7 +151,7 @@
     },
     data () {
       return {
-        descriptionId: this.$route.params.descriptionId,
+        descriptionId: this.$route.params.materialStorageId,
         queryParam:{
           supplier: null,
           supplierDescription: null,
@@ -163,7 +163,9 @@
           expirationDate: null,
           storageTime: null,
           materialsState: null,
-          descriptionId: this.$route.params.descriptionId,
+          merchandiseNewsId: this.$route.params.merchandiseNewsId,
+          materialStorageId: this.$route.params.materialStorageId,
+          descriptionId: null,
           del_flag: 0
         },
 
@@ -187,27 +189,27 @@
           {
             title:'供应商',
             align:"center",
-            dataIndex: 'supplier'
-          },
-          {
-            title:'供应商描述',
-            align:"center",
-            dataIndex: 'supplierDescription'
+            dataIndex: 'supplierName'
           },
+          // {
+          //   title:'供应商描述',
+          //   align:"center",
+          //   dataIndex: 'supplierDescription'
+          // },
           {
             title:'物料组',
             align:"center",
-            dataIndex: 'materialGroup'
+            dataIndex: 'descriptionName'
           },
           {
-            title:'物料',
+            title:'物料号',
             align:"center",
-            dataIndex: 'materialNumber'
+            dataIndex: 'materialsNumber'
           },
           {
             title:'物料描述',
             align:"center",
-            dataIndex: 'materialDescription'
+            dataIndex: 'merchandiseName'
           },
           {
             title:'库存位置',
@@ -237,7 +239,7 @@
           {
             title:'金额(元)',
             align:"center",
-            dataIndex: 'materialAmount'
+            dataIndex: 'rates'
           },
           {
             title:'生产日期',
@@ -295,7 +297,8 @@
     },
     watch: {
       $route() {
-        this.queryParam.descriptionId = this.$route.params.descriptionId
+        this.queryParam.merchandiseNewsId = this.$route.params.merchandiseNewsId;
+        this.queryParam.materialStorageId = this.$route.params.materialStorageId;
         this.loadData()
       }
     },
@@ -316,7 +319,7 @@
         this.queryParam.inboundDateEnd=dateString[1];
       },
       judgeRouterParam(){
-        if (this.$route.params.descriptionId == null){
+        if (this.$route.params.merchandiseNewsId == null){
           this.$router.go(-1);
         }
       },