wms / wms4_hubeijili · Commits

Commit b002b133c415c54c0c1bde7a5bb2fcddb35cbf90

Authored by 谭毅彬
1 parent 6bac255c

VUE ID类型转换修正，操作日志页面字段显示顺序调整 

Signed-off-by: TanYibin <5491541@qq.com>
Inline Side-by-side
Showing 15 changed files with 37 additions and 35 deletions
ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
  View file @b002b13
... ... @@ -233,7 +233,7 @@ export default {
233 233 return {
234 234 on: {
235 235 click: () => {
236   - this.onSelectChange(record.id.split(","), [record]);
  236 + this.onSelectChange(record.id.toString().split(","), [record]);
237 237 }
238 238 }
239 239 }
... ... @@ -244,7 +244,7 @@ export default {
244 244 this.selectedMainId = ''
245 245 },
246 246 onSelectChange(selectedRowKeys, selectionRows) {
247   - this.selectedMainId = selectedRowKeys[0]
  247 + this.selectedMainId = selectedRowKeys[0].toString();
248 248 this.selectedRowKeys = selectedRowKeys;
249 249 this.selectionRows = selectionRows;
250 250 },
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
  View file @b002b13
... ... @@ -260,7 +260,7 @@ export default {
260 260 return {
261 261 on: {
262 262 click: () => {
263   - this.onSelectChange(record.id.split(","), [record]);
  263 + this.onSelectChange(record.id.toString().split(","), [record]);
264 264 }
265 265 }
266 266 }
... ... @@ -271,7 +271,7 @@ export default {
271 271 this.selectedMainId = ''
272 272 },
273 273 onSelectChange(selectedRowKeys, selectionRows) {
274   - this.selectedMainId = selectedRowKeys[0]
  274 + this.selectedMainId = selectedRowKeys[0].toString();
275 275 this.selectedRowKeys = selectedRowKeys;
276 276 this.selectionRows = selectionRows;
277 277 },
... ...
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
  View file @b002b13
... ... @@ -214,13 +214,13 @@
214 214 return {
215 215 on: {
216 216 click: () => {
217   - this.onSelectChange(record.id.split(","), [record]);
  217 + this.onSelectChange(record.id.toString().split(","), [record]);
218 218 }
219 219 }
220 220 }
221 221 },
222 222 onSelectChange(selectedRowKeys, selectionRows) {
223   - this.selectedMainId = selectedRowKeys[0]
  223 + this.selectedMainId = selectedRowKeys[0].toString();
224 224 this.selectedRowKeys = selectedRowKeys;
225 225 this.selectionRows = selectionRows;
226 226 },
... ...
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
  View file @b002b13
... ... @@ -16,7 +16,7 @@
16 16 </a-col>
17 17 <a-col :xl="6" :lg="7" :md="8" :sm="24">
18 18 <a-form-item label="业务标签">
19   - <j-multi-select-tag placeholder="请选择业务标签" v-model="queryParam.bizTag" dictCode="operation_log_tag"/>
  19 + <j-input placeholder="请输入业务标签" v-model="queryParam.bizTag"></j-input>
20 20 </a-form-item>
21 21 </a-col>
22 22 <a-col :xl="6" :lg="7" :md="8" :sm="24">
... ... @@ -100,14 +100,17 @@
100 100 import { mixinDevice } from '@/utils/mixin'
101 101 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
102 102 import OperationLogModal from './modules/OperationLogModal'
  103 + import JEllipsis from "@comp/jeecg/JEllipsis"
103 104  
104 105 export default {
105 106 name: 'OperationLogList',
106 107 mixins:[JeecgListMixin, mixinDevice],
107 108 components: {
108   - OperationLogModal
  109 + OperationLogModal,
  110 + JEllipsis
109 111 },
110 112 data () {
  113 + let ellipsis1 = (v, l = 80) => (<j-ellipsis value={v} length={l}/>)
111 114 return {
112 115 description: '操作记录管理页面',
113 116 // 表头
... ... @@ -130,7 +133,8 @@
130 133 {
131 134 title:'操作内容',
132 135 align:"center",
133   - dataIndex: 'operationMsg'
  136 + dataIndex: 'operationMsg',
  137 + customRender: (t) => ellipsis1(t)
134 138 },
135 139 {
136 140 title:'操作时间',
... ... @@ -138,11 +142,6 @@
138 142 dataIndex: 'operationTime'
139 143 },
140 144 {
141   - title:'操作结果状态',
142   - align:"center",
143   - dataIndex: 'operationStatus'
144   - },
145   - {
146 145 title:'操作耗时',
147 146 align:"center",
148 147 dataIndex: 'operationCostTime'
... ... @@ -153,6 +152,11 @@
153 152 dataIndex: 'operatorName'
154 153 },
155 154 {
  155 + title:'操作结果状态',
  156 + align:"center",
  157 + dataIndex: 'operationStatus'
  158 + },
  159 + {
156 160 title: '操作',
157 161 dataIndex: 'action',
158 162 align: "center",
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
  View file @b002b13
... ... @@ -11,7 +11,6 @@
11 11 show-search
12 12 placeholder="请选择货主"
13 13 option-filter-prop="children"
14   - :filter-option="filterOption"
15 14 v-model="queryParam.companyCode">
16 15 <a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
17 16 item.name
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
  View file @b002b13
... ... @@ -258,7 +258,7 @@ export default {
258 258 return {
259 259 on: {
260 260 click: () => {
261   - this.onSelectChange(record.id.split(","), [record]);
  261 + this.onSelectChange(record.id.toString().split(","), [record]);
262 262 }
263 263 }
264 264 }
... ... @@ -269,7 +269,7 @@ export default {
269 269 this.selectedMainId = ''
270 270 },
271 271 onSelectChange(selectedRowKeys, selectionRows) {
272   - this.selectedMainId = selectedRowKeys[0]
  272 + this.selectedMainId = selectedRowKeys[0].toString();
273 273 this.selectedRowKeys = selectedRowKeys;
274 274 this.selectionRows = selectionRows;
275 275 },
... ...
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
  View file @b002b13
... ... @@ -335,7 +335,7 @@ export default {
335 335 return {
336 336 on: {
337 337 click: () => {
338   - this.onSelectChange(record.id.split(','), [record])
  338 + this.onSelectChange(record.id.toString().split(','), [record])
339 339 }
340 340 }
341 341 }
... ... @@ -346,7 +346,7 @@ export default {
346 346 this.selectedMainId = ''
347 347 },
348 348 onSelectChange(selectedRowKeys, selectionRows) {
349   - this.selectedMainId = selectedRowKeys[0]
  349 + this.selectedMainId = selectedRowKeys[0].toString();
350 350 this.selectedRowKeys = selectedRowKeys
351 351 this.selectionRows = selectionRows
352 352 },
... ...
ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
  View file @b002b13
... ... @@ -17,7 +17,6 @@
17 17 show-search
18 18 placeholder="请选择分拣入库口"
19 19 option-filter-prop="children"
20   - :filter-option="filterOption"
21 20 v-model="model.toPort">
22 21 <a-select-option v-for="item in portList" :key="item.name" :value="item.code">{{
23 22 item.name
... ... @@ -41,7 +40,6 @@ import {selectSupplePort} from &#39;@/api/api&#39;
41 40  
42 41 export default {
43 42 name: "ReceiptContainerSelectModal",
44   - portList: [],
45 43 components: {},
46 44 props: {
47 45 mainId: {
... ... @@ -53,6 +51,7 @@ export default {
53 51 data() {
54 52 return {
55 53 title: "操作",
  54 + portList: [],
56 55 width: 500,
57 56 visible: false,
58 57 model: {},
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
  View file @b002b13
... ... @@ -268,7 +268,7 @@ export default {
268 268 return {
269 269 on: {
270 270 click: () => {
271   - this.onSelectChange(record.id.split(","), [record]);
  271 + this.onSelectChange(record.id.toString().split(","), [record]);
272 272 }
273 273 }
274 274 }
... ... @@ -279,7 +279,7 @@ export default {
279 279 this.selectedMainId = ''
280 280 },
281 281 onSelectChange(selectedRowKeys, selectionRows) {
282   - this.selectedMainId = selectedRowKeys[0]
  282 + this.selectedMainId = selectedRowKeys[0].toString();
283 283 this.selectedRowKeys = selectedRowKeys;
284 284 this.selectionRows = selectionRows;
285 285 },
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
  View file @b002b13
... ... @@ -363,7 +363,7 @@ export default {
363 363 return {
364 364 on: {
365 365 click: () => {
366   - this.onSelectChange(record.id.split(","), [record]);
  366 + this.onSelectChange(record.id.toString().split(","), [record]);
367 367 }
368 368 }
369 369 }
... ... @@ -374,7 +374,7 @@ export default {
374 374 this.selectedMainId = ''
375 375 },
376 376 onSelectChange(selectedRowKeys, selectionRows) {
377   - this.selectedMainId = selectedRowKeys[0]
  377 + this.selectedMainId = selectedRowKeys[0].toString();
378 378 this.selectedRowKeys = selectedRowKeys;
379 379 this.selectionRows = selectionRows;
380 380 },
... ...
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
  View file @b002b13
... ... @@ -379,7 +379,7 @@ export default {
379 379 return {
380 380 on: {
381 381 click: () => {
382   - this.onSelectChange(record.id.split(","), [record]);
  382 + this.onSelectChange(record.id.toString().split(","), [record]);
383 383 }
384 384 }
385 385 }
... ... @@ -390,7 +390,7 @@ export default {
390 390 this.selectedMainId = ''
391 391 },
392 392 onSelectChange(selectedRowKeys, selectionRows) {
393   - this.selectedMainId = selectedRowKeys[0]
  393 + this.selectedMainId = selectedRowKeys[0].toString();
394 394 this.selectedRowKeys = selectedRowKeys;
395 395 this.selectionRows = selectionRows;
396 396 },
... ...
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
  View file @b002b13
... ... @@ -346,7 +346,7 @@ export default {
346 346 return {
347 347 on: {
348 348 click: () => {
349   - this.onSelectChange(record.id.split(","), [record]);
  349 + this.onSelectChange(record.id.toString().split(","), [record]);
350 350 }
351 351 }
352 352 }
... ... @@ -357,7 +357,7 @@ export default {
357 357 this.selectedMainId = ''
358 358 },
359 359 onSelectChange(selectedRowKeys, selectionRows) {
360   - this.selectedMainId = selectedRowKeys[0]
  360 + this.selectedMainId = selectedRowKeys[0].toString();
361 361 this.selectedRowKeys = selectedRowKeys;
362 362 this.selectionRows = selectionRows;
363 363 },
... ...
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
  View file @b002b13
... ... @@ -344,7 +344,7 @@ export default {
344 344 return {
345 345 on: {
346 346 click: () => {
347   - this.onSelectChange(record.id.split(","), [record]);
  347 + this.onSelectChange(record.id.toString().split(","), [record]);
348 348 }
349 349 }
350 350 }
... ... @@ -355,7 +355,7 @@ export default {
355 355 this.selectedMainId = ''
356 356 },
357 357 onSelectChange(selectedRowKeys, selectionRows) {
358   - this.selectedMainId = selectedRowKeys[0]
  358 + this.selectedMainId = selectedRowKeys[0].toString();
359 359 this.selectedRowKeys = selectedRowKeys;
360 360 this.selectionRows = selectionRows;
361 361 },
... ...
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
  View file @b002b13
... ... @@ -348,7 +348,7 @@ export default {
348 348 return {
349 349 on: {
350 350 click: () => {
351   - this.onSelectChange(record.id.split(","), [record]);
  351 + this.onSelectChange(record.id.toString().split(","), [record]);
352 352 }
353 353 }
354 354 }
... ... @@ -359,7 +359,7 @@ export default {
359 359 this.selectedMainId = ''
360 360 },
361 361 onSelectChange(selectedRowKeys, selectionRows) {
362   - this.selectedMainId = selectedRowKeys[0]
  362 + this.selectedMainId = selectedRowKeys[0].toString();
363 363 this.selectedRowKeys = selectedRowKeys;
364 364 this.selectionRows = selectionRows;
365 365 },
... ...
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
  View file @b002b13
... ... @@ -353,7 +353,7 @@ export default {
353 353 return {
354 354 on: {
355 355 click: () => {
356   - this.onSelectChange(record.id.split(","), [record]);
  356 + this.onSelectChange(record.id.toString().split(","), [record]);
357 357 }
358 358 }
359 359 }
... ... @@ -364,7 +364,7 @@ export default {
364 364 this.selectedMainId = ''
365 365 },
366 366 onSelectChange(selectedRowKeys, selectionRows) {
367   - this.selectedMainId = selectedRowKeys[0]
  367 + this.selectedMainId = selectedRowKeys[0].toString();
368 368 this.selectedRowKeys = selectedRowKeys;
369 369 this.selectionRows = selectionRows;
370 370 },
... ...