zcdsj
/
factory_web
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clarify available inventory quantities

This commit is contained in:
caoqianming 2026-07-30 14:19:04 +08:00
parent 41b8e6f29b
commit c37eab7bbc
3 changed files with 64 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/wpm_bx/handover_form.vue
View File

@ -26,7 +26,7 @@
></el-input>
<scScanner @scanResult="codeTextChange" v-if="project_code!=='bxerp'"></scScanner>
</el-form-item>
<el-form-item label="总计：">
<el-form-item label="交接合计：">
{{ totalCount }}
</el-form-item>
<el-form-item label="原始物料" v-if="mode!='add'&&form.mtype==20" style="margin-left: 20px;">
@ -75,7 +75,7 @@
</el-form-item>
</el-col>
<el-col :span="5">
<el-form-item label="总数量">
<el-form-item label="可交接数量">
<span>{{ listItem.count_canhandover }}</span>
</el-form-item>
</el-col>

40
src/views/wpm_bx/inmIn.vue
View File

@ -72,7 +72,7 @@
:query="query"
@selection-change="selectionChange"
>
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="selection" width="50" :selectable="canSelectForHandover"></el-table-column>
<el-table-column label="库存状态" prop="state" width="110" >
<template #default="scope">
<el-tag :type="wmState[scope.row.state]?.type">
@ -132,24 +132,30 @@
</template>
</el-table-column>
<el-table-column
label="数量"
prop="count"
min-width="80"
label="可用/库存"
prop="count_canhandover"
min-width="100"
>
<template #default="scope">
<el-tooltip
:content="`生产中：${scope.row.count_working || 0}；交接中：${scope.row.count_handovering || 0}`"
placement="top"
>
<span>
<span :style="{ color: Number(scope.row.count_canhandover || 0) > 0 ? '#0052d9' : '#909399', fontWeight: 600 }">
{{ scope.row.count_canhandover }}
</span>
<span> / </span>
<span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{scope.row.count}}</span>
<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
<el-link v-else :underline="false" type="primary" @click.stop="showWpr(scope.row)">{{scope.row.count}}</el-link>
</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="备注"
prop="note"
></el-table-column>
<el-table-column
label="生产中"
prop="count_working"
min-width="80"
></el-table-column>
<el-table-column
label="缺陷项/标记"
prop="defect_name"
@ -519,6 +525,9 @@ export default {
});
},
//表格选择后回调事件
canSelectForHandover(row) {
return Number(row.count_canhandover || 0) > 0;
},
selectionChange(selection) {
let that = this;
that.selection = selection;
@ -547,8 +556,15 @@ export default {
let that = this;
that.changebatch = true;
let handoverb = [];
if(that.selection.length>0){
that.selection.forEach(item=>{
const selectableItems = that.selection.filter(item => Number(item.count_canhandover || 0) > 0);
if(selectableItems.length !== that.selection.length){
that.$message.warning("已忽略无可交接数量的批次");
}
if(selectableItems.length === 0){
return;
}
if(selectableItems.length>0){
selectableItems.forEach(item=>{
that.Mmodel = item.material_.model;
let obj = {};
obj.id = item.id;

40
src/views/wpm_bx/inmOut.vue
View File

@ -71,7 +71,7 @@
:query="query"
@selection-change="selectionChange"
>
<el-table-column type="selection" width="50"></el-table-column>
<el-table-column type="selection" width="50" :selectable="canSelectForHandover"></el-table-column>
<el-table-column label="库存状态" prop="state" width="110" >
<template #default="scope">
<el-tag :type="wmState[scope.row.state]?.type">
@ -131,24 +131,30 @@
</template>
</el-table-column>
<el-table-column
label="数量"
prop="count"
min-width="80"
label="可用/库存"
prop="count_canhandover"
min-width="100"
>
<template #default="scope">
<el-tooltip
:content="`生产中：${scope.row.count_working || 0}；交接中：${scope.row.count_handovering || 0}`"
placement="top"
>
<span>
<span :style="{ color: Number(scope.row.count_canhandover || 0) > 0 ? '#0052d9' : '#909399', fontWeight: 600 }">
{{ scope.row.count_canhandover }}
</span>
<span> / </span>
<span v-if="scope.row.material_&&scope.row.material_.tracking==10">{{scope.row.count}}</span>
<el-link v-else :underline="false" type="primary" @click="showWpr(scope.row)">{{scope.row.count}}</el-link>
<el-link v-else :underline="false" type="primary" @click.stop="showWpr(scope.row)">{{scope.row.count}}</el-link>
</span>
</el-tooltip>
</template>
</el-table-column>
<el-table-column
label="备注"
prop="note"
></el-table-column>
<el-table-column
label="生产中"
prop="count_working"
min-width="80"
></el-table-column>
<el-table-column
label="缺陷项/标记"
prop="defect_name"
@ -509,6 +515,9 @@ export default {
});
},
//表格选择后回调事件
canSelectForHandover(row) {
return Number(row.count_canhandover || 0) > 0;
},
selectionChange(selection) {
let that = this;
that.selection = selection;
@ -536,8 +545,15 @@ export default {
batchConcat(){
this.changebatch = true;
let handoverb = [];
if(this.selection.length>0){
this.selection.forEach(item=>{
const selectableItems = this.selection.filter(item => Number(item.count_canhandover || 0) > 0);
if(selectableItems.length !== this.selection.length){
this.$message.warning("已忽略无可交接数量的批次");
}
if(selectableItems.length === 0){
return;
}
if(selectableItems.length>0){
selectableItems.forEach(item=>{
let obj = {};
obj.id = item.id;
obj.wm = item.id;