From b002b133c415c54c0c1bde7a5bb2fcddb35cbf90 Mon Sep 17 00:00:00 2001
From: TanYibin <5491541@qq.com>
Date: Wed, 8 Mar 2023 11:40:09 +0800
Subject: [PATCH] VUE ID类型转换修正，操作日志页面字段显示顺序调整
---
ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue | 20 ++++++++++++--------
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue | 1 -
ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue | 3 +--
ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue | 4 ++--
ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue | 4 ++--
15 files changed, 37 insertions(+), 35 deletions(-)
diff --git a/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue b/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
index 64bee65..15e3eb7 100644
--- a/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/config/BomHeaderList.vue
@@ -233,7 +233,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -244,7 +244,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
index 584d578..dc6daa5 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryHeaderList.vue
@@ -260,7 +260,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -271,7 +271,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue b/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
index c1f4966..895a771 100644
--- a/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/inventory/InventoryMaterialSummaryList.vue
@@ -214,13 +214,13 @@
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
index 1c821d8..a3b0f18 100644
--- a/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
+++ b/ant-design-vue-jeecg/src/views/system/monitor/OperationLog.vue
@@ -16,7 +16,7 @@
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
<a-form-item label="业务标签">
- <j-multi-select-tag placeholder="请选择业务标签" v-model="queryParam.bizTag" dictCode="operation_log_tag"/>
+ <j-input placeholder="请输入业务标签" v-model="queryParam.bizTag"></j-input>
</a-form-item>
</a-col>
<a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -100,14 +100,17 @@
import { mixinDevice } from '@/utils/mixin'
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import OperationLogModal from './modules/OperationLogModal'
+ import JEllipsis from "@comp/jeecg/JEllipsis"
export default {
name: 'OperationLogList',
mixins:[JeecgListMixin, mixinDevice],
components: {
- OperationLogModal
+ OperationLogModal,
+ JEllipsis
},
data () {
+ let ellipsis1 = (v, l = 80) => (<j-ellipsis value={v} length={l}/>)
return {
description: '操作记录管理页面',
// 表头
@@ -130,7 +133,8 @@
{
title:'操作内容',
align:"center",
- dataIndex: 'operationMsg'
+ dataIndex: 'operationMsg',
+ customRender: (t) => ellipsis1(t)
},
{
title:'操作时间',
@@ -138,11 +142,6 @@
dataIndex: 'operationTime'
},
{
- title:'操作结果状态',
- align:"center",
- dataIndex: 'operationStatus'
- },
- {
title:'操作耗时',
align:"center",
dataIndex: 'operationCostTime'
@@ -153,6 +152,11 @@
dataIndex: 'operatorName'
},
{
+ title:'操作结果状态',
+ align:"center",
+ dataIndex: 'operationStatus'
+ },
+ {
title: '操作',
dataIndex: 'action',
align: "center",
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
index c2c6391..33b29d2 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerDetailList.vue
@@ -11,7 +11,6 @@
show-search
placeholder="请选择货主"
option-filter-prop="children"
- :filter-option="filterOption"
v-model="queryParam.companyCode">
<a-select-option v-for="item in companyList" :key="item.name" :value="item.code">{{
item.name
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
index c0a55ca..5b17745 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptContainerHeaderList.vue
@@ -258,7 +258,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -269,7 +269,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
index 43ed053..2087118 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/ReceiptHeaderHistoryList.vue
@@ -335,7 +335,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(','), [record])
+ this.onSelectChange(record.id.toString().split(','), [record])
}
}
}
@@ -346,7 +346,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys
this.selectionRows = selectionRows
},
diff --git a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
index 57ad60b..097d820 100644
--- a/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
+++ b/ant-design-vue-jeecg/src/views/system/receipt/modules/ReceiptContainerSelectModal.vue
@@ -17,7 +17,6 @@
show-search
placeholder="请选择分拣入库口"
option-filter-prop="children"
- :filter-option="filterOption"
v-model="model.toPort">
<a-select-option v-for="item in portList" :key="item.name" :value="item.code">{{
item.name
@@ -41,7 +40,6 @@ import {selectSupplePort} from '@/api/api'
export default {
name: "ReceiptContainerSelectModal",
- portList: [],
components: {},
props: {
mainId: {
@@ -53,6 +51,7 @@ export default {
data() {
return {
title: "操作",
+ portList: [],
width: 500,
visible: false,
model: {},
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
index ec4b01b..218b728 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentContainerHeaderList.vue
@@ -268,7 +268,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -279,7 +279,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
index 850f1fd..e8e7eff 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderHistoryList.vue
@@ -363,7 +363,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -374,7 +374,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
index 672951e..a1a2c52 100644
--- a/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/shipment/ShipmentHeaderList.vue
@@ -379,7 +379,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -390,7 +390,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
index 042998d..c3a7e8d 100644
--- a/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/CircleTaskHeaderList.vue
@@ -346,7 +346,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -357,7 +357,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
index 3cb6c7e..689f8d8 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ReceiptTaskHeaderList.vue
@@ -344,7 +344,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -355,7 +355,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
index 92f16ea..864db8c 100644
--- a/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/ShipmentTaskHeaderList.vue
@@ -348,7 +348,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -359,7 +359,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
diff --git a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
index 4515501..2fa9cde 100644
--- a/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
+++ b/ant-design-vue-jeecg/src/views/system/task/TransferTaskHeaderList.vue
@@ -353,7 +353,7 @@ export default {
return {
on: {
click: () => {
- this.onSelectChange(record.id.split(","), [record]);
+ this.onSelectChange(record.id.toString().split(","), [record]);
}
}
}
@@ -364,7 +364,7 @@ export default {
this.selectedMainId = ''
},
onSelectChange(selectedRowKeys, selectionRows) {
- this.selectedMainId = selectedRowKeys[0]
+ this.selectedMainId = selectedRowKeys[0].toString();
this.selectedRowKeys = selectedRowKeys;
this.selectionRows = selectionRows;
},
--
libgit2 0.22.2