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

fix:批次追踪左侧列表去掉类型筛选，去除版本列，日志展示变更

This commit is contained in:
shijing 2025-07-03 15:03:27 +08:00
parent c0f0038ccb
commit a53d3e4989
1 changed files with 24 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/views/statistics/batch_statistics.vue
View File

@ -3,7 +3,7 @@
<el-side> <el-side>
<el-container> <el-container>
<el-header style="height: 40px;"> <el-header style="height: 40px;">
<el-select <!-- <el-select
v-model="query.material_start__type" v-model="query.material_start__type"
placeholder="请选择" placeholder="请选择"
style="width: 90px;" style="width: 90px;"
@ -11,7 +11,7 @@
<el-option label="原料" :value="30"></el-option> <el-option label="原料" :value="30"></el-option>
<el-option label="半成品" :value="20"></el-option> <el-option label="半成品" :value="20"></el-option>
<el-option label="成品" :value="10"></el-option> <el-option label="成品" :value="10"></el-option>
</el-select> </el-select> -->
<el-input <el-input
v-model="query.batch" v-model="query.batch"
placeholder="请输入批次号" placeholder="请输入批次号"
@ -34,7 +34,7 @@
:paginationLayout="'total, sizes, jumper'" :paginationLayout="'total, sizes, jumper'"
> >
<el-table-column prop="batch" label="批次号"></el-table-column> <el-table-column prop="batch" label="批次号"></el-table-column>
<el-table-column prop="version" label="版本" width="60"></el-table-column> <!-- <el-table-column prop="version" label="版本" width="60"></el-table-column> -->
</scTable> </scTable>
</el-main> </el-main>
</el-container> </el-container>
@ -64,17 +64,25 @@
ref="tableMlog" ref="tableMlog"
:apiObj="apiObj_mlog" :apiObj="apiObj_mlog"
row-key="id" row-key="id"
:params="params" :params="params_mlog"
:query="params" :query="params_mlog"
> >
<el-table-column label="#" type="index" width="50" fixed></el-table-column> <el-table-column label="#" type="index" width="50" fixed></el-table-column>
<el-table-column label="工艺路线" prop="material_out_name" min-width="130" fixed> <el-table-column label="工艺路线" prop="material_out_name" min-width="150" fixed>
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span> <span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
<span v-else>返工</span> <span v-else>返工</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="生产设备" prop="equipment_name" min-width="150"></el-table-column> <el-table-column label="生产物料" min-width="250">
<template #default="scope">
<div v-if="scope.row.mlogb_full!==null">
<span v-for="item in scope.row.mlogb_full" :key="item.id">
<span v-if="item.material_in!==null">{{ item.batch }}({{Number(item.count_use)}})、</span>
</span>
</div>
</template>
</el-table-column>
<el-table-column label="加工数" prop="count_real"></el-table-column> <el-table-column label="加工数" prop="count_real"></el-table-column>
<el-table-column label="合格数" prop="count_ok"></el-table-column> <el-table-column label="合格数" prop="count_ok"></el-table-column>
<el-table-column label="类型"> <el-table-column label="类型">
@ -102,7 +110,7 @@
label="操作日期" label="操作日期"
prop="handle_date" prop="handle_date"
></el-table-column> ></el-table-column>
<el-table-column label="是否提交" prop="submit_time"> <el-table-column label="是否提交" prop="submit_time" width="80">
<template #default="scope"> <template #default="scope">
<span v-if="scope.row.submit_time!==null" style="color: green;">是</span> <span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
<span v-else>否</span> <span v-else>否</span>
@ -342,9 +350,13 @@ export default {
other_out: "其他出库", other_out: "其他出库",
}, },
//mlog\handover //mlog\handover
params_mlog:{
cbatch:'',
with_mlogb:'yes',
query: " { id,material_out_name,mlogb_full,count_real,count_ok,is_fix,belong_dept_name,mgroup_name,handle_user_name,handle_date,reminder_interval_list,mstate_json,work_start_time,work_end_time,oinfo_json,submit_time,submit_user_name}"
},
params:{ params:{
cbatch:'', cbatch:'',
// query:" { id, name, code, last_data, gather_state }",
}, },
params2:{ params2:{
batch:'', batch:'',
@ -354,7 +366,7 @@ export default {
}, },
query:{ query:{
batch:'', batch:'',
material_start__type:30, // material_start__type:30,
}, },
batch:'', batch:'',
activeName:'', activeName:'',
@ -365,12 +377,11 @@ export default {
}, },
methods: { methods: {
rowClick(row){ rowClick(row){
console.log('row',row)
let that = this; let that = this;
that.nodes =[]; that.nodes =[];
that.edges = []; that.edges = [];
that.limitedWatch = false; that.limitedWatch = false;
that.$API.wpm.batchlog.dag.req({batch:row.batch,version:row.version}).then((res) => { that.$API.wpm.batchlog.dag.req({batch:row.batch,method:'direct'}).then((res) => {
res.nodes.forEach(item => { res.nodes.forEach(item => {
let obj = {}; let obj = {};
obj.id = item.id; obj.id = item.id;
@ -389,6 +400,7 @@ export default {
nodeClick(data){ nodeClick(data){
let that = this; let that = this;
that.params.cbatch = data; that.params.cbatch = data;
that.params_mlog.cbatch = data;
that.params2.batch = data; that.params2.batch = data;
that.params_mio.item_mio__batch=data; that.params_mio.item_mio__batch=data;
that.activeName = 'mlog'; that.activeName = 'mlog';