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

Merge branch 'master' of http://121.40.234.130:8899/root/lanzhouhailiang_one

Browse Source
This commit is contained in:
ZHOUZ\Noble'lift
2022-12-10 15:37:55 +08:00
parent 641c390cd0 a5449d4fe9
commit bae5e198fd
13 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lms/nladmin-ui/src/views/wms/pdm/ivt/coolpointivt/inventory.vue
View File

@@ -212,21 +212,21 @@
<!--表格渲染-->
<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 prop="point_code" label="点位编码" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',crud.data,'点位编码')" />
<el-table-column prop="cool_ivt_status" label="库存状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_cool_ivt_status[scope.row.cool_ivt_status] }}
</template>
</el-table-column>
<el-table-column prop="full_point_code" label="满轴位" />
<el-table-column prop="full_point_code" label="满轴位" :min-width="flexWidth('full_point_code',crud.data,'满轴位')" />
<el-table-column prop="full_point_status" label="满轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_full_point_status[scope.row.full_point_status] }}
</template>
</el-table-column>
<el-table-column prop="container_name" label="母卷号" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" min-width="120" show-overflow-tooltip />
<el-table-column prop="empty_point_code" label="空轴位" />
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="full_vehicle_code" label="母卷轴编号" :min-width="flexWidth('full_vehicle_code',crud.data,'母卷轴编号')" />
<el-table-column prop="empty_point_code" label="空轴位" :min-width="flexWidth('empty_point_code',crud.data,'空轴位')" />
<el-table-column prop="empty_point_status" label="空轴位状态" min-width="100" show-overflow-tooltip>
<template slot-scope="scope">
{{ dict.label.sch_empty_point_status[scope.row.empty_point_status] }}
@@ -238,7 +238,7 @@
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="pcsn" label="批次" />
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="ivt_qty" label="库存数" :formatter="crud.formatNum3" />
<el-table-column prop="qty_unit_name" label="计量单位" />
<el-table-column prop="instorage_time" label="入库时间" min-width="120" show-overflow-tooltip />

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

@@ -40,6 +40,7 @@
</el-form-item>
<el-form-item label="母卷号">
<label slot="label">母&nbsp;&nbsp;卷&nbsp;&nbsp;号:</label>
<el-input
v-model="query.container_name"
clearable
@@ -208,18 +209,19 @@
>
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="workorder_id" label="工单标识" />
<el-table-column prop="mfg_order_name" label="工单号" min-width="120" show-overflow-tooltip />
<el-table-column prop="status" label="工单状态" :formatter="formatStatusName" />
<el-table-column prop="container_name" label="母卷号" min-width="120" show-overflow-tooltip />
<el-table-column prop="resource_name" label="机台编码" min-width="100" show-overflow-tooltip />
<el-table-column prop="product_name" label="产品编码" min-width="150" show-overflow-tooltip />
<el-table-column prop="theory_height" label="理论长度" />
<el-table-column prop="realstart_time" label="开始时间" width="150px" />
<el-table-column prop="realend_time" label="结束时间" width="150px" />
<el-table-column prop="productin_qty" label="重量" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" />
<el-table-column prop="product_area" label="生产区域" />
<el-table-column prop="update_time" label="更新时间" width="150px" />
<el-table-column prop="mfg_order_name" label="工单号" :min-width="flexWidth('mfg_order_name',crud.data,'工单号')" />
<el-table-column prop="status" label="工单状态" :min-width="flexWidth('status',crud.data,'工单状态')" :formatter="formatStatusName"/>
<el-table-column prop="container_name" label="母卷号" :min-width="flexWidth('container_name',crud.data,'母卷号')" />
<el-table-column prop="point_code2" label="点位编码" :min-width="flexWidth('point_code2',crud.data,'点位编码')" />
<el-table-column prop="resource_name" label="机台编码" :min-width="flexWidth('resource_name',crud.data,'机台编码')" />
<el-table-column prop="product_name" label="产品编码" :min-width="flexWidth('product_name',crud.data,'产品编码')" />
<el-table-column prop="theory_height" label="理论长度" :min-width="flexWidth('theory_height',crud.data,'理论长度')" />
<el-table-column prop="realstart_time" label="开始时间" :min-width="flexWidth('realstart_time',crud.data,'开始时间')" />
<el-table-column prop="realend_time" label="结束时间" :min-width="flexWidth('realend_time',crud.data,'结束时间')" />
<el-table-column prop="productin_qty" label="重量" :min-width="flexWidth('productin_qty',crud.data,'重量')" :formatter="crud.formatNum3" />
<el-table-column prop="agvno" label="车号" :min-width="flexWidth('agvno',crud.data,'车号')" />
<el-table-column prop="product_area" label="生产区域" :min-width="flexWidth('product_area',crud.data,'生产区域')" />
<el-table-column prop="update_time" label="更新时间" :min-width="flexWidth('update_time',crud.data,'更新时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation