Merge branch 'mergeBranch' into redUrgent

# Conflicts:
#	src/HDrpManagement/ProductMag/index.vue

src/HDrpManagement/ProductMag/index.vue

@@ -26,9 +26,10 @@
         <to_examine v-if="tool.checkAuth($route.name,'toExamine')" class="inline-16"  :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></to_examine>
         <counter_examine v-if="tool.checkAuth($route.name,'reverseReview')" class="inline-16" :rowData="rowData" @examineSuccess="onSuccess" :disabled="rowData.length === 0"></counter_examine>
         <priceLevelSetting class="inline-16" v-if="tool.checkAuth($route.name,'priceSet')" ></priceLevelSetting>
-        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet') && siteid === 'HY'"></commissionSchemeSet>
-        <setFieldCommission class="inline-16" v-if="tool.checkAuth($route.name,'fieldCommissionSet')"></setFieldCommission>
-        <el-button class="inline-16" size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
+        <commissionSchemeSet class="inline-16" v-if="tool.checkAuth($route.name,'commissionSchemeSet')"></commissionSchemeSet>
+        <div class="inline-16" >
+          <el-button size="small" v-if="tool.checkAuth($route.name,'refreshStock')" type="primary" @click="refreshStock">刷新库存</el-button>
+        </div>
         <importFile
           v-if="tool.checkAuth($route.name,'export')"
           ref="importFile"
@@ -198,7 +199,6 @@ import importFile from './modules/importFile.vue'
 import importImage from './modules/importImage.vue'
 import importInfo from './modules/importInfo.vue'
 import commissionSchemeSet from "@/HDrpManagement/ProductMag/modules/components/commissionSchemeSet";
-import setFieldCommission from './modules/components/setFieldCommission'
 import { Loading } from 'element-ui';
 
 export default {
@@ -252,8 +252,7 @@ export default {
     importInfo,
     batchUp,
     batchDown,
-    commissionSchemeSet,
-    setFieldCommission
+    commissionSchemeSet
   },
   methods:{
     async isOnSaleChange(val){