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 { ...@@ -526,7 +526,7 @@ ol {
} }
.ant-pro-layout-container>main { .ant-pro-layout-container>main {
>div:first-child>div { >div:first-child>div ul {
z-index: 1001 !important; 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 = { ...@@ -129,77 +129,77 @@ const getcolumns = {
}, },
], ],
}, },
{ // {
title: '非寿命件消耗', // title: '非寿命件消耗',
key: 'maintainTaskItemList', // key: 'maintainTaskItemList',
valueType: 'table', // valueType: 'table',
dataIndex: 'maintainTaskItemList', // dataIndex: 'maintainTaskItemList',
columns: [ // columns: [
{ // {
title: '备件料号', // title: '备件料号',
dataIndex: 'sparePartNo', // dataIndex: 'sparePartNo',
key: 'sparePartNo', // key: 'sparePartNo',
}, // },
{ // {
title: '备件名称', // title: '备件名称',
dataIndex: 'sparePartName', // dataIndex: 'sparePartName',
key: 'sparePartName', // key: 'sparePartName',
}, // },
{ // {
title: '供应商编号', // title: '供应商编号',
dataIndex: 'supplierNo', // dataIndex: 'supplierNo',
key: 'supplierNo', // key: 'supplierNo',
}, // },
{ // {
title: '供应商名称', // title: '供应商名称',
dataIndex: 'supplierName', // dataIndex: 'supplierName',
key: 'supplierName', // key: 'supplierName',
}, // },
{ // {
title: '消耗数量', // title: '消耗数量',
dataIndex: 'remark', // dataIndex: 'remark',
key: 'remark', // key: 'remark',
}, // },
], // ],
}, // },
{ // {
title: '寿命件更换', // title: '寿命件更换',
key: 'maintainTaskItemList', // key: 'maintainTaskItemList',
valueType: 'table', // valueType: 'table',
dataIndex: 'maintainTaskItemList', // dataIndex: 'maintainTaskItemList',
columns: [ // columns: [
{ // {
title: '备件料号', // title: '备件料号',
dataIndex: 'sparePartNo', // dataIndex: 'sparePartNo',
key: 'sparePartNo', // key: 'sparePartNo',
}, // },
{ // {
title: '备件名称', // title: '备件名称',
dataIndex: 'sparePartName', // dataIndex: 'sparePartName',
key: 'sparePartName', // key: 'sparePartName',
}, // },
{ // {
title: '供应商编号', // title: '供应商编号',
dataIndex: 'supplierNo', // dataIndex: 'supplierNo',
key: 'supplierNo', // key: 'supplierNo',
}, // },
{ // {
title: '供应商名称', // title: '供应商名称',
dataIndex: 'supplierName', // dataIndex: 'supplierName',
key: 'supplierName', // key: 'supplierName',
}, // },
{ // {
title: '安装部位', // title: '安装部位',
dataIndex: 'remark', // dataIndex: 'remark',
key: 'remark', // key: 'remark',
}, // },
{ // {
title: '更换数量', // title: '更换数量',
dataIndex: 'remark', // dataIndex: 'remark',
key: 'remark', // key: 'remark',
}, // },
], // ],
}, // },
], ],
4: [ 4: [
{ {
......
src/pages/system/pushsetting/columns.js
View file @ 4b5ff344
...@@ -21,6 +21,7 @@ function getcolumns(setdrawer) { ...@@ -21,6 +21,7 @@ function getcolumns(setdrawer) {
title: '详情', title: '详情',
val: 'detail', val: 'detail',
title: '详细信息', title: '详细信息',
pushSettingFlag: false,
})); }));
}} }}
> >
......
src/pages/system/pushsetting/index.jsx
View file @ 4b5ff344
...@@ -71,6 +71,7 @@ function Pushsetting(props) { ...@@ -71,6 +71,7 @@ function Pushsetting(props) {
item: row, item: row,
title: '编辑', title: '编辑',
val: 'edit', val: 'edit',
pushSettingFlag: true,
})); }));
}, },
}} }}
......
src/pages/system/pushsetting/procolumns.js
View file @ 4b5ff344
...@@ -148,7 +148,7 @@ function procolumns(id) { ...@@ -148,7 +148,7 @@ function procolumns(id) {
edit: '/base/paBusinessMsgOptionDetail/save', edit: '/base/paBusinessMsgOptionDetail/save',
list: '/base/paBusinessMsgOptionDetail/queryList', list: '/base/paBusinessMsgOptionDetail/queryList',
delete: '/base/paBusinessMsgOptionDetail/deleteById', 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