From c7a2e09b1bdc1d2228586bdab08f3ab2c4111ab7 Mon Sep 17 00:00:00 2001
From: haoxuan <haoxuan>
Date: 星期二, 07 五月 2024 15:23:23 +0800
Subject: [PATCH] 月度统计报表模块  期初,期末,本月入库,本月入库 4个部分主单位对应的数量显示逻辑出现

---
 src/views/reportForm/monthboundDetail/index.vue |   37 ++++++++++++++++++++-----------------
 1 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/views/reportForm/monthboundDetail/index.vue b/src/views/reportForm/monthboundDetail/index.vue
index 1d099fe..8bf20f9 100644
--- a/src/views/reportForm/monthboundDetail/index.vue
+++ b/src/views/reportForm/monthboundDetail/index.vue
@@ -25,88 +25,88 @@
               <el-table-column label="鏈熷垵搴撳瓨" prop='inventoryStart'>
                 <el-table-column label="浠�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.beginMoreUnitsArr,'浠�')}}
+                    {{getUnitValue(scope.row.beginMoreUnitsArr,'浠�',scope.row.beginAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="鍖�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.beginMoreUnitsArr,'鍖�')}}
+                    {{getUnitValue(scope.row.beginMoreUnitsArr,'鍖�',scope.row.beginAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="绫虫暟" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.beginMoreUnitsArr,'绫虫暟')}}
+                    {{getUnitValue(scope.row.beginMoreUnitsArr,'绫虫暟',scope.row.beginAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="閲嶉噺" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.beginMoreUnitsArr,'閲嶉噺')}}
+                    {{getUnitValue(scope.row.beginMoreUnitsArr,'閲嶉噺',scope.row.beginAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="鏈湀鍏ュ簱" prop='inInventoryCurrentMonth'>
                 <el-table-column label="浠�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.inputMoreUnitsArr,'浠�')}}
+                    {{getUnitValue(scope.row.inputMoreUnitsArr,'浠�',scope.row.inputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="鍖�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.inputMoreUnitsArr,'鍖�')}}
+                    {{getUnitValue(scope.row.inputMoreUnitsArr,'鍖�',scope.row.inputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="绫虫暟" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.inputMoreUnitsArr,'绫虫暟')}}
+                    {{getUnitValue(scope.row.inputMoreUnitsArr,'绫虫暟',scope.row.inputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="閲嶉噺" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.inputMoreUnitsArr,'閲嶉噺')}}
+                    {{getUnitValue(scope.row.inputMoreUnitsArr,'閲嶉噺',scope.row.inputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="鏈湀鍑哄簱" prop='outInventoryCurrentMonth'>
                 <el-table-column label="浠�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.outputMoreUnitsArr,'浠�')}}
+                    {{getUnitValue(scope.row.outputMoreUnitsArr,'浠�',scope.row.outputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="鍖�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.outputMoreUnitsArr,'鍖�')}}
+                    {{getUnitValue(scope.row.outputMoreUnitsArr,'鍖�',scope.row.outputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="绫虫暟" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.outputMoreUnitsArr,'绫虫暟')}}
+                    {{getUnitValue(scope.row.outputMoreUnitsArr,'绫虫暟',scope.row.outputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="閲嶉噺" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.outputMoreUnitsArr,'閲嶉噺')}}
+                    {{getUnitValue(scope.row.outputMoreUnitsArr,'閲嶉噺',scope.row.outputAmount,scope.row.unit)}}
                   </template>
                 </el-table-column>
               </el-table-column>
               <el-table-column label="鏈熸湯搴撳瓨" prop='inventoryEnd'>
                 <el-table-column label="浠�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.MoreUnitsArr,'浠�')}}
+                    {{getUnitValue(scope.row.MoreUnitsArr,'浠�',scope.row.amount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="鍖�" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.MoreUnitsArr,'鍖�')}}
+                    {{getUnitValue(scope.row.MoreUnitsArr,'鍖�',scope.row.amount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="绫虫暟" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.MoreUnitsArr,'绫虫暟')}}
+                    {{getUnitValue(scope.row.MoreUnitsArr,'绫虫暟',scope.row.amount,scope.row.unit)}}
                   </template>
                 </el-table-column>
                 <el-table-column label="閲嶉噺" prop='inventoryStart' min="90">
                   <template slot-scope="scope">
-                    {{getUnitValue(scope.row.MoreUnitsArr,'閲嶉噺')}}
+                    {{getUnitValue(scope.row.MoreUnitsArr,'閲嶉噺',scope.row.amount,scope.row.unit)}}
                   </template>
                 </el-table-column>
               </el-table-column>
@@ -153,7 +153,7 @@
     this.getData()
   },
   methods: {
-    getUnitValue(list,val){
+    getUnitValue(list,val,num,unit){
       let  string='--'
       if(list){
         if(list.length>0){
@@ -165,6 +165,9 @@
           }
         }
       }
+      if(unit==val){
+        string=num
+      }
       return string
     },
     setTable() {

--
Gitblit v1.8.0