Commit 97d1513a authored by 周毅's avatar 周毅

修改任务界面

parent b8e84220
...@@ -33,6 +33,34 @@ ...@@ -33,6 +33,34 @@
saveSelected: false saveSelected: false
}, },
config: { config: {
cellStyle({
row,
column,
}) {
// 定义样式变量
let cellStyle;
switch (row.zt) {
case 'W':
cellStyle = 'color:#dcc40e';
break;
case 'D':
cellStyle = 'color:#11b95c';
break;
case 'C':
cellStyle = 'color:#e6a700';
break;
case 'CF':
cellStyle = 'color:#ff4949';
break;
default:
cellStyle = '';
}
if (column.label) {
return cellStyle
}
},
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/wcs/lkrw', url: 'lxyl/wcs/lkrw',
tableTitle: [{ tableTitle: [{
...@@ -53,8 +81,7 @@ ...@@ -53,8 +81,7 @@
"label": "name", "label": "name",
"value": "id" "value": "id"
}, },
width: 80
width: 120
}, { }, {
title: "任务号", title: "任务号",
field: "djid", field: "djid",
...@@ -129,25 +156,40 @@ ...@@ -129,25 +156,40 @@
} }
}, },
{ {
title: "异常消息", title: "巷道",
field: "message",
width: 200
},
{
title: "设备",
field: "hjName", field: "hjName",
width: 140 width: 140
}, },
{ {
title: "单据来源", title: "业务类型",
field: "djly", field: "ywlx",
"transform": { "transform": {
"url": "lxyl/wcs/lkrw/init/djly", "url": "lxyl/wcs/lkrw/init/ywlx",
"label": "name", "label": "name",
"value": "id" "value": "id"
}, },
width: 120 width: 120
}, },
{
title: "业务单号",
field: "lydjCode",
width: 140
},
{
title: "异常消息",
field: "message",
width: 200
},
// {
// title: "单据来源",
// field: "djly",
// "transform": {
// "url": "lxyl/wcs/lkrw/init/djly",
// "label": "name",
// "value": "id"
// },
// width: 120
// },
{ {
title: "创建人", title: "创建人",
field: "cjr" field: "cjr"
...@@ -160,6 +202,41 @@ ...@@ -160,6 +202,41 @@
], ],
queryParams: [ queryParams: [
[{ [{
label: '日期',
startProp: "start",
endProp: "end",
span: 6,
type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 7,
endValue: new Date().getTime(),
},
{
label: '任务号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
{
label: '业务单号',
prop: 'lydjCode',
span: 6,
type: 'input',
value: ''
},
{
label: "巷道",
prop: "hjid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/wcs/lkrw/init/hj",
}
},
],
[
{
label: '状态', label: '状态',
prop: 'zt', prop: 'zt',
span: 6, span: 6,
...@@ -174,15 +251,8 @@ ...@@ -174,15 +251,8 @@
span: 6, span: 6,
type: 'RelSelect', type: 'RelSelect',
typeConfig: { typeConfig: {
src: 'lxyl/wcs/lkrw/init/zt' src: 'lxyl/wcs/lkrw/init/type'
} }
},
{
label: '单号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
} }
] ]
], ],
......
...@@ -46,21 +46,21 @@ ...@@ -46,21 +46,21 @@
cellStyle = 'color:#dcc40e'; cellStyle = 'color:#dcc40e';
break; break;
case 'D': case 'D':
cellStyle = 'color:#76b82a'; cellStyle = 'color:#11b95c';
break; break;
case 'C': case 'C':
cellStyle = 'color:#60b5ff'; cellStyle = 'color:#e6a700';
break; break;
case 'CF': case 'CF':
cellStyle = 'color:#666'; cellStyle = 'color:#ff4949';
break; break;
default: default:
cellStyle = ''; cellStyle = '';
} }
if (column.label == "状态") { if (column.label) {
return cellStyle return cellStyle
} }
}, },
/* 基本配置*/ /* 基本配置*/
...@@ -111,6 +111,14 @@ ...@@ -111,6 +111,14 @@
field: "rqCode", field: "rqCode",
width: 140, width: 140,
}, },
{
title: "设备",
field: "hjName",
formatter(row, b, v) {
return row.hjName || "运输线"
},
width: 140
},
{ {
title: "开始时间", title: "开始时间",
field: "kssj", field: "kssj",
...@@ -154,10 +162,10 @@ ...@@ -154,10 +162,10 @@
}, },
{ {
title: "业务类型", title: "业务类型",
field: "djly", field: "ywlx",
width: 140, width: 140,
transform: { transform: {
"url": "lxyl/wcs/wcsTask/init/djly", "url": "lxyl/wcs/wcsTask/init/ywlx",
"label": "name", "label": "name",
"value": "id" "value": "id"
} }
...@@ -187,15 +195,41 @@ ...@@ -187,15 +195,41 @@
label: '日期', label: '日期',
startProp: "start", startProp: "start",
endProp: "end", endProp: "end",
span: 8, span: 6,
type: 'RelDaterangeV2', type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30, startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 7,
endValue: new Date().getTime(), endValue: new Date().getTime(),
}, },
{
label: '任务号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
{
label: '立库任务单号',
prop: 'lydjDjid',
span: 6,
type: 'input',
value: ''
},
{
label: "巷道",
prop: "deviceid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/wcs/wcsTask/init/hj",
}
},
],
[
{ {
label: '任务类型', label: '任务类型',
prop: 'type', prop: 'type',
span: 8, span: 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -209,7 +243,7 @@ ...@@ -209,7 +243,7 @@
{ {
"label": "状态", "label": "状态",
"prop": "zt", "prop": "zt",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
...@@ -219,39 +253,7 @@ ...@@ -219,39 +253,7 @@
"label": "name" "label": "name"
} }
} }
}, }
],
[{
label: '任务号',
prop: 'djid',
span: 8,
type: 'input',
value: ''
},
{
"label": "业务类型",
"prop": "djly",
"span": 8,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "lxyl/wcs/wcsTask/init/djly",
"match": {
"value": "id",
"label": "name"
}
}
},
{
label: '业务单号',
prop: 'lydjDjid',
span: 8,
type: 'input',
value: ''
},
] ]
], ],
......
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