Skip to content

L
lxyl-vue
Commit 68ac647a authored by 李苏's avatar 李苏 💬
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:lisu/lxyl-vue 

# Conflicts:
#	src/views/ccgl/ckgl/lkckrw/top/akck.vue
parents c14ef55e 2939e492
Show whitespace changes
Inline Side-by-side
Showing with 123 additions and 83 deletions
src/views/ccgl/ckgl/lkckrw/top/akck.vue
View file @ 68ac647a
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<DefaultDialog :app='app'> <DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;"> <div slot="form" style="display: flex;height: 70vh;">
<Xzgw @saveGw='saveGw' v-if="showDialog" :app='this' /> <Xzgw @saveGw='saveGw' v-if="showDialog" :app='this' />
<BasePage :changeQueryParams='changeQueryParams' fePage ref="basePage" :power='power' class="min_full" style="height: 100%;" :config="config"> ref="basePage" <BasePage fePage ref="basePage" :power='power' class="min_full" style="height: 100%;" :config="config"> ref="basePage"
:power='power' class="min_full" :config="config"> :power='power' class="min_full" :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
...@@ -136,32 +136,28 @@ ...@@ -136,32 +136,28 @@
queryParams: [ queryParams: [
[ [
{ {
"label": "仓库", label: "仓库",
"prop": "ckid", prop: "ckid",
"span": 6, span: 6,
"type": "RelSelect", type: "RelSelect",
"value": "", value: "",
"typeConfig": { typeConfig: {
"src": "lxyl/jcsj/uck/ck/queryCjckid", src: "lxyl/jcsj/uck/ck/queryCjckid",
"match": { match: {
"value": "id", value: "id",
"label": "name" label: "name"
} }
} }
}, },
{ {
label: '物料信息', label: "巷道",
prop: 'wlxxInfo', prop: "hjid",
span: 6,
type: 'input',
value: ''
},
{
label: '制令号',
prop: 'zlhInfo',
span: 6, span: 6,
type: 'input', type: "RelSelect",
value: '' value: "",
typeConfig: {
src: "wms/jcsj/hj/query",
}
}, },
{ {
label: '容器编码', label: '容器编码',
...@@ -170,14 +166,14 @@ ...@@ -170,14 +166,14 @@
type: 'input', type: 'input',
value: '' value: ''
}, },
],[
{ {
label: '容器信息', label: '物料信息',
prop: 'rqInfos', prop: 'condition',
span: 24, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
] ]
], ],
/* 默认启停用 */ /* 默认启停用 */
...@@ -189,13 +185,6 @@ ...@@ -189,13 +185,6 @@
} }
}, },
methods: { methods: {
changeQueryParams(queryParams){
let str=queryParams.rqInfos
let trimmedStr = str.replace(/\s/g, ''); // 使用正则表达式去除空格
let arr = trimmedStr.split(",");
queryParams.rqInfos=arr
console.log(queryParams.rqInfos)
},
saveGw(form){ saveGw(form){
let list=this.$refs.basePage.$refs.TablePager.selectedList.map(item=>{ let list=this.$refs.basePage.$refs.TablePager.selectedList.map(item=>{
let ml={ let ml={
......
src/views/ccgl/ckgl/lkckrw/top/index.vue
View file @ 68ac647a
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
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 * 30,
endValue: new Date().getTime(), endValue: new Date().getTime(),
...@@ -124,7 +124,7 @@ ...@@ -124,7 +124,7 @@
{ {
label: "仓库", label: "仓库",
prop: "ckid", prop: "ckid",
span: 8, span: 6,
type: "RelSelect", type: "RelSelect",
value: "", value: "",
typeConfig: { typeConfig: {
...@@ -139,33 +139,32 @@ ...@@ -139,33 +139,32 @@
} }
}, },
{ {
label: '出库单号',
prop: 'lydjDjid',
span: 8,
type: 'input',
value: ''
}
],
[{
label: '容器', label: '容器',
prop: 'rqInfo', prop: 'rqInfo',
span: 8, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: '唯一码', label: '任务号',
prop: 'packInfo', prop: 'djidInfo',
span: 8, span: 6,
type: 'input',
value: ''
}
],
[
{
label: '出库单号',
prop: 'lydjDjid',
span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
"label": "状态", "label": "状态",
"prop": "zt", "prop": "zt",
"span": 8, "span": 6,
"type": "RelSelect", "type": "RelSelect",
"value": "", "value": "",
"typeConfig": { "typeConfig": {
......
src/views/ccgl/jcsj/cgywh/edit.vue
View file @ 68ac647a
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
return { return {
editColItemList: [ editColItemList: [
{ {
label: '货主', label: '工厂',
prop: 'hzid', prop: 'hzid',
span: 12, span: 12,
required: true, required: true,
......
src/views/ccgl/jcsj/cgywh/index.vue
View file @ 68ac647a
...@@ -21,12 +21,12 @@ ...@@ -21,12 +21,12 @@
url: 'lxyl/jcsj/ckglysz', url: 'lxyl/jcsj/ckglysz',
tableTitle: [ tableTitle: [
{ {
title: "货主", title: "工厂名称",
field: "hzName", field: "hzName",
width: 140 width: 140
}, },
{ {
title: "货主编码", title: "工厂编码",
field: "hzCode", field: "hzCode",
width: 140 width: 140
}, },
......
src/views/ccgl/jcsj/kwgl/plcz.vue
View file @ 68ac647a
...@@ -214,6 +214,27 @@ ...@@ -214,6 +214,27 @@
type: 'input', type: 'input',
value: '' value: ''
} }
],
[{
"label": "状态",
"prop": "zt",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "wms/jcsj/kw/init/zt",
}
},
{
"label": "存储状态",
"prop": "kczt",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "wms/jcsj/kw/init/kczt",
}
},
] ]
], ],
......
src/views/ccgl/wcsrwgl/lkrw/index.vue
View file @ 68ac647a
...@@ -188,29 +188,28 @@ ...@@ -188,29 +188,28 @@
endValue: new Date().getTime(), endValue: new Date().getTime(),
}, },
{ {
label: '任务号', label: "巷道",
prop: 'djid', prop: "deviceid",
span: 6, span: 6,
type: 'input', type: "RelSelect",
value: '' value: "",
typeConfig: {
src: "lxyl/wcs/lkrw/init/hj",
}
}, },
{ {
label: '业务单号', label: '容器',
prop: 'lydjCode', prop: 'rqCode',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: "巷道", label: '起始位置',
prop: "deviceid", prop: 'startPos',
span: 6, span: 6,
type: "RelSelect", type: 'input'
value: "",
typeConfig: {
src: "lxyl/wcs/lkrw/init/hj",
} }
},
], ],
[ [
{ {
...@@ -230,7 +229,21 @@ ...@@ -230,7 +229,21 @@
typeConfig: { typeConfig: {
src: 'lxyl/wcs/lkrw/init/type' src: 'lxyl/wcs/lkrw/init/type'
} }
} },
{
label: '业务单号',
prop: 'lydjCode',
span: 6,
type: 'input',
value: ''
},
{
label: '任务号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
] ]
], ],
} }
......
src/views/ccgl/wcsrwgl/wcsrw/index.vue
View file @ 68ac647a
...@@ -144,6 +144,11 @@ ...@@ -144,6 +144,11 @@
"value": "id" "value": "id"
} }
}, },
{
title: "异常消息",
field: "message",
width: 200
},
{ {
title: "来源单号", title: "来源单号",
field: "lydh", field: "lydh",
...@@ -175,29 +180,28 @@ ...@@ -175,29 +180,28 @@
endValue: new Date().getTime(), endValue: new Date().getTime(),
}, },
{ {
label: '任务号', label: "巷道",
prop: 'djid', prop: "deviceid",
span: 6, span: 6,
type: 'input', type: "RelSelect",
value: '' value: "",
typeConfig: {
src: "lxyl/wcs/wcsTask/init/hj",
}
}, },
{ {
label: '立库任务单号', label: '容器',
prop: 'lydjDjid', prop: 'rqCode',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: "巷道", label: '起始位置',
prop: "deviceid", prop: 'startPos',
span: 6, span: 6,
type: "RelSelect", type: 'input'
value: "",
typeConfig: {
src: "lxyl/wcs/wcsTask/init/hj",
} }
},
], ],
[ [
{ {
...@@ -227,7 +231,21 @@ ...@@ -227,7 +231,21 @@
"label": "name" "label": "name"
} }
} }
} },
{
label: '立库任务号：',
prop: 'lydjDjid',
span: 6,
type: 'input',
value: ''
},
{
label: '任务号',
prop: 'djid',
span: 6,
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