Commit 61e9e1bf authored by 李苏's avatar 李苏 💬

3.25调整

parent b2c261bc
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
}, },
{ {
title: "库位", title: "库位",
field: "rqName", field: "kwCode",
width: 140, width: 140,
}, },
{ {
......
...@@ -157,6 +157,11 @@ ...@@ -157,6 +157,11 @@
field: "wlxxName", field: "wlxxName",
width: 160 width: 160
}, },
{
title: "物料批号",
field: "wlph",
width: 160
},
{ {
title: "规格", title: "规格",
field: "wlxxGg", field: "wlxxGg",
......
<template> <template>
<BasePage :setFirstCurrent='false' :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config"> <BasePage ref="basePage" :setFirstCurrent='false' :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<!-- <el-button @click="demo(ctx.basePage)" size='mini' type="primary">直接入库</el-button> --> <el-button @click="ckmx(ctx.basePage)" size='mini' type="primary">查看所选清单</el-button>
</template> </template>
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
operateButtons: false, operateButtons: false,
workFlow: false, workFlow: false,
/* 表格 */ /* 表格 */
showSelection: false, showSelection: true,
saveSelected: false saveSelected: true
}, },
config: { config: {
queryDetail: true, queryDetail: true,
...@@ -151,6 +151,16 @@ ...@@ -151,6 +151,16 @@
}, },
methods: { methods: {
ckmx(){
let list =this.$refs.basePage.$refs.TablePager.selectedList||[]
if(list.length!=0){
/* 回填校验xxx是否相同*/
this.$emit('ckmx',list)
}else{
this.$warning('请至少勾选一条数据')
}
},
getRow(val){ getRow(val){
this.$emit('getRow',val) this.$emit('getRow',val)
} }
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="full"> <div class="full">
<el-tabs class="full" v-model="activeName"> <el-tabs class="full" v-model="activeName">
<el-tab-pane class="full" label="入库单" name="first"> <el-tab-pane class="full" label="入库单" name="first">
<Rkd @getRow='getRow' /> <Rkd @ckmx='ckmx' />
</el-tab-pane> </el-tab-pane>
<el-tab-pane class="full" label="入库清单" name="second"> <el-tab-pane class="full" label="入库清单" name="second">
<Rkqd ref="rkqd" /> <Rkqd ref="rkqd" />
...@@ -50,14 +50,12 @@ ...@@ -50,14 +50,12 @@
methods: { methods: {
save() { save() {
let list=this.$refs.rkqd.$refs.basePage.$refs.TablePager.selectedList||[] let list=this.$refs.rkqd.$refs.basePage.$refs.TablePager.selectedList||[]
if(list.length==0){ if(list.length==0){
this.$warning('请选择存在数据的入库单或者勾选入库清单') this.$warning('请选择存在数据的入库单或者勾选入库清单')
}else{ }else{
let obj={ let obj={
list:list, list:list,
row:this.row row:this.row[0]
} }
/* 判断库区是否一致*/ /* 判断库区是否一致*/
let kqList=list.map(item=>item.kqid||'null') let kqList=list.map(item=>item.kqid||'null')
...@@ -86,11 +84,11 @@ ...@@ -86,11 +84,11 @@
} }
// if() // if()
}, },
getRow(val) { ckmx(list) {
this.row=val this.row=list
this.$refs.rkqd.$refs.basePage.queryParams.mid = val.id this.$refs.rkqd.$refs.basePage.queryParams.mids = list.map(item=>item.id)
this.$refs.rkqd.$refs.basePage.$refs['TablePager'].pageQuery({ this.$refs.rkqd.$refs.basePage.$refs['TablePager'].pageQuery({
// setFirstCurrent: true
}) })
this.activeName = 'second' this.activeName = 'second'
......
...@@ -41,8 +41,13 @@ ...@@ -41,8 +41,13 @@
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/zlgl/kccj', url: 'lxyl/zlgl/kccj',
tableTitle: [{ tableTitle: [{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "重检单号", title: "重检单号",
field: "code", field: "djid",
width: 140 width: 140
}, },
{ {
......
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