Commit e82f9354 authored by 周毅's avatar 周毅

1、库位详情增加仓库显示

2、下立库增加巷道
3、工位增加最大任务数
parent f19f3ae2
...@@ -160,29 +160,28 @@ ...@@ -160,29 +160,28 @@
} }
}, },
{ {
label: '容器编码', label: '物料信息',
prop: 'rqCode', prop: 'condition',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: '物料信息', label: '库位',
prop: 'condition', prop: 'kwInfo',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
], ],
[ [
{ {
label: '容器信息', label: '容器信息',
prop: 'rqInfos', prop: 'rqInfos',
span: 24, span: 24,
type: 'input', type: 'input',
value: '' value: ''
}, },
] ]
], ],
/* 默认启停用 */ /* 默认启停用 */
......
...@@ -70,6 +70,11 @@ ...@@ -70,6 +70,11 @@
field: "swlxName", field: "swlxName",
width: 140 width: 140
}, },
{
title: "巷道",
field: "hjName",
width: 100
},
{ {
title: "库位", title: "库位",
field: "kwName", field: "kwName",
...@@ -122,22 +127,16 @@ ...@@ -122,22 +127,16 @@
endValue: new Date().getTime(), endValue: new Date().getTime(),
}, },
{ {
label: "仓库", label: "巷道",
prop: "ckid", prop: "hjid",
span: 6, span: 6,
type: "RelSelect", type: "RelSelect",
value: "", value: "",
typeConfig: { typeConfig: {
src: "lxyl/jcsj/uck/ck/queryCjckid", src: "wms/jcsj/hj/query",
match: {
value: "id",
label: "name"
},
params:{
flid:'L'
}
} }
}, },
{ {
label: '容器', label: '容器',
prop: 'rqInfo', prop: 'rqInfo',
...@@ -146,11 +145,21 @@ ...@@ -146,11 +145,21 @@
value: '' value: ''
}, },
{ {
label: '任务号', label: "仓库",
prop: 'djidInfo', prop: "ckid",
span: 6, span: 6,
type: 'input', type: "RelSelect",
value: '' value: "",
typeConfig: {
src: "lxyl/jcsj/uck/ck/queryCjckid",
match: {
value: "id",
label: "name"
},
params:{
flid:'L'
}
}
} }
], ],
[ [
...@@ -182,7 +191,13 @@ ...@@ -182,7 +191,13 @@
type: 'input', type: 'input',
value: '' value: ''
}, },
{
label: '任务号',
prop: 'djidInfo',
span: 6,
type: 'input',
value: ''
}
] ]
], ],
/* 默认启停用 */ /* 默认启停用 */
......
...@@ -55,13 +55,13 @@ ...@@ -55,13 +55,13 @@
} }
}, },
{ {
title: "库位编码", title: "仓库",
field: "kwCode", field: "ckName",
width: 140 width: 140
}, },
{ {
title: "库位名称", title: "库位编码",
field: "kwCode", field: "kwName",
width: 140 width: 140
}, },
{ {
......
...@@ -64,13 +64,14 @@ ...@@ -64,13 +64,14 @@
src: "lxyl/jcsj/ugw/init/wxjcgw" src: "lxyl/jcsj/ugw/init/wxjcgw"
}, },
// required: true, // required: true,
},
{
label: '最大任务数',
prop: 'zdrwsl',
span: 12,
type: 'inputNumber',
// required: true,
} }
// {
// label: '外形检测工位',
// prop: 'wxCode',
// span: 12,
// type: 'input'
// }
] ]
......
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
return showZd||'未设置' return showZd||'未设置'
} }
}, },
{title: "停用", field: "tybz",fieldType:"tybz"}, {title: "最大任务数", field: "zdrwsl",fieldType:"int"},
{title: "停用日期", field: "tyrq", fieldType:"ftDate"}, {title: "停用日期", field: "tyrq", fieldType:"ftDate"},
{ {
title: "维护人", title: "维护人",
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<el-button @click="execute(ctx.basePage)" size='mini' type="primary">手动执行</el-button> <el-button @click="execute(ctx.basePage)" size='mini' type="primary">手动执行</el-button>
<el-button @click="complete(ctx.basePage)" size='mini' type="primary">完成</el-button> <el-button @click="complete(ctx.basePage)" size='mini' type="primary">完成</el-button>
<el-button @click="close(ctx.basePage)" size='mini' type="primary">关闭</el-button> <el-button @click="close(ctx.basePage)" size='mini' type="primary">关闭</el-button>
<div style="float:right;line-height: 28px;font-size: 12px;" > 定时刷新:<el-switch <div style="float:right;line-height: 28px;font-size: 12px;" > 自动刷新:<el-switch
v-model="doQuery" v-model="doQuery"
active-color="#13ce66" active-color="#13ce66"
inactive-color="#eee"> inactive-color="#eee">
......
...@@ -101,7 +101,7 @@ ...@@ -101,7 +101,7 @@
label: '保质期(天)', label: '保质期(天)',
prop: 'kcqx', prop: 'kcqx',
span: 12, span: 12,
type: 'input' type: 'inputNumber'
}, },
// 重检期限 // 重检期限
......
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