Skip to content

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

库存验货前端调整

parent 8c1c7464
Hide whitespace changes
Inline Side-by-side
Showing with 214 additions and 65 deletions
src/views/ccgl/ckgl/lkckrw/top/akck.vue
View file @ 6d9425ff
...@@ -68,21 +68,24 @@ ...@@ -68,21 +68,24 @@
url: 'lxyl/ckgl/ckrw/lkck/query/kc', url: 'lxyl/ckgl/ckrw/lkck/query/kc',
queryUrl: 'lxyl/ckgl/ckrw/lkck/query/kc', queryUrl: 'lxyl/ckgl/ckrw/lkck/query/kc',
tableTitle: [{ tableTitle: [{
title: "库位", title: "仓库",
field: "kwCode", field: "ckName",
width: 100, width: 140
}, },
{ {
title: "容器", title: "库位",
field: "rqCode", field: "kwCode",
width: 160, width: 140
}, },
{ {
title: "唯一码", title: "唯一码",
field: "packCode", field: "packCode",
width: 180, width: 140
},
{
title: "容器",
field: "rqCode",
width: 140
}, },
{ {
title: "物料编码", title: "物料编码",
...@@ -92,49 +95,42 @@ ...@@ -92,49 +95,42 @@
{ {
title: "物料名称", title: "物料名称",
field: "wlxxName", field: "wlxxName",
width: 160 width: 140
}, },
{ {
title: "规格", title: "物料规格",
field: "wlxxGg", field: "wlxxGg",
width: 140 width: 140
}, },
{ {
title: "库存数量", title: "制令号",
field: "kcsl", field: "zlh",
width: 120, width: 180
fieldType: 'float'
}, },
{ {
title: "物料批号", title: "物料批号",
field: "wlph", field: "wlph",
width: 140, width: 180
}, },
{ {
title: "计量单位", title: "货主",
field: "jldwName", field: "hzName",
width: 140 width: 140
}, },
// {
// title: "库位名称",
// field: "wlxxName",
// width: 120,
// },
{ {
title: "制令号", title: "数量",
field: "zlh", field: "sl",
width: 180, width: 140
}, },
{
// { title: "维护人",
// title: "货主", field: "whr"
// field: "hzName", },
// width: 180, {
// }, title: "维护时间",
field: "whsj",
fieldType: 'ftDateTime'
}
], ],
queryParams: [ queryParams: [
[ [
......
src/views/ccgl/zlgl/kcyhd/mx.vue
View file @ 6d9425ff
<template> <template>
<BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" <BasePage @getRow='getRow' ref="basePage" :power='power' :toolButton='false' class="min_full" style="height: 100%;"
style="height: 100%;" :autoQuery='false' :config="config"> :autoQuery='false' :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
</template> </template>
...@@ -35,6 +35,27 @@ ...@@ -35,6 +35,27 @@
url: 'lxyl/ukcyhd', url: 'lxyl/ukcyhd',
queryUrl: 'lxyl/ukcyhd/query/detail', queryUrl: 'lxyl/ukcyhd/query/detail',
tableTitle: [{ tableTitle: [{
title: "下架状态",
field: "zt",
width: 100,
transform: {
"url": "lxyl/wcszy/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "上架状态",
field: "sjzt",
width: 100,
transform: {
"url": "lxyl/wcszy/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
width: 140 width: 140
......
src/views/ccgl/zlgl/kcyhd/top/add.vue
View file @ 6d9425ff
<template> <template>
<DefaultDialog :app='app'> <DefaultDialog :app='app'>
<div slot="form" style="display: flex;height: 70vh;"> <div slot="form" style="display: flex;height: 70vh;">
<BasePage ref="basePage" :toolButton='false' :power='power' class="min_full" style="height: 100%;" <BasePage :toolButtonConfig="{
showExcel:false,
showPrint:false,
showField:true
}" :changeQueryParams='changeQueryParams' ref="basePage" :toolButton='false' :power='power' class="min_full" style="height: 100%;"
:config="config" /> :config="config" />
</div> </div>
<div slot="reFooter" class="refooter"> <div slot="reFooter" class="refooter">
...@@ -51,8 +55,8 @@ ...@@ -51,8 +55,8 @@
/* Dialog*/ /* Dialog*/
// queryDetail: true, // queryDetail: true,
/* 基本配置*/ /* 基本配置*/
url: 'lxyl/zlgl/kccj/queryZkPackOrRq', url: 'lxyl/ckgl/ckrw/lkck/query/kc',
queryUrl: 'lxyl/zlgl/kccj/queryZkPackOrRq', queryUrl: 'lxyl/ckgl/ckrw/lkck/query/kc',
tableTitle: [{ tableTitle: [{
title: "仓库", title: "仓库",
field: "ckName", field: "ckName",
...@@ -119,34 +123,54 @@ ...@@ -119,34 +123,54 @@
} }
], ],
queryParams: [ queryParams: [
[{ [
{
label: "仓库",
prop: "ckid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "lxyl/jcsj/uck/ck/queryCjckid",
match: {
value: "id",
label: "name"
}
}
},
{
label: "巷道",
prop: "hjid",
span: 6,
type: "RelSelect",
value: "",
typeConfig: {
src: "wms/jcsj/hj/query",
}
},
{
label: '物料信息', label: '物料信息',
prop: 'wlxxInfo', prop: 'condition',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ {
label: '物料批号', label: '库位',
prop: 'wlphInfo', prop: 'kwInfo',
span: 6, span: 6,
type: 'input', type: 'input',
value: '' value: ''
}, },
{ ],
"label": "仓库", [
"prop": "ckid", {
"span": 6, label: '容器信息',
"type": "RelSelect", prop: 'rqInfos',
"value": "", span: 24,
"typeConfig": { type: 'input',
"src": "lxyl/jcsj/uck/ck/queryCjckid", value: ''
"match": { },
"value": "id",
"label": "name"
}
}
}
] ]
], ],
...@@ -157,6 +181,14 @@ ...@@ -157,6 +181,14 @@
} }
}, },
methods: { methods: {
changeQueryParams(queryParams){
let str=queryParams.rqInfos
let trimmedStr = str.replace(/\s/g, ''); // 使用正则表达式去除空格
trimmedStr=trimmedStr.replace(/，/s, ',')
let arr = trimmedStr.split(",");
queryParams.rqInfos=arr
console.log(queryParams.rqInfos)
},
save() { save() {
let list = this.$refs.basePage.$refs.TablePager.selectedList || [] let list = this.$refs.basePage.$refs.TablePager.selectedList || []
if (list.length != 0) { if (list.length != 0) {
......
src/views/ccgl/zlgl/kcyhd/top/index.vue
View file @ 6d9425ff
<template> <template>
<BasePage :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config"> <BasePage ref="basePage" :power='power' @getRow='getRow' class="min_full" style="height: 100%;" :config="config">
<template #dialog="ctx"> <template #dialog="ctx">
<!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 --> <!-- 嵌入默认页面额外弹框的插槽 ctx.pagePage来操作默认页面 -->
<Add :app='ctx.basePage' v-if="ctx.basePage.showDialog" /> <Add :app='ctx.basePage' v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='新增'" />
<Xzgw @saveGw='saveGw' :app='ctx.basePage' v-if="ctx.basePage.showDialog&&ctx.basePage.DialogTitle=='选择工位'" />
</template> </template>
<template #toolbar="ctx"> <template #toolbar="ctx">
<el-button v-if="ctx.basePage.powerObj['01']" @click="showAdd(ctx.basePage)" size='mini' type="primary">新增</el-button> <el-button v-if="ctx.basePage.powerObj['01']" @click="showAdd(ctx.basePage)" size='mini' type="primary">新增</el-button>
...@@ -17,6 +18,7 @@ ...@@ -17,6 +18,7 @@
<script> <script>
// import Edit from './edit.vue' // import Edit from './edit.vue'
import Add from './add.vue' import Add from './add.vue'
import Xzgw from './xzgw.vue'
export default { export default {
data() { data() {
return { return {
...@@ -103,7 +105,7 @@ ...@@ -103,7 +105,7 @@
getRow(val) { getRow(val) {
this.$emit('getRow', val) this.$emit('getRow', val)
}, },
cxjyrw(ctx) { /* cxjyrw(ctx) {
if (ctx.singleItem && ctx.singleItem.id) { if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', { this.$confirm('是否继续操作, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
...@@ -123,10 +125,25 @@ ...@@ -123,10 +125,25 @@
this.$warning('请选中一条数据') this.$warning('请选中一条数据')
} }
}, */
saveGw(form){
let ctx=this.$refs.basePage
this.$post('lxyl/ukcyhd/genXjrw', {
id: ctx.singleItem.id,
gwid:form.gwid
}).then(res => {
if (res.success) {
this.$success('操作成功')
ctx.refresh()
}
})
}, },
cjxjrw(ctx) { cjxjrw(ctx) {
if (ctx.singleItem && ctx.singleItem.id) { if (ctx.singleItem && ctx.singleItem.id) {
this.$confirm('是否继续操作, 是否继续?', '提示', { ctx.DialogTitle = '选择工位'
ctx.DialogWidth = '40vw'
ctx.showDialog = true
/* this.$confirm('是否继续操作, 是否继续?', '提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
type: 'warning' type: 'warning'
...@@ -139,7 +156,7 @@ ...@@ -139,7 +156,7 @@
ctx.refresh() ctx.refresh()
} }
}) })
}) }) */
} else { } else {
this.$warning('请选中一条数据') this.$warning('请选中一条数据')
} }
...@@ -147,7 +164,8 @@ ...@@ -147,7 +164,8 @@
} }
}, },
components: { components: {
Add Add,
Xzgw
// Edit // Edit
} }
......
src/views/ccgl/zlgl/kcyhd/top/xzgw.vue 0 → 100644
View file @ 6d9425ff
<template>
<DefaultDialog v-loading='isLoading' :element-loading-text="text" :app='app'>
<div slot="form" style="">
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this" class="editRow">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false "
v-for="(item,index) in editColItemList " :value="item.value" :span="item.span" :label="item.label"
v-if="(item.show==false)?false:true" :prop='item.prop' :key="item.prop" :type="item.type"
:typeConfig='item.typeConfig' :rule="item.rule" />
<!-- 额外数据 -->
</el-row>
</el-form>
</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 {
editMixin,
editMixin_expand
} from 'common'
export default {
mixins: [editMixin, editMixin_expand],
props: {
app: {
type: Object,
default: () => {
return {}
}
}
},
async mounted() {
/* 初始化数据 */
},
data() {
return {
isLoading: false,
text: '加载中',
readonly: false,
editColItemList: [{
label: '工位',
prop: 'gwid',
span: 24,
required: true,
type: 'RelSelect',
typeConfig: {
src: 'lxyl/common/queryXlk',
transform: {
value: 'id',
label: 'name'
}
}
},
]
}
},
methods: {
save() {
this.$refs['form'].validate((valid) => {
if (valid) {
this.$emit('saveGw',this.form)
this.app.showDialog=false
}
})
}
}
}
</script>
<style scoped>
</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