aike/emis-oms-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request 'master-dev' (#7) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-oms-frontend/pulls/7
This commit is contained in:
wuteng 2025-12-09 15:31:18 +08:00
commit 8aa4699aa2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/oms/emisWaybill/WsInBatchList.vue
View File

@ -146,7 +146,7 @@
</div>
<div style="text-align: right;margin-top: 10px;">
<el-button size="mini" @click="handleFeedDialogClick(item)">反馈异常</el-button>
<el-button type="primary" size="mini" @click="confirmJinCang(item.inNo)">进仓确认</el-button>
<el-button type="primary" size="mini" @click="confirmJinCang(item.inNo,item.id)" :disabled="item.confirmStatus==1">{{item.confirmStatus==1?'确认已进仓':'进仓确认'}}</el-button>
</div>
<div style="margin-top: 10px;padding: 10px 0px;border-top: 1px solid #e6ebf5;">
<!-- <div>进仓图片：</div> -->
@ -213,7 +213,7 @@ export default {
dateTimeRange:[],
// 总条数
total: 0,
// 进仓单批次表格数据
// 进仓单批次表格数据
emisWarehouseInBatchList: this.stockInBatchList,
currentId:null,
@ -396,13 +396,13 @@ export default {
dateTimeChange(value){
this.dateTimeRange=value;
},
async confirmJinCang(inNo) {
async confirmJinCang(inNo,id) {
let confirmStatus = '2' // 部分入仓
if (!inNo) {
confirmStatus = '1' // 全部入仓
inNo = this.billInfo.inNo
}
let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true }).then(() => {
let res = await cusConfirmWsIn({ inNo, confirmStatus, _loading: true ,id:id }).then(() => {
this.$modal.msgSuccess("操作成功");
})
},