Browse Source

大隔离

master
常熟吴彦祖 1 month ago
parent
commit
416ad7d3f0
  1. 9
      src/views/modules/sys/user.vue
  2. 6
      src/views/modules/warehouse/changeHUSpecialItem.vue

9
src/views/modules/sys/user.vue

@ -9,10 +9,11 @@
<el-button type="primary" @click="addOrUpdateHandle()">
{{ $t('user.table.add') }}
</el-button>
<el-button :disabled="this.showButton" type="primary"
@click="specialAuthorize()"
>{{ buttons.specialCompetencies || $t('sys.user.specialPermissions') }}
</el-button>
<!-- 隔离先隐藏-->
<!-- <el-button :disabled="this.showButton" type="primary"-->
<!-- @click="specialAuthorize()"-->
<!-- >{{ buttons.specialCompetencies || $t('sys.user.specialPermissions') }}-->
<!-- </el-button>-->
<el-button v-if="isAuth('sys:user:save')" :disabled="this.showButton" type="primary"
@click="siteAuthorize()"
> {{ buttons.factoryAuthorization || $t('sys.user.factoryAuthorization') }}

6
src/views/modules/warehouse/changeHUSpecialItem.vue

@ -35,9 +35,9 @@
<el-button @click="openChangeWdrDialog()" type="primary" :disabled="dataListSelections.length === 0 || isolationActionLoading || dataListLoading">Change W/D/R</el-button>
<el-button @click="openChangeExpDateDialog()" type="primary" :disabled="dataListSelections.length === 0 || isolationActionLoading || dataListLoading">Change Expiration Date</el-button>
<el-button @click="openChangeAvailDialog()" type="primary" :disabled="dataListSelections.length === 0 || isolationActionLoading || dataListLoading">Change Availability Control ID</el-button>
<!-- 只有选中标签状态完全一致时才启用对应操作,后端仍会复核权限与实时状态。- rqrq -->
<el-button @click="changeIsolation('Q')" type="warning" :loading="isolationActionLoading && isolationAction === 'Q'" :disabled="isolationActionLoading || !canIsolate">隔离</el-button>
<el-button @click="changeIsolation('Y')" type="primary" :loading="isolationActionLoading && isolationAction === 'Y'" :disabled="isolationActionLoading || !canReleaseIsolation">解除隔离</el-button>
<!-- 只有选中标签状态完全一致时才启用对应操作,后端仍会复核权限与实时状态。- rqrq 隔离先隐藏-->
<!-- <el-button @click="changeIsolation('Q')" type="warning" :loading="isolationActionLoading && isolationAction === 'Q'" :disabled="isolationActionLoading || !canIsolate">隔离</el-button>-->
<!-- <el-button @click="changeIsolation('Y')" type="primary" :loading="isolationActionLoading && isolationAction === 'Y'" :disabled="isolationActionLoading || !canReleaseIsolation">解除隔离</el-button>-->
</el-form>
<!-- 主表格 - rqrq -->

Loading…
Cancel
Save