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
Hide 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 @@
<DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;">
<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">
<template #dialog="ctx">
......@@ -136,32 +136,28 @@
queryParams: [
[
{
"label": "仓库",
"prop": "ckid",
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
"src": "lxyl/jcsj/uck/ck/queryCjckid",
"match": {
"value": "id",
"label": "name"
label: "仓库",
prop: "ckid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/jcsj/uck/ck/queryCjckid",
match: {
value: "id",
label: "name"
}
}
},
{
label: '物料信息',
prop: 'wlxxInfo',
span: 6,
type: 'input',
value: ''
},
{
label: '制令号',
prop: 'zlhInfo',
label: "巷道",
prop: "hjid",
span: 6,
type: 'input',
value: ''
type: "RelSelect",
value: "",
typeConfig: {
src: "wms/jcsj/hj/query",
}
},
{
label: '容器编码',
......@@ -170,14 +166,14 @@
type: 'input',
value: ''
},
],[
{
label: '容器信息',
prop: 'rqInfos',
span: 24,
label: '物料信息',
prop: 'condition',
span: 6,
type: 'input',
value: ''
},
]
],
/* 默认启停用 */
......@@ -189,13 +185,6 @@
}
},
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){
let list=this.$refs.basePage.$refs.TablePager.selectedList.map(item=>{
let ml={
......
src/views/ccgl/ckgl/lkckrw/top/index.vue
View file @ 68ac647a
......@@ -116,7 +116,7 @@
label: '日期',
startProp: "start",
endProp: "end",
span: 8,
span: 6,
type: 'RelDaterangeV2',
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
endValue: new Date().getTime(),
......@@ -124,7 +124,7 @@
{
label: "仓库",
prop: "ckid",
span: 8,
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
......@@ -139,33 +139,32 @@
}
},
{
label: '出库单号',
prop: 'lydjDjid',
span: 8,
type: 'input',
value: ''
}
],
[{
label: '容器',
prop: 'rqInfo',
span: 8,
span: 6,
type: 'input',
value: ''
},
{
label: '唯一码',
prop: 'packInfo',
span: 8,
label: '任务号',
prop: 'djidInfo',
span: 6,
type: 'input',
value: ''
}
],
[
{
label: '出库单号',
prop: 'lydjDjid',
span: 6,
type: 'input',
value: ''
},
{
"label": "状态",
"prop": "zt",
"span": 8,
"span": 6,
"type": "RelSelect",
"value": "",
"typeConfig": {
......
src/views/ccgl/jcsj/cgywh/edit.vue
View file @ 68ac647a
......@@ -20,7 +20,7 @@
return {
editColItemList: [
{
label: '货主',
label: '工厂',
prop: 'hzid',
span: 12,
required: true,
......
src/views/ccgl/jcsj/cgywh/index.vue
View file @ 68ac647a
......@@ -21,12 +21,12 @@
url: 'lxyl/jcsj/ckglysz',
tableTitle: [
{
title: "货主",
title: "工厂名称",
field: "hzName",
width: 140
},
{
title: "货主编码",
title: "工厂编码",
field: "hzCode",
width: 140
},
......
src/views/ccgl/jcsj/kwgl/plcz.vue
View file @ 68ac647a
......@@ -214,6 +214,27 @@
type: 'input',
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
......@@ -187,20 +187,6 @@
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: "deviceid",
......@@ -211,6 +197,19 @@
src: "lxyl/wcs/lkrw/init/hj",
}
},
{
label: '容器',
prop: 'rqCode',
span: 6,
type: 'input',
value: ''
},
{
label: '起始位置',
prop: 'startPos',
span: 6,
type: 'input'
}
],
[
{
......@@ -230,7 +229,21 @@
typeConfig: {
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 @@
"value": "id"
}
},
{
title: "异常消息",
field: "message",
width: 200
},
{
title: "来源单号",
field: "lydh",
......@@ -174,20 +179,6 @@
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 7,
endValue: new Date().getTime(),
},
{
label: '任务号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
},
{
label: '立库任务单号',
prop: 'lydjDjid',
span: 6,
type: 'input',
value: ''
},
{
label: "巷道",
prop: "deviceid",
......@@ -198,6 +189,19 @@
src: "lxyl/wcs/wcsTask/init/hj",
}
},
{
label: '容器',
prop: 'rqCode',
span: 6,
type: 'input',
value: ''
},
{
label: '起始位置',
prop: 'startPos',
span: 6,
type: 'input'
}
],
[
{
......@@ -227,7 +231,21 @@
"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