wms / wms4_andelichi · Commits

Commit 23b8c002eaac3704d6cf2920fd45acc576463339

Authored by 肖超群
2 parents 7656d77c b1cd604d
develop ... AzureAD

Merge branch 'develop' of http://www.huahengrobot.com:90/wms/wms4 into develop 

# Conflicts:
#	jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
#	jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
Inline Side-by-side
Showing 69 changed files with 346 additions and 227 deletions
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/DepartListSync.vue
  View file @23b8c00
... ... @@ -5,14 +5,14 @@
5 5  
6 6 <!-- 按钮操作区域 -->
7 7 <a-row style="margin: 0 0 0 14px" class="table-operator">
8   - <a-button @click="handleAdd(1)" type="primary">添加部门</a-button>
9   - <a-button @click="handleAdd(2)" type="primary">添加下级</a-button>
  8 + <a-button v-has="'depart:addDepart'" @click="handleAdd(1)" type="primary">添加部门</a-button>
  9 + <a-button v-has="'depart:addChildren'" @click="handleAdd(2)" type="primary">添加下级</a-button>
10 10 <a-button type="primary" icon="download" @click="handleExportXls('部门信息')">导出</a-button>
11 11 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
12 12 <a-button type="primary" icon="import">导入</a-button>
13 13 </a-upload>
14 14 <j-third-app-button biz-type="depart" :selected-row-keys="selectedRowKeys" syncToApp @sync-finally="onSyncFinally"/>
15   - <a-button title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
  15 + <a-button v-has="'depart:deleteBatch'" title="删除多条数据" @click="batchDel" type="default">批量删除</a-button>
16 16 </a-row>
17 17 <div style="background: #fff;padding-left:16px;height: 100%; margin-top: 5px">
18 18 <a-alert type="info" :showIcon="true">
... ... @@ -270,7 +270,7 @@
270 270 that.departTree = []
271 271 //所有的树节点key信息
272 272 that.allIds = []
273   -
  273 +
274 274 that.iExpandedKeys = []
275 275 //update-begin---author:wangshuai ---date:20220105 for：[JTC-364]sqlserver 部门导入导入失败，部门树数据丢失------------
276 276 //部门树v-if用到了loading,和上传loading冲突了，换一个名称
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/DictList.vue
  View file @23b8c00
... ... @@ -25,7 +25,7 @@
25 25 </a-form>
26 26  
27 27 <div class="table-operator" style="border-top: 5px">
28   - <a-button @click="handleAdd" type="primary" icon="plus">添加</a-button>
  28 + <a-button v-has="'dict:add'" @click="handleAdd" type="primary" icon="plus">添加</a-button>
29 29 <a-button type="primary" icon="download" @click="handleExportXls('字典信息')">导出</a-button>
30 30 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
31 31 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -45,15 +45,15 @@
45 45 :loading="loading"
46 46 @change="handleTableChange">
47 47 <span slot="action" slot-scope="text, record">
48   - <a @click="handleEdit(record)">
  48 + <a @click="handleEdit(record)" v-has="'dict:edit'">
49 49 <a-icon type="edit"/>
50 50 编辑
51 51 </a>
52 52 <a-divider type="vertical"/>
53   - <a @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
  53 + <a v-has="'dict:config'" @click="editDictItem(record)"><a-icon type="setting"/> 字典配置</a>
54 54 <a-divider type="vertical"/>
55 55 <a-popconfirm title="确定删除吗?" @confirm="() =>handleDelete(record.id)">
56   - <a>删除</a>
  56 + <a v-has="'dict:delete'">删除</a>
57 57 </a-popconfirm>
58 58 </span>
59 59 </a-table>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/PermissionList.vue
  View file @23b8c00
... ... @@ -3,8 +3,9 @@
3 3  
4 4 <!-- 操作按钮区域 -->
5 5 <div class="table-operator">
6   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  6 + <a-button v-has="'permission:edit'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
7 7 <a-button
  8 + v-has="'permission:deleteBatch'"
8 9 @click="batchDel"
9 10 v-if="selectedRowKeys.length > 0"
10 11 ghost
... ... @@ -34,7 +35,7 @@
34 35 @expandedRowsChange="handleExpandedRowsChange">
35 36  
36 37 <span slot="action" slot-scope="text, record">
37   - <a @click="handleEdit(record)">编辑</a>
  38 + <a v-has="'permission:edit'" @click="handleEdit(record)">编辑</a>
38 39  
39 40 <a-divider type="vertical"/>
40 41 <a-dropdown>
... ... @@ -45,14 +46,14 @@
45 46 <a-menu-item>
46 47 <a href="javascript:;" @click="handleDetail(record)">详情</a>
47 48 </a-menu-item>
48   - <a-menu-item>
  49 + <a-menu-item v-has="'permission:addChildren'">
49 50 <a href="javascript:;" @click="handleAddSub(record)">添加下级</a>
50 51 </a-menu-item>
51 52 <a-menu-item>
52 53 <a href="javascript:;" @click="handleDataRule(record)">数据规则</a>
53 54 </a-menu-item>
54 55  
55   - <a-menu-item>
  56 + <a-menu-item v-has="'permission:delete'">
56 57 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
57 58 <a>删除</a>
58 59 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/RoleUserList.vue
  View file @23b8c00
... ... @@ -32,7 +32,7 @@
32 32 </div>
33 33 <!-- 操作按钮区域 -->
34 34 <div class="table-operator" style="margin: 5px 0 10px 2px">
35   - <a-button @click="handleAdd" type="primary" icon="plus">新建角色</a-button>
  35 + <a-button @click="handleAdd" v-has="'role:add'" type="primary" icon="plus">新建角色</a-button>
36 36 <!--<a-button @click="handleEdit(model1)" type="primary" icon="plus">角色编辑</a-button>-->
37 37 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
38 38 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -70,14 +70,14 @@
70 70 </a>
71 71 <a-menu slot="overlay">
72 72 <a-menu-item>
73   - <a @click="handlePerssion(record.id)">授权</a>
  73 + <a v-has="'role:authorize'" @click="handlePerssion(record.id)">授权</a>
74 74 </a-menu-item>
75 75 <a-menu-item>
76   - <a @click="handleEdit(record)">编辑</a>
  76 + <a v-has="'role:edit'" @click="handleEdit(record)">编辑</a>
77 77 </a-menu-item>
78 78 <a-menu-item>
79 79 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete1(record.id)">
80   - <a>删除</a>
  80 + <a v-has="'role:delete'">删除</a>
81 81 </a-popconfirm>
82 82 </a-menu-item>
83 83 </a-menu>
... ... @@ -117,13 +117,13 @@
117 117 </div>
118 118 <!-- 操作按钮区域 -->
119 119 <div class="table-operator" :md="24" :sm="24">
120   - <a-button @click="handleAdd2" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
  120 + <a-button @click="handleAdd2" v-has="'role:addUserWithRole'" type="primary" icon="plus" style="margin-top: 16px">新增用户</a-button>
121 121 <!--<a-button @click="handleEdit2" type="primary" icon="edit" style="margin-top: 16px">用户编辑</a-button>-->
122   - <a-button @click="handleAddUserRole" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
  122 + <a-button @click="handleAddUserRole" v-has="'role:addUserExistingRole'" type="primary" icon="plus" style="margin-top: 16px">已有用户</a-button>
123 123  
124 124 <a-dropdown v-if="selectedRowKeys2.length > 0">
125 125 <a-menu slot="overlay">
126   - <a-menu-item key="1" @click="batchDel2">
  126 + <a-menu-item key="1" @click="batchDel2" v-has="'role:deleteBatchExistingRoleUser'">
127 127 <a-icon type="delete"/>
128 128 删除
129 129 </a-menu-item>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/SysAnnouncementList.vue
  View file @23b8c00
... ... @@ -30,13 +30,13 @@
30 30  
31 31 <!-- 操作按钮区域 -->
32 32 <div class="table-operator">
33   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  33 + <a-button v-has="'announcement:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
34 34 <a-button type="primary" icon="download" @click="handleExportXls('系统通告')">导出</a-button>
35 35 <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
36 36 <!-- <a-button type="primary" icon="import">导入</a-button>-->
37 37 <!-- </a-upload>-->
38 38 <a-dropdown v-if="selectedRowKeys.length > 0">
39   - <a-menu slot="overlay">
  39 + <a-menu slot="overlay" v-has="'announcement:deleteBatch'">
40 40 <a-menu-item key="1" @click="batchDel">
41 41 <a-icon type="delete"/>
42 42 删除
... ... @@ -68,13 +68,13 @@
68 68 @change="handleTableChange">
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a v-if="record.sendStatus == 0" @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'announcement:edit'" v-if="record.sendStatus == 0" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" v-if="record.sendStatus == 0"/>
74 74 <a-dropdown>
75 75 <a class="ant-dropdown-link">更多 <a-icon type="down"/></a>
76 76 <a-menu slot="overlay">
77   - <a-menu-item v-if="record.sendStatus != 1">
  77 + <a-menu-item v-if="record.sendStatus != 1" v-has="'announcement:delete'">
78 78 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
79 79 <a>删除</a>
80 80 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/UserList.vue
  View file @23b8c00
... ... @@ -65,7 +65,7 @@
65 65  
66 66 <!-- 操作按钮区域 -->
67 67 <div class="table-operator" style="border-top: 5px">
68   - <a-button @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
  68 + <a-button v-has="'user:add'" @click="handleAdd" type="primary" icon="plus" >添加用户</a-button>
69 69 <a-button type="primary" icon="download" @click="handleExportXls('用户信息')">导出</a-button>
70 70 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
71 71 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -75,15 +75,15 @@
75 75 <a-dropdown v-if="selectedRowKeys.length > 0">
76 76 <a-menu slot="overlay" @click="handleMenuClick">
77 77 <a-menu-item key="1">
78   - <a-icon type="delete" @click="batchDel"/>
  78 + <a-icon type="delete" v-has="'user:deleteBatch'" @click="batchDel"/>
79 79 删除
80 80 </a-menu-item>
81 81 <a-menu-item key="2">
82   - <a-icon type="lock" @click="batchFrozen('2')"/>
  82 + <a-icon type="lock" v-has="'user:frozenBatch'" @click="batchFrozen('2')"/>
83 83 冻结
84 84 </a-menu-item>
85 85 <a-menu-item key="3">
86   - <a-icon type="unlock" @click="batchFrozen('1')"/>
  86 + <a-icon v-has="'user:thawBatch'" type="unlock" @click="batchFrozen('1')"/>
87 87 解冻
88 88 </a-menu-item>
89 89 </a-menu>
... ... @@ -121,7 +121,7 @@
121 121 </template>
122 122  
123 123 <span slot="action" slot-scope="text, record">
124   - <a @click="handleEdit(record)" >编辑</a>
  124 + <a v-has="'user:edit'" @click="handleEdit(record)" >编辑</a>
125 125  
126 126 <a-divider type="vertical" />
127 127  
... ... @@ -138,7 +138,7 @@
138 138 <a href="javascript:;" @click="handleChangePassword(record.username)">密码</a>
139 139 </a-menu-item>
140 140  
141   - <a-menu-item>
  141 + <a-menu-item v-has="'user:delete'">
142 142 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
143 143 <a>删除</a>
144 144 </a-popconfirm>
... ... @@ -146,13 +146,13 @@
146 146  
147 147 <a-menu-item v-if="record.status==1">
148 148 <a-popconfirm title="确定冻结吗?" @confirm="() => handleFrozen(record.id,2,record.username)">
149   - <a>冻结</a>
  149 + <a v-has="'user:frozen'">冻结</a>
150 150 </a-popconfirm>
151 151 </a-menu-item>
152 152  
153 153 <a-menu-item v-if="record.status==2">
154 154 <a-popconfirm title="确定解冻吗?" @confirm="() => handleFrozen(record.id,1,record.username)">
155   - <a>解冻</a>
  155 + <a v-has="'user:thaw'">解冻</a>
156 156 </a-popconfirm>
157 157 </a-menu-item>
158 158  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/AddressList.vue
  View file @23b8c00
... ... @@ -26,7 +26,7 @@
26 26  
27 27 <!-- 操作按钮区域 -->
28 28 <div class="table-operator">
29   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  29 + <a-button @click="handleAdd" v-has="'address:add'" type="primary" icon="plus">新增</a-button>
30 30 <a-button type="primary" icon="download" @click="handleExportXls('接口地址')">导出</a-button>
31 31 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
32 32 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -34,7 +34,7 @@
34 34 <!-- 高级查询区域 -->
35 35 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
36 36 <a-dropdown v-if="selectedRowKeys.length > 0">
37   - <a-menu slot="overlay">
  37 + <a-menu slot="overlay" v-has="'address:deleteBatch'">
38 38 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
39 39 </a-menu>
40 40 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -83,7 +83,7 @@
83 83 </template>
84 84  
85 85 <span slot="action" slot-scope="text, record">
86   - <a @click="handleEdit(record)">编辑</a>
  86 + <a v-has="'address:edit'" @click="handleEdit(record)">编辑</a>
87 87  
88 88 <a-divider type="vertical" />
89 89 <a-dropdown>
... ... @@ -93,7 +93,7 @@
93 93 <a @click="handleDetail(record)">详情</a>
94 94 </a-menu-item>
95 95 <a-menu-item>
96   - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
  96 + <a-popconfirm title="确定删除吗?" v-has="'address:delete'" @confirm="() => handleDelete(record.id)">
97 97 <a>删除</a>
98 98 </a-popconfirm>
99 99 </a-menu-item>
... ... @@ -186,7 +186,7 @@
186 186 deleteBatch: "/config/address/deleteBatch",
187 187 exportXlsUrl: "/config/address/exportXls",
188 188 importExcelUrl: "config/address/importExcel",
189   -
  189 +
190 190 },
191 191 dictOptions:{},
192 192 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/BomDetailList.vue
  View file @23b8c00
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  5 + <a-button @click="handleAdd" v-has="'bomDetail:add'" type="primary" icon="plus">新增</a-button>
6 6 <a-button type="primary" icon="download" @click="handleExportXls('bom子表')">导出</a-button>
7 7 <a-upload
8 8 name="file"
... ... @@ -14,8 +14,8 @@
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload>
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17   - <a-menu slot="overlay">
18   - <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
  17 + <a-menu slot="overlay" v-has="'bomDetail:deleteBatch'" >
  18 + <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
19 19 </a-menu>
20 20 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
21 21 </a-dropdown>
... ... @@ -62,10 +62,10 @@
62 62 </template>
63 63  
64 64 <span slot="action" slot-scope="text, record">
65   - <a @click="handleEdit(record)">编辑</a>
  65 + <a v-has="'bomDetail:edit'" @click="handleEdit(record)">编辑</a>
66 66 <a-divider type="vertical" />
67   - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
68   - <a>删除</a>
  67 + <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
  68 + <a v-has="'bomDetail:delete'">删除</a>
69 69 </a-popconfirm>
70 70 </span>
71 71  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
  View file @23b8c00
... ... @@ -28,10 +28,10 @@
28 28 </a-form>
29 29 </div>
30 30 <!-- 查询区域-END -->
31   -
  31 +
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button @click="handleAdd" v-has="'bomHeader:add'" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('bom主表')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -83,14 +83,14 @@
83 83 </template>
84 84  
85 85 <span slot="action" slot-scope="text, record">
86   - <a @click="handleEdit(record)">编辑</a>
  86 + <a v-has="'bomHeader:edit'" @click="handleEdit(record)">编辑</a>
87 87  
88 88 <a-divider type="vertical" />
89 89 <a-dropdown>
90 90 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
91 91 <a-menu slot="overlay">
92 92 <a-menu-item>
93   - <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
  93 + <a-popconfirm v-has="'bomHeader:delete'" title="确定删除吗?" @confirm="() => handleDelete(record.id)">
94 94 <a>删除</a>
95 95 </a-popconfirm>
96 96 </a-menu-item>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CarrierList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button @click="handleAdd" v-has="'carrier:add'" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('承运商管理')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'carrier:deleteBatch'">
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'carrier:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'carrier:delete'">
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ... @@ -177,7 +177,7 @@
177 177 deleteBatch: "/config/carrier/deleteBatch",
178 178 exportXlsUrl: "/config/carrier/exportXls",
179 179 importExcelUrl: "config/carrier/importExcel",
180   -
  180 +
181 181 },
182 182 dictOptions:{},
183 183 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CompanyList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button @click="handleAdd" v-has="'company:add'" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('货主')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,8 +39,8 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
43   - <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
  42 + <a-menu slot="overlay" v-has="'company:deleteBatch'">
  43 + <a-menu-item key="1" @click="batchDel"><a-icon type="deleteBatch"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
46 46 </a-dropdown>
... ... @@ -88,8 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
92   -
  91 + <a v-has="'company:edit'" @click="handleEdit(record)">编辑</a>
93 92 <a-divider type="vertical" />
94 93 <a-dropdown>
95 94 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
... ... @@ -97,7 +96,7 @@
97 96 <a-menu-item>
98 97 <a @click="handleDetail(record)">详情</a>
99 98 </a-menu-item>
100   - <a-menu-item>
  99 + <a-menu-item v-has="'company:delete'">
101 100 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 101 <a>删除</a>
103 102 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ContainerCapacityList.vue
  View file @23b8c00
... ... @@ -38,7 +38,7 @@
38 38  
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  41 + <a-button @click="handleAdd" v-has="'containerCapacity:add'" type="primary" icon="plus">新增</a-button>
42 42 <a-button type="primary" icon="download" @click="handleExportXls('容器容量管理')">导出</a-button>
43 43 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
44 44 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -46,7 +46,7 @@
46 46 <!-- 高级查询区域 -->
47 47 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
48 48 <a-dropdown v-if="selectedRowKeys.length > 0">
49   - <a-menu slot="overlay">
  49 + <a-menu slot="overlay" v-has="'containerCapacity:deleteBatch'">
50 50 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
51 51 </a-menu>
52 52 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -95,7 +95,7 @@
95 95 </template>
96 96  
97 97 <span slot="action" slot-scope="text, record">
98   - <a @click="handleEdit(record)">编辑</a>
  98 + <a v-has="'containerCapacity:edit'" @click="handleEdit(record)">编辑</a>
99 99  
100 100 <a-divider type="vertical" />
101 101 <a-dropdown>
... ... @@ -104,7 +104,7 @@
104 104 <a-menu-item>
105 105 <a @click="handleDetail(record)">详情</a>
106 106 </a-menu-item>
107   - <a-menu-item>
  107 + <a-menu-item v-has="'containerCapacity:delete'">
108 108 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
109 109 <a>删除</a>
110 110 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ContainerList.vue
  View file @23b8c00
... ... @@ -51,7 +51,7 @@
51 51 <!-- 操作按钮区域 -->
52 52 <div class="table-operator">
53 53 <a-button @click="batchPrint()" type="primary">打印</a-button>
54   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  54 + <a-button @click="handleAdd" v-has="'container:add'" type="primary" icon="plus">新增</a-button>
55 55 <a-button type="primary" icon="download" @click="handleExportXls('容器管理')">导出</a-button>
56 56 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
57 57 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -59,7 +59,7 @@
59 59 <!-- 高级查询区域 -->
60 60 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
61 61 <a-dropdown v-if="selectedRowKeys.length > 0">
62   - <a-menu slot="overlay">
  62 + <a-menu slot="overlay" v-has="'container:deleteBatch'" >
63 63 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
64 64 </a-menu>
65 65 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -120,7 +120,7 @@
120 120 </template>
121 121  
122 122 <span slot="action" slot-scope="text, record">
123   - <a @click="editForm(record)">编辑</a>
  123 + <a v-has="'container:add'" @click="editForm(record)">编辑</a>
124 124  
125 125 <a-divider type="vertical" />
126 126 <a-dropdown>
... ... @@ -129,7 +129,7 @@
129 129 <a-menu-item>
130 130 <a @click="handleDetail(record)">详情</a>
131 131 </a-menu-item>
132   - <a-menu-item>
  132 + <a-menu-item v-has="'container:delete'" >
133 133 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
134 134 <a>删除</a>
135 135 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ContainerTypeList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button @click="handleAdd" v-has="'containerType:add'" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('容器类型')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'containerType:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'containerType:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'containerType:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CustomerList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button @click="handleAdd" v-has="'customer:add'" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('客户管理')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'customer:deleteBatch'">
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'customer:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'customer:delete'">
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ... @@ -192,7 +192,7 @@
192 192 deleteBatch: "/config/customer/deleteBatch",
193 193 exportXlsUrl: "/config/customer/exportXls",
194 194 importExcelUrl: "config/customer/importExcel",
195   -
  195 +
196 196 },
197 197 dictOptions:{},
198 198 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/CycleCountPreferenceList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button @click="handleAdd" v-has="'cycleCountPreference:add'" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('盘点首选项')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'cycleCountPreference:deleteBatch'" >
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'cycleCountPreference:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'cycleCountPreference:delete'" >
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ... @@ -192,7 +192,7 @@
192 192 deleteBatch: "/config/cycleCountPreference/deleteBatch",
193 193 exportXlsUrl: "/config/cycleCountPreference/exportXls",
194 194 importExcelUrl: "config/cycleCountPreference/importExcel",
195   -
  195 +
196 196 },
197 197 dictOptions:{},
198 198 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/LocationHighList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button @click="handleAdd" v-has="'locationHigh:add'" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('库位高度管理')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'locationHigh:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -94,7 +94,7 @@
94 94 </template>
95 95  
96 96 <span slot="action" slot-scope="text, record">
97   - <a @click="handleEdit(record)">编辑</a>
  97 + <a v-has="'locationHigh:edit'" @click="handleEdit(record)">编辑</a>
98 98  
99 99 <a-divider type="vertical" />
100 100 <a-dropdown>
... ... @@ -103,7 +103,7 @@
103 103 <a-menu-item>
104 104 <a @click="handleDetail(record)">详情</a>
105 105 </a-menu-item>
106   - <a-menu-item>
  106 + <a-menu-item v-has="'locationHigh:delete'">
107 107 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
108 108 <a>删除</a>
109 109 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/LocationList.vue
  View file @23b8c00
... ... @@ -100,8 +100,8 @@
100 100 <!-- 操作按钮区域 -->
101 101 <div class="table-operator">
102 102 <a-button @click="batchPrint()" type="primary" >打印</a-button>
103   - <a-button @click="batchAdd()" type="primary" icon="plus">批量新增</a-button>
104   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  103 + <a-button @click="batchAdd()" v-has="'location:batchAdd'" type="primary" icon="plus">批量新增</a-button>
  104 + <a-button v-has="'location:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
105 105 <a-button type="primary" icon="download" @click="handleExportXls('库位管理')">导出</a-button>
106 106 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
107 107 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -109,7 +109,7 @@
109 109 <!-- 高级查询区域 -->
110 110 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
111 111 <a-dropdown v-if="selectedRowKeys.length > 0">
112   - <a-menu slot="overlay">
  112 + <a-menu slot="overlay" v-has="'location:deleteBatch'">
113 113 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
114 114 </a-menu>
115 115 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -170,7 +170,7 @@
170 170 </template>
171 171  
172 172 <span slot="action" slot-scope="text, record">
173   - <a @click="handleEdit(record)">编辑</a>
  173 + <a v-has="'location:edit'" @click="handleEdit(record)">编辑</a>
174 174  
175 175 <a-divider type="vertical" />
176 176 <a-dropdown>
... ... @@ -179,7 +179,7 @@
179 179 <a-menu-item>
180 180 <a @click="handleDetail(record)">详情</a>
181 181 </a-menu-item>
182   - <a-menu-item>
  182 + <a-menu-item v-has="'location:delete'">
183 183 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
184 184 <a>删除</a>
185 185 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/LocationTypeList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button v-has="'locationType:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('库位类型')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'locationType:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'locationType:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'locationType:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialAreaList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button @click="handleAdd" v-has="'materialArea:add'" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('物料分区')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'materialArea:deleteBatch'">
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'materialArea:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'materialArea:delete'">
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialList.vue
  View file @23b8c00
... ... @@ -39,7 +39,7 @@
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41 41 <a-button @click="batchPrint()" type="primary" >打印</a-button>
42   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  42 + <a-button v-has="'material:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
43 43 <a-button type="primary" icon="download" @click="handleExportXls('物料管理')">导出</a-button>
44 44 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
45 45 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -47,7 +47,7 @@
47 47 <!-- 高级查询区域 -->
48 48 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
49 49 <a-dropdown v-if="selectedRowKeys.length > 0">
50   - <a-menu slot="overlay">
  50 + <a-menu slot="overlay" v-has="'material:deleteBatch'">
51 51 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
52 52 </a-menu>
53 53 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -96,7 +96,7 @@
96 96 </template>
97 97  
98 98 <span slot="action" slot-scope="text, record">
99   - <a @click="handleEdit(record)">编辑</a>
  99 + <a v-has="'material:edit'" @click="handleEdit(record)">编辑</a>
100 100  
101 101 <a-divider type="vertical" />
102 102 <a-dropdown>
... ... @@ -105,7 +105,7 @@
105 105 <a-menu-item>
106 106 <a @click="handleDetail(record)">详情</a>
107 107 </a-menu-item>
108   - <a-menu-item>
  108 + <a-menu-item v-has="'material:delete'">
109 109 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
110 110 <a>删除</a>
111 111 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialMultipleList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button v-has="'materialMultiple:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('物料单位换算')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'materialMultiple:deleteBatch'">
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'materialMultiple:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'materialMultiple:delete'">
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialTypeList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button v-has="'materialType:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('物料类别')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'materialType:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'materialType:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'materialType:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialUnitList.vue
  View file @23b8c00
... ... @@ -38,7 +38,7 @@
38 38  
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  41 + <a-button v-has="'materialUnit:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
42 42 <a-button type="primary" icon="download" @click="handleExportXls('物料单位')">导出</a-button>
43 43 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
44 44 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -46,7 +46,7 @@
46 46 <!-- 高级查询区域 -->
47 47 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
48 48 <a-dropdown v-if="selectedRowKeys.length > 0">
49   - <a-menu slot="overlay">
  49 + <a-menu slot="overlay" v-has="'materialUnit:deleteBatch'">
50 50 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
51 51 </a-menu>
52 52 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -95,7 +95,7 @@
95 95 </template>
96 96  
97 97 <span slot="action" slot-scope="text, record">
98   - <a @click="handleEdit(record)">编辑</a>
  98 + <a v-has="'materialUnit:edit'" @click="handleEdit(record)">编辑</a>
99 99  
100 100 <a-divider type="vertical" />
101 101 <a-dropdown>
... ... @@ -104,7 +104,7 @@
104 104 <a-menu-item>
105 105 <a @click="handleDetail(record)">详情</a>
106 106 </a-menu-item>
107   - <a-menu-item>
  107 + <a-menu-item v-has="'materialUnit:delete'">
108 108 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
109 109 <a>删除</a>
110 110 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/MaterialWarningList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button v-has="'materialWarning:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('物料预警')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'materialWarning:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'materialWarning:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'materialWarning:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ParameterConfigurationList.vue
  View file @23b8c00
... ... @@ -38,7 +38,7 @@
38 38  
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  41 + <a-button @click="handleAdd" v-has="'ParameterConfiguration:add'" type="primary" icon="plus">新增</a-button>
42 42 <a-button type="primary" icon="download" @click="handleExportXls('参数配置')">导出</a-button>
43 43 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
44 44 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -46,7 +46,7 @@
46 46 <!-- 高级查询区域 -->
47 47 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
48 48 <a-dropdown v-if="selectedRowKeys.length > 0">
49   - <a-menu slot="overlay">
  49 + <a-menu slot="overlay" v-has="'ParameterConfiguration:deleteBatch'">
50 50 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
51 51 </a-menu>
52 52 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -95,7 +95,7 @@
95 95 </template>
96 96  
97 97 <span slot="action" slot-scope="text, record">
98   - <a @click="handleEdit(record)">编辑</a>
  98 + <a v-has="'ParameterConfiguration:edit'" @click="handleEdit(record)">编辑</a>
99 99  
100 100 <a-divider type="vertical" />
101 101 <a-dropdown>
... ... @@ -104,7 +104,7 @@
104 104 <a-menu-item>
105 105 <a @click="handleDetail(record)">详情</a>
106 106 </a-menu-item>
107   - <a-menu-item>
  107 + <a-menu-item v-has="'ParameterConfiguration:delete'">
108 108 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
109 109 <a>删除</a>
110 110 </a-popconfirm>
... ... @@ -203,7 +203,7 @@
203 203 deleteBatch: "/config/parameterConfiguration/deleteBatch",
204 204 exportXlsUrl: "/config/parameterConfiguration/exportXls",
205 205 importExcelUrl: "config/parameterConfiguration/importExcel",
206   -
  206 +
