yemianduobankuaiyangshixiugai
This commit is contained in:
parent
5d21c4e72e
commit
e9cdb49787
|
@ -47,21 +47,21 @@
|
|||
v-el-height-adaptive-table="{bottomOffset: 42}"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="设备名称" prop="name" width="120" show-overflow-tooltip>
|
||||
<el-table-column label="设备名称" prop="name" min-width="120" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="设备编号" prop="number" width="120">
|
||||
<el-table-column label="设备编号" prop="number" min-width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="型号规格" prop="model" width="120">
|
||||
<el-table-column label="型号规格" prop="model" min-width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="生产厂及国别" prop="factory" width="120" show-overflow-tooltip>
|
||||
<el-table-column label="生产厂及国别" prop="factory" min-width="120" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="生产日期" prop="production_date" width="120">
|
||||
<el-table-column label="生产日期" prop="production_date" min-width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="购置日期" prop="buy_date" width="120">
|
||||
<el-table-column label="购置日期" prop="buy_date" min-width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="数量" prop="count" width="120">
|
||||
<el-table-column label="数量" prop="count" min-width="120">
|
||||
</el-table-column>
|
||||
<el-table-column label="状态" width="120">
|
||||
<el-table-column label="状态" min-width="120">
|
||||
<template slot-scope="scope">
|
||||
<el-tag v-if="scope.row.state===10" type="success">
|
||||
{{ state_[scope.row.state] }}
|
||||
|
@ -77,16 +77,16 @@
|
|||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="技术指标" width="120" show-overflow-tooltip>
|
||||
<el-table-column label="技术指标" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.parameter }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="保管人" width="120">
|
||||
<el-table-column label="保管人" min-width="120">
|
||||
<template slot-scope="scope" v-if="scope.row.keeper_">{{ scope.row.keeper_.username }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="存放位置" width="120" show-overflow-tooltip>
|
||||
<el-table-column label="存放位置" min-width="120" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.place }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="绑定工序" width="120" show-overflow-tooltip>
|
||||
<el-table-column label="绑定工序" min-width="160" show-overflow-tooltip>
|
||||
<template slot-scope="scope" v-if="scope.row.step_">
|
||||
<el-tag v-for="item in scope.row.step_"
|
||||
:key="item.number"
|
||||
|
@ -101,7 +101,7 @@
|
|||
<el-table-column
|
||||
align="center"
|
||||
label="操作"
|
||||
width="120px"
|
||||
min-width="120px"
|
||||
fixed="right"
|
||||
>
|
||||
<template slot-scope="scope">
|
||||
|
|
|
@ -16,9 +16,10 @@
|
|||
:data="subPlanList"
|
||||
fit
|
||||
style="width: 100%"
|
||||
height="100"
|
||||
stripe
|
||||
border
|
||||
height="100"
|
||||
highlight-current-row
|
||||
v-el-height-adaptive-table="{bottomOffset: 50}"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
|
|
|
@ -9,8 +9,9 @@
|
|||
border
|
||||
fit
|
||||
stripe
|
||||
height="100"
|
||||
highlight-current-row
|
||||
max-height="600"
|
||||
v-el-height-adaptive-table="{bottomOffset: 60}"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="成品名称">
|
||||
|
@ -53,7 +54,6 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="wproductList.count > 0"
|
||||
:total="wproductList.count"
|
||||
:page.sync="listQuery.page"
|
||||
:limit.sync="listQuery.page_size"
|
||||
|
@ -73,8 +73,9 @@
|
|||
border
|
||||
fit
|
||||
stripe
|
||||
height="100"
|
||||
highlight-current-row
|
||||
max-height="600"
|
||||
v-el-height-adaptive-table="{bottomOffset: 60}"
|
||||
>
|
||||
<el-table-column type="selection" width="55"></el-table-column>
|
||||
<el-table-column type="index" width="50"/>
|
||||
|
@ -124,7 +125,6 @@
|
|||
</el-table-column>
|
||||
</el-table>
|
||||
<pagination
|
||||
v-show="wproductList1.count > 0"
|
||||
:total="wproductList1.count"
|
||||
:page.sync="listQuery1.page"
|
||||
:limit.sync="listQuery1.page_size"
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
<template>
|
||||
<div class="app-container">
|
||||
<el-card>
|
||||
<el-tabs v-model="activeName" @tab-click="handleClick" type="border-card">
|
||||
<el-tab-pane
|
||||
v-for="item in processOption"
|
||||
|
@ -13,7 +14,7 @@
|
|||
border
|
||||
stripe
|
||||
style="width: 100%"
|
||||
height="250"
|
||||
:height="tableHeight"
|
||||
highlight-current-row
|
||||
@current-change="handleCurrentChange"
|
||||
>
|
||||
|
@ -115,6 +116,10 @@
|
|||
:limit.sync="listQuery.page_size"
|
||||
@pagination="subproductionplanList"
|
||||
/>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-card>
|
||||
<el-card>
|
||||
<el-row :gutter="2">
|
||||
<el-col :span="12">
|
||||
<el-card class="box-card">
|
||||
|
@ -155,41 +160,41 @@
|
|||
fit
|
||||
stripe
|
||||
style="width: 100%"
|
||||
max-height="300"
|
||||
:height="secondTableHeight"
|
||||
:data="wproductData"
|
||||
@selection-change="handleSelectionChange"
|
||||
>
|
||||
<el-table-column type="selection" width="40"></el-table-column>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="子计划编号" width="100" show-overflow-tooltip>
|
||||
<el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">{{ scope.row.number }}</template>>
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.subproduction_plan_.number}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="玻璃编号" prop="number" width="100" show-overflow-tooltip>
|
||||
<el-table-column label="玻璃编号" prop="number" min-width="100" show-overflow-tooltip>
|
||||
</el-table-column>
|
||||
<el-table-column label="玻璃状态" width="100" show-overflow-tooltip>
|
||||
<el-table-column label="玻璃状态" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.material_.name}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="所在子工序" width="100" show-overflow-tooltip>
|
||||
<el-table-column label="所在子工序" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{scope.row.step_.name}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="进行状态" width="100" show-overflow-tooltip>
|
||||
<el-table-column label="进行状态" min-width="100" show-overflow-tooltip>
|
||||
<template slot-scope="scope">
|
||||
{{actstate_[scope.row.act_state]}}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="不合格标记" width="100">
|
||||
<el-table-column label="不合格标记" min-width="100">
|
||||
<template slot-scope="scope">
|
||||
{{ ng_sign_[scope.row.ng_sign] }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="更新时间" prop="update_time" width="160">
|
||||
<el-table-column label="更新时间" prop="update_time" min-width="160">
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-card>
|
||||
|
@ -205,7 +210,7 @@
|
|||
fit
|
||||
stripe
|
||||
style="width: 100%"
|
||||
max-height="300"
|
||||
:height="tableHeight"
|
||||
>
|
||||
<el-table-column type="index" width="50"/>
|
||||
<el-table-column label="子计划编号" min-width="100" show-overflow-tooltip>
|
||||
|
@ -231,8 +236,7 @@
|
|||
</el-card>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</el-tab-pane>
|
||||
</el-tabs>
|
||||
</el-card>
|
||||
<el-dialog
|
||||
title="半成品报废"
|
||||
:close-on-click-modal="false"
|
||||
|
@ -781,7 +785,6 @@
|
|||
4: "已完成",
|
||||
},
|
||||
listLoading: true,
|
||||
listLoading: true,
|
||||
id: "",
|
||||
dialogTableVisible: false,
|
||||
dialogVisible: false,
|
||||
|
@ -828,6 +831,8 @@
|
|||
{lable: "其他", value: 40},
|
||||
],
|
||||
count: null,
|
||||
tableHeight: null,
|
||||
secondTableHeight: null,
|
||||
};
|
||||
},
|
||||
process: "",
|
||||
|
@ -1187,5 +1192,11 @@
|
|||
});
|
||||
},
|
||||
},
|
||||
mounted() {
|
||||
let H = document.getElementsByClassName('app-main')[0].clientHeight;
|
||||
let h = H/2-85;
|
||||
this.tableHeight = h+'px';
|
||||
this.secondTableHeight = h-36+'px';
|
||||
}
|
||||
};
|
||||
</script>
|
||||
|
|
Loading…
Reference in New Issue