Skip to content

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

库存重检新增重写

parent aaafd6c8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 796 additions and 171 deletions
src/views/ccgl/cxfx/sfhzcx/index.vue
View file @ 8f68344f
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
{ {
"label": "物料批号", "label": "物料批号",
"prop": "wlph", "prop": "phxx",
"span": 4, "span": 4,
"type": "input", "type": "input",
"value": "", "value": "",
......
src/views/ccgl/dpkb/lkkb/detail.vue 0 → 100644
View file @ 8f68344f
<template>
<DefaultDialog :appendToBody='false' :app='app'>
<div slot="form" style="display: flex;height: 70vh;">
<BasePage :showPagination='false' :setFirstCurrent='false' @basePageMounted='basePageMounted' :power='power' class="min_full" style="height: 100%;" :config="config">
</BasePage>
</div>
<!-- <div slot="reFooter" class="refooter" >
<span slot="footer" class="dialog-footer" >
<el-button @click="app.showDialog=false">取 消</el-button>
<el-button type="primary" @click="save()">保 存</el-button>
</span>
</div> -->
</DefaultDialog>
</template>
<script>
export default {
props: {
app: {
type: Object,
default: ()=>{
return {}
}
}
},
async mounted() {
},
data() {
return {
power: {
add: false,
copy: false,
/* 手动控制删除 */
delButton: false,
/* 手动控制编辑按钮权限 */
editButton: false,
/* 是否渲染右侧操作按钮 */
operateButtons: false,
/* 是否开启工作流按钮 */
workFlow: false,
/* 表格开启选择，以及记住选择 */
showSelection: false,
saveSelected: false
},
config: {
/* 基本配置*/
url: 'wms/cxfx/kwmx',
queryUrl:'wms/jcsj/kw/queryKwmx',
tableTitle: [
{
title: "容器编码",
field: "rqCode",
width: 140
},
{
title: "唯一码",
field: "packCode",
width: 140
},
{
title: "物料编码",
field: "wlxxCode",
width: 140
},
{
title: "物料名称",
field: "wlxxName",
width: 140
},
{
title: "规格",
field: "wlxxGg",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "制令号",
field: "zlh",
width: 140
},
{
title: "库存数量",
field: "kcsl",
width: 140
}
],
queryParams: [
],
/* 默认启停用 */
showqt:false,
}
}
},
methods: {
basePageMounted(ctx){
ctx.queryParams.kwid=this.app.nowSelect.id
}
}
}
</script>
<style scoped>
/deep/.el-dialog {
border: 2px solid #032d60;
-webkit-box-shadow: #07417a 0px 0px 10px;
-moz-box-shadow: #07417a 0px 0px 10px;
box-shadow: inset 0 0 30px #07417a;
background: url(./dimage/data08.png);
background-size: 100% 100%;
opacity: 1;
}
/deep/.toolButton{
display: none;
}
/deep/.el-dialog__title {
color: #fff;
}
.search-span {
color: #fff !important;
}
.min_full {
border: 0px solid !important;
}
.search {
border: 0px solid !important;
}
/deep/.el-table th.el-table__cell {
background-color: rgba(0, 0, 0, .2) !important;
color: #25c2da !important;
font-size: 13px !important;
font-weight: 500 !important;
}
/deep/.el-table tr {
background-color: rgba(0, 0, 0, .2) !important;
color: #25c2da !important;
font-size: 13px !important;
font-weight: 500 !important;
}
/deep/.el-table {
background-color: rgba(0, 0, 0, .2) !important;
}
</style>
src/views/ccgl/dpkb/lkkb/index.vue
View file @ 8f68344f
<template> <template>
<div ref='lkkb' class="min_full dbAllBody "> <div ref='lkkb' class="min_full dbAllBody ">
<Detail :app='this' v-if="showDialog" />
<!-- 绝对定位展示框--> <!-- 绝对定位展示框-->
<div ref="infoBox" class="infoCar"> <div ref="infoBox" class="infoCar">
</div> </div>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<b class="data-title-right">]</b> <b class="data-title-right">]</b>
</div> </div>
<div class="kwMain full "> <div class="kwMain full ">
<component ref="dynamic" class="full" :is="dynamicComponent"> <component @eclick='eclick' ref="dynamic" class="full" :is="dynamicComponent">
</component> </component>
</div> </div>
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
</template> </template>
<script> <script>
import Detail from './detail.vue'
/* mx集合*/ /* mx集合*/
import mx1 from './mx/mx1.vue'; import mx1 from './mx/mx1.vue';
import mx2 from './mx/mx2.vue'; import mx2 from './mx/mx2.vue';
...@@ -159,12 +160,9 @@ ...@@ -159,12 +160,9 @@
this.$nextTick(() => { this.$nextTick(() => {
$(this.$refs.lkkb).dblclick(() => { $(this.$refs.lkkb).dblclick(() => {
fullScreen(this.$refs.lkkb); fullScreen(this.$refs.lkkb);
}) })
}) })
}, },
computed: { computed: {
...@@ -172,6 +170,10 @@ ...@@ -172,6 +170,10 @@
}, },
data() { data() {
return { return {
showDialog:false,
DialogTitle:'详情',
DialogWidth:'75vw',
nowSelect:{},
dynamicComponent:'mx1', dynamicComponent:'mx1',
/* 排列*/ /* 排列*/
xdList1: [1, 2, 3, 4], xdList1: [1, 2, 3, 4],
...@@ -193,9 +195,16 @@ ...@@ -193,9 +195,16 @@
clearInterval(this.timer) clearInterval(this.timer)
}, },
methods: { methods: {
eclick(item){
this.nowSelect=item
this.DialogTitle=item.code
this.$nextTick(()=>{
this.showDialog=true
})
}
}, },
components: { components: {
Detail,
mx1,mx2,mx3,mx11 mx1,mx2,mx3,mx11
} }
...@@ -225,11 +234,11 @@ ...@@ -225,11 +234,11 @@
} }
::v-deep .sdkccj{ ::v-deep .sdkccj{
background-size: 100% 100%; background-size: 100% 100%;
background-image: url(./lkdp/sd.svg); background-image: url(./lkdp/jy.svg);
} }
::v-deep .djkccj{ ::v-deep .djkccj{
background-size: 100% 100%; background-size: 100% 100%;
background-image: url(./lkdp/dj.svg); background-image: url(./lkdp/jy.svg);
} }
.kwMain{ .kwMain{
......
src/views/ccgl/dpkb/lkkb/mx/mx1.vue
View file @ 8f68344f
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<div ref="infoBox" class="infoCar"> <div ref="infoBox" class="infoCar">
</div> </div>
<div class="full container"> <div class="full container">
<div ref="mx1" v-for="(item,index) in boxList" :key="item.code" class="box" :class="{ <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="{
yh:item.kczt=='U', wh:item.kczt=='E', dj:item.zt=='F', sd:item.zt=='L', kccj:item.cjzt=='Y' yh:item.kczt=='U', wh:item.kczt=='E', dj:item.zt=='F', sd:item.zt=='L', kccj:item.cjzt=='Y',sdkccj:item.cjzt=='Y'&&item.zt=='L',sdkccj:item.cjzt=='Y'&&item.zt=='F'
}" > }" >
<!-- {{item.code}} --> <!-- {{item.code}} -->
</div> </div>
...@@ -22,6 +22,9 @@ ...@@ -22,6 +22,9 @@
} }
}, },
methods:{ methods:{
eclick(item){
this.$emit('eclick',item)
},
getBoxList(){ getBoxList(){
this.$post('lxyl/cxfx/kw/query',{ this.$post('lxyl/cxfx/kw/query',{
hjCode :'HJ1', hjCode :'HJ1',
...@@ -34,19 +37,16 @@ ...@@ -34,19 +37,16 @@
var infoBox = this.$refs.infoBox var infoBox = this.$refs.infoBox
$(this.$refs.mx1).each((index, element) => { $(this.$refs.mx1).each((index, element) => {
element.addEventListener('mouseover', (event)=>{ element.addEventListener('mouseover', (event)=>{
console.log(event)
let info= this.boxList[index] let info= this.boxList[index]
let content = let content =
` `
<br /> <br />
名称:${info.code} 仓库编码:${info.ckCode}
<br />
状态:正常
<br /> <br />
数量:100 库区编码:${info.kqCode}
<br /> <br />
物料:测试code 库位编码:${info.code}
<br />` `
$(infoBox).empty() $(infoBox).empty()
$(infoBox).append(content) $(infoBox).append(content)
infoBox.style.top = (event.layerY + 25) + 'px'; // 信息框距离顶部10像素 infoBox.style.top = (event.layerY + 25) + 'px'; // 信息框距离顶部10像素
...@@ -105,6 +105,6 @@ ...@@ -105,6 +105,6 @@
top: 10px; top: 10px;
line-height: 16px; line-height: 16px;
height: 106px; height: 106px;
width: 130px width: 150px
} }
</style> </style>
src/views/ccgl/dpkb/lkkb/mx/mx11.vue
View file @ 8f68344f
This diff is collapsed.
src/views/ccgl/rkgl/rkd/mx.vue
View file @ 8f68344f
...@@ -96,11 +96,21 @@ ...@@ -96,11 +96,21 @@
field: "rksl", field: "rksl",
width: 100, width: 100,
}, },
// { {
// title: "过账数量", title: "检验数量",
// field: "gzsl", field: "jysl",
// width: 120, width: 100,
// }, },
{
title: "包装状态",
field: "bzzt",
width: 120,
"transform": {
"url": "lxyl/rkgl/rktz/init/bzzt",
"label": "name",
"value": "id"
}
},
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
......
src/views/ccgl/rkgl/rkd/top/index.vue
View file @ 8f68344f
...@@ -97,26 +97,26 @@ ...@@ -97,26 +97,26 @@
field: "ckName", field: "ckName",
width: 140 width: 140
}, },
{ // {
title: "码盘状态", // title: "码盘状态",
field: "mpzt", // field: "mpzt",
width: 100, // width: 100,
"transform": { // "transform": {
"url": "wms/rkgl/rktz/init/mpzt", // "url": "wms/rkgl/rktz/init/mpzt",
"label": "name", // "label": "name",
"value": "id" // "value": "id"
} // }
}, // },
{ // {
title: "包装状态", // title: "包装状态",
field: "bzzt", // field: "bzzt",
width: 100, // width: 100,
"transform": { // "transform": {
"url": "wms/rkgl/rktz/init/bzzt", // "url": "wms/rkgl/rktz/init/bzzt",
"label": "name", // "label": "name",
"value": "id" // "value": "id"
} // }
}, // },
// { // {
// title: "过账状态", // title: "过账状态",
// field: "gzzt", // field: "gzzt",
......
src/views/ccgl/zlgl/kccjd/top/add.vue
View file @ 8f68344f
<template> <template>
<DefaultDialog :app='app'> <BasePage :autoQuery='false' ref="basePage" :showPagination='false' :toolButton='false' :power='power' class="min_full" style="height: 100%;"
<div slot="form" style="display: flex;height: 70vh;">
<BasePage ref="basePage" :toolButton='false' :power='power' class="min_full" style="height: 100%;"
:config="config" /> :config="config" />
</div> </div>
<div slot="reFooter" class="refooter">
<span slot="footer" class="dialog-footer">
<el-button @click="app.showDialog=false">取 消</el-button>
<el-button type="primary" @click="save()">保 存</el-button>
</span>
</div>
</DefaultDialog>
</template> </template>
<script> <script>
import wlsx from 'common/src/mixin/wlphsx.js' import wlsx from 'common/src/mixin/wlphsx.js'
...@@ -43,8 +35,8 @@ ...@@ -43,8 +35,8 @@
/* 是否开启工作流按钮 */ /* 是否开启工作流按钮 */
workFlow: false, workFlow: false,
/* 表格开启选择，以及记住选择 */ /* 表格开启选择，以及记住选择 */
showSelection: true, showSelection: false,
saveSelected: true saveSelected: false
}, },
config: { config: {
...@@ -120,39 +112,39 @@ ...@@ -120,39 +112,39 @@
} }
], ],
queryParams: [ queryParams: [
[{ // [{
label: '物料信息', // label: '物料信息',
prop: 'wlxxInfo', // prop: 'wlxxInfo',
span: 4, // span: 4,
type: 'input', // type: 'input',
value: '' // value: ''
}, // },
{ // {
label: '物料批号', // label: '物料批号',
prop: 'wlphInfo', // prop: 'wlphInfo',
span: 4, // span: 4,
type: 'input', // type: 'input',
value: '' // value: ''
}, // },
{ // {
label: '检验日期', // label: '检验日期',
startProp: "jyrqStart", // startProp: "jyrqStart",
endProp: "jyrqEnd", // endProp: "jyrqEnd",
span: 8, // span: 8,
type: 'RelDaterangeV2', // type: 'RelDaterangeV2',
startValue: '', // startValue: '',
endValue: '', // endValue: '',
}, // },
{ // {
label: '过期日期', // label: '过期日期',
startProp: "gqrqStart", // startProp: "gqrqStart",
endProp: "gqrqEnd", // endProp: "gqrqEnd",
span: 8, // span: 8,
type: 'RelDaterangeV2', // type: 'RelDaterangeV2',
startValue: '', // startValue: '',
endValue: '', // endValue: '',
} // }
] // ]
], ],
/* 默认启停用 */ /* 默认启停用 */
...@@ -163,25 +155,7 @@ ...@@ -163,25 +155,7 @@
}, },
methods: { methods: {
save() { save() {
let list = this.$refs.basePage.$refs.TablePager.selectedList || []
if (list.length != 0) {
let ckList = list.map(item => item.ckid)
ckList = [...new Set(ckList)]
if (ckList.length == 1) {
this.$post('lxyl/zlgl/kccj/doGenerate', list).then(res => {
if (res.success) {
this.app.showDialog = false
this.app.refresh()
}
})
} else {
this.$warning('只能勾选相同仓库的数据进行操作')
}
} else {
this.$warning('请至少勾选一条数据')
}
} }
} }
} }
......
src/views/ccgl/zlgl/kccjd/top/addAll.vue 0 → 100644
View file @ 8f68344f
<template>
</template>
<script>
</script>
<template>
<DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;">
<div class="full">
<el-tabs class="full" v-model="activeName">
<el-tab-pane class="full" label="汇总" name="first">
<Wlxx @getRow='getRow' />
</el-tab-pane>
<el-tab-pane class="full" label="明细" name="second">
<Add ref="add" />
</el-tab-pane>
</el-tabs>
</div>
</div>
<div slot="reFooter" class="refooter">
<span slot="footer" class="dialog-footer">
<el-button @click="app.showDialog=false">取 消</el-button>
<el-button type="primary" @click="save()">保 存</el-button>
</span>
</div>
</DefaultDialog>
</template>
<script>
import Wlxx from './wlxx.vue'
import Add from './add.vue'
export default {
components: {
Wlxx,
Add
},
props: {
app: {
type: Object,
default: () => {
return {}
}
}
},
async mounted() {
},
data() {
return {
row:{},
activeName: 'first'
}
},
methods: {
save() {
let list = this.$refs.add.$refs.basePage.tabData || []
if (list.length != 0) {
let ckList = list.map(item => item.ckid)
ckList = [...new Set(ckList)]
if (ckList.length == 1) {
this.$post('lxyl/zlgl/kccj/doGenerate', list).then(res => {
if (res.success) {
this.$success('操作成功')
this.app.showDialog = false
this.app.refresh()
}
})
} else {
this.$warning('只能勾选相同仓库的数据进行操作')
}
} else {
this.$warning('请至少勾选一条数据')
}
// if()
},
getRow(val) {
this.row=val
this.$refs.add.$refs.basePage.queryParams.ckid = val.ckid
this.$refs.add.$refs.basePage.queryParams.wild = val.wild
this.$refs.add.$refs.basePage.queryParams.wlph = val.wlph
this.$refs.add.$refs.basePage.$refs['TablePager'].pageQuery({
// setFirstCurrent: true
})
this.activeName = 'second'
}
}
}
</script>
<style scoped>
::v-deep .el-tabs__content {
height: calc(100% - 50px);
}
::v-deep .el-tabs__nav-scroll {
padding-left: 10px;
}
</style>
<style>
</style>
src/views/ccgl/zlgl/kccjd/top/index.vue
View file @ 8f68344f
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<script> <script>
// import Edit from './edit.vue' // import Edit from './edit.vue'
import Add from './add.vue' import Add from './addAll.vue'
export default { export default {
data() { data() {
return { return {
......
src/views/ccgl/zlgl/kccjd/top/wlxx.vue 0 → 100644
View file @ 8f68344f
<template>
<BasePage :setFirstCurrent='false' :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
<template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template>
<template #toolbar="ctx">
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">直接入库</el-button> -->
</template>
</BasePage>
</template>
<script>
// import Edit from './edit.vue'
export default {
data() {
return {
power:{
add: false,
copy: false,
delButton: false,
editButton: false,
operateButtons: false,
workFlow: false,
/* 表格 */
showSelection: false,
saveSelected: false
},
config: {
queryDetail: true,
/* 基本配置*/
url: 'lxyl/zlgl/kccj/queryKccjKchz',
queryUrl:'lxyl/zlgl/kccj/queryKccjKchz',
tableTitle: [
{
title: "仓库编码",
field: "ckCode",
width: 140
},
{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "物料编码",
field: "wlCode",
width: 140
},
{
title: "物料名称",
field: "wlName",
width: 140
},
{
title: "物料批号",
field: "wlph",
width: 140
},
{
title: "生产日期",
field: "scrq",
fieldType: 'ftDate'
},
{
title: "过期日期",
field: "gqrq",
fieldType: 'ftDate'
},
{
title: "检验日期",
field: "jyrq",
fieldType: 'ftDate'
},
{
title: "物料描述",
field: "wlms",
width: 240
}
],
queryParams: [
[{
label: '日期',
startProp: "begin",
endProp: "end",
span: 8,
type: 'RelDaterangeV2',
startValue: new Date().getTime()-1000*60*60*24*30,
endValue:new Date().getTime(),
},
{
label: '物料批号',
prop: 'wlph',
span: 6,
type: 'input',
value: ''
},
{
label: '物料编码',
prop: 'wlcode',
span: 6,
type: 'input',
value: ''
}
]
],
/* 默认启停用 */
}
}
},
methods: {
getRow(val){
this.$emit('getRow',val)
}
},
components: {
// Edit
}
}
</script>
<style>
</style>
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