207 207 },
208 208 dictOptions:{},
209 209 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/PortList.vue
  View file @23b8c00
... ... @@ -38,7 +38,7 @@
38 38  
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  41 + <a-button v-has="'port:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
42 42 <a-button type="primary" icon="download" @click="handleExportXls('出入口')">导出</a-button>
43 43 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
44 44 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -46,7 +46,7 @@
46 46 <!-- 高级查询区域 -->
47 47 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
48 48 <a-dropdown v-if="selectedRowKeys.length > 0">
49   - <a-menu slot="overlay">
  49 + <a-menu slot="overlay" v-has="'port:deleteBatch'">
50 50 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
51 51 </a-menu>
52 52 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -101,7 +101,7 @@
101 101 </template>
102 102  
103 103 <span slot="action" slot-scope="text, record">
104   - <a @click="handleEdit(record)">编辑</a>
  104 + <a v-has="'port:edit'" @click="handleEdit(record)">编辑</a>
105 105  
106 106 <a-divider type="vertical" />
107 107 <a-dropdown>
... ... @@ -110,7 +110,7 @@
110 110 <a-menu-item>
111 111 <a @click="handleDetail(record)">详情</a>
112 112 </a-menu-item>
113   - <a-menu-item>
  113 + <a-menu-item v-has="'port:delete'">
114 114 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
115 115 <a>删除</a>
116 116 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ReceiptTypeList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button v-has="'receiptType:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('入库单类型')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'receiptType:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'receiptType:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'receiptType:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ShipmentTypeList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button @click="handleAdd" v-has="'shipmentType:add'" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('出库单类型')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'shipmentType:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -88,7 +88,7 @@
88 88 </template>
89 89  
90 90 <span slot="action" slot-scope="text, record">
91   - <a @click="handleEdit(record)">编辑</a>
  91 + <a v-has="'shipmentType:edit'" @click="handleEdit(record)">编辑</a>
92 92  
93 93 <a-divider type="vertical" />
94 94 <a-dropdown>
... ... @@ -97,7 +97,7 @@
97 97 <a-menu-item>
98 98 <a @click="handleDetail(record)">详情</a>
99 99 </a-menu-item>
100   - <a-menu-item>
  100 + <a-menu-item v-has="'shipmentType:delete'">
101 101 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
102 102 <a>删除</a>
103 103 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/SupplierList.vue
  View file @23b8c00
... ... @@ -38,7 +38,7 @@
38 38  
39 39 <!-- 操作按钮区域 -->
40 40 <div class="table-operator">
41   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  41 + <a-button v-has="'supplier:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
42 42 <a-button type="primary" icon="download" @click="handleExportXls('供应商管理')">导出</a-button>
43 43 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
44 44 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -46,7 +46,7 @@
46 46 <!-- 高级查询区域 -->
47 47 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
48 48 <a-dropdown v-if="selectedRowKeys.length > 0">
49   - <a-menu slot="overlay">
  49 + <a-menu slot="overlay" v-has="'supplier:deleteBatch'">
50 50 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
51 51 </a-menu>
52 52 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -95,7 +95,7 @@
95 95 </template>
96 96  
97 97 <span slot="action" slot-scope="text, record">
98   - <a @click="handleEdit(record)">编辑</a>
  98 + <a v-has="'supplier:edit'" @click="handleEdit(record)">编辑</a>
99 99  
100 100 <a-divider type="vertical" />
101 101 <a-dropdown>
... ... @@ -104,7 +104,7 @@
104 104 <a-menu-item>
105 105 <a @click="handleDetail(record)">详情</a>
106 106 </a-menu-item>
107   - <a-menu-item>
  107 + <a-menu-item v-has="'supplier:delete'">
108 108 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
109 109 <a>删除</a>
110 110 </a-popconfirm>
... ... @@ -219,7 +219,7 @@
219 219 deleteBatch: "/config/supplier/deleteBatch",
220 220 exportXlsUrl: "/config/supplier/exportXls",
221 221 importExcelUrl: "config/supplier/importExcel",
222   -
  222 +
223 223 },
224 224 dictOptions:{},
225 225 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/SysUserWarehouseList.vue
  View file @23b8c00
... ... @@ -11,7 +11,7 @@
11 11  
12 12 <!-- 操作按钮区域 -->
13 13 <div class="table-operator">
14   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  14 + <a-button v-has="'sysUserWarehouse:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
15 15 <a-button type="primary" icon="download" @click="handleExportXls('用户仓库关系表')">导出</a-button>
16 16 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
17 17 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -19,7 +19,7 @@
19 19 <!-- 高级查询区域 -->
20 20 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
21 21 <a-dropdown v-if="selectedRowKeys.length > 0">
22   - <a-menu slot="overlay">
  22 + <a-menu slot="overlay" v-has="'sysUserWarehouse:deleteBatch'">
23 23 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
24 24 </a-menu>
25 25 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,7 +68,7 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'sysUserWarehouse:edit'" @click="handleEdit(record)">编辑</a>
72 72  
73 73 <a-divider type="vertical" />
74 74 <a-dropdown>
... ... @@ -77,7 +77,7 @@
77 77 <a-menu-item>
78 78 <a @click="handleDetail(record)">详情</a>
79 79 </a-menu-item>
80   - <a-menu-item>
  80 + <a-menu-item v-has="'sysUserWarehouse:delete'">
81 81 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
82 82 <a>删除</a>
83 83 </a-popconfirm>
... ... @@ -151,7 +151,7 @@
151 151 deleteBatch: "/config/sysUserWarehouse/deleteBatch",
152 152 exportXlsUrl: "/config/sysUserWarehouse/exportXls",
153 153 importExcelUrl: "config/sysUserWarehouse/importExcel",
154   -
  154 +
155 155 },
156 156 dictOptions:{},
157 157 superFieldList:[],
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/WarehouseList.vue
  View file @23b8c00
... ... @@ -95,7 +95,7 @@
95 95 </template>
96 96  
97 97 <span slot="action" slot-scope="text, record">
98   - <a @click="handleEdit(record)">编辑</a>
  98 + <a v-has="'warehouse:edit'" @click="handleEdit(record)">编辑</a>
99 99  
100 100 <a-divider type="vertical" />
101 101 <a-dropdown>
... ... @@ -104,7 +104,7 @@
104 104 <a-menu-item>
105 105 <a @click="handleDetail(record)">详情</a>
106 106 </a-menu-item>
107   - <a-menu-item>
  107 + <a-menu-item v-has="'warehouse:delete'">
108 108 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
109 109 <a>删除</a>
110 110 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/config/ZoneList.vue
  View file @23b8c00
... ... @@ -31,7 +31,7 @@
31 31  
32 32 <!-- 操作按钮区域 -->
33 33 <div class="table-operator">
34   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  34 + <a-button v-has="'zone:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
35 35 <a-button type="primary" icon="download" @click="handleExportXls('库区管理')">导出</a-button>
36 36 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
37 37 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -39,7 +39,7 @@
39 39 <!-- 高级查询区域 -->
40 40 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
41 41 <a-dropdown v-if="selectedRowKeys.length > 0">
42   - <a-menu slot="overlay">
  42 + <a-menu slot="overlay" v-has="'zone:deleteBatch'">
43 43 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
44 44 </a-menu>
45 45 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -94,7 +94,7 @@
94 94 </template>
95 95  
96 96 <span slot="action" slot-scope="text, record">
97   - <a @click="handleEdit(record)">编辑</a>
  97 + <a v-has="'zone:edit'" @click="handleEdit(record)">编辑</a>
98 98  
99 99 <a-divider type="vertical" />
100 100 <a-dropdown>
... ... @@ -103,7 +103,7 @@
103 103 <a-menu-item>
104 104 <a @click="handleDetail(record)">详情</a>
105 105 </a-menu-item>
106   - <a-menu-item>
  106 + <a-menu-item v-has="'zone:delete'">
107 107 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
108 108 <a>删除</a>
109 109 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/inventory/InventoryDetailList.vue
  View file @23b8c00
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  5 + <a-button v-has="'inventoryDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
6 6 <a-button type="primary" icon="download" @click="handleExportXls('库存详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
... ... @@ -14,7 +14,7 @@
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload>
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17   - <a-menu slot="overlay">
  17 + <a-menu slot="overlay" v-has="'inventoryDetail:deleteBatch'">
18 18 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
19 19 </a-menu>
20 20 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -68,10 +68,11 @@
68 68 </template>
69 69  
70 70 <span slot="action" slot-scope="text, record">
71   - <a @click="handleEdit(record)">编辑</a>
  71 + <a v-has="'inventoryDetail:edit'" @click="handleEdit(record)">编辑</a>
72 72 <a-divider type="vertical" />
  73 +
73 74 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
74   - <a>删除</a>
  75 + <a v-has="'inventoryDetail:add'" >删除</a>
75 76 </a-popconfirm>
76 77 </span>
77 78  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @23b8c00
... ... @@ -55,7 +55,7 @@
55 55  
56 56 <!-- 操作按钮区域 -->
57 57 <div class="table-operator">
58   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  58 + <a-button v-has="'inventoryHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
59 59 <a-button type="primary" icon="download" @click="handleExportXls('库存表')">导出</a-button>
60 60 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
61 61 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -107,12 +107,12 @@
107 107 </template>
108 108  
109 109 <span slot="action" slot-scope="text, record">
110   - <a @click="handleEdit(record)">编辑</a>
  110 + <a v-has="'inventoryHeader:edit'" @click="handleEdit(record)">编辑</a>
111 111  
112 112 <a-divider type="vertical" />
113 113 <a-dropdown>
114 114 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
115   - <a-menu slot="overlay">
  115 + <a-menu slot="overlay" v-has="'inventoryHeader:delete'">
116 116 <a-menu-item>
117 117 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
118 118 <a>删除</a>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/inventory/InventoryTransactionList.vue
  View file @23b8c00
... ... @@ -92,7 +92,7 @@
92 92  
93 93 <!-- 操作按钮区域 -->
94 94 <div class="table-operator">
95   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  95 + <a-button @click="handleAdd" v-has="'inventoryTransaction:add'" type="primary" icon="plus">新增</a-button>
96 96 <a-button type="primary" icon="download" @click="handleExportXls('库存交易记录')">导出</a-button>
97 97 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
98 98 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -100,7 +100,7 @@
100 100 <!-- 高级查询区域 -->
101 101 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
102 102 <a-dropdown v-if="selectedRowKeys.length > 0">
103   - <a-menu slot="overlay">
  103 + <a-menu slot="overlay" v-has="'inventoryTransaction:deleteBatch'">
104 104 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
105 105 </a-menu>
106 106 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -155,7 +155,7 @@
155 155 </template>
156 156  
157 157 <span slot="action" slot-scope="text, record">
158   - <a @click="handleEdit(record)">编辑</a>
  158 + <a v-has="'inventoryTransaction:edit'" @click="handleEdit(record)">编辑</a>
159 159  
160 160 <a-divider type="vertical" />
161 161 <a-dropdown>
... ... @@ -164,7 +164,7 @@
164 164 <a-menu-item>
165 165 <a @click="handleDetail(record)">详情</a>
166 166 </a-menu-item>
167   - <a-menu-item>
  167 + <a-menu-item v-has="'inventoryTransaction:delete'">
168 168 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
169 169 <a>删除</a>
170 170 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/monitor/ApiLogList.vue
  View file @23b8c00
... ... @@ -70,7 +70,7 @@
70 70  
71 71 <!-- 操作按钮区域 -->
72 72 <div class="table-operator">
73   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  73 + <a-button v-has="'apiLog:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
74 74 <a-button type="primary" icon="download" @click="handleExportXls('接口日志')">导出</a-button>
75 75 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
76 76 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -78,8 +78,8 @@
78 78 <!-- 高级查询区域 -->
79 79 <j-super-query :fieldList="superFieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
80 80 <a-dropdown v-if="selectedRowKeys.length > 0">
81   - <a-menu slot="overlay">
82   - <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
  81 + <a-menu slot="overlay" v-has="'apiLog:deleteBatch'">
  82 + <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
83 83 </a-menu>
84 84 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
85 85 </a-dropdown>
... ... @@ -127,7 +127,7 @@
127 127 </template>
128 128  
129 129 <span slot="action" slot-scope="text, record">
130   - <a @click="handleEdit(record)">编辑</a>
  130 + <a v-has="'apiLog:edit'" @click="handleEdit(record)">编辑</a>
131 131  
132 132 <a-divider type="vertical" />
133 133 <a-dropdown>
... ... @@ -136,7 +136,7 @@
136 136 <a-menu-item>
137 137 <a @click="handleDetail(record)">详情</a>
138 138 </a-menu-item>
139   - <a-menu-item>
  139 + <a-menu-item v-has="'apiLog:delete'">
140 140 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
141 141 <a>删除</a>
142 142 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/monitor/modules/ApiLogForm.vue
  View file @23b8c00
... ... @@ -171,7 +171,7 @@
171 171 that.confirmLoading = false;
172 172 })
173 173 }
174   -
  174 +
175 175 })
176 176 },
177 177 }
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
  View file @23b8c00
... ... @@ -56,7 +56,7 @@
56 56  
57 57 <!-- 操作按钮区域 -->
58 58 <div class="table-operator" v-if="mainId">
59   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  59 + <a-button @click="handleAdd" v-has="'receiptContainerDetail:add'" type="primary" icon="plus">新增</a-button>
60 60 <a-button type="primary" icon="download" @click="handleExportXls('入库组盘详情')">导出</a-button>
61 61 <a-upload
62 62 name="file"
... ... @@ -68,7 +68,7 @@
68 68 <a-button type="primary" icon="import">导入</a-button>
69 69 </a-upload>
70 70 <a-dropdown v-if="selectedRowKeys.length > 0">
71   - <a-menu slot="overlay">
  71 + <a-menu slot="overlay" v-has="'receiptContainerDetail:deleteBatch'">
72 72 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
73 73 </a-menu>
74 74 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -121,10 +121,10 @@
121 121 </template>
122 122  
123 123 <span slot="action" slot-scope="text, record">
124   - <a @click="handleEdit(record)">编辑</a>
  124 + <a v-has="'receiptContainerDetail:edit'" @click="handleEdit(record)">编辑</a>
125 125 <a-divider type="vertical" />
126 126 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
127   - <a>删除</a>
  127 + <a v-has="'receiptContainerDetail:delete'">删除</a>
