Skip to content

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

113 debug

parent ff4453a8
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 44 deletions
src/views/ccgl/rkgl/rkd/top/edit.vue
View file @ fba83011
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules"> <el-form slot="form" ref="form" :model="form" label-width="100px" :rules="rules">
<el-row :gutter="20" :app="this" class="editRow"> <el-row :gutter="20" :app="this" class="editRow">
<EditColItem :required="item.required||false" :readonly="item.readonly?true:false " <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-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" /> :prop='item.prop' :key="item.prop" :type="item.type" :typeConfig='item.typeConfig' :rule="item.rule" />
<!-- 额外数据 --> <!-- 额外数据 -->
</el-row> </el-row>
...@@ -193,10 +193,18 @@ ...@@ -193,10 +193,18 @@
} }
} }
}, },
{
label: '供应商',
prop: 'gysid',
span: 8,
type: 'input',
readonly:true,
show:this.type=='view'?true:false
},
{ {
label: '备注', label: '备注',
prop: 'bz', prop: 'bz',
span: 24, span: this.type=='view'?16:24,
type: 'input', type: 'input',
}, },
......
src/views/ccgl/rkgl/rkdj/index.vue
View file @ fba83011
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
}, },
{title: "部门", field: "bmName", width: 130}, {title: "部门", field: "bmName", width: 130},
{title: "入库人", field: "jsr", width: 120}, {title: "入库人", field: "jsr", width: 120},
{title: "来源单号", field: "lydjCode", width: 120}, // {title: "来源单号", field: "lydjCode", width: 120},
{title: "保管员", field: "bgy", width: 120}, {title: "保管员", field: "bgy", width: 120},
{title: "入库单号", field: "lydjid", width: 140, {title: "入库单号", field: "lydjid", width: 140,
formatter(a, b, c) { formatter(a, b, c) {
...@@ -93,7 +93,7 @@ ...@@ -93,7 +93,7 @@
}, },
{ {
label: '来源单号', label: '来源单号',
prop: 'lydh', prop: 'sjtzDjid',
span: 4, span: 4,
type: 'input', type: 'input',
value: '' value: ''
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
}, },
methods: { methods: {
/* 示例*/ /* 示例*/
// demo(basePage){ // demo(basePage){
......
src/views/ccgl/rkgl/sjrw/mx.vue
View file @ fba83011
...@@ -36,7 +36,18 @@ ...@@ -36,7 +36,18 @@
/* 基本配置*/ /* 基本配置*/
url: 'wms/rkgl/sjtz', url: 'wms/rkgl/sjtz',
queryUrl: 'wms/rkgl/sjtz/query/detail', queryUrl: 'wms/rkgl/sjtz/query/detail',
tableTitle: [{ tableTitle: [
{
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/sjtz/init/zt",
"label": "name",
"value": "id"
}
},
{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
fieldType: "upper", fieldType: "upper",
...@@ -92,25 +103,16 @@ ...@@ -92,25 +103,16 @@
field: "sjsl", field: "sjsl",
width: 100, width: 100,
}, },
{ // {
title: "入库数量", // title: "入库数量",
field: "rksl", // field: "rksl",
width: 100, // width: 100,
}, { // }, {
title: "过账数量", // title: "过账数量",
field: "gzsl", // field: "gzsl",
width: 100, // width: 100,
}, // },
{
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/sjtz/init/zt",
"label": "name",
"value": "id"
}
}
], ],
queryParams: [], queryParams: [],
......
src/views/ccgl/rkgl/sjrw/sjhz.vue
View file @ fba83011
...@@ -65,6 +65,11 @@ ...@@ -65,6 +65,11 @@
field: "kwName", field: "kwName",
width: 140 width: 140
}, },
{
title: "实际库位",
field: "sjkwName",
width: 140
},
{ {
title: "状态", title: "状态",
field: "zt", field: "zt",
......
src/views/ccgl/rkgl/sjrw/top/edit.vue
View file @ fba83011
...@@ -68,7 +68,17 @@ ...@@ -68,7 +68,17 @@
delete item.id delete item.id
this.formDetail.push(_.cloneDeep(item)) this.formDetail.push(_.cloneDeep(item))
}) })
// 回填上架人
this.$post('lxyl/rkgl/sjtz/default/sjr',{
ckid:row.ckid,
hzid:list[0].hzid,
wlid:list[0].wlid,
}).then(res=>{
if(res.success){
this.form.sjrName=res.data.records.username
this.form.sjrid=res.data.records.id
}
})
}, },
xzrkqd(){ xzrkqd(){
this.showDialog=true this.showDialog=true
...@@ -181,23 +191,23 @@ ...@@ -181,23 +191,23 @@
value: new Date().getTime(), value: new Date().getTime(),
"required": true, "required": true,
}, },
// { {
// label: '上架人', label: '上架人',
// prop: 'sjrid', prop: 'sjrid',
// span: 8, span: 8,
// "required": true, "required": true,
// type: 'AuxInput', type: 'AuxInput',
// typeConfig: { typeConfig: {
// code: 'USER', code: 'USER',
// label: 'sjrName', label: 'sjrName',
// transform: { transform: {
// value: 'id', value: 'id',
// label: 'username' label: 'username'
// } }
// }, },
// }, },
// { // {
// label: '单据来源', // label: '单据来源',
// prop: 'djlyName', // prop: 'djlyName',
......
src/views/ccgl/rkgl/sjrw/top/rkqd.vue
View file @ fba83011
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
config: { config: {
/* 基本配置*/ /* 基本配置*/
url: 'wms/rkgl/rktz', url: 'wms/rkgl/rktz',
queryUrl: 'wms/rkgl/sjtz/query/rktzqd', queryUrl: 'lxyl/rkgl/sjtz/query/rktzqd',
tableTitle: [{ tableTitle: [{
title: "物料编码", title: "物料编码",
field: "wlxxCode", field: "wlxxCode",
...@@ -61,6 +61,11 @@ ...@@ -61,6 +61,11 @@
field: "wlph", field: "wlph",
width: 180 width: 180
}, },
{
title: "物料组",
field: "wlzName",
width: 180
},
{ {
title: "制令号", title: "制令号",
field: "zlh", field: "zlh",
......
src/views/ccgl/rkgl/sjrw/top/xzrkqd.vue
View file @ fba83011
...@@ -59,8 +59,23 @@ ...@@ -59,8 +59,23 @@
list:list, list:list,
row:this.row row:this.row
} }
this.$emit('save',obj) /* 判定list wlid是否重复*/
this.app.showDialog=false let wlzList=list.map(item=>item.wlxxWlzid)
wlzList=[...new Set(wlzList)]
if(wlzList.length>1){
this.$confirm('选择的物料组不唯一，系统随机其中一个物料组的仓管员，是否确认?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(res=>{
this.$emit('save',obj)
this.app.showDialog=false
})
}else{
this.$emit('save',obj)
this.app.showDialog=false
}
} }
// if() // if()
}, },
......
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