Compare commits

..

No commits in common. "c11ef69667270c6d9c5cbfb674124f803dace889" and "2f1910fed6a555347356f8060726dd337fe02773" have entirely different histories.

3 changed files with 13 additions and 11 deletions

View File

@ -74,7 +74,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="已完成工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="70" min-width="70"
> >
@ -191,12 +191,12 @@
min-width="150" min-width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="已完成工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="100" min-width="100"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.process_name }} {{ scope.row.material_name.split('|').at(-1) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="不合格标记" prop="wprdefect"> <el-table-column label="不合格标记" prop="wprdefect">

View File

@ -89,7 +89,7 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
label="已完成工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="70" min-width="70"
> >
@ -206,12 +206,12 @@
min-width="150" min-width="150"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
label="已完成工序" label="物料已到工序"
prop="material_name" prop="material_name"
min-width="100" min-width="100"
> >
<template #default="scope"> <template #default="scope">
{{ scope.row.process_name }} {{ scope.row.material_name.split('|').at(-1) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="不合格标记" prop="wprdefect"> <el-table-column label="不合格标记" prop="wprdefect">

View File

@ -1,10 +1,12 @@
<!-- 日志详情 mlog信息以及mlogb --> <!-- 日志详情 mlog信息以及mlogb -->
<template> <template>
<el-drawer v-model="visible" :size="'95%'" :show-close="false"> <el-drawer
<template #header> title="日志详情"
<h4>日志详情</h4> v-model="visible"
<el-button type="danger" @click="$emit('closed')">关闭</el-button> :size="'95%'"
</template> destroy-on-close
@closed="$emit('closed')"
>
<div> <div>
<el-card style="width: 100%" header="基本信息" shadow="never"> <el-card style="width: 100%" header="基本信息" shadow="never">
<el-descriptions> <el-descriptions>