128 128 </a-popconfirm>
129 129 </span>
130 130  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @23b8c00
... ... @@ -60,7 +60,7 @@
60 60  
61 61 <!-- 操作按钮区域 -->
62 62 <div class="table-operator">
63   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  63 + <a-button v-has="'receiptContainerHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
64 64 <a-button type="primary" icon="download" @click="handleExportXls('入库组盘')">导出</a-button>
65 65 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
66 66 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -112,7 +112,7 @@
112 112 </template>
113 113  
114 114 <span slot="action" slot-scope="text, record">
115   - <a @click="handleEdit(record)">编辑</a>
  115 + <a v-has="'receiptContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
116 116 <a-divider type="vertical" />
117 117 <a v-if="record.status == 0 && record.taskType == 200" @click="selectPort(record)" >生成任务</a>
118 118 <a v-else-if="record.status == 0" @click="createTask(record)">生成任务</a>
... ... @@ -120,7 +120,7 @@
120 120 <a-dropdown>
121 121 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
122 122 <a-menu slot="overlay">
123   - <a-menu-item>
  123 + <a-menu-item v-has="'receiptContainerHeader:delete'">
124 124 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
125 125 <a>删除</a>
126 126 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptDetailList.vue
  View file @23b8c00
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  5 + <a-button v-has="'receiptDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
6 6 <a-button type="primary" icon="download" @click="handleExportXls('入库单详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
... ... @@ -14,7 +14,7 @@
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload>
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17   - <a-menu slot="overlay">
  17 + <a-menu slot="overlay" v-has="'receiptDetail:deleteBatch'" >
18 18 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
19 19 </a-menu>
20 20 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -62,10 +62,10 @@
62 62 </template>
63 63  
64 64 <span slot="action" slot-scope="text, record">
65   - <a @click="edit(record)">编辑</a>
  65 + <a v-has="'receiptDetail:edit'" @click="edit(record)">编辑</a>
66 66 <a-divider type="vertical" />
67 67 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
68   - <a>删除</a>
  68 + <a v-has="'receiptDetail:delete'" >删除</a>
69 69 </a-popconfirm>
70 70 </span>
71 71  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderList.vue
  View file @23b8c00
... ... @@ -91,7 +91,7 @@
91 91  
92 92 <!-- 操作按钮区域 -->
93 93 <div class="table-operator">
94   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  94 + <a-button v-has="'receiptHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
95 95 <a-button type="primary" icon="download" @click="handleExportXls('入库表主表')">导出</a-button>
96 96 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
97 97 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -161,14 +161,14 @@
161 161 </template>
162 162  
163 163 <span slot="action" slot-scope="text, record">
164   - <a @click="handleEdit(record)">编辑</a>
  164 + <a v-has="'receiptHeader:edit'" @click="handleEdit(record)">编辑</a>
165 165 <a-divider type="vertical" />
166 166 <a v-if="record.lastStatus < 800" @click="receive(record)">组盘</a>
167 167 <a-divider type="vertical" />
168 168 <a-dropdown>
169 169 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
170 170 <a-menu slot="overlay">
171   - <a-menu-item>
  171 + <a-menu-item v-has="'receiptHeader:delete'">
172 172 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
173 173 <a>删除</a>
174 174 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerDetailList.vue
  View file @23b8c00
... ... @@ -56,7 +56,7 @@
56 56  
57 57 <!-- 操作按钮区域 -->
58 58 <div class="table-operator" v-if="mainId">
59   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  59 + <a-button v-has="'shipmentContainerDetail:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
60 60 <a-button type="primary" icon="download" @click="handleExportXls('出库组盘详情')">导出</a-button>
61 61 <a-upload
62 62 name="file"
... ... @@ -68,7 +68,7 @@
68 68 <a-button type="primary" icon="import">导入</a-button>
69 69 </a-upload>
70 70 <a-dropdown v-if="selectedRowKeys.length > 0">
71   - <a-menu slot="overlay">
  71 + <a-menu slot="overlay" v-has="'shipmentContainerDetail:deleteBatch'" >
72 72 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
73 73 </a-menu>
74 74 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -122,10 +122,10 @@
122 122 </template>
123 123  
124 124 <span slot="action" slot-scope="text, record">
125   - <a @click="handleEdit(record)">编辑</a>
  125 + <a v-has="'shipmentContainerDetail:edit'" @click="handleEdit(record)">编辑</a>
126 126 <a-divider type="vertical" />
127 127 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
128   - <a>删除</a>
  128 + <a v-has="'shipmentContainerDetail:delete'" >删除</a>
129 129 </a-popconfirm>
130 130 </span>
131 131  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @23b8c00
... ... @@ -65,7 +65,7 @@
65 65  
66 66 <!-- 操作按钮区域 -->
67 67 <div class="table-operator">
68   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  68 + <a-button @click="handleAdd" v-has="'shipmentContainerHeader:add'" type="primary" icon="plus">新增</a-button>
69 69 <a-button type="primary" icon="download" @click="handleExportXls('出库组盘')">导出</a-button>
70 70 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
71 71 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -117,13 +117,13 @@
117 117 </template>
118 118  
119 119 <span slot="action" slot-scope="text, record">
120   - <a @click="handleEdit(record)">编辑</a>
  120 + <a v-has="'shipmentContainerHeader:edit'" @click="handleEdit(record)">编辑</a>
121 121 <a-divider type="vertical" />
122 122 <a v-if="record.status == 0" @click="selectPort(record)">生成任务</a>
123 123 <a-divider type="vertical" />
124 124 <a-dropdown>
125 125 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
126   - <a-menu slot="overlay">
  126 + <a-menu slot="overlay" v-has="'shipmentContainerHeader:delete'" >
127 127 <a-menu-item>
128 128 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
129 129 <a>删除</a>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentDetailList.vue
  View file @23b8c00
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  5 + <a-button @click="handleAdd" v-has="'shipmentDetail:add'" type="primary" icon="plus">新增</a-button>
6 6 <a-button type="primary" icon="download" @click="handleExportXls('出库单详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
... ... @@ -14,7 +14,7 @@
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload>
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17   - <a-menu slot="overlay">
  17 + <a-menu slot="overlay" v-has="'shipmentDetail:deleteBatch'">
18 18 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
19 19 </a-menu>
20 20 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -64,10 +64,10 @@
64 64 <span slot="action" slot-scope="text, record">
65 65 <a @click="combine(record)">配盘</a>
66 66 <a-divider type="vertical" />
67   - <a @click="edit(record)">编辑</a>
  67 + <a v-has="'shipmentDetail:edit'" @click="edit(record)">编辑</a>
68 68 <a-divider type="vertical" />
69 69 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
70   - <a>删除</a>
  70 + <a v-has="'shipmentDetail:delete'">删除</a>
71 71 </a-popconfirm>
72 72 </span>
73 73  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @23b8c00
... ... @@ -96,7 +96,7 @@
96 96  
97 97 <!-- 操作按钮区域 -->
98 98 <div class="table-operator">
99   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  99 + <a-button v-has="'shipmentHeader:add'" @click="handleAdd" type="primary" icon="plus">新增</a-button>
100 100 <a-button type="primary" icon="download" @click="handleExportXls('出库单')">导出</a-button>
101 101 <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
102 102 <a-button type="primary" icon="import">导入</a-button>
... ... @@ -169,12 +169,12 @@
169 169 <a-divider type="vertical" />
170 170 <a v-if="record.lastStatus < 800" @click="autoShipmentCombine(record)">自动配盘</a>
171 171 <a-divider type="vertical" />
172   - <a @click="handleEdit(record)">编辑</a>
  172 + <a v-has="'shipmentHeader:edit'" @click="handleEdit(record)">编辑</a>
173 173  
174 174 <a-divider type="vertical" />
175 175 <a-dropdown>
176 176 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
177   - <a-menu slot="overlay">
  177 + <a-menu slot="overlay" v-has="'shipmentHeader:delete'">
178 178 <a-menu-item>
179 179 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
180 180 <a>删除</a>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @23b8c00
... ... @@ -93,7 +93,7 @@
93 93  
94 94 <!-- 操作按钮区域 -->
95 95 <div class="table-operator">
96   - <a-button @click="createCheckOut()" type="primary">出库查看</a-button>
  96 + <a-button v-has="'taskHeader:checkOut'" @click="createCheckOut()" type="primary">出库查看</a-button>
97 97 <!-- <a-button type="primary" icon="download" @click="handleExportXls('任务表')">导出</a-button>-->
98 98 <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
99 99 <!-- <a-button type="primary" icon="import">导入</a-button>-->
... ... @@ -151,17 +151,17 @@
151 151 </template>
152 152  
153 153 <span slot="action" slot-scope="text, record">
154   - <a v-if="record.status == 1" @click="executeTask(record)">执行</a>
  154 + <a v-if="record.status == 1" v-has="'taskHeader:executeTask'" @click="executeTask(record)">执行</a>
155 155 <a-divider type="vertical" />
156   - <a v-if="record.status < 100" @click="completeTask(record)">完成</a>
  156 + <a v-if="record.status < 100" v-has="'taskHeader:completeTask'" @click="completeTask(record)">完成</a>
157 157 <a-divider type="vertical" />
158 158 <a-dropdown>
159 159 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
160 160 <a-menu slot="overlay">
161   - <a-menu-item>
  161 + <a-menu-item v-has="'taskHeader:edit'">
162 162 <a @click="handleEdit(record)">编辑</a>
163 163 </a-menu-item>
164   - <a-menu-item>
  164 + <a-menu-item v-has="'taskHeader:delete'" >
165 165 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
166 166 <a>删除</a>
167 167 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @23b8c00
... ... @@ -93,8 +93,8 @@
93 93  
94 94 <!-- 操作按钮区域 -->
95 95 <div class="table-operator">
96   - <a-button @click="createEmptyIn()" type="primary">空托入库</a-button>
97   - <a-button @click="createManyEmptyIn()" type="primary">空托组入库</a-button>
  96 + <a-button @click="createEmptyIn()" v-has="'taskHeader:emptyIn'" type="primary">空托入库</a-button>
  97 + <a-button @click="createManyEmptyIn()" v-has="'taskHeader:manyEmptyIn'" type="primary">空托组入库</a-button>
98 98 </div>
99 99  
100 100 <!-- table区域-begin -->
... ... @@ -146,19 +146,19 @@
146 146 </template>
147 147  
148 148 <span slot="action" slot-scope="text, record">
149   - <a v-if="record.status == 1" @click="executeTask(record)">执行</a>
  149 + <a v-if="record.status == 1" v-has="'taskHeader:executeTask'" @click="executeTask(record)">执行</a>
150 150 <a-divider type="vertical" />
151   - <a v-if="record.status < 100" @click="cancelTask(record)">取消</a>
  151 + <a v-if="record.status < 100" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)">取消</a>
152 152 <a-divider type="vertical" />
153   - <a v-if="record.status < 100" @click="completeTask(record)">完成</a>
  153 + <a v-if="record.status < 100" v-has="'taskHeader:completeTask'" @click="completeTask(record)">完成</a>
154 154 <a-divider type="vertical" />
155 155 <a-dropdown>
156 156 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
157 157 <a-menu slot="overlay">
158   - <a-menu-item>
  158 + <a-menu-item v-has="'taskHeader:edit'">
159 159 <a @click="handleEdit(record)">编辑</a>
160 160 </a-menu-item>
161   - <a-menu-item>
  161 + <a-menu-item v-has="'taskHeader:delete'">
162 162 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
163 163 <a>删除</a>
164 164 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @23b8c00
... ... @@ -93,8 +93,8 @@
93 93  
94 94 <!-- 操作按钮区域 -->
95 95 <div class="table-operator">
96   - <a-button @click="createEmptyOut()" type="primary" >空托出库</a-button>
97   - <a-button @click="createManyEmptyOut()" type="primary" >空托组出库</a-button>
  96 + <a-button @click="createEmptyOut()" v-has="'taskHeader:emptyOut'" type="primary" >空托出库</a-button>
  97 + <a-button @click="createManyEmptyOut()" v-has="'taskHeader:manyEmptyOut'" type="primary" >空托组出库</a-button>
98 98 </div>
99 99  
100 100 <!-- table区域-begin -->
... ... @@ -146,19 +146,19 @@
146 146 </template>
147 147  
148 148 <span slot="action" slot-scope="text, record">
149   - <a v-if="record.status == 1" @click="executeTask(record)">执行</a>
  149 + <a v-if="record.status == 1" v-has="'taskHeader:executeTask'" @click="executeTask(record)">执行</a>
150 150 <a-divider type="vertical" />
151   - <a v-if="record.status < 100" @click="cancelTask(record)">取消</a>
  151 + <a v-if="record.status < 100" v-has="'taskHeader:executeTask'" @click="cancelTask(record)">取消</a>
152 152 <a-divider type="vertical" />
153   - <a v-if="record.status < 100" @click="completeTask(record)">完成</a>
  153 + <a v-if="record.status < 100" v-has="'taskHeader:executeTask'" @click="completeTask(record)">完成</a>
154 154 <a-divider type="vertical" />
155 155 <a-dropdown>
156 156 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
157 157 <a-menu slot="overlay">
158   - <a-menu-item>
  158 + <a-menu-item v-has="'taskHeader:edit'">
159 159 <a @click="handleEdit(record)">编辑</a>
160 160 </a-menu-item>
161   - <a-menu-item>
  161 + <a-menu-item v-has="'taskHeader:delete'">
162 162 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
163 163 <a>删除</a>
164 164 </a-popconfirm>
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/task/TaskDetailList.vue
  View file @23b8c00
... ... @@ -2,7 +2,7 @@
2 2 <a-card :bordered="false" :class="'cust-erp-sub-tab'">
3 3 <!-- 操作按钮区域 -->
4 4 <div class="table-operator" v-if="mainId">
5   - <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
  5 + <a-button @click="handleAdd" v-has="'taskDetail:add'" type="primary" icon="plus">新增</a-button>
6 6 <a-button type="primary" icon="download" @click="handleExportXls('任务详情')">导出</a-button>
7 7 <a-upload
8 8 name="file"
... ... @@ -14,7 +14,7 @@
14 14 <a-button type="primary" icon="import">导入</a-button>
15 15 </a-upload>
16 16 <a-dropdown v-if="selectedRowKeys.length > 0">
17   - <a-menu slot="overlay">
  17 + <a-menu slot="overlay" v-has="'taskDetail:deleteBatch'">
18 18 <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
19 19 </a-menu>
20 20 <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
... ... @@ -62,10 +62,10 @@
62 62 </template>
63 63  
64 64 <span slot="action" slot-scope="text, record">
65   - <a @click="handleEdit(record)">编辑</a>
  65 + <a v-has="'taskDetail:edit'" @click="handleEdit(record)">编辑</a>
66 66 <a-divider type="vertical" />
67 67 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
68   - <a>删除</a>
  68 + <a v-has="'taskDetail:delete'">删除</a>
69 69 </a-popconfirm>
70 70 </span>
71 71  
... ...
jeecg-boot-master/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @23b8c00
... ... @@ -93,8 +93,8 @@
93 93  
94 94 <!-- 操作按钮区域 -->
95 95 <div class="table-operator">
96   - <a-button @click="createTransfer()" type="primary">移库任务</a-button>
97   - <a-button @click="createOverStation()" type="primary">跨站任务</a-button>
  96 + <a-button @click="createTransfer()" v-has="'taskHeader:transfer'" type="primary">移库任务</a-button>
  97 + <a-button @click="createOverStation()" v-has="'taskHeader:overStation'" type="primary">跨站任务</a-button>
98 98 <!-- <a-button type="primary" icon="download" @click="handleExportXls('任务表')">导出</a-button>-->
99 99 <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
100 100 <!-- <a-button type="primary" icon="import">导入</a-button>-->
... ... @@ -152,17 +152,17 @@
152 152 </template>
153 153  
154 154 <span slot="action" slot-scope="text, record">
155   - <a v-if="record.status == 1" @click="executeTask(record)">执行</a>
  155 + <a v-if="record.status == 1" v-has="'taskHeader:executeTask'" @click="executeTask(record)">执行</a>
156 156 <a-divider type="vertical" />
157   - <a v-if="record.status < 100" @click="completeTask(record)">完成</a>
  157 + <a v-if="record.status < 100" v-has="'taskHeader:completeTask'" @click="completeTask(record)">完成</a>
158 158 <a-divider type="vertical" />
159 159 <a-dropdown>
160 160 <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
161 161 <a-menu slot="overlay">
162   - <a-menu-item>
  162 + <a-menu-item v-has="'taskHeader:edit'">
163 163 <a @click="handleEdit(record)">编辑</a>
164 164 </a-menu-item>
165   - <a-menu-item>
  165 + <a-menu-item v-has="'taskHeader:delete'">
166 166 <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
167 167 <a>删除</a>
168 168 </a-popconfirm>
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysAnnouncementController.java
  View file @23b8c00
... ... @@ -9,6 +9,7 @@ import com.jeecg.dingtalk.api.core.response.Response;
9 9 import lombok.extern.slf4j.Slf4j;
10 10 import org.apache.commons.lang.StringUtils;
11 11 import org.apache.shiro.SecurityUtils;
  12 +import org.apache.shiro.authz.annotation.RequiresPermissions;
