root/longdianningxing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码更新

Browse Source
This commit is contained in:
ldj_willow
2022-10-09 11:14:33 +08:00
parent d497daef9b
commit 422c2f537b
3 changed files with 106 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nladmin-ui/src/views/wms/pdm/ivt/cutpointivt/index.vue
View File

@@ -56,20 +56,18 @@
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" /> <el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" /> <el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="full_point_code" label="满轴位编码" /> <el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="full_point_status" label="满轴位状态" /> <el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip/>
<el-table-column prop="container_name" label="母卷号" /> <el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编码" /> <el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="100" show-overflow-tooltip/>
<el-table-column prop="empty_point_code" label="空轴位编码" /> <el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="empty_point_status" label="空轴位状态" /> <el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip/>
<el-table-column prop="empty_vehicle_code" label="空轴编码" /> <el-table-column prop="empty_vehicle_code" label="空轴编码" />
<el-table-column prop="product_area" label="生产区域" /> <el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" /> <el-table-column prop="point_location" label="位置" />
<el-table-column prop="sort_seq" label="顺序号" />
<el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" /> <el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip/>
<el-table-column prop="update_time" label="修改时间" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<udOperation <udOperation

2
nladmin-ui/src/views/wms/pdm/ivt/deliverypointivt/index.vue
View File

@@ -37,10 +37,8 @@
<el-table-column prop="point_code" label="点位编码" /> <el-table-column prop="point_code" label="点位编码" />
<el-table-column prop="product_area" label="生产区域" /> <el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="point_location" label="位置" /> <el-table-column prop="point_location" label="位置" />
<el-table-column prop="sort_seq" label="顺序号" />
<el-table-column prop="is_used" label="是否启用" /> <el-table-column prop="is_used" label="是否启用" />
<el-table-column prop="remark" label="备注" /> <el-table-column prop="remark" label="备注" />
<el-table-column prop="create_name" label="创建人姓名" />
<el-table-column prop="update_time" label="修改时间" /> <el-table-column prop="update_time" label="修改时间" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">

201
nladmin-ui/src/views/wms/pdm/order/rawfoilworkorder/index.vue
View File

