kevin 1 rok temu
rodzic
commit
c3307e1334

+ 5 - 5
src/views/bonus/period.vue

@@ -71,7 +71,7 @@
 <!--                       @click.native="trialCalcHandle(scope.row.PERIOD_NUM)" >-->
 <!--              计算-->
 <!--            </el-button>-->
-            <el-button v-if="scope.row.IS_CAN_CLOSE || scope.row.IS_CAN_PERF" type="primary" class="button"
+            <el-button v-if="(scope.row.IS_CAN_CLOSE || scope.row.IS_CAN_PERF) && permission.hasPermission(`bonus/close-period`)" type="primary" class="button"
                        @click="dialogTableVisible = true;currentPeriod = scope.row.PERIOD_NUM;getDialogData();">
               {{$t('common.action')}}</el-button>
             <el-button style="margin: 0 0 !important;" v-if="scope.row.IS_CAN_CLOSE && permission.hasPermission(`bonus/close-period`)" type="primary" class="button"
@@ -83,6 +83,8 @@
               <!-- 挂网 -->{{ $t('bonus.spreadNet') }}
             </el-button>
 
+						<el-button  class="button customstyle" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(scope.row.PERIOD_NUM)" v-if="(scope.row.IS_CAN_CLOSE || scope.row.IS_CAN_PERF) && permission.hasPermission(`bonus/auto-calc`) && !permission.hasPermission(`bonus/close-period`)">{{$t('bonus.autoCalculation')}}</el-button>
+
             <el-dialog :title="$t('bonus.logTitle', { currentPeriod: currentPeriod })" :visible.sync="dialogTableVisible" append-to-body :width="screenWidth">
               <el-row>
                 <el-button style="margin-left:10px;" class="button" type="primary" @click.native="getDialogData();dialogLoading=true;" >
@@ -92,10 +94,8 @@
               <el-divider></el-divider>
 
               <el-row>
-                <el-button  class="button customstyle" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(currentPeriod)"
-                  v-if="permission.hasPermission(`bonus/calc-period`)"
-                >{{$t('bonus.autoCalculation')}}</el-button>
-                <el-button   class="button customstyle" type="primary" @click.native="perfOrderHandle(currentPeriod)" >{{$t('bonus.createPerformanceSheet')}}</el-button>
+                <el-button  class="button customstyle" v-if="permission.hasPermission(`bonus/auto-calc`)" style="margin-left:10px;" type="success" @click.native="autoCalcHandle(currentPeriod)">{{$t('bonus.autoCalculation')}}</el-button>
+                <el-button  class="button customstyle" type="primary" @click.native="perfOrderHandle(currentPeriod)" >{{$t('bonus.createPerformanceSheet')}}</el-button>
                 <el-button  class="button customstyle" type="primary" @click.native="initDataHandle(currentPeriod)" >{{$t('bonus.initializeBasicData')}}</el-button>
                 <el-button  class="button customstyle" type="primary" @click.native="perfPeriodHandle(currentPeriod)" >{{$t('bonus.generationPeriodPerformance')}}</el-button>
                 <el-button  class="button customstyle" type="primary" @click.native="pullPerfPeriodHandle(currentPeriod)" >{{$t('bonus.pullPeriodPerformance')}}</el-button>

+ 1 - 1
src/views/shop/order-period-adjust.vue

@@ -17,7 +17,7 @@
         </el-table-column>
       </el-table>
       <div class="white-box-footer">
-        <el-button type="primary" size="small" @click="visible = true" v-show="permission.hasPermission(`shop/order-adjust-period`)">{{ $t('menu.shopOrderPeriodAdjust') }}</el-button>
+        <el-button type="primary" size="small" @click="visible = true">{{ $t('menu.shopOrderPeriodAdjust') }}</el-button>
         <pagination :total="totalCount" :page_size="pageSize" @size-change="handleSizeChange" @current-change="handleCurrentChange"></pagination>
       </div>
     </div>