fix:表格完善
This commit is contained in:
parent
5e9c79e0a5
commit
69a5dfd1ee
|
|
@ -56,222 +56,238 @@
|
||||||
</scDegra>
|
</scDegra>
|
||||||
</el-header>
|
</el-header>
|
||||||
<el-main style="height: 50%;background: #fff;">
|
<el-main style="height: 50%;background: #fff;">
|
||||||
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
|
<el-tabs type="border-card" v-model="activeName" @tab-click="handleClick" style="height: 100%;">
|
||||||
<el-tab-pane name="mlog" label="生产日志">
|
<el-tab-pane name="mlog" label="生产日志" style="height: 100%;">
|
||||||
<scTable
|
<el-container>
|
||||||
ref="tableMlog"
|
<el-main>
|
||||||
:apiObj="apiObj_mlog"
|
<scTable
|
||||||
row-key="id"
|
ref="tableMlog"
|
||||||
:params="params"
|
:apiObj="apiObj_mlog"
|
||||||
:query="params"
|
row-key="id"
|
||||||
>
|
:params="params"
|
||||||
<el-table-column label="#" type="index" width="50" fixed></el-table-column>
|
:query="params"
|
||||||
<el-table-column label="工艺路线" prop="material_out_name" min-width="130" fixed>
|
>
|
||||||
<template #default="scope">
|
<el-table-column label="#" type="index" width="50" fixed></el-table-column>
|
||||||
<span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
|
<el-table-column label="工艺路线" prop="material_out_name" min-width="130" fixed>
|
||||||
<span v-else>返工</span>
|
<template #default="scope">
|
||||||
</template>
|
<span v-if="scope.row.material_out_name!==null">{{scope.row.material_out_name}}</span>
|
||||||
</el-table-column>
|
<span v-else>返工</span>
|
||||||
<el-table-column label="生产设备" prop="equipment_name" min-width="150"></el-table-column>
|
</template>
|
||||||
<el-table-column label="加工数" prop="count_real"></el-table-column>
|
</el-table-column>
|
||||||
<el-table-column label="合格数" prop="count_ok"></el-table-column>
|
<el-table-column label="生产设备" prop="equipment_name" min-width="150"></el-table-column>
|
||||||
<el-table-column label="类型">
|
<el-table-column label="加工数" prop="count_real"></el-table-column>
|
||||||
<template #default="scope">
|
<el-table-column label="合格数" prop="count_ok"></el-table-column>
|
||||||
<el-tag v-if="scope.row.is_fix" type="warning">返修</el-tag>
|
<el-table-column label="类型">
|
||||||
<el-tag v-else type="primary">正常</el-tag>
|
<template #default="scope">
|
||||||
</template>
|
<el-tag v-if="scope.row.is_fix" type="warning">返修</el-tag>
|
||||||
</el-table-column>
|
<el-tag v-else type="primary">正常</el-tag>
|
||||||
<el-table-column label="部门/工段">
|
|
||||||
<template #default="scope">
|
|
||||||
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="处理人"
|
|
||||||
prop="handle_user_name"
|
|
||||||
width="80"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
|
|
||||||
<template #default="scope">
|
|
||||||
{{ getRemaTime(scope.row) }}
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="操作日期"
|
|
||||||
prop="handle_date"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column label="是否提交" prop="submit_time">
|
|
||||||
<template #default="scope">
|
|
||||||
<span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
|
|
||||||
<span v-else>否</span>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
</scTable>
|
|
||||||
</el-tab-pane>
|
|
||||||
<el-tab-pane name="handover" label="交接记录">
|
|
||||||
<scTable
|
|
||||||
ref="tableHandover"
|
|
||||||
:apiObj="apiObj_handover"
|
|
||||||
row-key="id"
|
|
||||||
:query="params"
|
|
||||||
:params="params"
|
|
||||||
>
|
|
||||||
<el-table-column
|
|
||||||
label="#"
|
|
||||||
type="index"
|
|
||||||
width="50"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column type="expand">
|
|
||||||
<template #default="props">
|
|
||||||
<div style="padding-left: 50px">
|
|
||||||
<template v-for="item in props.row.handoverb" :key="item.id">
|
|
||||||
<el-descriptions :column="3">
|
|
||||||
<el-descriptions-item label="批次">
|
|
||||||
{{item.batch}}
|
|
||||||
</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="数量">
|
|
||||||
{{item.count}}
|
|
||||||
</el-descriptions-item>
|
|
||||||
<el-descriptions-item label="不合格标记" v-if="item.defect_name!==null">
|
|
||||||
{{item.defect_name}}
|
|
||||||
</el-descriptions-item>
|
|
||||||
</el-descriptions>
|
|
||||||
</template>
|
</template>
|
||||||
</div>
|
</el-table-column>
|
||||||
</template>
|
<el-table-column label="部门/工段">
|
||||||
</el-table-column>
|
<template #default="scope">
|
||||||
<el-table-column
|
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
|
||||||
label="物料"
|
</template>
|
||||||
prop="material_name"
|
</el-table-column>
|
||||||
min-width="140"
|
<el-table-column
|
||||||
></el-table-column>
|
label="处理人"
|
||||||
<el-table-column label="批次" prop="batch" min-width="80">
|
prop="handle_user_name"
|
||||||
<template #default="scope">
|
width="80"
|
||||||
<el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
|
></el-table-column>
|
||||||
</template>
|
<el-table-column label="保温剩余时间" v-if="mgroup_name=='黑化'||mgroup_name=='退火'">
|
||||||
</el-table-column>
|
<template #default="scope">
|
||||||
<el-table-column label="数量" prop="count" min-width="80"></el-table-column>
|
{{ getRemaTime(scope.row) }}
|
||||||
<el-table-column label="交接类型" prop="type" min-width="80">
|
</template>
|
||||||
<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
|
</el-table-column>
|
||||||
<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
|
<el-table-column
|
||||||
<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
|
label="操作日期"
|
||||||
</template>
|
prop="handle_date"
|
||||||
<template #default="scope" v-else>
|
></el-table-column>
|
||||||
<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
|
<el-table-column label="是否提交" prop="submit_time">
|
||||||
<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
|
<template #default="scope">
|
||||||
</template>
|
<span v-if="scope.row.submit_time!==null" style="color: green;">是</span>
|
||||||
</el-table-column>
|
<span v-else>否</span>
|
||||||
<el-table-column label="交接工段" min-width="80">
|
</template>
|
||||||
<template #default="scope">
|
</el-table-column>
|
||||||
<el-text v-if="scope.row.send_mgroup == mgroupId">{{scope.row.send_mgroup_name}}</el-text>
|
</scTable>
|
||||||
<el-text v-if="scope.row.recive_mgroup == mgroupId">{{scope.row.recive_mgroup_name}}</el-text>
|
</el-main>
|
||||||
</template>
|
</el-container>
|
||||||
</el-table-column>
|
|
||||||
<el-table-column label="交接类别" prop="type" width="80">
|
|
||||||
<template #default="scope">
|
|
||||||
<el-tag v-if="scope.row.type == 10" type="success"
|
|
||||||
>正常</el-tag
|
|
||||||
>
|
|
||||||
<el-tag v-if="scope.row.type == 20" type="warning"
|
|
||||||
>返工</el-tag
|
|
||||||
>
|
|
||||||
<el-tag v-if="scope.row.type == 30" type="primary"
|
|
||||||
>检验</el-tag
|
|
||||||
>
|
|
||||||
<el-tag v-if="scope.row.type == 40" type="danger"
|
|
||||||
>报废</el-tag
|
|
||||||
>
|
|
||||||
</template>
|
|
||||||
</el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="交送人"
|
|
||||||
prop="send_user_name"
|
|
||||||
width="80"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="接收人"
|
|
||||||
prop="recive_user_name"
|
|
||||||
width="80"
|
|
||||||
></el-table-column>
|
|
||||||
<el-table-column
|
|
||||||
label="交接日期"
|
|
||||||
prop="send_date"
|
|
||||||
width="120"
|
|
||||||
></el-table-column>
|
|
||||||
</scTable>
|
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane name="winm" label="车间库存">
|
<el-tab-pane name="handover" label="交接记录" style="height: 100%;">
|
||||||
<scTable
|
<el-container>
|
||||||
ref="tableWinm"
|
<el-main>
|
||||||
:apiObj="apiObj_winm"
|
<scTable
|
||||||
row-key="id"
|
ref="tableHandover"
|
||||||
:query="params2"
|
:apiObj="apiObj_handover"
|
||||||
:params="params2"
|
row-key="id"
|
||||||
>
|
:query="params"
|
||||||
<el-table-column type="selection"></el-table-column>
|
:params="params"
|
||||||
<el-table-column label="状态" prop="state">
|
>
|
||||||
<template #default="scope">
|
<el-table-column
|
||||||
<el-tag :type="wmState[scope.row.state]?.type">
|
label="#"
|
||||||
{{wmState[scope.row.state]?.text}}
|
type="index"
|
||||||
</el-tag>
|
width="50"
|
||||||
</template>
|
></el-table-column>
|
||||||
</el-table-column>
|
<el-table-column type="expand">
|
||||||
<el-table-column label="物料名称" min-width="150">
|
<template #default="props">
|
||||||
<template #default="scope">
|
<div style="padding-left: 50px">
|
||||||
{{ scope.row.material_name }}
|
<template v-for="item in props.row.handoverb" :key="item.id">
|
||||||
<span v-if="scope.row.material_origin != null">（{{ scope.row.material_origin_name }}）</span>
|
<el-descriptions :column="3">
|
||||||
</template>
|
<el-descriptions-item label="批次">
|
||||||
</el-table-column>
|
{{item.batch}}
|
||||||
<el-table-column label="批次号" prop="batch" min-width="120"></el-table-column>
|
</el-descriptions-item>
|
||||||
<el-table-column label="部门/工段">
|
<el-descriptions-item label="数量">
|
||||||
<template #default="scope">
|
{{item.count}}
|
||||||
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
|
</el-descriptions-item>
|
||||||
</template>
|
<el-descriptions-item label="不合格标记" v-if="item.defect_name!==null">
|
||||||
</el-table-column>
|
{{item.defect_name}}
|
||||||
<el-table-column label="数量" prop="count"></el-table-column>
|
</el-descriptions-item>
|
||||||
<el-table-column label="生产中" prop="count_working"></el-table-column>
|
</el-descriptions>
|
||||||
<el-table-column label="不合格标记" prop="defect_name"></el-table-column>
|
</template>
|
||||||
<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
|
</div>
|
||||||
</scTable>
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="物料"
|
||||||
|
prop="material_name"
|
||||||
|
min-width="140"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column label="批次" prop="batch" min-width="80">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-text v-if="scope.row.handoverb.length>0" type="primary">{{scope.row.handoverb.length}}批</el-text>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="数量" prop="count" min-width="80"></el-table-column>
|
||||||
|
<el-table-column label="交接类型" prop="type" min-width="80">
|
||||||
|
<template #default="scope" v-if="mgroup_name=='size'||mgroup_name=='facade'">
|
||||||
|
<el-text v-if="scope.row.send_dept == deptId" type="primary">交送</el-text>
|
||||||
|
<el-text v-if="scope.row.recive_dept == deptId" type="success">接收</el-text>
|
||||||
|
</template>
|
||||||
|
<template #default="scope" v-else>
|
||||||
|
<el-text v-if="scope.row.send_mgroup == mgroupId" type="primary">交送</el-text>
|
||||||
|
<el-text v-if="scope.row.recive_mgroup == mgroupId" type="success">接收</el-text>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="交接工段" min-width="80">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-text v-if="scope.row.send_mgroup == mgroupId">{{scope.row.send_mgroup_name}}</el-text>
|
||||||
|
<el-text v-if="scope.row.recive_mgroup == mgroupId">{{scope.row.recive_mgroup_name}}</el-text>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="交接类别" prop="type" width="80">
|
||||||
|
<template #default="scope">
|
||||||
|
<el-tag v-if="scope.row.type == 10" type="success"
|
||||||
|
>正常</el-tag
|
||||||
|
>
|
||||||
|
<el-tag v-if="scope.row.type == 20" type="warning"
|
||||||
|
>返工</el-tag
|
||||||
|
>
|
||||||
|
<el-tag v-if="scope.row.type == 30" type="primary"
|
||||||
|
>检验</el-tag
|
||||||
|
>
|
||||||
|
<el-tag v-if="scope.row.type == 40" type="danger"
|
||||||
|
>报废</el-tag
|
||||||
|
>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="交送人"
|
||||||
|
prop="send_user_name"
|
||||||
|
width="80"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="接收人"
|
||||||
|
prop="recive_user_name"
|
||||||
|
width="80"
|
||||||
|
></el-table-column>
|
||||||
|
<el-table-column
|
||||||
|
label="交接日期"
|
||||||
|
prop="send_date"
|
||||||
|
width="120"
|
||||||
|
></el-table-column>
|
||||||
|
</scTable>
|
||||||
|
</el-main>
|
||||||
|
</el-container>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane name="binm" label="仓库库存">
|
<el-tab-pane name="winm" label="车间库存" style="height: 100%;">
|
||||||
<scTable
|
<el-container>
|
||||||
ref="tableBinm"
|
<el-main>
|
||||||
:apiObj="apiObj_binm"
|
<scTable
|
||||||
row-key="id"
|
ref="tableWinm"
|
||||||
stripe
|
:apiObj="apiObj_winm"
|
||||||
:query="params_binm"
|
row-key="id"
|
||||||
:params="params_binm"
|
:query="params2"
|
||||||
>
|
:params="params2"
|
||||||
<el-table-column type="index" width="50" />
|
>
|
||||||
<el-table-column label="批次" prop="batch">
|
<el-table-column type="selection"></el-table-column>
|
||||||
</el-table-column>
|
<el-table-column label="状态" prop="state">
|
||||||
<el-table-column label="物料名称" prop="material_name">
|
<template #default="scope">
|
||||||
</el-table-column>
|
<el-tag :type="wmState[scope.row.state]?.type">
|
||||||
<el-table-column label="规格型号">
|
{{wmState[scope.row.state]?.text}}
|
||||||
<template #default="scope">
|
</el-tag>
|
||||||
<span v-if="scope.row.material_">
|
</template>
|
||||||
{{ scope.row.material_.specification }}
|
</el-table-column>
|
||||||
{{ scope.row.material_.model }}
|
<el-table-column label="物料名称" min-width="150">
|
||||||
</span>
|
<template #default="scope">
|
||||||
</template>
|
{{ scope.row.material_name }}
|
||||||
</el-table-column>
|
<span v-if="scope.row.material_origin != null">（{{ scope.row.material_origin_name }}）</span>
|
||||||
<el-table-column label="已完成工序">
|
</template>
|
||||||
<template #default="scope">
|
</el-table-column>
|
||||||
<span v-if="scope.row.material_">
|
<el-table-column label="批次号" prop="batch" min-width="120"></el-table-column>
|
||||||
{{ scope.row.material_.process_name }}
|
<el-table-column label="部门/工段">
|
||||||
</span>
|
<template #default="scope">
|
||||||
</template>
|
{{scope.row.belong_dept_name}}/{{scope.row.mgroup_name}}
|
||||||
</el-table-column>
|
</template>
|
||||||
<el-table-column label="仓库" prop="warehouse_name">
|
</el-table-column>
|
||||||
</el-table-column>
|
<el-table-column label="数量" prop="count"></el-table-column>
|
||||||
<el-table-column label="物料存量" prop="count">
|
<el-table-column label="生产中" prop="count_working"></el-table-column>
|
||||||
</el-table-column>
|
<el-table-column label="不合格标记" prop="defect_name"></el-table-column>
|
||||||
<el-table-column label="有效期" prop="expiration_date">
|
<el-table-column label="创建时间" prop="create_time" width="150"></el-table-column>
|
||||||
</el-table-column>
|
</scTable>
|
||||||
<el-table-column label="更新时间" prop="update_time">
|
</el-main>
|
||||||
</el-table-column>
|
</el-container>
|
||||||
</scTable>
|
</el-tab-pane>
|
||||||
|
<el-tab-pane name="binm" label="仓库库存" style="height: 100%;">
|
||||||
|
<el-container>
|
||||||
|
<el-main>
|
||||||
|
<scTable
|
||||||
|
ref="tableBinm"
|
||||||
|
:apiObj="apiObj_binm"
|
||||||
|
row-key="id"
|
||||||
|
stripe
|
||||||
|
:query="params_binm"
|
||||||
|
:params="params_binm"
|
||||||
|
>
|
||||||
|
<el-table-column type="index" width="50" />
|
||||||
|
<el-table-column label="批次" prop="batch">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="物料名称" prop="material_name">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="规格型号">
|
||||||
|
<template #default="scope">
|
||||||
|
<span v-if="scope.row.material_">
|
||||||
|
{{ scope.row.material_.specification }}
|
||||||
|
{{ scope.row.material_.model }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="已完成工序">
|
||||||
|
<template #default="scope">
|
||||||
|
<span v-if="scope.row.material_">
|
||||||
|
{{ scope.row.material_.process_name }}
|
||||||
|
</span>
|
||||||
|
</template>
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="仓库" prop="warehouse_name">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="物料存量" prop="count">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="有效期" prop="expiration_date">
|
||||||
|
</el-table-column>
|
||||||
|
<el-table-column label="更新时间" prop="update_time">
|
||||||
|
</el-table-column>
|
||||||
|
</scTable>
|
||||||
|
</el-main>
|
||||||
|
</el-container>
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</el-main>
|
</el-main>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue