fix:物料维护、组盘管理增加产品牌号和物料型号筛选；
申请贴标增加重量显示；木托盘绑定接口增加砖块数量校验
This commit is contained in:
songxiaopeng
@@ -10,21 +10,21 @@
|
||||
label-width="90px"
|
||||
label-suffix=":"
|
||||
>
|
||||
<!-- <el-form-item label="所属车间">-->
|
||||
<!-- <el-select-->
|
||||
<!-- v-model="query.workshop_code"-->
|
||||
<!-- clearable-->
|
||||
<!-- size="mini"-->
|
||||
<!-- placeholder="所属车间"-->
|
||||
<!-- class="filter-item"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in workShopList"-->
|
||||
<!-- :label="item.workshop_name"-->
|
||||
<!-- :value="item.workshop_code"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<!-- <el-form-item label="所属车间">-->
|
||||
<!-- <el-select-->
|
||||
<!-- v-model="query.workshop_code"-->
|
||||
<!-- clearable-->
|
||||
<!-- size="mini"-->
|
||||
<!-- placeholder="所属车间"-->
|
||||
<!-- class="filter-item"-->
|
||||
<!-- >-->
|
||||
<!-- <el-option-->
|
||||
<!-- v-for="item in workShopList"-->
|
||||
<!-- :label="item.workshop_name"-->
|
||||
<!-- :value="item.workshop_code"-->
|
||||
<!-- />-->
|
||||
<!-- </el-select>-->
|
||||
<!-- </el-form-item>-->
|
||||
<el-form-item label="模糊搜索">
|
||||
<el-input
|
||||
v-model="query.blurry"
|
||||
@@ -34,12 +34,30 @@
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料规格">
|
||||
<el-form-item label="产品部位">
|
||||
<el-input
|
||||
v-model="query.material_spec"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="物料规格"
|
||||
placeholder="产品部位"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="产品牌号">
|
||||
<el-input
|
||||
v-model="query.material_code"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="产品牌号"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="物料型号">
|
||||
<el-input
|
||||
v-model="query.material_model"
|
||||
clearable
|
||||
size="mini"
|
||||
placeholder="物料型号"
|
||||
@keyup.enter.native="crud.toQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
@@ -54,7 +72,8 @@
|
||||
:before-close="crud.cancelCU"
|
||||
:visible.sync="crud.status.cu > 0"
|
||||
:title="crud.status.title"
|
||||
width="820px">
|
||||
width="820px"
|
||||
>
|
||||
<el-form
|
||||
ref="form"
|
||||
:inline="true"
|
||||
@@ -63,8 +82,9 @@
|
||||
:rules="rules"
|
||||
size="mini"
|
||||
label-width="125px"
|
||||
label-suffix=":">
|
||||
|
||||
label-suffix=":"
|
||||
>
|
||||
|
||||
<el-form-item label="订单编号" prop="order_number">
|
||||
<el-input v-model="form.order_number" style="width: 240px;" />
|
||||
</el-form-item>
|
||||
@@ -83,6 +103,13 @@
|
||||
<el-form-item label="物料型号" prop="material_model">
|
||||
<el-input v-model="form.material_model" style="width: 240px;" />
|
||||
</el-form-item>
|
||||
<el-form-item label="单重（吨）">
|
||||
<el-input-number
|
||||
v-model.number="form.single_weight"
|
||||
:min="0"
|
||||
style="width: 240px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- <el-form-item label="A长边">
|
||||
<el-input-number
|
||||
v-model.number="form.a_long_side"
|
||||
@@ -111,13 +138,7 @@
|
||||
style="width: 240px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="单重">
|
||||
<el-input-number
|
||||
v-model.number="form.single_weight"
|
||||
:min="0"
|
||||
style="width: 240px;"
|
||||
/>
|
||||
</el-form-item>
|
||||
|
||||
<el-form-item label="木托盘规格">
|
||||
<el-tooltip class="item" effect="dark" content="例如：950*1000" placement="top">
|
||||
<el-select
|
||||
@@ -195,9 +216,10 @@
|
||||
<el-table-column prop="material_code" label="产品牌号 " :min-width="flexWidth('material_code',crud.data,'产品牌号 ')" />
|
||||
<el-table-column prop="material_spec" label="产品部位" :min-width="flexWidth('material_spec',crud.data,'产品部位')" />
|
||||
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'物料分类标识')" />
|
||||
<el-table-column prop="single_weight" label="单重（吨）" :min-width="flexWidth('single_weight',crud.data,'物料分类标识')" />
|
||||
<!-- <el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
|
||||
<el-table-column prop="cooling_time" label="冷却时间(分钟)" :min-width="flexWidth('cooling_time',crud.data,'静置时间(分钟)')" /> -->
|
||||
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
|
||||
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />-->
|
||||
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
|
||||
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">
|
||||
<template slot-scope="scope">
|
||||
@@ -213,7 +235,7 @@
|
||||
<el-table-column prop="create_time" label="同步时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
|
||||
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
|
||||
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
|
||||
<!-- <el-table-column prop="ext_time" label="MES时间" :min-width="flexWidth('ext_time',crud.data,'修改时间')" />-->
|
||||
<!-- <el-table-column prop="ext_time" label="MES时间" :min-width="flexWidth('ext_time',crud.data,'修改时间')" />-->
|
||||
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
|
||||
<template slot-scope="scope">
|
||||
<udOperation
|
||||
|
||||
Reference in New Issue
Block a user