Merge pull request '进仓确认传参'serialNo'' (#8) from master-dev into master
Reviewed-on: http://git.xdadan.loc/tanex/emis-oms-frontend/pulls/8
This commit is contained in:
commit
5decad5dff
@ -146,7 +146,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<div style="text-align: right;margin-top: 10px;">
|
<div style="text-align: right;margin-top: 10px;">
|
||||||
<el-button size="mini" @click="handleFeedDialogClick(item)">反馈异常</el-button>
|
<el-button size="mini" @click="handleFeedDialogClick(item)">反馈异常</el-button>
|
||||||
<el-button type="primary" size="mini" @click="confirmJinCang(item.inNo,item.id)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
|
<el-button type="primary" size="mini" @click="confirmJinCang(item.inNo,item.serialNo)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
|
||||||
</div>
|
</div>
|
||||||
<div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
|
<div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
|
||||||
<!-- <div>进仓图片:</div> -->
|
<!-- <div>进仓图片:</div> -->
|
||||||
@ -396,13 +396,13 @@ export default {
|
|||||||
dateTimeChange(value){
|
dateTimeChange(value){
|
||||||
this.dateTimeRange=value;
|
this.dateTimeRange=value;
|
||||||
},
|
},
|
||||||
async confirmJinCang(inNo,id) {
|
async confirmJinCang(inNo,serialNo) {
|
||||||
let confirmStatus = '2' // 部分入仓
|
let confirmStatus = '2' // 部分入仓
|
||||||
if (!inNo) {
|
if (!inNo) {
|
||||||
confirmStatus = '1' // 全部入仓
|
confirmStatus = '1' // 全部入仓
|
||||||
inNo = this.billInfo.inNo
|
inNo = this.billInfo.inNo
|
||||||
}
|
}
|
||||||
let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true ,id:id }).then(() => {
|
let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true ,serialNo:serialNo }).then(() => {
|
||||||
this.$modal.msgSuccess("操作成功");
|
this.$modal.msgSuccess("操作成功");
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user