@@ -8,93 +8,77 @@
:inline="true" :inline="true"
class="demo-form-inline" class="demo-form-inline"
label-position="right" label-position="right"
label-width="11 0px" label-width="80px"
label-suffix=":" label-suffix=":"
> >
<el-row>
<el-col :span="8">
<el-form-item label="生产区域">
<el-select
v-model="query.product_area"
clearable
size="mini"
placeholder="请选择"
class="filter-item"
style="width: 250px"
@change="hand"
>
<el-option
v-for="item in dict.product_area"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
</el-col>
<el-col :span="8"> <el-form-item label="生产区域">
<el-form-item label="机台编码"> <el-select
<el-input v-model="query.product_area"
v-model="query.resource_name" clearable
clearable size="mini"
size="mini" placeholder="请选择"
placeholder="机台编码" class="filter-item"
style="width: 250px" @change="hand"
@keyup.enter.native="crud.toQuery" >
/> <el-option
</el-form-item> v-for="item in dict.product_area"
</el-col> :label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-col :span="8"> <el-form-item label="机台编码">
<el-form-item label="母卷号"> <el-input
<el-input v-model="query.resource_name"
v-model="query.container_name" clearable
clearable size="mini"
size="mini" placeholder="机台编码"
placeholder="母卷号" @keyup.enter.native="crud.toQuery"
style="width: 250px" />
@keyup.enter.native="crud.toQuery" </el-form-item>
/>
</el-form-item>
</el-col>
</el-row>
<el-row> <el-form-item label="母卷号">
<el-col :span="8"> <el-input
<el-form-item label="日期"> v-model="query.container_name"
<el-date-picker clearable
v-model="query.createTime" size="mini"
type="daterange" placeholder="母卷号"
value-format="yyyy-MM-dd HH:mm:ss" @keyup.enter.native="crud.toQuery"
start-placeholder="开始日期" />
end-placeholder="结束日期" </el-form-item>
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
</el-col>
<el-col :span="8"> <el-form-item label="工单状态">
<el-form-item label="状态"> <el-select
<el-select v-model="query.status"
v-model="query.status" clearable
clearable size="mini"
size="mini" placeholder="工单状态"
placeholder="单据状态" class="filter-item"
class="filter-item" @change="hand"
style="width: 250px" >
@change="hand" <el-option
> v-for="item in dict.product_status"
<el-option :label="item.label"
v-for="item in dict.product_status" :value="item.value"
:label="item.label" />
:value="item.value" </el-select>
/> </el-form-item>
</el-select>
</el-form-item> <el-form-item label="工单日期">
<rrOperation /> <el-date-picker
</el-col> v-model="query.createTime"
</el-row> type="daterange"
value-format="yyyy-MM-dd HH:mm:ss"
start-placeholder="开始日期"
end-placeholder="结束日期"
:default-time="['00:00:00', '23:59:59']"
@change="crud.toQuery"
/>
</el-form-item>
<rrOperation />
</el-form> </el-form>
</div> </div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'--> <!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
@@ -112,31 +96,37 @@
</el-button> </el-button>
</crudOperation> </crudOperation>
<!--表单组件--> <!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="500px"> <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 ref="form" :model="form" :rules="rules" size="mini" label-width="80px">
<el-form-item label="母卷号" prop="container_name"> <el-form-item label="母卷号" prop="container_name">
<el-input v-model="form.container_name" style="width: 370px;"/> <el-input v-model="form.container_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="机台编码" prop="resource_name"> <el-form-item label="机台编码" prop="resource_name">
<el-input v-model="form.resource_name" style="width: 370px;"/> <el-input v-model="form.resource_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="生产工单" prop="mfg_order_name"> <el-form-item label="生产工单" prop="mfg_order_name">
<el-input v-model="form.mfg_order_name" style="width: 370px;"/> <el-input v-model="form.mfg_order_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="产品编码" prop="product_name"> <el-form-item label="产品编码" prop="product_name">
<el-input v-model="form.product_name" style="width: 370px;"/> <el-input v-model="form.product_name" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="产品名称" prop="description"> <el-form-item label="产品名称" prop="description">
<el-input v-model="form.description" style="width: 370px;"/> <el-input v-model="form.description" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="重量"> <el-form-item label="重量">
<el-input v-model="form.productin_qty" style="width: 370px;"/> <el-input v-model="form.productin_qty" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="车号"> <el-form-item label="车号">
<el-input v-model="form.agvno" style="width: 370px;"/> <el-input v-model="form.agvno" style="width: 370px;" />
</el-form-item> </el-form-item>
<el-form-item label="备注"> <el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;"/> <el-input v-model="form.remark" style="width: 370px;" />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@@ -145,20 +135,27 @@
</div> </div>
</el-dialog> </el-dialog>
<!--表格渲染--> <!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler"> <el-table
<el-table-column type="selection" width="55"/> ref="table"
v-loading="crud.loading"
:data="crud.data"
size="mini"
style="width: 100%;"
@selection-change="crud.selectionChangeHandler"
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="工单标识" /> <el-table-column v-if="false" prop="workorder_id" label="工单标识" />
<el-table-column prop="status" label="状态" :formatter="formatStatusName" /> <el-table-column prop="mfg_order_name" label="工单号" />
<el-table-column prop="mfg_order_name" label="工单号"/> <el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
<el-table-column prop="container_name" label="母卷号"/> <el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="resource_name" label="机台编码"/> <el-table-column prop="resource_name" label="机台编码" />
<el-table-column prop="product_name" label="产品编码"/> <el-table-column prop="product_name" label="产品编码" />
<el-table-column prop="theory_height" label="理论长度"/> <el-table-column prop="theory_height" label="理论长度" />
<el-table-column prop="realstart_time" label="开始时间" width="150px" /> <el-table-column prop="realstart_time" label="开始时间" width="150px" />
<el-table-column prop="realend_time" label="结束时间" width="150px" /> <el-table-column prop="realend_time" label="结束时间" width="150px" />
<el-table-column prop="productin_qty" label="重量"/> <el-table-column prop="productin_qty" label="重量" />
<el-table-column prop="agvno" label="车号"/> <el-table-column prop="agvno" label="车号" />
<el-table-column prop="product_area" label="生产区域"/> <el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="update_time" label="更新时间" width="150px" /> <el-table-column prop="update_time" label="更新时间" width="150px" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right"> <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
@@ -170,7 +167,7 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<!--分页组件--> <!--分页组件-->
<pagination/> <pagination />
</div> </div>
</div> </div>
</template> </template>