|
|
|
@ -26,7 +26,7 @@ |
|
|
|
<div class="avue-crud__left"> |
|
|
|
<div class="avue-crud__left"> |
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button> |
|
|
|
<!-- <el-button type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button> |
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>--> |
|
|
|
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派配货信息</el-button> |
|
|
|
<el-button type="primary" text icon="el-icon-edit" @click="handleForklift" >指派备货信息</el-button> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<!-- 头部右侧按钮模块 --> |
|
|
|
<div class="avue-crud__right"> |
|
|
|
<div class="avue-crud__right"> |
|
|
|
@ -75,7 +75,7 @@ |
|
|
|
</el-pagination> |
|
|
|
</el-pagination> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</el-row> |
|
|
|
</el-row> |
|
|
|
<el-dialog v-model="dialogFormCustomer" title="指派叉车"> |
|
|
|
<el-dialog v-model="dialogFormCustomer" title="指派备货信息"> |
|
|
|
<el-form :model="form"> |
|
|
|
<el-form :model="form"> |
|
|
|
<el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'"> |
|
|
|
<el-form-item label="备货时间" :label-width="formLabelWidth" v-if="this.num=='2'"> |
|
|
|
<el-date-picker style="width: 25%;" |
|
|
|
<el-date-picker style="width: 25%;" |
|
|
|
@ -116,6 +116,9 @@ |
|
|
|
</el-option> |
|
|
|
</el-option> |
|
|
|
</el-select> |
|
|
|
</el-select> |
|
|
|
</el-form-item> |
|
|
|
</el-form-item> |
|
|
|
|
|
|
|
<el-form-item label="出库时间" prop="outboundDate" :label-width="formLabelWidth"> |
|
|
|
|
|
|
|
<el-date-picker v-model="form.outboundDate" type="datetime" value-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择出库时间" style="width: 26%"></el-date-picker> |
|
|
|
|
|
|
|
</el-form-item> |
|
|
|
</el-form> |
|
|
|
</el-form> |
|
|
|
<template #footer> |
|
|
|
<template #footer> |
|
|
|
<span class="dialog-footer"> |
|
|
|
<span class="dialog-footer"> |
|
|
|
@ -248,6 +251,17 @@ export default { |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
head: false, |
|
|
|
head: false, |
|
|
|
}, |
|
|
|
}, |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
prop: 'stockupDate', |
|
|
|
|
|
|
|
label: '出库时间', |
|
|
|
|
|
|
|
type: 4, |
|
|
|
|
|
|
|
values: '', |
|
|
|
|
|
|
|
width: '150', |
|
|
|
|
|
|
|
checkarr: [], |
|
|
|
|
|
|
|
fixed: true, |
|
|
|
|
|
|
|
sortable: true, |
|
|
|
|
|
|
|
head: false, |
|
|
|
|
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'stockupUser', |
|
|
|
prop: 'stockupUser', |
|
|
|
label: '备货人', |
|
|
|
label: '备货人', |
|
|
|
@ -316,7 +330,7 @@ export default { |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'stockipAllocation', |
|
|
|
prop: 'stockipAllocation', |
|
|
|
label: '备货库位', |
|
|
|
label: '所在库位', |
|
|
|
type: 2, |
|
|
|
type: 2, |
|
|
|
values: '', |
|
|
|
values: '', |
|
|
|
width: '150', |
|
|
|
width: '150', |
|
|
|
@ -345,7 +359,7 @@ export default { |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
}, |
|
|
|
{ |
|
|
|
/*{ |
|
|
|
prop: 'typeServiceName', |
|
|
|
prop: 'typeServiceName', |
|
|
|
label: '服务类型', |
|
|
|
label: '服务类型', |
|
|
|
type: 3, |
|
|
|
type: 3, |
|
|
|
@ -354,7 +368,7 @@ export default { |
|
|
|
checkarr: [], |
|
|
|
checkarr: [], |
|
|
|
fixed: false, |
|
|
|
fixed: false, |
|
|
|
sortable: true, |
|
|
|
sortable: true, |
|
|
|
}, |
|
|
|
},*/ |
|
|
|
{ |
|
|
|
{ |
|
|
|
prop: 'loaderName', |
|
|
|
prop: 'loaderName', |
|
|
|
label: '装卸班组', |
|
|
|
label: '装卸班组', |
|
|
|
@ -713,7 +727,7 @@ export default { |
|
|
|
this.dialogFormCustomer = false; |
|
|
|
this.dialogFormCustomer = false; |
|
|
|
}) |
|
|
|
}) |
|
|
|
}else if(this.num == '2'){ |
|
|
|
}else if(this.num == '2'){ |
|
|
|
console.log(">>>>>>>",this.formOne); |
|
|
|
console.log("修改提交",this.formOne); |
|
|
|
update(Object.assign(this.formOne,this.form)).then(res =>{ |
|
|
|
update(Object.assign(this.formOne,this.form)).then(res =>{ |
|
|
|
console.log(">>>>>>>",this.formOne); |
|
|
|
console.log(">>>>>>>",this.formOne); |
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
@ -732,12 +746,13 @@ export default { |
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
getDictionaryBiz('distribution_type').then(res => { |
|
|
|
// console.log("8908098080",res.data.data); |
|
|
|
// console.log("8908098080",res.data.data); |
|
|
|
this.distributionType = res.data.data; |
|
|
|
this.distributionType = res.data.data; |
|
|
|
this.columnList[8].checkarr =res.data.data.map(item=>{ |
|
|
|
// this.columnList[8].checkarr =res.data.data.map(item=>{ |
|
|
|
item.value=item.dictKey |
|
|
|
// item.value=item.dictKey |
|
|
|
item.label=item.dictValue |
|
|
|
// item.label=item.dictValue |
|
|
|
return item |
|
|
|
// return item |
|
|
|
}); |
|
|
|
// }); |
|
|
|
}); |
|
|
|
}); |
|
|
|
|
|
|
|
|
|
|
|
this.onLoad(this.page); |
|
|
|
this.onLoad(this.page); |
|
|
|
}, |
|
|
|
}, |
|
|
|
searchHide () { |
|
|
|
searchHide () { |
|
|
|
@ -884,23 +899,23 @@ export default { |
|
|
|
let a = await getUser(i.forkliftId); |
|
|
|
let a = await getUser(i.forkliftId); |
|
|
|
i.forkliftId =a.data.data.name; |
|
|
|
i.forkliftId =a.data.data.name; |
|
|
|
}*/ |
|
|
|
}*/ |
|
|
|
let s =this.distributionType.find(d => d.dictKey == i.typeService); |
|
|
|
// let s =this.distributionType.find(d => d.dictKey == i.typeService); |
|
|
|
// console.log("sssss",s); |
|
|
|
// // console.log("sssss",s); |
|
|
|
i.typeServiceName = s.dictValue; |
|
|
|
// i.typeServiceName = s.dictValue; |
|
|
|
i.loader = i.groupName; |
|
|
|
i.loader = i.groupName; |
|
|
|
i.stockupArea = i.headline; |
|
|
|
// i.stockupArea = i.headline; |
|
|
|
if(i.assignStatus == '2'){ |
|
|
|
// if(i.assignStatus == '2'){ |
|
|
|
i.assignStatusName = '已指派'; |
|
|
|
// i.assignStatusName = '已指派'; |
|
|
|
}else{ |
|
|
|
// }else{ |
|
|
|
i.assignStatusName = '未指派'; |
|
|
|
// i.assignStatusName = '未指派'; |
|
|
|
} |
|
|
|
// } |
|
|
|
if(i.stockupStatus == '2'){ |
|
|
|
// if(i.stockupStatus == '2'){ |
|
|
|
i.stockupStatusName = '待备货'; |
|
|
|
// i.stockupStatusName = '待备货'; |
|
|
|
}else if(i.stockupStatus == '3'){ |
|
|
|
// }else if(i.stockupStatus == '3'){ |
|
|
|
i.stockupStatusName = '已备货'; |
|
|
|
// i.stockupStatusName = '已备货'; |
|
|
|
}else{ |
|
|
|
// }else{ |
|
|
|
i.stockupStatusName = '未备货'; |
|
|
|
// i.stockupStatusName = '未备货'; |
|
|
|
} |
|
|
|
// } |
|
|
|
}); |
|
|
|
}); |
|
|
|
this.selectionClear(); |
|
|
|
this.selectionClear(); |
|
|
|
this.loading = false; |
|
|
|
this.loading = false; |
|
|
|
|
