From 4cfbfd1b425f7b22b876ae6cae95c4fc29ae6bfb Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 23 二月 2024 09:25:33 +0800
Subject: [PATCH] 盘库修改

---
 src/views/warehouse/stockAnalyse.vue |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/warehouse/stockAnalyse.vue b/src/views/warehouse/stockAnalyse.vue
index 9cc28ed..7ab0b52 100644
--- a/src/views/warehouse/stockAnalyse.vue
+++ b/src/views/warehouse/stockAnalyse.vue
@@ -106,7 +106,7 @@
                 <el-table-column label="操作" align="center" width="120" class-name="small-padding fixed-width" fixed="right">
                     <template slot-scope="scope" v-if="scope.row.storehouseName !== '本库区合计' && scope.row.storehouseName !== '合计'">
                         <el-button type="text" @click="showEnterprises(scope.row)">查看详情</el-button>
-                        <el-button type="text" @click="delData(scope.row)">删除</el-button>
+<!--                        <el-button type="text" @click="delData(scope.row)">删除</el-button>-->
                     </template>
                 </el-table-column>
             </el-table>
@@ -187,7 +187,7 @@
                         }
                     })
                 }
-                console.log(gData,'gData')
+
                 if(Array.isArray(gData)){
                     gData.map(item=>{
                         if(Array.isArray(item.storehouse.warehouses) && item.storehouse.whTotal){
@@ -212,7 +212,8 @@
                             item.storehouse.warehouses.map((subRes, subIndex)=>{
                                 let content2 = {}
                                 content2 = subRes
-                                content2['gId'] = item.enterpriseId
+                                content2['gId'] = item.gId
+                                content2['ggId'] = item.enterpriseId
                                 content2['gStock'] = item.gStock
                                 content2['gName'] = item.gName
                                 content2['gNum'] = item.gNum || null
@@ -237,6 +238,7 @@
                         topId: null,
                         reserveName: total.name,
                         gId: null,
+                        ggId: null,
                         gName: total.name,
                         gStock: total.enterpriseTotalStock,
                         storehouseName: total.name,
@@ -260,6 +262,7 @@
                     }
                     this.stateStockData.push(totalObj)
                 }
+                console.log(this.stateStockData,'G')
             }else{
                 this.$message({
                     type:'warning',
@@ -281,7 +284,7 @@
 
         showEnterprises(row){
             const t = this
-            t.$refs.enterStock.open(row)
+            t.$refs.enterStock.open(row,'汇总')
         },
 
         openStock(type,data){

--
Gitblit v1.9.2