12 13 import org.jeecg.common.api.vo.Result;
13 14 import org.jeecg.common.constant.CommonConstant;
14 15 import org.jeecg.common.constant.CommonSendStatus;
... ... @@ -121,6 +122,7 @@ public class SysAnnouncementController {
121 122 * @return
122 123 */
123 124 @RequestMapping(value = "/add", method = RequestMethod.POST)
  125 + @RequiresPermissions("Announcement:add")
124 126 public Result<SysAnnouncement> add(@RequestBody SysAnnouncement sysAnnouncement) {
125 127 Result<SysAnnouncement> result = new Result<SysAnnouncement>();
126 128 try {
... ... @@ -145,6 +147,7 @@ public class SysAnnouncementController {
145 147 * @return
146 148 */
147 149 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  150 + @RequiresPermissions("Announcement:edit")
148 151 public Result<SysAnnouncement> eidt(@RequestBody SysAnnouncement sysAnnouncement) {
149 152 Result<SysAnnouncement> result = new Result<SysAnnouncement>();
150 153 SysAnnouncement sysAnnouncementEntity = sysAnnouncementService.getById(sysAnnouncement.getId());
... ... @@ -171,6 +174,7 @@ public class SysAnnouncementController {
171 174 * @return
172 175 */
173 176 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
  177 + @RequiresPermissions("Announcement:delete")
174 178 public Result<SysAnnouncement> delete(@RequestParam(name="id",required=true) String id) {
175 179 Result<SysAnnouncement> result = new Result<SysAnnouncement>();
176 180 SysAnnouncement sysAnnouncement = sysAnnouncementService.getById(id);
... ... @@ -193,6 +197,7 @@ public class SysAnnouncementController {
193 197 * @return
194 198 */
195 199 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
  200 + @RequiresPermissions("Announcement:deleteBatch")
196 201 public Result<SysAnnouncement> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
197 202 Result<SysAnnouncement> result = new Result<SysAnnouncement>();
198 203 if(ids==null || "".equals(ids.trim())) {
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysDictController.java
  View file @23b8c00
... ... @@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
8 8 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
9 9 import lombok.extern.slf4j.Slf4j;
10 10 import org.apache.shiro.SecurityUtils;
  11 +import org.apache.shiro.authz.annotation.RequiresPermissions;
11 12 import org.apache.shiro.authz.annotation.RequiresRoles;
12 13 import org.jeecg.common.api.vo.Result;
13 14 import org.jeecg.common.constant.CacheConstant;
... ... @@ -338,6 +339,7 @@ public class SysDictController {
338 339 * @return
339 340 */
340 341 //@RequiresRoles({"admin"})
  342 + @RequiresPermissions("dict:add")
341 343 @RequestMapping(value = "/add", method = RequestMethod.POST)
342 344 public Result<SysDict> add(@RequestBody SysDict sysDict) {
343 345 Result<SysDict> result = new Result<SysDict>();
... ... @@ -359,6 +361,7 @@ public class SysDictController {
359 361 * @return
360 362 */
361 363 //@RequiresRoles({"admin"})
  364 + @RequiresPermissions("dict:edit")
362 365 @RequestMapping(value = "/edit", method = { RequestMethod.PUT,RequestMethod.POST })
363 366 public Result<SysDict> edit(@RequestBody SysDict sysDict) {
364 367 Result<SysDict> result = new Result<SysDict>();
... ... @@ -381,6 +384,7 @@ public class SysDictController {
381 384 * @return
382 385 */
383 386 //@RequiresRoles({"admin"})
  387 + @RequiresPermissions("dict:delete")
384 388 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
385 389 @CacheEvict(value={CacheConstant.SYS_DICT_CACHE, CacheConstant.SYS_ENABLE_DICT_CACHE}, allEntries=true)
386 390 public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/controller/SysPermissionController.java
  View file @23b8c00
... ... @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
7 7 import lombok.extern.slf4j.Slf4j;
8 8 import org.apache.commons.lang3.StringUtils;
9 9 import org.apache.shiro.SecurityUtils;
  10 +import org.apache.shiro.authz.annotation.RequiresPermissions;
10 11 import org.apache.shiro.authz.annotation.RequiresRoles;
11 12 import org.jeecg.common.api.vo.Result;
12 13 import org.jeecg.common.constant.CommonConstant;
... ... @@ -178,7 +179,7 @@ public class SysPermissionController {
178 179  
179 180 // /**
180 181 // * 查询用户拥有的菜单权限和按钮权限（根据用户账号）
181   -// *
  182 +// *
182 183 // * @return
183 184 // */
184 185 // @RequestMapping(value = "/queryByUser", method = RequestMethod.GET)
... ... @@ -254,7 +255,7 @@ public class SysPermissionController {
254 255 json.put("sysSafeMode", jeeccgBaseConfig.getSafeMode());
255 256 result.setResult(json);
256 257 } catch (Exception e) {
257   - result.error500("查询失败:" + e.getMessage());
  258 + result.error500("查询失败:" + e.getMessage());
258 259 log.error(e.getMessage(), e);
259 260 }
260 261 return result;
... ... @@ -313,6 +314,7 @@ public class SysPermissionController {
313 314 */
314 315 //@RequiresRoles({ "admin" })
315 316 @RequestMapping(value = "/add", method = RequestMethod.POST)
  317 + @RequiresPermissions("permission:add")
316 318 public Result<SysPermission> add(@RequestBody SysPermission permission) {
317 319 Result<SysPermission> result = new Result<SysPermission>();
318 320 try {
... ... @@ -333,6 +335,7 @@ public class SysPermissionController {
333 335 */
334 336 //@RequiresRoles({ "admin" })
335 337 @RequestMapping(value = "/edit", method = { RequestMethod.PUT, RequestMethod.POST })
  338 + @RequiresPermissions("permission:edit")
336 339 public Result<SysPermission> edit(@RequestBody SysPermission permission) {
337 340 Result<SysPermission> result = new Result<>();
338 341 try {
... ... @@ -353,6 +356,7 @@ public class SysPermissionController {
353 356 */
354 357 //@RequiresRoles({ "admin" })
355 358 @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
  359 + @RequiresPermissions("permission:delete")
356 360 public Result<SysPermission> delete(@RequestParam(name = "id", required = true) String id) {
357 361 Result<SysPermission> result = new Result<>();
358 362 try {
... ... @@ -372,6 +376,7 @@ public class SysPermissionController {
372 376 */
373 377 //@RequiresRoles({ "admin" })
374 378 @RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
  379 + @RequiresPermissions("permission:deleteBatch")
375 380 public Result<SysPermission> deleteBatch(@RequestParam(name = "ids", required = true) String ids) {
376 381 Result<SysPermission> result = new Result<>();
377 382 try {
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/address/controller/AddressController.java
  View file @23b8c00
... ... @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import org.apache.shiro.authz.annotation.RequiresPermissions;
12 14 import org.jeecg.common.api.vo.Result;
13 15 import org.jeecg.common.system.query.QueryGenerator;
14 16 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -83,6 +85,7 @@ public class AddressController extends JeecgController&lt;Address, IAddressService&gt;
83 85 @AutoLog(value = "接口地址-添加")
84 86 @ApiOperation(value="接口地址-添加", notes="接口地址-添加")
85 87 @PostMapping(value = "/add")
  88 + @RequiresPermissions("address:add")
86 89 public Result<String> add(@RequestBody Address address, HttpServletRequest req) {
87 90 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
88 91 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -101,6 +104,7 @@ public class AddressController extends JeecgController&lt;Address, IAddressService&gt;
101 104 @AutoLog(value = "接口地址-编辑")
102 105 @ApiOperation(value="接口地址-编辑", notes="接口地址-编辑")
103 106 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  107 + @RequiresPermissions("address:edit")
104 108 public Result<String> edit(@RequestBody Address address) {
105 109 addressService.updateById(address);
106 110 return Result.OK("编辑成功!");
... ... @@ -115,6 +119,7 @@ public class AddressController extends JeecgController&lt;Address, IAddressService&gt;
115 119 @AutoLog(value = "接口地址-通过id删除")
116 120 @ApiOperation(value="接口地址-通过id删除", notes="接口地址-通过id删除")
117 121 @DeleteMapping(value = "/delete")
  122 + @RequiresPermissions("address:delete")
118 123 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
119 124 addressService.removeById(id);
120 125 return Result.OK("删除成功!");
... ... @@ -129,6 +134,7 @@ public class AddressController extends JeecgController&lt;Address, IAddressService&gt;
129 134 @AutoLog(value = "接口地址-批量删除")
130 135 @ApiOperation(value="接口地址-批量删除", notes="接口地址-批量删除")
131 136 @DeleteMapping(value = "/deleteBatch")
  137 + @RequiresPermissions("address:deleteBatch")
132 138 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
133 139 this.addressService.removeByIds(Arrays.asList(ids.split(",")));
134 140 return Result.OK("批量删除成功!");
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/bomHeader/controller/BomHeaderController.java
  View file @23b8c00
... ... @@ -190,6 +190,7 @@ public class BomHeaderController extends JeecgController&lt;BomHeader, IBomHeaderSe
190 190 @AutoLog(value = "bom子表-添加")
191 191 @ApiOperation(value="bom子表-添加", notes="bom子表-添加")
192 192 @PostMapping(value = "/addBomDetail")
  193 + @RequiresPermissions("bomDetail:add")
193 194 public Result<String> addBomDetail(@RequestBody BomDetail bomDetail, HttpServletRequest req) {
194 195 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
195 196 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -205,6 +206,7 @@ public class BomHeaderController extends JeecgController&lt;BomHeader, IBomHeaderSe
205 206 * @return
206 207 */
207 208 @AutoLog(value = "bom子表-编辑")
  209 + @RequiresPermissions("bomDetail:edit")
208 210 @ApiOperation(value="bom子表-编辑", notes="bom子表-编辑")
209 211 @RequestMapping(value = "/editBomDetail", method = {RequestMethod.PUT,RequestMethod.POST})
210 212 public Result<String> editBomDetail(@RequestBody BomDetail bomDetail) {
... ... @@ -219,6 +221,7 @@ public class BomHeaderController extends JeecgController&lt;BomHeader, IBomHeaderSe
219 221 */
220 222 @AutoLog(value = "bom子表-通过id删除")
221 223 @ApiOperation(value="bom子表-通过id删除", notes="bom子表-通过id删除")
  224 + @RequiresPermissions("bomDetail:delete")
222 225 @DeleteMapping(value = "/deleteBomDetail")
223 226 public Result<String> deleteBomDetail(@RequestParam(name="id",required=true) String id) {
224 227 bomDetailService.removeById(id);
... ... @@ -232,6 +235,7 @@ public class BomHeaderController extends JeecgController&lt;BomHeader, IBomHeaderSe
232 235 */
233 236 @AutoLog(value = "bom子表-批量删除")
234 237 @ApiOperation(value="bom子表-批量删除", notes="bom子表-批量删除")
  238 + @RequiresPermissions("bomDetail:deleteBatch")
235 239 @DeleteMapping(value = "/deleteBatchBomDetail")
236 240 public Result<String> deleteBatchBomDetail(@RequestParam(name="ids",required=true) String ids) {
237 241 this.bomDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/cycleCountPreference/controller/CycleCountPreferenceController.java
  View file @23b8c00
... ... @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import org.apache.shiro.authz.annotation.RequiresPermissions;
12 14 import org.jeecg.common.api.vo.Result;
13 15 import org.jeecg.common.system.query.QueryGenerator;
14 16 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -83,6 +85,7 @@ public class CycleCountPreferenceController extends JeecgController&lt;CycleCountPr
83 85 @AutoLog(value = "盘点首选项-添加")
84 86 @ApiOperation(value="盘点首选项-添加", notes="盘点首选项-添加")
85 87 @PostMapping(value = "/add")
  88 + @RequiresPermissions("cycleCountPreference:add")
86 89 public Result<String> add(@RequestBody CycleCountPreference cycleCountPreference, HttpServletRequest req) {
87 90 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
88 91 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -100,6 +103,7 @@ public class CycleCountPreferenceController extends JeecgController&lt;CycleCountPr
100 103 */
101 104 @AutoLog(value = "盘点首选项-编辑")
102 105 @ApiOperation(value="盘点首选项-编辑", notes="盘点首选项-编辑")
  106 + @RequiresPermissions("cycleCountPreference:edit")
103 107 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
104 108 public Result<String> edit(@RequestBody CycleCountPreference cycleCountPreference) {
105 109 cycleCountPreferenceService.updateById(cycleCountPreference);
... ... @@ -115,6 +119,7 @@ public class CycleCountPreferenceController extends JeecgController&lt;CycleCountPr
115 119 @AutoLog(value = "盘点首选项-通过id删除")
116 120 @ApiOperation(value="盘点首选项-通过id删除", notes="盘点首选项-通过id删除")
117 121 @DeleteMapping(value = "/delete")
  122 + @RequiresPermissions("cycleCountPreference:delete")
118 123 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
119 124 cycleCountPreferenceService.removeById(id);
120 125 return Result.OK("删除成功!");
... ... @@ -129,6 +134,7 @@ public class CycleCountPreferenceController extends JeecgController&lt;CycleCountPr
129 134 @AutoLog(value = "盘点首选项-批量删除")
130 135 @ApiOperation(value="盘点首选项-批量删除", notes="盘点首选项-批量删除")
131 136 @DeleteMapping(value = "/deleteBatch")
  137 + @RequiresPermissions("cycleCountPreference:deleteBatch")
132 138 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
133 139 this.cycleCountPreferenceService.removeByIds(Arrays.asList(ids.split(",")));
134 140 return Result.OK("批量删除成功!");
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/location/controller/LocationController.java
  View file @23b8c00
... ... @@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
12 12  
13 13 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
  14 +import org.apache.shiro.authz.annotation.RequiresPermissions;
14 15 import org.jeecg.common.api.vo.Result;
15 16 import org.jeecg.common.system.query.QueryGenerator;
16 17 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -92,6 +93,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
92 93 @AutoLog(value = "库位管理-添加")
93 94 @ApiOperation(value="库位管理-添加", notes="库位管理-添加")
94 95 @PostMapping(value = "/add")
  96 + @RequiresPermissions("location:add")
95 97 public Result<String> add(@RequestBody Location location, HttpServletRequest req) {
96 98 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
97 99 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -109,6 +111,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
109 111 */
110 112 @AutoLog(value = "库位管理-批量添加")
111 113 @ApiOperation(value="库位管理-批量添加", notes="库位管理-批量添加")
  114 + @RequiresPermissions("location:batchAdd")
112 115 @PostMapping(value = "/batchAdd")
113 116 public Result<String> batchAdd(@RequestBody BatchLocation batchLocation, HttpServletRequest req) {
114 117 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
... ... @@ -144,6 +147,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
144 147 */
145 148 @AutoLog(value = "库位管理-编辑")
146 149 @ApiOperation(value="库位管理-编辑", notes="库位管理-编辑")
  150 + @RequiresPermissions("location:edit")
147 151 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
148 152 public Result<String> edit(@RequestBody Location location) {
149 153 locationService.updateById(location);
... ... @@ -158,6 +162,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
158 162 */
159 163 @AutoLog(value = "库位管理-通过id删除")
160 164 @ApiOperation(value="库位管理-通过id删除", notes="库位管理-通过id删除")
  165 + @RequiresPermissions("location:delete")
161 166 @DeleteMapping(value = "/delete")
162 167 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
163 168 locationService.removeById(id);
... ... @@ -172,6 +177,7 @@ public class LocationController extends JeecgController&lt;Location, ILocationServi
172 177 */
173 178 @AutoLog(value = "库位管理-批量删除")
174 179 @ApiOperation(value="库位管理-批量删除", notes="库位管理-批量删除")
  180 + @RequiresPermissions("location:deleteBatch")
175 181 @DeleteMapping(value = "/deleteBatch")
176 182 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
177 183 this.locationService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/locationHigh/controller/LocationHighController.java
  View file @23b8c00
... ... @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
12 12  
13 13 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
14 14 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  15 +import org.apache.shiro.authz.annotation.RequiresPermissions;
15 16 import org.jeecg.common.api.vo.Result;
16 17 import org.jeecg.common.system.query.QueryGenerator;
17 18 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -89,6 +90,7 @@ public class LocationHighController extends JeecgController&lt;LocationHigh, ILocat
89 90 @AutoLog(value = "库位高度管理-添加")
90 91 @ApiOperation(value="库位高度管理-添加", notes="库位高度管理-添加")
91 92 @PostMapping(value = "/add")
  93 + @RequiresPermissions("locationHigh:add")
92 94 public Result<String> add(@RequestBody LocationHigh locationHigh, HttpServletRequest req) {
93 95 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
94 96 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -106,6 +108,7 @@ public class LocationHighController extends JeecgController&lt;LocationHigh, ILocat
106 108 */
107 109 @AutoLog(value = "库位高度管理-编辑")
108 110 @ApiOperation(value="库位高度管理-编辑", notes="库位高度管理-编辑")
  111 + @RequiresPermissions("locationHigh:edit")
109 112 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
110 113 public Result<String> edit(@RequestBody LocationHigh locationHigh) {
111 114 locationHighService.updateById(locationHigh);
... ... @@ -119,6 +122,7 @@ public class LocationHighController extends JeecgController&lt;LocationHigh, ILocat
119 122 * @return
120 123 */
121 124 @AutoLog(value = "库位高度管理-通过id删除")
  125 + @RequiresPermissions("locationHigh:delete")
122 126 @ApiOperation(value="库位高度管理-通过id删除", notes="库位高度管理-通过id删除")
123 127 @DeleteMapping(value = "/delete")
124 128 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
... ... @@ -134,6 +138,7 @@ public class LocationHighController extends JeecgController&lt;LocationHigh, ILocat
134 138 */
135 139 @AutoLog(value = "库位高度管理-批量删除")
136 140 @ApiOperation(value="库位高度管理-批量删除", notes="库位高度管理-批量删除")
  141 + @RequiresPermissions("locationHigh:deleteBatch")
137 142 @DeleteMapping(value = "/deleteBatch")
138 143 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
139 144 this.locationHighService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/locationType/controller/LocationTypeController.java
  View file @23b8c00
... ... @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
12 12  
13 13 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
14 14 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  15 +import org.apache.shiro.authz.annotation.RequiresPermissions;
15 16 import org.jeecg.common.api.vo.Result;
16 17 import org.jeecg.common.system.query.QueryGenerator;
17 18 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -88,6 +89,7 @@ public class LocationTypeController extends JeecgController&lt;LocationType, ILocat
88 89 */
89 90 @AutoLog(value = "库位类型-添加")
90 91 @ApiOperation(value="库位类型-添加", notes="库位类型-添加")
  92 + @RequiresPermissions("locationType:add")
91 93 @PostMapping(value = "/add")
92 94 public Result<String> add(@RequestBody LocationType locationType, HttpServletRequest req) {
93 95 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
... ... @@ -106,6 +108,7 @@ public class LocationTypeController extends JeecgController&lt;LocationType, ILocat
106 108 */
107 109 @AutoLog(value = "库位类型-编辑")
108 110 @ApiOperation(value="库位类型-编辑", notes="库位类型-编辑")
  111 + @RequiresPermissions("locationType:edit")
109 112 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
110 113 public Result<String> edit(@RequestBody LocationType locationType) {
111 114 locationTypeService.updateById(locationType);
... ... @@ -120,6 +123,7 @@ public class LocationTypeController extends JeecgController&lt;LocationType, ILocat
120 123 */
121 124 @AutoLog(value = "库位类型-通过id删除")
122 125 @ApiOperation(value="库位类型-通过id删除", notes="库位类型-通过id删除")
  126 + @RequiresPermissions("locationType:delete")
123 127 @DeleteMapping(value = "/delete")
124 128 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
125 129 locationTypeService.removeById(id);
... ... @@ -134,6 +138,7 @@ public class LocationTypeController extends JeecgController&lt;LocationType, ILocat
134 138 */
135 139 @AutoLog(value = "库位类型-批量删除")
136 140 @ApiOperation(value="库位类型-批量删除", notes="库位类型-批量删除")
  141 + @RequiresPermissions("locationType:deleteBatch")
137 142 @DeleteMapping(value = "/deleteBatch")
138 143 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
139 144 this.locationTypeService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/parameterConfiguration/controller/ParameterConfigurationController.java
  View file @23b8c00
... ... @@ -9,6 +9,8 @@ import java.io.UnsupportedEncodingException;
9 9 import java.net.URLDecoder;
10 10 import javax.servlet.http.HttpServletRequest;
11 11 import javax.servlet.http.HttpServletResponse;
  12 +
  13 +import org.apache.shiro.authz.annotation.RequiresPermissions;
12 14 import org.jeecg.common.api.vo.Result;
13 15 import org.jeecg.common.system.query.QueryGenerator;
14 16 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -83,6 +85,7 @@ public class ParameterConfigurationController extends JeecgController&lt;ParameterC
83 85 @AutoLog(value = "参数配置-添加")
84 86 @ApiOperation(value="参数配置-添加", notes="参数配置-添加")
85 87 @PostMapping(value = "/add")
  88 + @RequiresPermissions("parameterConfiguration:add")
86 89 public Result<String> add(@RequestBody ParameterConfiguration parameterConfiguration, HttpServletRequest req) {
87 90 parameterConfigurationService.save(parameterConfiguration);
88 91 return Result.OK("添加成功！");
... ... @@ -97,6 +100,7 @@ public class ParameterConfigurationController extends JeecgController&lt;ParameterC
97 100 @AutoLog(value = "参数配置-编辑")
98 101 @ApiOperation(value="参数配置-编辑", notes="参数配置-编辑")
99 102 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  103 + @RequiresPermissions("parameterConfiguration:edit")
100 104 public Result<String> edit(@RequestBody ParameterConfiguration parameterConfiguration) {
101 105 parameterConfigurationService.updateById(parameterConfiguration);
102 106 return Result.OK("编辑成功!");
... ... @@ -111,6 +115,7 @@ public class ParameterConfigurationController extends JeecgController&lt;ParameterC
111 115 @AutoLog(value = "参数配置-通过id删除")
112 116 @ApiOperation(value="参数配置-通过id删除", notes="参数配置-通过id删除")
113 117 @DeleteMapping(value = "/delete")
  118 + @RequiresPermissions("parameterConfiguration:delete")
114 119 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
115 120 parameterConfigurationService.removeById(id);
116 121 return Result.OK("删除成功!");
... ... @@ -125,6 +130,7 @@ public class ParameterConfigurationController extends JeecgController&lt;ParameterC
125 130 @AutoLog(value = "参数配置-批量删除")
126 131 @ApiOperation(value="参数配置-批量删除", notes="参数配置-批量删除")
127 132 @DeleteMapping(value = "/deleteBatch")
  133 + @RequiresPermissions("parameterConfiguration:deleteBatch")
128 134 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
129 135 this.parameterConfigurationService.removeByIds(Arrays.asList(ids.split(",")));
130 136 return Result.OK("批量删除成功!");
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/receiptType/controller/ReceiptTypeController.java
  View file @23b8c00
... ... @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
12 12  
13 13 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
14 14 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  15 +import org.apache.shiro.authz.annotation.RequiresPermissions;
15 16 import org.jeecg.common.api.vo.Result;
16 17 import org.jeecg.common.system.query.QueryGenerator;
17 18 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -87,6 +88,7 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
87 88 @AutoLog(value = "入库单类型-添加")
88 89 @ApiOperation(value="入库单类型-添加", notes="入库单类型-添加")
89 90 @PostMapping(value = "/add")
  91 + @RequiresPermissions("receiptType:add")
90 92 public Result<String> add(@RequestBody ReceiptType receiptType, HttpServletRequest req) {
91 93 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
92 94 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -104,6 +106,7 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
104 106 */
105 107 @AutoLog(value = "入库单类型-编辑")
106 108 @ApiOperation(value="入库单类型-编辑", notes="入库单类型-编辑")
  109 + @RequiresPermissions("receiptType:edit")
107 110 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
108 111 public Result<String> edit(@RequestBody ReceiptType receiptType) {
109 112 receiptTypeService.updateById(receiptType);
... ... @@ -118,6 +121,7 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
118 121 */
119 122 @AutoLog(value = "入库单类型-通过id删除")
120 123 @ApiOperation(value="入库单类型-通过id删除", notes="入库单类型-通过id删除")
  124 + @RequiresPermissions("receiptType:delete")
121 125 @DeleteMapping(value = "/delete")
122 126 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
123 127 receiptTypeService.removeById(id);
... ... @@ -132,6 +136,7 @@ public class ReceiptTypeController extends JeecgController&lt;ReceiptType, IReceipt
132 136 */
133 137 @AutoLog(value = "入库单类型-批量删除")
134 138 @ApiOperation(value="入库单类型-批量删除", notes="入库单类型-批量删除")
  139 + @RequiresPermissions("receiptType:deleteBatch")
135 140 @DeleteMapping(value = "/deleteBatch")
136 141 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
137 142 this.receiptTypeService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/config/shipmentType/controller/ShipmentTypeController.java
  View file @23b8c00
... ... @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
12 12  
13 13 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
14 14 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
  15 +import org.apache.shiro.authz.annotation.RequiresPermissions;
15 16 import org.jeecg.common.api.vo.Result;
16 17 import org.jeecg.common.system.query.QueryGenerator;
17 18 import org.jeecg.common.system.util.JwtUtil;
... ... @@ -86,6 +87,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
86 87 */
87 88 @AutoLog(value = "出库单类型-添加")
88 89 @ApiOperation(value="出库单类型-添加", notes="出库单类型-添加")
  90 + @RequiresPermissions("shipmentType:add")
89 91 @PostMapping(value = "/add")
90 92 public Result<String> add(@RequestBody ShipmentType shipmentType, HttpServletRequest req) {
91 93 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
... ... @@ -104,6 +106,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
104 106 */
105 107 @AutoLog(value = "出库单类型-编辑")
106 108 @ApiOperation(value="出库单类型-编辑", notes="出库单类型-编辑")
  109 + @RequiresPermissions("shipmentType:edit")
107 110 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
108 111 public Result<String> edit(@RequestBody ShipmentType shipmentType) {
109 112 shipmentTypeService.updateById(shipmentType);
... ... @@ -118,6 +121,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
118 121 */
119 122 @AutoLog(value = "出库单类型-通过id删除")
120 123 @ApiOperation(value="出库单类型-通过id删除", notes="出库单类型-通过id删除")
  124 + @RequiresPermissions("shipmentType:delete")
121 125 @DeleteMapping(value = "/delete")
122 126 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
123 127 shipmentTypeService.removeById(id);
... ... @@ -132,6 +136,7 @@ public class ShipmentTypeController extends JeecgController&lt;ShipmentType, IShipm
132 136 */
133 137 @AutoLog(value = "出库单类型-批量删除")
134 138 @ApiOperation(value="出库单类型-批量删除", notes="出库单类型-批量删除")
  139 + @RequiresPermissions("shipmentType:deleteBatch")
135 140 @DeleteMapping(value = "/deleteBatch")
136 141 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
137 142 this.shipmentTypeService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptContainerHeader/controller/ReceiptContainerHeaderController.java
  View file @23b8c00
1 1 package org.jeecg.modules.wms.receipt.receiptContainerHeader.controller;
2 2  
  3 +import org.apache.shiro.authz.annotation.RequiresPermissions;
3 4 import org.jeecg.common.system.query.QueryGenerator;
4 5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 6 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -103,6 +104,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
103 104 */
104 105 @AutoLog(value = "入库组盘-添加")
105 106 @ApiOperation(value="入库组盘-添加", notes="入库组盘-添加")
  107 + @RequiresPermissions("receiptContainerHeader:add")
106 108 @PostMapping(value = "/add")
107 109 public Result<String> add(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
108 110 receiptContainerHeaderService.save(receiptContainerHeader);
... ... @@ -116,6 +118,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
116 118 */
117 119 @AutoLog(value = "入库组盘-编辑")
118 120 @ApiOperation(value="入库组盘-编辑", notes="入库组盘-编辑")
  121 + @RequiresPermissions("receiptContainerHeader:edit")
119 122 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
120 123 public Result<String> edit(@RequestBody ReceiptContainerHeader receiptContainerHeader) {
121 124 receiptContainerHeaderService.updateById(receiptContainerHeader);
... ... @@ -130,6 +133,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
130 133 @AutoLog(value = "入库组盘-通过id删除")
131 134 @ApiOperation(value="入库组盘-通过id删除", notes="入库组盘-通过id删除")
132 135 @DeleteMapping(value = "/delete")
  136 + @RequiresPermissions("receiptContainerHeader:delete")
133 137 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
134 138 receiptContainerHeaderService.delMain(id);
135 139 return Result.OK("删除成功!");
... ... @@ -143,6 +147,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
143 147 @AutoLog(value = "入库组盘-批量删除")
144 148 @ApiOperation(value="入库组盘-批量删除", notes="入库组盘-批量删除")
145 149 @DeleteMapping(value = "/deleteBatch")
  150 + @RequiresPermissions("receiptContainerHeader:deleteBatch")
146 151 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
147 152 this.receiptContainerHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
148 153 return Result.OK("批量删除成功!");
... ... @@ -194,6 +199,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
194 199 @AutoLog(value = "入库组盘详情-添加")
195 200 @ApiOperation(value="入库组盘详情-添加", notes="入库组盘详情-添加")
196 201 @PostMapping(value = "/addReceiptContainerDetail")
  202 + @RequiresPermissions("receiptContainerDetail:add")
197 203 public Result<String> addReceiptContainerDetail(@RequestBody ReceiptContainerDetail receiptContainerDetail) {
198 204 receiptContainerDetailService.save(receiptContainerDetail);
199 205 return Result.OK("添加成功！");
... ... @@ -206,6 +212,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
206 212 */
207 213 @AutoLog(value = "入库组盘详情-编辑")
208 214 @ApiOperation(value="入库组盘详情-编辑", notes="入库组盘详情-编辑")
  215 + @RequiresPermissions("receiptContainerDetail:edit")
209 216 @RequestMapping(value = "/editReceiptContainerDetail", method = {RequestMethod.PUT,RequestMethod.POST})
210 217 public Result<String> editReceiptContainerDetail(@RequestBody ReceiptContainerDetail receiptContainerDetail) {
211 218 receiptContainerDetailService.updateById(receiptContainerDetail);
... ... @@ -219,6 +226,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
219 226 */
220 227 @AutoLog(value = "入库组盘详情-通过id删除")
221 228 @ApiOperation(value="入库组盘详情-通过id删除", notes="入库组盘详情-通过id删除")
  229 + @RequiresPermissions("receiptContainerDetail:delete")
222 230 @DeleteMapping(value = "/deleteReceiptContainerDetail")
223 231 public Result<String> deleteReceiptContainerDetail(@RequestParam(name="id",required=true) String id) {
224 232 receiptContainerDetailService.removeById(id);
... ... @@ -232,6 +240,7 @@ public class ReceiptContainerHeaderController extends JeecgController&lt;ReceiptCon
232 240 */
233 241 @AutoLog(value = "入库组盘详情-批量删除")
234 242 @ApiOperation(value="入库组盘详情-批量删除", notes="入库组盘详情-批量删除")
  243 + @RequiresPermissions("receiptContainerDetail:deleteBatch")
235 244 @DeleteMapping(value = "/deleteBatchReceiptContainerDetail")
236 245 public Result<String> deleteBatchReceiptContainerDetail(@RequestParam(name="ids",required=true) String ids) {
237 246 this.receiptContainerDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/receipt/receiptHeader/controller/ReceiptHeaderController.java
  View file @23b8c00
1 1 package org.jeecg.modules.wms.receipt.receiptHeader.controller;
2 2  
3 3 import com.aliyun.oss.ServiceException;
  4 +import org.apache.shiro.authz.annotation.RequiresPermissions;
4 5 import org.jeecg.common.system.query.QueryGenerator;
5 6 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 7 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -99,6 +100,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
99 100 @AutoLog(value = "入库表主表-添加")
100 101 @ApiOperation(value="入库表主表-添加", notes="入库表主表-添加")
101 102 @PostMapping(value = "/add")
  103 + @RequiresPermissions("receiptHeader:add")
102 104 public Result<String> add(@RequestBody ReceiptHeader receiptHeader, HttpServletRequest req) {
103 105 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
104 106 if(StringUtils.isNotEmpty(warehouseCode)) {
... ... @@ -115,6 +117,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
115 117 */
116 118 @AutoLog(value = "入库表主表-编辑")
117 119 @ApiOperation(value="入库表主表-编辑", notes="入库表主表-编辑")
  120 + @RequiresPermissions("receiptHeader:edit")
118 121 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
119 122 public Result<String> edit(@RequestBody ReceiptHeader receiptHeader) {
120 123 receiptHeaderService.updateById(receiptHeader);
... ... @@ -128,6 +131,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
128 131 */
129 132 @AutoLog(value = "入库表主表-通过id删除")
130 133 @ApiOperation(value="入库表主表-通过id删除", notes="入库表主表-通过id删除")
  134 + @RequiresPermissions("receiptHeader:delete")
131 135 @DeleteMapping(value = "/delete")
132 136 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
133 137 receiptHeaderService.delMain(id);
... ... @@ -141,6 +145,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
141 145 */
142 146 @AutoLog(value = "入库表主表-批量删除")
143 147 @ApiOperation(value="入库表主表-批量删除", notes="入库表主表-批量删除")
  148 + @RequiresPermissions("receiptHeader:deleteBatch")
144 149 @DeleteMapping(value = "/deleteBatch")
145 150 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
146 151 this.receiptHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
... ... @@ -193,6 +198,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
193 198 @AutoLog(value = "入库单详情-添加")
194 199 @ApiOperation(value="入库单详情-添加", notes="入库单详情-添加")
195 200 @PostMapping(value = "/addReceiptDetail")
  201 + @RequiresPermissions("receiptDetail:add")
196 202 public Result<String> addReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
197 203 Result result = receiptDetailService.saveReceiptDetail(receiptDetail);
198 204 return result;
... ... @@ -205,6 +211,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
205 211 */
206 212 @AutoLog(value = "入库单详情-编辑")
207 213 @ApiOperation(value="入库单详情-编辑", notes="入库单详情-编辑")
  214 + @RequiresPermissions("receiptDetail:edit")
208 215 @RequestMapping(value = "/editReceiptDetail", method = {RequestMethod.PUT,RequestMethod.POST})
209 216 public Result<String> editReceiptDetail(@RequestBody ReceiptDetail receiptDetail) {
210 217 receiptDetailService.updateById(receiptDetail);
... ... @@ -218,6 +225,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
218 225 */
219 226 @AutoLog(value = "入库单详情-通过id删除")
220 227 @ApiOperation(value="入库单详情-通过id删除", notes="入库单详情-通过id删除")
  228 + @RequiresPermissions("receiptDetail:delete")
221 229 @DeleteMapping(value = "/deleteReceiptDetail")
222 230 public Result<String> deleteReceiptDetail(@RequestParam(name="id",required=true) String id) {
223 231 ReceiptDetail receiptDetail = receiptDetailService.getById(id);
... ... @@ -249,6 +257,7 @@ public class ReceiptHeaderController extends JeecgController&lt;ReceiptHeader, IRec
249 257 */
250 258 @AutoLog(value = "入库单详情-批量删除")
251 259 @ApiOperation(value="入库单详情-批量删除", notes="入库单详情-批量删除")
  260 + @RequiresPermissions("receiptDetail:deleteBatch")
252 261 @DeleteMapping(value = "/deleteBatchReceiptDetail")
253 262 public Result<String> deleteBatchReceiptDetail(@RequestParam(name="ids",required=true) String ids) {
254 263 this.receiptDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentCombination/service/impl/ShipmentCombinationServiceImpl.java
  View file @23b8c00
... ... @@ -547,7 +547,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
547 547 return Result.OK("生成出库任务成功");
548 548 }
549 549  
550   - @Override
  550 + @Override
551 551 public Result getInventoryFromShipmentDetail(Integer shipmentDetailId) {
552 552 ShipmentDetail shipmentDetail = shipmentDetailService.getById(shipmentDetailId);
553 553 if(shipmentDetail == null){
... ... @@ -561,6 +561,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
561 561 List<InventoryDetail> removeInventoryList = new ArrayList<>();
562 562 for(InventoryDetail inventoryDetail : inventoryDetailList) {
563 563 String containerCode = inventoryDetail.getContainerCode();
  564 + Container container =
564 565 Container container = containerService.getContainerByCode(containerCode, warehouseCode);
565 566 if(container == null) {
566 567 return Result.error("没有找到容器，容器号" + containerCode);
... ... @@ -569,6 +570,7 @@ public class ShipmentCombinationServiceImpl implements IShipmentCombinationServi
569 570 removeInventoryList.add(inventoryDetail);
570 571 }
571 572 }
  573 + return null;
572 574 List<ReceiptContainerHeader> unCompleteCombineList =
573 575 receiptContainerHeaderService.getUnCompleteCombineList();
574 576 if(unCompleteCombineList != null && unCompleteCombineList.size() > 0) {
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentContainerHeader/controller/ShipmentContainerHeaderController.java
  View file @23b8c00
1 1 package org.jeecg.modules.wms.shipment.shipmentContainerHeader.controller;
2 2  
  3 +import org.apache.shiro.authz.annotation.RequiresPermissions;
3 4 import org.jeecg.common.system.query.QueryGenerator;
4 5 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
5 6 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -85,6 +86,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
85 86 @AutoLog(value = "出库组盘-添加")
86 87 @ApiOperation(value="出库组盘-添加", notes="出库组盘-添加")
87 88 @PostMapping(value = "/add")
  89 + @RequiresPermissions("shipmentContainerHeader:add")
88 90 public Result<String> add(@RequestBody ShipmentContainerHeader shipmentContainerHeader) {
89 91 shipmentContainerHeaderService.save(shipmentContainerHeader);
90 92 return Result.OK("添加成功！");
... ... @@ -97,6 +99,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
97 99 */
98 100 @AutoLog(value = "出库组盘-编辑")
99 101 @ApiOperation(value="出库组盘-编辑", notes="出库组盘-编辑")
  102 + @RequiresPermissions("shipmentContainerHeader:edit")
100 103 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
101 104 public Result<String> edit(@RequestBody ShipmentContainerHeader shipmentContainerHeader) {
102 105 shipmentContainerHeaderService.updateById(shipmentContainerHeader);
... ... @@ -110,6 +113,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
110 113 */
111 114 @AutoLog(value = "出库组盘-通过id删除")
112 115 @ApiOperation(value="出库组盘-通过id删除", notes="出库组盘-通过id删除")
  116 + @RequiresPermissions("shipmentContainerHeader:delete")
113 117 @DeleteMapping(value = "/delete")
114 118 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
115 119 shipmentContainerHeaderService.delMain(id);
... ... @@ -123,6 +127,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
123 127 */
124 128 @AutoLog(value = "出库组盘-批量删除")
125 129 @ApiOperation(value="出库组盘-批量删除", notes="出库组盘-批量删除")
  130 + @RequiresPermissions("shipmentContainerHeader:deleteBatch")
126 131 @DeleteMapping(value = "/deleteBatch")
127 132 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
128 133 this.shipmentContainerHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
... ... @@ -174,6 +179,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
174 179 */
175 180 @AutoLog(value = "出库组盘详情-添加")
176 181 @ApiOperation(value="出库组盘详情-添加", notes="出库组盘详情-添加")
  182 + @RequiresPermissions("shipmentContainerDetail:add")
177 183 @PostMapping(value = "/addShipmentContainerDetail")
178 184 public Result<String> addShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail) {
179 185 shipmentContainerDetailService.save(shipmentContainerDetail);
... ... @@ -187,6 +193,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
187 193 */
188 194 @AutoLog(value = "出库组盘详情-编辑")
189 195 @ApiOperation(value="出库组盘详情-编辑", notes="出库组盘详情-编辑")
  196 + @RequiresPermissions("shipmentContainerDetail:edit")
190 197 @RequestMapping(value = "/editShipmentContainerDetail", method = {RequestMethod.PUT,RequestMethod.POST})
191 198 public Result<String> editShipmentContainerDetail(@RequestBody ShipmentContainerDetail shipmentContainerDetail) {
192 199 shipmentContainerDetailService.updateById(shipmentContainerDetail);
... ... @@ -200,6 +207,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
200 207 */
201 208 @AutoLog(value = "出库组盘详情-通过id删除")
202 209 @ApiOperation(value="出库组盘详情-通过id删除", notes="出库组盘详情-通过id删除")
  210 + @RequiresPermissions("shipmentContainerDetail:delete")
203 211 @DeleteMapping(value = "/deleteShipmentContainerDetail")
204 212 public Result<String> deleteShipmentContainerDetail(@RequestParam(name="id",required=true) String id) {
205 213 shipmentContainerDetailService.removeById(id);
... ... @@ -213,6 +221,7 @@ public class ShipmentContainerHeaderController extends JeecgController&lt;ShipmentC
213 221 */
214 222 @AutoLog(value = "出库组盘详情-批量删除")
215 223 @ApiOperation(value="出库组盘详情-批量删除", notes="出库组盘详情-批量删除")
  224 + @RequiresPermissions("shipmentContainerDetail:deleteBatch")
216 225 @DeleteMapping(value = "/deleteBatchShipmentContainerDetail")
217 226 public Result<String> deleteBatchShipmentContainerDetail(@RequestParam(name="ids",required=true) String ids) {
218 227 this.shipmentContainerDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/shipment/shipmentHeader/controller/ShipmentHeaderController.java
  View file @23b8c00
1 1 package org.jeecg.modules.wms.shipment.shipmentHeader.controller;
2 2  
3 3 import com.aliyun.oss.ServiceException;
  4 +import org.apache.shiro.authz.annotation.RequiresPermissions;
4 5 import org.jeecg.common.system.query.QueryGenerator;
5 6 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
6 7 import com.baomidou.mybatisplus.core.metadata.IPage;
... ... @@ -91,6 +92,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
91 92 @AutoLog(value = "出库单-添加")
92 93 @ApiOperation(value="出库单-添加", notes="出库单-添加")
93 94 @PostMapping(value = "/add")
  95 + @RequiresPermissions("shipmentHeader:add")
94 96 public Result<String> add(@RequestBody ShipmentHeader shipmentHeader, HttpServletRequest req) {
95 97 String warehouseCode = JwtUtil.getWarehouseCodeByToken(req);
96 98 shipmentHeader.setWarehouseCode(warehouseCode);
... ... @@ -105,6 +107,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
105 107 */
106 108 @AutoLog(value = "出库单-编辑")
107 109 @ApiOperation(value="出库单-编辑", notes="出库单-编辑")
  110 + @RequiresPermissions("shipmentHeader:edit")
108 111 @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
109 112 public Result<String> edit(@RequestBody ShipmentHeader shipmentHeader) {
110 113 shipmentHeaderService.updateById(shipmentHeader);
... ... @@ -117,6 +120,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
117 120 * @return
118 121 */
119 122 @AutoLog(value = "出库单-通过id删除")
  123 + @RequiresPermissions("shipmentHeader:delete")
120 124 @ApiOperation(value="出库单-通过id删除", notes="出库单-通过id删除")
121 125 @DeleteMapping(value = "/delete")
122 126 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
... ... @@ -131,6 +135,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
131 135 */
132 136 @AutoLog(value = "出库单-批量删除")
133 137 @ApiOperation(value="出库单-批量删除", notes="出库单-批量删除")
  138 + @RequiresPermissions("shipmentHeader:deleteBatch")
134 139 @DeleteMapping(value = "/deleteBatch")
135 140 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
136 141 this.shipmentHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
... ... @@ -182,6 +187,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
182 187 */
183 188 @AutoLog(value = "出库单详情-添加")
184 189 @ApiOperation(value="出库单详情-添加", notes="出库单详情-添加")
  190 + @RequiresPermissions("shipmentDetail:add")
185 191 @PostMapping(value = "/addShipmentDetail")
186 192 public Result<String> addShipmentDetail(@RequestBody ShipmentDetail shipmentDetail, HttpServletRequest req) {
187 193 Result result = shipmentDetailService.saveShipmentDetail(shipmentDetail);
... ... @@ -195,6 +201,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
195 201 */
196 202 @AutoLog(value = "出库单详情-编辑")
197 203 @ApiOperation(value="出库单详情-编辑", notes="出库单详情-编辑")
  204 + @RequiresPermissions("shipmentDetail:edit")
198 205 @RequestMapping(value = "/editShipmentDetail", method = {RequestMethod.PUT,RequestMethod.POST})
199 206 public Result<String> editShipmentDetail(@RequestBody ShipmentDetail shipmentDetail) {
200 207 shipmentDetailService.updateById(shipmentDetail);
... ... @@ -208,6 +215,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
208 215 */
209 216 @AutoLog(value = "出库单详情-通过id删除")
210 217 @ApiOperation(value="出库单详情-通过id删除", notes="出库单详情-通过id删除")
  218 + @RequiresPermissions("shipmentDetail:delete")
211 219 @DeleteMapping(value = "/deleteShipmentDetail")
212 220 public Result<String> deleteShipmentDetail(@RequestParam(name="id",required=true) String id) {
213 221 ShipmentDetail shipmentDetail = shipmentDetailService.getById(id);
... ... @@ -239,6 +247,7 @@ public class ShipmentHeaderController extends JeecgController&lt;ShipmentHeader, IS
239 247 */
240 248 @AutoLog(value = "出库单详情-批量删除")
241 249 @ApiOperation(value="出库单详情-批量删除", notes="出库单详情-批量删除")
  250 + @RequiresPermissions("shipmentDetail:deleteBatch")
242 251 @DeleteMapping(value = "/deleteBatchShipmentDetail")
243 252 public Result<String> deleteBatchShipmentDetail(@RequestParam(name="ids",required=true) String ids) {
244 253 this.shipmentDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ...
jeecg-boot-master/jeecg-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/wms/task/taskHeader/controller/TaskHeaderController.java
  View file @23b8c00
... ... @@ -112,6 +112,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
112 112 @AutoLog(value = "任务表-添加")
113 113 @ApiOperation(value="任务表-添加", notes="任务表-添加")
114 114 @PostMapping(value = "/add")
  115 + @RequiresPermissions("taskHeader:add")
115 116 public Result<String> add(@RequestBody TaskHeader taskHeader) {
116 117 taskHeaderService.save(taskHeader);
117 118 return Result.OK("添加成功！");
... ... @@ -124,7 +125,8 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
124 125 */
125 126 @AutoLog(value = "任务表-编辑")
126 127 @ApiOperation(value="任务表-编辑", notes="任务表-编辑")
127   - @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
  128 + @RequiresPermissions("taskHeader:edit")
  129 + @RequestMapping(value = "/edit", method = {RequestMethod.PUT,RequestMethod.POST})
128 130 public Result<String> edit(@RequestBody TaskHeader taskHeader) {
129 131 taskHeaderService.updateById(taskHeader);
130 132 return Result.OK("编辑成功!");
... ... @@ -137,6 +139,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
137 139 */
138 140 @AutoLog(value = "任务表-通过id删除")
139 141 @ApiOperation(value="任务表-通过id删除", notes="任务表-通过id删除")
  142 + @RequiresPermissions("taskHeader:edit")
140 143 @DeleteMapping(value = "/delete")
141 144 public Result<String> delete(@RequestParam(name="id",required=true) String id) {
142 145 taskHeaderService.delMain(id);
... ... @@ -150,6 +153,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
150 153 */
151 154 @AutoLog(value = "任务表-批量删除")
152 155 @ApiOperation(value="任务表-批量删除", notes="任务表-批量删除")
  156 + @RequiresPermissions("taskHeader:deleteBatch")
153 157 @DeleteMapping(value = "/deleteBatch")
154 158 public Result<String> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
155 159 this.taskHeaderService.delBatchMain(Arrays.asList(ids.split(",")));
... ... @@ -202,6 +206,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
202 206 @AutoLog(value = "任务详情-添加")
203 207 @ApiOperation(value="任务详情-添加", notes="任务详情-添加")
204 208 @PostMapping(value = "/addTaskDetail")
  209 + @RequiresPermissions("taskDetail:add")
205 210 public Result<String> addTaskDetail(@RequestBody TaskDetail taskDetail) {
206 211 taskDetailService.save(taskDetail);
207 212 return Result.OK("添加成功！");
... ... @@ -214,6 +219,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
214 219 */
215 220 @AutoLog(value = "任务详情-编辑")
216 221 @ApiOperation(value="任务详情-编辑", notes="任务详情-编辑")
  222 + @RequiresPermissions("taskDetail:edit")
217 223 @RequestMapping(value = "/editTaskDetail", method = {RequestMethod.PUT,RequestMethod.POST})
218 224 public Result<String> editTaskDetail(@RequestBody TaskDetail taskDetail) {
219 225 taskDetailService.updateById(taskDetail);
... ... @@ -227,6 +233,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
227 233 */
228 234 @AutoLog(value = "任务详情-通过id删除")
229 235 @ApiOperation(value="任务详情-通过id删除", notes="任务详情-通过id删除")
  236 + @RequiresPermissions("taskDetail:delete")
230 237 @DeleteMapping(value = "/deleteTaskDetail")
231 238 public Result<String> deleteTaskDetail(@RequestParam(name="id",required=true) String id) {
232 239 taskDetailService.removeById(id);
... ... @@ -240,6 +247,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
240 247 */
241 248 @AutoLog(value = "任务详情-批量删除")
242 249 @ApiOperation(value="任务详情-批量删除", notes="任务详情-批量删除")
  250 + @RequiresPermissions("taskDetail:deleteBatch")
243 251 @DeleteMapping(value = "/deleteBatchTaskDetail")
244 252 public Result<String> deleteBatchTaskDetail(@RequestParam(name="ids",required=true) String ids) {
245 253 this.taskDetailService.removeByIds(Arrays.asList(ids.split(",")));
... ... @@ -324,6 +332,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
324 332 @AutoLog(value = "任务表-完成任务")
325 333 @ApiOperation(value="任务表-完成任务", notes="任务表-完成任务")
326 334 @PostMapping( "/completeTaskByWMS")
  335 + @RequiresPermissions("taskHeader:completeTask")
327 336 public Result completeTaskByWMS(@RequestBody TaskHeader taskHeader){
328 337 if(taskHeader == null) {
329 338 return Result.error("taskHeader不能为空");
... ... @@ -346,6 +355,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
346 355 @ApiOperation(value="任务表-取消任务", notes="任务表-取消任务")
347 356 @PostMapping( "/cancelTask")
348 357 @ResponseBody
  358 + @RequiresPermissions("taskHeader:cancelTask")
349 359 public Result cancelTask(@RequestParam(name="ids",required=true) String ids) {
350 360 if (StringUtils.isEmpty(ids)) {
351 361 return Result.error("taskId不能为空");
... ... @@ -370,6 +380,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
370 380 @AutoLog(value = "任务表-执行任务")
371 381 @ApiOperation(value="任务表-执行任务", notes="任务表-执行任务")
372 382 @PostMapping( "/execute")
  383 + @RequiresPermissions("taskHeader:executeTask")
373 384 public Result execute(@RequestBody TaskHeader taskHeader) {
374 385 {
375 386 if (taskHeader == null) {
... ... @@ -393,6 +404,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
393 404 @AutoLog(value = "任务表-创建空托入库任务")
394 405 @ApiOperation(value="任务表-创建空托入库任务", notes="任务表-创建空托入库任务")
395 406 @PostMapping( "/createEmptyIn")
  407 + @RequiresPermissions("taskHeader:emptyIn")
396 408 public Result createEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
397 409 String contaienrCode = taskHeader.getContainerCode();
398 410 String toLocationCode = taskHeader.getToLocationCode();
... ... @@ -413,6 +425,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
413 425 */
414 426 @AutoLog(value = "任务表-创建空托出库任务")
415 427 @ApiOperation(value="任务表-创建空托出库任务", notes="任务表-创建空托出库任务")
  428 + @RequiresPermissions("taskHeader:emptyOut")
416 429 @PostMapping( "/createEmptyOut")
417 430 public Result createEmptyOut(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
418 431 String contaienrCode = taskHeader.getContainerCode();
... ... @@ -434,6 +447,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
434 447 */
435 448 @AutoLog(value = "任务表-创建移库任务")
436 449 @ApiOperation(value="任务表-创建移库任务", notes="任务表-创建移库任务")
  450 + @RequiresPermissions("taskHeader:transfer")
437 451 @PostMapping( "/createTransferTask")
438 452 public Result createTransferTask(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
439 453 String fromLocationCode = taskHeader.getFromLocationCode();
... ... @@ -456,6 +470,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
456 470 @AutoLog(value = "任务表-创建出库查看任务")
457 471 @ApiOperation(value="任务表-创建出库查看任务", notes="任务表-创建出库查看任务")
458 472 @PostMapping( "/createCheckOutTask")
  473 + @RequiresPermissions("taskHeader:checkOut")
459 474 public Result createCheckOutTask(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
460 475 String containerCode = taskHeader.getContainerCode();
461 476 String toPortCode = taskHeader.getToPortCode();
... ... @@ -476,6 +491,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
476 491 */
477 492 @AutoLog(value = "任务表-创建跨站任务")
478 493 @ApiOperation(value="任务表-创建跨站任务", notes="任务表-创建跨站任务")
  494 + @RequiresPermissions("taskHeader:overStation")
479 495 @PostMapping( "/createOverStationTask")
480 496 public Result createOverStationTask(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
481 497 String containerCode = taskHeader.getContainerCode();
... ... @@ -499,6 +515,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
499 515 @AutoLog(value = "任务表-创建空托盘组入库")
500 516 @ApiOperation(value="任务表-创建空托盘组入库", notes="任务表-创建空托盘组入库")
501 517 @PostMapping( "/createManyEmptyIn")
  518 + @RequiresPermissions("taskHeader:manyEmptyIn")
502 519 public Result createManyEmptyIn(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
503 520 String containerCode = taskHeader.getContainerCode();
504 521 String toLocationCode = taskHeader.getToLocationCode();
... ... @@ -518,6 +535,7 @@ public class TaskHeaderController extends JeecgController&lt;TaskHeader, ITaskHeade
518 535 */
519 536 @AutoLog(value = "任务表-创建空托盘组出库")
520 537 @ApiOperation(value="任务表-创建空托盘组出库", notes="任务表-创建空托盘组出库")
  538 + @RequiresPermissions("taskHeader:manyEmptyOut")
521 539 @PostMapping( "/createManyEmptyOut")
522 540 public Result createManyEmptyOut(@RequestBody TaskHeader taskHeader, HttpServletRequest req) {
523 541 String containerCode = taskHeader.getContainerCode();
... ...