mes/nalinv-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
luochen 2024-11-15 15:00:06 +08:00
commit 61e3236b66
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/views/mes/wip-nalinv/reportSap/index.vue
View File

@ -16,16 +16,16 @@
width="40%"
:show-close="false"
center>
<el-form :model="postingDateForm">
<el-form :model="postingDateForm" label-width="100px">
<el-row :gutter="24">
<el-col :span="24">
<el-form-item label="过账日期">
<el-form-item label="过账日期" :rules="{ required: true, message: '请选择日期', trigger: 'blur' }">
<el-date-picker
style="width: 100%"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
v-model="postingDateForm.postingDate"
type="datetime"
type="date"
placeholder="选择日期">
</el-date-picker>
</el-form-item>
@ -39,7 +39,7 @@
</el-dialog>
<basic-container>
<c-top-bar :offset="30" style="margin-top: -15px; margin-bottom: 40px">
<c-top-bar :offset="30" style="margin-top: -30px; margin-bottom: 40px">
<el-button type="text" icon="el-icon-search" @click="searchFormObjAction">检索</el-button>
<el-divider direction="vertical"></el-divider>
<el-button type="text" icon="el-icon-circle-check" @click="searchCleanAction">{{
@ -130,9 +130,9 @@
@selection-change="mtrlConsSelectionChange"
:cell-style="{ 'text-align': 'center' }" tooltip-effect="dark" border style="width: 100%">
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="index" width="80" fixed="left" label="序号"></el-table-column>
<el-table-column prop="fabNo" label="车间" width="150"></el-table-column>
<el-table-column prop="workCenter" label="工作中心" width="140"></el-table-column>
<el-table-column type="index" width="60" fixed="left" label="序号"></el-table-column>
<el-table-column prop="fabNo" label="车间"></el-table-column>
<el-table-column prop="workCenter" label="工作中心" width="100"></el-table-column>
<el-table-column prop="shopOrder" label="生产工单"></el-table-column>
<el-table-column prop="lotNo" label="LOT号"></el-table-column>
<el-table-column prop="componentItem" label="组件物料"></el-table-column>
@ -143,7 +143,7 @@
<el-table-column prop="subQty" label="辅单位数量" width="110"></el-table-column>
<el-table-column prop="subUom" label="辅单位"></el-table-column>
<el-table-column prop="transactionType" label="事务类型"></el-table-column>
<el-table-column prop="transactionDate" label="事务日期"></el-table-column>
<el-table-column prop="transactionDate" label="事务日期" width="160"></el-table-column>
<el-table-column prop="" label="班次"></el-table-column>
<el-table-column prop="syncPostingDate" label="过账日期"></el-table-column>
<el-table-column prop="warehouseCode" label="仓库"></el-table-column>
@ -180,7 +180,7 @@
<el-button type="primary" @click="dialogPostingDateVisible = true">物料消耗提交同步</el-button>
</el-col>
<el-col :span="4">
<el-button type="primary">物料消耗冲销</el-button>
<el-button type="danger">物料消耗冲销</el-button>
</el-col>
<el-col :span="8"></el-col>
</el-row>
@ -194,11 +194,11 @@
@selection-change="mtrlCompleteSelectionChange"
:cell-style="{ 'text-align': 'center' }" tooltip-effect="dark" border style="width: 100%">
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="index" width="80" fixed="left" label="序号"></el-table-column>
<el-table-column prop="fabNo" label="车间" width="150"></el-table-column>
<el-table-column prop="workCenter" label="工作中心" width="140"></el-table-column>
<el-table-column prop="shopOrder" label="生产工单"></el-table-column>
<el-table-column prop="lotNo" label="LOT号"></el-table-column>
<el-table-column type="index" width="60" fixed="left" label="序号"></el-table-column>
<el-table-column prop="fabNo" label="车间"></el-table-column>
<el-table-column prop="workCenter" label="工作中心" width="120"></el-table-column>
<el-table-column prop="shopOrder" label="生产工单" width="100"></el-table-column>
<el-table-column prop="lotNo" label="LOT号" width="120"></el-table-column>
<el-table-column prop="item" label="产出物料"></el-table-column>
<el-table-column prop="item" label="物料描述"></el-table-column>
<el-table-column prop="sapBatchNo" label="SAP批次"></el-table-column>
@ -210,9 +210,9 @@
<el-table-column prop="subQty" label="辅单位数量" width="100"></el-table-column>
<el-table-column prop="qcGrade" label="判定等级"></el-table-column>
<el-table-column prop="transactionType" label="事务类型"></el-table-column>
<el-table-column prop="transactionDate" label="事务日期"></el-table-column>
<el-table-column prop="transactionDate" label="事务日期" width="160"></el-table-column>
<el-table-column prop="" label="班次"></el-table-column>
<el-table-column prop="syncPostingDate" label="过账日期"></el-table-column>
<el-table-column prop="syncPostingDate" label="过账日期" width="110"></el-table-column>
<el-table-column prop="warehouseCode" label="仓库"></el-table-column>
<el-table-column prop="storageLocation" label="存储位置"></el-table-column>
<el-table-column prop="erpInventory" label="ERP仓库"></el-table-column>
@ -246,7 +246,7 @@
<el-button type="primary" @click="dialogPostingDateVisible = true">完工入库提交同步</el-button>
</el-col>
<el-col :span="4">
<el-button type="primary">完工入库冲销</el-button>
<el-button type="danger">完工入库冲销</el-button>
</el-col>
<el-col :span="8"></el-col>
</el-row>
@ -262,7 +262,7 @@
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="index" width="60" fixed="left" label="序号"></el-table-column>
<el-table-column prop="fabNo" label="车间"></el-table-column>
<el-table-column prop="workCenter" label="工作中心"></el-table-column>
<el-table-column prop="workCenter" label="工作中心" width="120"></el-table-column>
<el-table-column prop="shopOrder" label="生产工单"></el-table-column>
<el-table-column prop="resource" label="资源"></el-table-column>
<el-table-column prop="operation" label="工序"></el-table-column>
@ -306,7 +306,7 @@
<el-row :gutter="24">
<el-col :span="8"></el-col>
<el-col :span="4">
<el-button type="primary" @click="soSyncAction">生产报工提交同步</el-button>
<el-button type="primary" @click="dialogPostingDateVisible = true">生产报工提交同步</el-button>
</el-col>
<el-col :span="4">
<el-button type="primary" @click="soSyncCancelAction">生产报工取消</el-button>
@ -643,9 +643,12 @@ export default {
},
// 同步工单报工数据
soSyncAction(){
soSyncAction(postingDate){
let me = this;
if(me.wipReportSelection.length>0){
me.wipReportSelection.forEach(ite=>{
ite.syncPostingDate = postingDate;
});
showLoading();
callErpShopOrderStatisticsTransaction(me.wipReportSelection).then(res => {
hideLoading();
@ -690,9 +693,12 @@ export default {
me.lotSyncAction(me.postingDateForm.postingDate);
}else if(me.activeName === 'materialConsumption'){
me.materialSyncAction(me.postingDateForm.postingDate);
}else if(me.activeName === 'wipReportSap'){
me.soSyncAction(me.postingDateForm.postingDate);
}else{
this.$message.error('未获取到正确到报工选项');
}
me.postingDateForm.postingDate = '';
},
wipReportSelectionChange(val){