Merge branch 'blueBranch' into allTestUrgent

src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -122,22 +122,24 @@
             >{{ $t("装箱数") }}：{{ selectProduct.packqty }}</span
           >
           <span style="color: #888; font-size: 14px; margin-left: 10px"
-            >{{ $t("库存") }}：
-            <template v-if="usertype === 0 || usertype === 1">
+            v-if="tool.checkAuth($route.name,'Inventory_Number') || tool.checkAuth($route.name,'Inventory_Text')">{{ $t("库存") }}：
+            <template v-if="tool.checkAuth($route.name,'Inventory_Number')">
               <span>{{ stockData.invbal_qty }}</span>
             </template>
-            <template v-else>
+            <template v-if="tool.checkAuth($route.name,'Inventory_Text')" >
               <span
                 v-if="stockData.stockstatus === '紧缺'"
                 style="color: red"
+                :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}"
                 >{{ $t(stockData.stockstatus) }}</span
               >
               <span
                 v-else-if="stockData.stockstatus === '充足'"
                 style="color: green"
+                :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}"
                 >{{ $t(stockData.stockstatus) }}</span
               >
-              <span v-else>{{ $t(stockData.stockstatus) }}</span>
+              <span v-else :style="{marginLeft:tool.checkAuth($route.name,'Inventory_Number')?'10px':'0'}">{{ $t(stockData.stockstatus) }}</span>
             </template>
           </span>
         </div>