Skip to content

E
ems3.3
Commit 4b5ff344 authored by TZW's avatar TZW
Browse files
Options

bug

parent 14dbf77c
Show whitespace changes
Inline Side-by-side
Showing with 75 additions and 73 deletions
src/global.less
View file @ 4b5ff344
......@@ -526,7 +526,7 @@ ol {
}
.ant-pro-layout-container>main {
>div:first-child>div {
>div:first-child>div ul {
z-index: 1001 !important;
}
}
\ No newline at end of file
src/pages/maintain/workOrder/detailColumns.js
View file @ 4b5ff344
......@@ -129,77 +129,77 @@ const getcolumns = {
},
],
},
{
title: '非寿命件消耗',
key: 'maintainTaskItemList',
valueType: 'table',
dataIndex: 'maintainTaskItemList',
columns: [
{
title: '备件料号',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
},
{
title: '备件名称',
dataIndex: 'sparePartName',
key: 'sparePartName',
},
{
title: '供应商编号',
dataIndex: 'supplierNo',
key: 'supplierNo',
},
{
title: '供应商名称',
dataIndex: 'supplierName',
key: 'supplierName',
},
{
title: '消耗数量',
dataIndex: 'remark',
key: 'remark',
},
],
},
{
title: '寿命件更换',
key: 'maintainTaskItemList',
valueType: 'table',
dataIndex: 'maintainTaskItemList',
columns: [
{
title: '备件料号',
dataIndex: 'sparePartNo',
key: 'sparePartNo',
},
{
title: '备件名称',
dataIndex: 'sparePartName',
key: 'sparePartName',
},
{
title: '供应商编号',
dataIndex: 'supplierNo',
key: 'supplierNo',
},
{
title: '供应商名称',
dataIndex: 'supplierName',
key: 'supplierName',
},
{
title: '安装部位',
dataIndex: 'remark',
key: 'remark',
},
{
title: '更换数量',
dataIndex: 'remark',
key: 'remark',
},
],
},
// {
// title: '非寿命件消耗',
// key: 'maintainTaskItemList',
// valueType: 'table',
// dataIndex: 'maintainTaskItemList',
// columns: [
// {
// title: '备件料号',
// dataIndex: 'sparePartNo',
// key: 'sparePartNo',
// },
// {
// title: '备件名称',
// dataIndex: 'sparePartName',
// key: 'sparePartName',
// },
// {
// title: '供应商编号',
// dataIndex: 'supplierNo',
// key: 'supplierNo',
// },
// {
// title: '供应商名称',
// dataIndex: 'supplierName',
// key: 'supplierName',
// },
// {
// title: '消耗数量',
// dataIndex: 'remark',
// key: 'remark',
// },
// ],
// },
// {
// title: '寿命件更换',
// key: 'maintainTaskItemList',
// valueType: 'table',
// dataIndex: 'maintainTaskItemList',
// columns: [
// {
// title: '备件料号',
// dataIndex: 'sparePartNo',
// key: 'sparePartNo',
// },
// {
// title: '备件名称',
// dataIndex: 'sparePartName',
// key: 'sparePartName',
// },
// {
// title: '供应商编号',
// dataIndex: 'supplierNo',
// key: 'supplierNo',
// },
// {
// title: '供应商名称',
// dataIndex: 'supplierName',
// key: 'supplierName',
// },
// {
// title: '安装部位',
// dataIndex: 'remark',
// key: 'remark',
// },
// {
// title: '更换数量',
// dataIndex: 'remark',
// key: 'remark',
// },
// ],
// },
],
4: [
{
......
src/pages/system/pushsetting/columns.js
View file @ 4b5ff344
......@@ -21,6 +21,7 @@ function getcolumns(setdrawer) {
title: '详情',
val: 'detail',
title: '详细信息',
pushSettingFlag: false,
}));
}}
>
......
src/pages/system/pushsetting/index.jsx
View file @ 4b5ff344
......@@ -71,6 +71,7 @@ function Pushsetting(props) {
item: row,
title: '编辑',
val: 'edit',
pushSettingFlag: true,
}));
},
}}
......
src/pages/system/pushsetting/procolumns.js
View file @ 4b5ff344
......@@ -148,7 +148,7 @@ function procolumns(id) {
edit: '/base/paBusinessMsgOptionDetail/save',
list: '/base/paBusinessMsgOptionDetail/queryList',
delete: '/base/paBusinessMsgOptionDetail/deleteById',
detail: '',
detail: '/base/paBusinessMsgOptionDetail/queryById',
},
};
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment