|
|
|
@ -67,7 +67,7 @@ |
|
|
|
fixed="left" |
|
|
|
label="操作"> |
|
|
|
<template slot-scope="scope"> |
|
|
|
|
|
|
|
<a type="text" size="small" v-if="scope.row.notifyStatus==='仓库已确认'" @click="updateModelOpen(scope.row)">修改</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.notifyStatus==='已下达'" @click="confirmModelOpen(scope.row)">仓库确认</a> |
|
|
|
<a type="text" size="small" v-if="scope.row.notifyStatus==='仓库已确认'" @click="cancerConfirm(scope.row)">取消确认</a> |
|
|
|
</template> |
|
|
|
@ -293,7 +293,30 @@ |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="confirmDo()">保存</el-button> |
|
|
|
<el-button type="primary" @click="boxDetailModelFlag=false">关闭</el-button> |
|
|
|
<el-button type="primary" @click="confirmModelFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
|
|
|
|
<el-dialog title="修改" :close-on-click-modal="false" v-drag :visible.sync="updateModelFlag" width="260px"> |
|
|
|
<el-form label-position="top" style="margin-left: 7px;margin-top: -5px;"> |
|
|
|
<el-row :gutter="20"> |
|
|
|
<el-col :span="24"> |
|
|
|
<el-form-item :label="'ReadyDate'" > |
|
|
|
<el-date-picker |
|
|
|
style="width: 100%" |
|
|
|
v-model="confirmModel.readyDate" |
|
|
|
type="date" |
|
|
|
format="yyyy-MM-dd" |
|
|
|
value-format="yyyy-MM-dd" |
|
|
|
placeholder="选择日期"> |
|
|
|
</el-date-picker> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
</el-row> |
|
|
|
</el-form> |
|
|
|
<el-footer style="height:40px;margin-top: 10px;text-align:center"> |
|
|
|
<el-button type="primary" @click="updateDo()">保存</el-button> |
|
|
|
<el-button type="primary" @click="updateModelFlag=false">关闭</el-button> |
|
|
|
</el-footer> |
|
|
|
</el-dialog> |
|
|
|
<el-dialog title="装箱" :close-on-click-modal="false" v-drag :visible.sync="palletModelFlag" width="600px"> |
|
|
|
@ -373,7 +396,7 @@ |
|
|
|
<el-col :span="6"> |
|
|
|
<el-form-item > |
|
|
|
<span slot="label" @click="openPartDialog()"><a herf="#">物料编码</a></span> |
|
|
|
<el-input v-model="boxModelData.partNo" ></el-input> |
|
|
|
<el-input v-model="boxModelData.pn" ></el-input> |
|
|
|
</el-form-item> |
|
|
|
</el-col> |
|
|
|
<el-col :span="6"> |
|
|
|
@ -447,7 +470,7 @@ |
|
|
|
@row-dblclick="partRowDblclick" |
|
|
|
style="width: 100%;"> |
|
|
|
<el-table-column |
|
|
|
prop="partNo" |
|
|
|
prop="pn" |
|
|
|
header-align="center" |
|
|
|
align="center" |
|
|
|
label="物料编码"> |
|
|
|
@ -538,6 +561,7 @@ |
|
|
|
searchEcssCoDelNotifyHeaderForCK, |
|
|
|
searchEcssCoDelNotifyDetail, |
|
|
|
confirmEcssDel, |
|
|
|
updateEcssDel, |
|
|
|
cancerConfirmEcssDel, |
|
|
|
searchCoDelPalletData, |
|
|
|
searchEcssCoDelPalletHeaderData, |
|
|
|
@ -627,6 +651,7 @@ |
|
|
|
seqNo:'', |
|
|
|
itemNo:'', |
|
|
|
partNo:'', |
|
|
|
pn:'', |
|
|
|
qty:'', |
|
|
|
poNo:'', |
|
|
|
boxQty:'', |
|
|
|
@ -637,6 +662,7 @@ |
|
|
|
search:'查询', |
|
|
|
}, |
|
|
|
confirmModelFlag:false, |
|
|
|
updateModelFlag:false, |
|
|
|
confirmModel:{ |
|
|
|
site:'', |
|
|
|
buDesc:'', |
|
|
|
@ -1840,6 +1866,7 @@ |
|
|
|
}, |
|
|
|
partRowDblclick (row) { |
|
|
|
this.boxModelData.partNo = row.partNo |
|
|
|
this.boxModelData.pn = row.pn |
|
|
|
this.partFlag = false |
|
|
|
}, |
|
|
|
// 获取基础数据列表S |
|
|
|
@ -1941,6 +1968,12 @@ |
|
|
|
}, |
|
|
|
|
|
|
|
confirmDo(){ |
|
|
|
if (!this.confirmModel.notifyDate) { |
|
|
|
this.$alert('请选择预计发货日期！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
confirmEcssDel(this.confirmModel).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.searchTable() |
|
|
|
@ -1991,6 +2024,34 @@ |
|
|
|
this.confirmModel=JSON.parse(JSON.stringify(row)); |
|
|
|
this.confirmModelFlag=true |
|
|
|
}, |
|
|
|
updateModelOpen(row){ |
|
|
|
this.confirmModel=JSON.parse(JSON.stringify(row)); |
|
|
|
this.updateModelFlag=true |
|
|
|
}, |
|
|
|
updateDo(){ |
|
|
|
if (!this.confirmModel.readyDate) { |
|
|
|
this.$alert('请选择ReadyDate！', '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
return false |
|
|
|
} |
|
|
|
updateEcssDel(this.confirmModel).then(({data}) => { |
|
|
|
if (data && data.code === 0) { |
|
|
|
this.searchTable() |
|
|
|
this.updateModelFlag=false |
|
|
|
this.$message({ |
|
|
|
message: '操作成功', |
|
|
|
type: 'success', |
|
|
|
duration: 1500, |
|
|
|
onClose: () => {} |
|
|
|
}) |
|
|
|
} else { |
|
|
|
this.$alert(data.msg, '错误', { |
|
|
|
confirmButtonText: '确定' |
|
|
|
}) |
|
|
|
} |
|
|
|
}) |
|
|
|
}, |
|
|
|
upLoadPallet(){ |
|
|
|
if(this.dataList3.length>0){ |
|
|
|
this.$alert('已经有明细无法再次导入请去手工装箱全部删除！', '错误', { |
|
|
|
@ -2034,6 +2095,8 @@ |
|
|
|
}, |
|
|
|
updatePalletModel(row){ |
|
|
|
this.palletModelData=JSON.parse(JSON.stringify(row)) |
|
|
|
this.palletModelData.pallet=row.palletNo |
|
|
|
this.palletModelData.palletRemark=row.palletRemark |
|
|
|
this.palletModelData.addFlag=1 |
|
|
|
this.palletModelFlag=true |
|
|
|
}, |
|
|
|
@ -2059,6 +2122,7 @@ |
|
|
|
volume:'', |
|
|
|
grossWeight:'', |
|
|
|
netWeight:'', |
|
|
|
pallet:'', |
|
|
|
palletRemark:'', |
|
|
|
} |
|
|
|
searchEcssCoDelNotifyDetail(this.currentRow).then(({data}) => { |
|
|
|
@ -2152,6 +2216,7 @@ |
|
|
|
seqNo:this.boxDetailData.seqNo, |
|
|
|
itemNo:'', |
|
|
|
partNo:'', |
|
|
|
pn:'', |
|
|
|
qty:'', |
|
|
|
poNo:'', |
|
|
|
boxQty:'', |
|
|
|
|
