Skip to content

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

码盘调整

parent 6ffe60e8
Show whitespace changes
Inline Side-by-side
Showing with 175 additions and 217 deletions
src/views/ccgl/kngl/zlhbg/top/index.vue
View file @ f1a85900
......@@ -19,73 +19,31 @@
queryDetail: true,
/* 基本配置*/
url: 'lxyl/kcgl/zlhbg',
tableTitle: [
{
tableTitle: [{
title: "变更单号",
field: "bgdh",
width: 140
},
{
title: "变更日期",
field: "bgrq",
fieldType: 'ftDate'
},
{
title: "SAP变更类型",
field: "sapbglx",
fieldType: 'ftDate'
},
{
title: "入库单号",
field: "djid",
width: 140
},
{
title: "入库日期",
title: "变更日期",
field: "ywrq",
fieldType: 'ftDate'
},
{
title: "入库人",
field: "rkr",
width: 140
},
{
title: "事务类型",
field: "swlxName",
width: 100
},
{
title: "仓库",
field: "ckid",
width: 140,
hidden: true
},
{
title: "仓库",
field: "ckName",
width: 140
},
{
title: "入库部门",
field: "bmName",
title: "SAP变更类型",
field: "bglx",
width: 140
},
{
title: "单据来源",
field: "djly",
width: 140,
title: "状态",
field: "zt",
width: 100,
"transform": {
"url": "wms/rkgl/rktz/init/djly",
"url": "lxyl/kcgl/zlhbg/init/zt",
"label": "name",
"value": "id"
}
},
// {
// title: "来源单据号",
// field: "lydjDjid",
// width: 140
// },
{
title: "备注",
field: "bz",
......@@ -108,8 +66,8 @@
endProp: "end",
span: 8,
type: 'RelDaterangeV2',
startValue: new Date().getTime()-1000*60*60*24*30,
endValue:new Date().getTime(),
startValue: new Date().getTime() - 1000 * 60 * 60 * 24 * 30,
endValue: new Date().getTime(),
},
{
"label": "仓库",
......@@ -126,34 +84,21 @@
}
},
{
label: '单据编号',
label: '变更单号',
prop: 'djid',
span: 6,
type: 'input',
value: ''
}
],[
{
label: '状态',
prop: 'zt',
span: 6,
type: 'RelSelect',
typeConfig: {
src: 'wms/rkgl/rktz/init/zt'
}
},
{
label: '事务类型',
prop: 'swlxid',
span: 6,
type: 'RelSelect',
typeConfig: {
src: 'wms/rkgl/rktz/init/swlx'
}
label: '负责人',
prop: 'fzr',
span: 4,
type: 'input',
value: ''
}
]
],
/* 默认启停用 */
......@@ -162,8 +107,8 @@
},
methods: {
getRow(val){
this.$emit('getRow',val)
getRow(val) {
this.$emit('getRow', val)
}
},
components: {
......
src/views/ccgl/rkgl/mpzy/top/edit.vue
View file @ f1a85900
......@@ -97,7 +97,6 @@
this.$warning('请选择一条入库单')
} else {
this.showDialog = true
console.log(this.form.lydjid)
/* 开启弹框*/
}
},
......
src/views/ccgl/rkgl/mpzy/top/mp.vue
View file @ f1a85900
......@@ -27,19 +27,21 @@
label:'packCode'}" :match="{
label:'packCode',
value:'packid'
}" code='WMSBZGLMX' :form='form' />
}" :queryParams='{
id:app.app.singleItem.id
}' code='WMSBZGLMXMPZY' :form='form' />
</div>
</el-col>
</el-row>
<!-- -->
</div>
<EditTable staticHeader ref="editTable" :app='editTableConfig' >
<EditTable staticHeader ref="editTable" :app='editTableConfig'>
<template slot="tabCustom">
<el-table-column label="操作" width="90" header-align="center" fixed="right" >
<el-table-column label="操作" width="90" header-align="center" fixed="right">
<template slot-scope="scope">
<el-button style="text-align: center;color: red;width: 100%;"
@click.native.prevent="del(scope.$index)" type="text" size="small">
<el-button style="text-align: center;color: red;width: 100%;" @click.native.prevent="del(scope.$index)"
type="text" size="small">
<i class="el-icon-delete"></i>删除
</el-button>
</template>
......@@ -80,9 +82,8 @@
},
data() {
return {
editTableConfig:{
editTableTitle:[
{
editTableConfig: {
editTableTitle: [{
label: "容器",
prop: "rqCode",
width: 170
......@@ -123,13 +124,13 @@
width: 240
}
],
editTableData:[]
editTableData: []
},
form: {
rqid: '',
rqCode: '',
id:'',
code:''
id: '',
code: ''
}
......@@ -137,76 +138,89 @@
},
methods: {
/* 重新渲染表格 */
del(index){
del(index) {
this.editTableConfig.editTableData.splice(index,1)
this.editTableConfig.editTableData.splice(index, 1)
},
save() {
if(
this.editTableConfig.editTableData.length>0
){
let list =this.editTableConfig.editTableData||[]
list.forEach(item=>item.mpsl=item.sl)
this.$emit('save',list)
this.app.showDialog=false
if (
this.editTableConfig.editTableData.length > 0
) {
let list = this.editTableConfig.editTableData || []
list.forEach(item => item.mpsl = item.sl)
this.$emit('save', list)
this.app.showDialog = false
/* 触发传递事件*/
}else{
} else {
this.$warning('请添加数据后保存')
}
},
search() {
/* 卡下数据*/
if (this.form.packCode&&this.form.rqid) {
if (this.form.packCode && this.form.rqid) {
// this.$refs.basePage.queryParams.code = this.form.packCode
// this.$refs.basePage.refresh()
/* 查询*/
let params={
code:this.form.packCode
}
this.$post('wms/common/queryPackmxByCode',params).then(res=>{
if(res.success){
let list=res.data.records||[]
this.$post('wms/rkgl/mpzy/checkRqAndPack', {
id: this.app.app.singleItem.id,
rqid: this.form.rqid,
packid: this.form.packid
}).then(res => {
if (res.success) {
this.$post('wms/common/queryPackmxByCode', params).then(res => {
if (res.success) {
let list = res.data.records || []
/* 判定1*/
if(list.length==0){
if (list.length == 0) {
this.$warning('暂未查询到数据')
}else{
let newList=list.map(item=>{
item.rqid=this.form.rqid
item.rqCode=this.form.rqCode
item.lydjid=item.id
} else {
let newList = list.map(item => {
item.rqid = this.form.rqid
item.rqCode = this.form.rqCode
item.lydjid = item.id
delete item.id
return item
})
/* 判定重复*/
let iscf=false
let lydjidList=this.editTableConfig.editTableData.map(item=>item.lydjid)
newList.forEach(item=>{
if(lydjidList.includes(item.lydjid)){
iscf=true
}else{
let iscf = false
let lydjidList = this.editTableConfig.editTableData.map(item => item.lydjid)
newList.forEach(item => {
if (lydjidList.includes(item.lydjid)) {
iscf = true
} else {
this.editTableConfig.editTableData.push(_.cloneDeep(item))
}
})
/* 添加完毕要做的*/
if(iscf){
if (iscf) {
this.$warning('存在重复数据,已自动过滤')
}
/* 清除数据*/
this.form['rqCode']=''
this.form['rqid']=''
this.form['packid']=''
this.form['packCode']=''
this.form['rqCode'] = ''
this.form['rqid'] = ''
this.form['packid'] = ''
this.form['packCode'] = ''
this.$forceUpdate()
}
}
})
}
})
let params = {
code: this.form.packCode
}
} else {
this.$warning('请选择唯一码和容器')
}
}
}
}
......
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