This commit is contained in:
2022-12-05 11:43:18 +08:00
parent 7ec52b45c8
commit f8144305f2
15 changed files with 93 additions and 59 deletions

View File

@@ -167,7 +167,7 @@
</div>
<!--如果想在工具栏加入更多按钮可以使用插槽方式 slot = 'left' or 'right'-->
<crudOperation :permission="permission">
<!-- <el-button
<el-button
slot="right"
class="filter-item"
type="success"
@@ -176,7 +176,7 @@
@click="downdtl"
>
导出Excel
</el-button>-->
</el-button>
</crudOperation>
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="1000px">

View File

@@ -129,10 +129,23 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
<el-select
v-model="form.product_area"
size="mini"
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

View File

@@ -91,16 +91,29 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="满轴位编码">
<el-input v-model="form.full_point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.full_point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true" />
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-input v-model="form.product_area" style="width: 370px;" :disabled="true" />
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 185px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="是否启用">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />
@@ -166,11 +179,7 @@
</template>
</el-table-column>
<el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="product_area" label="生产区域">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
</template>
</el-table-column>
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置">
<template slot-scope="scope">
{{ dict.label.point_location[scope.row.point_location] }}

View File

@@ -74,7 +74,7 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -83,7 +83,6 @@
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.product_area"
@@ -120,7 +119,6 @@
placeholder="位置"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.point_location"
@@ -130,7 +128,7 @@
</el-select>
</el-form-item>
<el-form-item label="顺序号" prop="sort_seq">
<el-input v-model="form.sort_seq" style="width: 370px;" :disabled="true" />
<el-input v-model="form.sort_seq" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

View File

@@ -85,7 +85,23 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="520px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="100px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
filterable
size="mini"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态" prop="point_status">
<el-select
@@ -104,10 +120,7 @@
</el-select>
</el-form-item>
<el-form-item label="母卷号">
<el-input v-model="form.container_name" style="width: 370px;" :disabled="true" />
</el-form-item>
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 370px;" :disabled="true" />
<el-input v-model="form.container_name" style="width: 370px;"/>
</el-form-item>
<el-form-item label="温度">
<el-input v-model="form.temperature" style="width: 370px;" />

View File

@@ -57,10 +57,10 @@
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="点位编码" prop="point_code">
<el-input v-model="form.point_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="生产区域">
<el-select
@@ -69,7 +69,7 @@
placeholder="生产区域"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.product_area"
@@ -85,7 +85,6 @@
placeholder="位置"
class="filter-item"
style="width: 370px;"
:disabled="true"
>
<el-option
v-for="item in dict.point_location"
@@ -95,7 +94,7 @@
</el-select>
</el-form-item>
<el-form-item label="外部编码">
<el-input v-model="form.ext_code" style="width: 370px;" :disabled="true" />
<el-input v-model="form.ext_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否启用" prop="is_used">
<el-switch v-model="form.is_used" active-value="1" inactive-value="0" />

View File

@@ -106,7 +106,7 @@
@current-change="handleDtlCurrentChange"
>
<el-table-column type="index" label="序号" width="55" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" />
<el-table-column prop="bill_code" label="出库单号" align="center" width="100"/>
<el-table-column :formatter="bill_statusFormat" prop="bill_status" label="状态" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
<el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
@@ -115,6 +115,8 @@
<el-table-column prop="qty_unit_name" label="单位" align="center" />
<el-table-column prop="source_bill_type" label="源单类型" align="center" width="130px" :formatter="invtypeFormat" />
<el-table-column prop="source_bill_code" label="源单号" align="center" width="130px" />
<el-table-column prop="vbeln" label="交货单号" align="center" width="130px" />
<el-table-column prop="posnr" label="交货单行号" align="center" width="130px" />
<el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" />
</el-table>
</el-card>