From ba7285fcc4619afe49811e9aace2ff920dcf7b6a Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080>
Date: Mon, 7 Nov 2022 22:35:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/layouts/TabLayout.vue          |  1 +
 .../ProcessSuppliesStrongerList.vue           | 38 +++++++++++--------
 2 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue
index 0521f1f..879be45 100644
--- a/src/components/layouts/TabLayout.vue
+++ b/src/components/layouts/TabLayout.vue
@@ -16,6 +16,7 @@
       @edit="editPage">
       <a-tab-pane :id="page.fullPath" :key="page.fullPath" v-for="page in pageList" :closable="!(page.meta.title=='首页')">
         <span slot="tab" :pagekey="page.fullPath">{{ page.meta.title }}</span>
+        <span slot="tab" :pagekey="page.fullPath" v-if="page.params" >{{page.params.merchandiseName}}</span>
       </a-tab-pane>
     </a-tabs>
     <div style="margin: 12px 12px 0;">
diff --git a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
index 52d9802..67ac07f 100644
--- a/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
+++ b/src/views/suppliesstronger/ProcessSuppliesStrongerList.vue
@@ -160,12 +160,12 @@
           {
             title:'规格',
             align:"center",
-            dataIndex: 'merchandiseName'
+            dataIndex: 'merchandiseName1'
           },
           {
             title:'型号',
             align:"center",
-            dataIndex: 'merchandiseName'
+            dataIndex: 'merchandiseName2'
           },
 
           {
@@ -181,7 +181,7 @@
           {
             title:'项目部数量',
             align:"center",
-            dataIndex: 'materialQuantity'
+            dataIndex: 'materialQuantity1'
           },
           {
             title:'核算属性',
@@ -221,19 +221,25 @@
       handleDetaills(record){
         console.log(record);
 
-      var temomen =  {
-          name: 'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
-          hidden: true,
-          meta: {
-            title: 'title',
-            keepAlive: true,
-            hiddenHeaderContent: true,
-          }
-        }
-        this.tabs
-       // this.$router.push({name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',params:{item: record.merchandiseNewsId}})
-
-
+      // var temomen =  {
+      //     name: 'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
+      //     hidden: true,
+      //     meta: {
+      //       title: 'title',
+      //       keepAlive: true,
+      //       hiddenHeaderContent: true,
+      //     }
+      //   }
+      //   this.$router.push(temomen);
+      //   console.log(record)
+      //   console.log("下标为",record.merchandiseName.substring(record.merchandiseName.lastIndexOf(" ")))
+       this.$router.push({
+         name:'src-views-suppliesstronger-ProcessSuppliesStrongerLists',
+         params:{
+           item: record.merchandiseNewsId,
+           merchandiseName : ' - '+record.merchandiseName.substring(0,record.merchandiseName.lastIndexOf(" "))
+         }
+       })
       },
       initDictConfig(){
       },