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

Merge branch 'master' into b_lms2

Browse Source
This commit is contained in:
zhangzq
2024-06-07 16:21:32 +08:00
parent bc4fd0c139 bfd22526bf
commit c33ffe440b
796 changed files with 42349 additions and 14164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@
</template>
</el-table-column>
<el-table-column prop="remark" label="备注" />
<el-table-column prop="update_time" label="修改时间" min-width="150" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" min-width="151" show-overflow-tooltip />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

3
lms/nladmin-ui/src/views/wms/pdm/ivt/package/index.vue
View File

@@ -158,6 +158,7 @@
>
<el-table-column type="selection" width="55" />
<el-table-column prop="point_code" label="点位编码" width="100px" />
<el-table-column prop="label" label="点位类型" width="100px" />
<el-table-column prop="product_area" label="生产区域">
<template slot-scope="scope">
{{ dict.label.product_area[scope.row.product_area] }}
@@ -173,7 +174,7 @@
{{ dict.label.is_used[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip />
<el-table-column prop="update_time" label="修改时间" show-overflow-tooltip width="150px;"/>
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
<template slot-scope="scope">
<udOperation

2
lms/nladmin-ui/src/views/wms/pdm/order/slittingplan/index.vue
View File

@@ -467,7 +467,7 @@
<el-table-column prop="is_child_tz_ok" label="子卷套轴完成" width="100px" :formatter="formatChildName"/>
<el-table-column prop="is_child_ps_ok" label="子卷配送完成" width="100px" :formatter="formatChildPsName"/>
<el-table-column prop="is_call" label="是否呼叫" width="100px" :formatter="formatChildCallName"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="150px"/>
<el-table-column prop="qzzno" label="气涨轴编码" width="160px"/>
<el-table-column prop="start_time" label="开始时间" width="150px"/>
<el-table-column prop="end_time" label="结束时间" width="150px"/>
<!-- <el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">