Merge branch 'dev' into test

src/views/warehouseManagement/stocktaking/reportLoss/components/addReportDialog.vue

@@ -209,7 +209,7 @@
                 ></el-table-column>
               </el-table>
               <div slot="reference" class="name-wrapper">
-                <el-tag size="medium">{{ scope.row.categoryLevelId }}</el-tag>
+                <el-tag size="medium">{{ scope.row.categoryLevelName }}</el-tag>
               </div>
             </el-popover>
           </template>

src/views/warehouseManagement/stocktaking/reportLoss/components/reportProcuts.vue

@@ -140,7 +140,7 @@
                   </el-table>
                   <div slot="reference" class="name-wrapper">
                     <el-tag size="medium">{{
-                      scope.row.categoryLevelId
+                      scope.row.categoryLevelName
                     }}</el-tag>
                   </div>
                 </el-popover>