fix:交接记录展示补全
This commit is contained in:
parent
23d0df54ca
commit
1a68fb56d8
|
|
@ -71,7 +71,9 @@
|
||||||
<el-table-column type="expand">
|
<el-table-column type="expand">
|
||||||
<template #default="props">
|
<template #default="props">
|
||||||
<div style="padding-left: 50px">
|
<div style="padding-left: 50px">
|
||||||
<div v-if="props.row.new_batch&&props.row.new_batch!= null" style="font-size: 14px;">新批次号:{{ props.row.new_batch }}</div>
|
<div v-if="props.row.new_batch&&props.row.new_batch!= null" style="font-size: 14px;">
|
||||||
|
新批次号:{{ props.row.new_batch }}<span v-if="props.row.material_changed!==null">({{ props.row.material_changed_fname }})</span>
|
||||||
|
</div>
|
||||||
<template v-for="item in props.row.handoverb" :key="item.id">
|
<template v-for="item in props.row.handoverb" :key="item.id">
|
||||||
<el-descriptions :column="3" style="margin-top: 10px;">
|
<el-descriptions :column="3" style="margin-top: 10px;">
|
||||||
<el-descriptions-item label="批次">
|
<el-descriptions-item label="批次">
|
||||||
|
|
@ -153,12 +155,12 @@
|
||||||
>接收</el-button>
|
>接收</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
@click="table_reBack(scope.row)"
|
@click="table_reBack(scope.row)"
|
||||||
type="danger"
|
type="warning"
|
||||||
v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time!== null&&scope.row.type == 10&&scope.row.mtype == 10"
|
v-if="scope.row.recive_mgroup == mgroupId&&scope.row.submit_time!== null&&scope.row.type == 10&&scope.row.mtype == 10"
|
||||||
>退回</el-button>
|
>退回</el-button>
|
||||||
<el-button
|
<el-button
|
||||||
@click="table_show(scope.row)"
|
@click="table_show(scope.row)"
|
||||||
type="warning"
|
type="primary"
|
||||||
>查看</el-button>
|
>查看</el-button>
|
||||||
<el-popconfirm
|
<el-popconfirm
|
||||||
title="确定撤消吗?"
|
title="确定撤消吗?"
|
||||||
|
|
@ -166,7 +168,7 @@
|
||||||
@confirm="table_reBack2(scope.row)"
|
@confirm="table_reBack2(scope.row)"
|
||||||
>
|
>
|
||||||
<template #reference>
|
<template #reference>
|
||||||
<el-button type="danger">撤消</el-button>
|
<el-button type="warning">撤消</el-button>
|
||||||
</template>
|
</template>
|
||||||
</el-popconfirm>
|
</el-popconfirm>
|
||||||
<!-- <el-button
|
<!-- <el-button
|
||||||
|
|
|
||||||
|
|
@ -200,7 +200,7 @@
|
||||||
:apiObj="apiObj"
|
:apiObj="apiObj"
|
||||||
:params="paramsM"
|
:params="paramsM"
|
||||||
v-model="form.material_changed"
|
v-model="form.material_changed"
|
||||||
v-model:label="form.material_changed_name"
|
v-model:label="form.material_changed_fname"
|
||||||
style="width:100%"
|
style="width:100%"
|
||||||
>
|
>
|
||||||
<el-table-column label="名称" prop="name"></el-table-column>
|
<el-table-column label="名称" prop="name"></el-table-column>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue