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

fix:coding#803#848、31日志列表加列：添加批次号、提交人列

This commit is contained in:
shijing 2025-07-02 16:52:50 +08:00
parent 0d5aab23d4
commit bfa4fd5127
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/views/wpm_bx/mlogs.vue
View File

@ -68,10 +68,19 @@
prop="hour_work"
width="80"
></el-table-column>
<el-table-column label="批次号" min-width="100">
<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 }}、</span>
</span>
</div>
</template>
</el-table-column>
<el-table-column
label="生产设备"
prop="equipment_name"
min-width="150"
min-width="130"
></el-table-column>
<el-table-column label="进度" prop="belong_dept_name" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
<template #default="scope">
@ -111,7 +120,6 @@
<span v-if="scope.row.oinfo_json_">{{scope.row.oinfo_json_.压板用时}}</span>
</template>
</el-table-column>
<el-table-column
label="处理人"
prop="handle_user_name"
@ -130,12 +138,11 @@
label="结束时间"
prop="work_end_time"
></el-table-column>
<!-- <el-table-column label="是否提交">
<el-table-column label="提交人">
<template #default="scope">
<el-tag v-if="scope.row.submit_time == null" type="warning">未提交</el-tag>
<el-tag v-else type="success">已提交</el-tag>
<span v-if="scope.row.submit_user_name">{{ scope.row.submit_user_name }}</span>
</template>
</el-table-column> -->
</el-table-column>
<el-table-column
label="提交时间"
prop="submit_time"
@ -231,8 +238,8 @@ export default {
data() {
return {
apiObj: null,
params: { mgroup: "" ,submit_time__isnull:true,
query: " { id,equipment, material_out_name, equipment_name, reminder_interval_list ,mstate_json,belong_dept_name, mgroup_name,handle_user_name,work_start_time,work_end_time,submit_time,oinfo_json}"
params: { mgroup: "" ,submit_time__isnull:true,with_mlogb:'yes',
query: " { id,equipment, material_out_name, equipment_name, reminder_interval_list ,mstate_json,belong_dept_name, mgroup_name,handle_user_name,work_start_time,work_end_time,submit_time,oinfo_json,mlogb_full,submit_user_name}"
},
query: {submit_time__isnull:true},
dialog: {