Skip to content

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

调整

parent 48122e38
Show whitespace changes
Inline Side-by-side
Showing with 110 additions and 51 deletions
src/views/ccgl/cxfx/cxlkrw/index.vue
View file @ d8cebe1f
<template> <template>
<BasePage :power='power' class="min_full" :config="config"> <BasePage ref="basePage" :power='power' class="min_full" :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
...@@ -13,8 +13,10 @@ ...@@ -13,8 +13,10 @@
</template> </template>
<script> <script>
import wlsx from 'common/src/mixin/wlsx.js'
import wlphsx from 'common/src/mixin/wlphsx.js'
export default { export default {
mixins: [wlsx, wlphsx],
data() { data() {
return { return {
power: { power: {
...@@ -71,7 +73,8 @@ ...@@ -71,7 +73,8 @@
"transform": { "transform": {
"url": "lxyl/wcs/lkrw/init/zt", "url": "lxyl/wcs/lkrw/init/zt",
"label": "name", "label": "name",
"value": "id" "value": "id",
}, },
width: 80 width: 80
}, },
...@@ -94,16 +97,16 @@ ...@@ -94,16 +97,16 @@
title: "起始位", title: "起始位",
field: "gwName", field: "gwName",
width: 140, width: 140,
formatter(a,b,v){ formatter(a, b, v) {
return a.kwName||a.gwName return a.kwName || a.gwName
} }
}, },
{ {
title: "目标位", title: "目标位",
field: "mbkwCode", field: "mbkwCode",
width: 140, width: 140,
formatter(a,b,v){ formatter(a, b, v) {
return a.mbkwCode||a.gwName return a.mbkwCode || a.gwName
} }
}, },
{ {
...@@ -111,6 +114,33 @@ ...@@ -111,6 +114,33 @@
field: "rqCode", field: "rqCode",
width: 140 width: 140
}, },
/* 新增物料信息*/
{
title: "物料编码",
field: "wlxxCode",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 140
},
{
title: "规格",
field: "wlxxGg",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 180
},
{
title: "制令号",
field: "zlh",
width: 180
},
{ {
title: "垛机取/放货口", title: "垛机取/放货口",
field: "rcgwCode", field: "rcgwCode",
...@@ -211,14 +241,14 @@ ...@@ -211,14 +241,14 @@
type: 'input' type: 'input'
} }
], ],
[ [{
{
label: '状态', label: '状态',
prop: 'zt', prop: 'zt',
span: 6, span: 6,
type: 'RelSelect', type: 'RelSelect',
typeConfig: { typeConfig: {
src: 'lxyl/wcs/lkrw/init/zt' src: 'lxyl/wcs/lkrw/init/zt',
multiple: true
} }
}, },
{ {
...@@ -244,6 +274,35 @@ ...@@ -244,6 +274,35 @@
type: 'input', type: 'input',
value: '' value: ''
}, },
],
[{
label: '物料信息',
prop: 'wlxxInfo',
span: 6,
type: 'input',
value: ''
},
{
label: '物料批号',
prop: 'wlph',
span: 6,
type: 'input',
value: ''
},
{
label: '物料描述',
prop: 'wlphSx01',
span: 6,
type: 'input',
value: ''
},
{
label: '制令号',
prop: 'zlh',
span: 6,
type: 'input',
value: ''
},
] ]
], ],
} }
...@@ -255,34 +314,34 @@ ...@@ -255,34 +314,34 @@
// demo(basePage){ // demo(basePage){
// } // }
start(ctx){ start(ctx) {
if(ctx.singleItem&&ctx.singleItem.id){ if (ctx.singleItem && ctx.singleItem.id) {
this.$post('lxyl/wcs/lkrw/start',{ this.$post('lxyl/wcs/lkrw/start', {
id:ctx.singleItem.id id: ctx.singleItem.id
}).then(res=>{ }).then(res => {
if(res.success){ if (res.success) {
this.$success('任务启动成功！') this.$success('任务启动成功！')
ctx.refresh() ctx.refresh()
} }
}) })
}else{ } else {
this.warning('请选择一条数据！') this.warning('请选择一条数据！')
} }
}, },
close(ctx){ close(ctx) {
if(ctx.singleItem&&ctx.singleItem.id){ if (ctx.singleItem && ctx.singleItem.id) {
this.$post('lxyl/wcs/lkrw/close',{ this.$post('lxyl/wcs/lkrw/close', {
id:ctx.singleItem.id id: ctx.singleItem.id
}).then(res=>{ }).then(res => {
if(res.success){ if (res.success) {
this.$success('任务关闭成功！') this.$success('任务关闭成功！')
ctx.refresh() ctx.refresh()
} }
}) })
}else{ } else {
this.warning('请选择一条数据！') this.warning('请选择一条数据！')
} }
......
src/views/ccgl/dpkb/lkkb/mx/mx1.vue
View file @ d8cebe1f
<template> <template>
<div class="full "> <div class="full">
<!-- 刻度表示-->
<div ref="infoBox" class="infoCar"> <div ref="infoBox" class="infoCar">
</div> </div>
<div class="full container"> <div class="full container">
<!-- 刻度x--> <!-- 刻度x-->
<div class="flex" <div class="flex"
style="position: absolute;top: 0px;color: #fff;line-height: 16px;font-size: 12px;padding-left: 14px;"> style="position: absolute;top: 0px;color: #fff;line-height: 16px;font-size: 12px;padding-left: 14px;">
...@@ -19,8 +19,9 @@ ...@@ -19,8 +19,9 @@
</div> </div>
</div> </div>
<div style="position: relative" @click='eclick(item)' :code='item.code' :item='JSON.stringify(item)' ref="mx1" <div @click='eclick(item)' :code='item.code' :item='JSON.stringify(item)' ref="mx1"
v-for="(item,index) in boxList" :key="item.code" class="box" :class="{ v-for="(item,index) in boxList" :key="item.code" class="box"
:class="{
yh:item.kczt=='U', yh:item.kczt=='U',
wh:item.kczt=='E', wh:item.kczt=='E',
dj:item.zt=='F', dj:item.zt=='F',
...@@ -30,7 +31,8 @@ ...@@ -30,7 +31,8 @@
yhyj:item.kczt=='U'&&item.cjzt=='Y', yhyj:item.kczt=='U'&&item.cjzt=='Y',
yhyjsd:item.kczt=='U'&&item.cjzt=='Y'&&item.zt=='L', yhyjsd:item.kczt=='U'&&item.cjzt=='Y'&&item.zt=='L',
yhyjdj:item.kczt=='U'&&item.cjzt=='Y'&&item.zt=='F', yhyjdj:item.kczt=='U'&&item.cjzt=='Y'&&item.zt=='F',
}"> }"
>
<!-- {{item.code}} --> <!-- {{item.code}} -->
</div> </div>
</div> </div>
...@@ -60,7 +62,7 @@ ...@@ -60,7 +62,7 @@
}, },
getBoxList() { getBoxList() {
this.$post('lxyl/cxfx/kw/query', { this.$post('lxyl/cxfx/kw/query', {
hjCode: 'HJ1', hjCode:'HJ1',
kwx: '1' kwx: '1'
}).then(res => { }).then(res => {
if (res.data.records) { if (res.data.records) {
...@@ -88,10 +90,8 @@ ...@@ -88,10 +90,8 @@
` `
$(infoBox).empty() $(infoBox).empty()
$(infoBox).append(content) $(infoBox).append(content)
infoBox.style.top = event.clientY > 400 ? ((event.layerY - 125) + 'px') : ((event infoBox.style.top = event.clientY>400?((event.layerY - 125) + 'px'):((event.layerY + 40) + 'px'); // 信息框距离顶部10像素
.layerY + 40) + 'px'); // 信息框距离顶部10像素 infoBox.style.left =event.clientX>800?((event.layerX - 125) + 'px'):((event.layerX + 40) + 'px'); // 信息框距离左侧10像素
infoBox.style.left = event.clientX > 800 ? ((event.layerX - 125) + 'px') : ((event
.layerX + 40) + 'px'); // 信息框距离左侧10像素
infoBox.style.display = 'block'; infoBox.style.display = 'block';
}); });
element.addEventListener('mouseout', function(event) { element.addEventListener('mouseout', function(event) {
......
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