wms / wms4_shenzhenxinyi · Commits

Commit a5a15cbe5240f44dbcac08e5460d36b9e4b4a297

Authored by 谭毅彬
1 parent 6ff036f9

操作日志补缺 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 4 changed files with 9 additions and 7 deletions
ant-design-vue-jeecg/src/views/system/RoleUserList.vue
  View file @a5a15cb
... ... @@ -42,9 +42,9 @@
42 42  
43 43 <div>
44 44 <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
45   - <i class="anticon anticon-info-circle ant-alert-icon">
46   - </i> 已选择 <a><b>{{ selectedRowKeys1.length }}</b></a> 项
47   - <a style="margin-left: 24px" @click="onClearSelected1">清空</a>
  45 + <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择
  46 + <a style="font-weight: 600">{{ selectedRowKeys.length }}</a> 项
  47 + <a style="margin-left: 24px" @click="onClearSelected">清空</a>
48 48 </div>
49 49  
50 50 <a-table
... ... @@ -273,7 +273,8 @@ export default {
273 273 title: '操作',
274 274 dataIndex: 'action',
275 275 align: 'center',
276   - scopedSlots: {customRender: 'action'}
  276 + scopedSlots: {customRender: 'action'},
  277 + width: 147
277 278 }
278 279 ],
279 280 columns2: [{
... ... @@ -300,7 +301,7 @@ export default {
300 301 dataIndex: 'action',
301 302 scopedSlots: {customRender: 'action'},
302 303 align: 'center',
303   - width: 120
  304 + width: 147
304 305 }],
305 306  
306 307 // 高级查询参数
... ...
ant-design-vue-jeecg/src/views/system/UserList.vue
  View file @a5a15cb
... ... @@ -345,7 +345,6 @@ export default {
345 345 });
346 346 queryall().then((res) => {
347 347 if (res.success) {
348   - debugger
349 348 this.rolesOptions = res.result.map((item, index, arr) => {
350 349 return {label: item.id + "", value: item.roleName}
351 350 })
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @a5a15cb
... ... @@ -158,7 +158,7 @@
158 158 <a-divider type="vertical"/></a>
159 159 <a v-if="record.isDoubleIn == 1 && record.exceptionState == 1" v-has="'taskHeader:executeTask'" @click="handleDoubleInTask(record)"><a-button type="danger">修复重入数据</a-button>
160 160 <a-divider type="vertical"/></a>
161   - <a v-if="record.status <= 10" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)"><a-button type="danger">取消</a-button> <a-divider type="vertical"/></a>
  161 + <a v-if="record.status <= 10" v-has="'taskHeader:cancelTask'" @click="cancelTask(record)"><a-button type="danger">取消</a-button></a>
162 162 </span>
163 163  
164 164 </a-table>
... ...
huaheng-wms-core/src/main/java/org/jeecg/modules/wms/monitor/operation/service/impl/OperationLogServiceImpl.java
  View file @a5a15cb
... ... @@ -112,6 +112,8 @@ public class OperationLogServiceImpl extends ServiceImpl&lt;OperationLogMapper, Ope
112 112 switch (logDTO.getTag()) {
113 113 case "入库任务生成":
114 114 case "入库任务完成":
  115 + case "出库任务生成":
  116 + case "出库任务完成":
115 117 message = "详情ID：{}，物料编码：{}，物料名称：{}，数量：{}";
116 118 operationLogList.addAll(createOperationLogs(logDTO, TaskDetail.class, "getTaskHeaderId", message, "getId", "getMaterialCode",
117 119 "getMaterialName", "getQty"));
... ...