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

手持更新

Browse Source
This commit is contained in:
张江玮
2023-06-02 14:24:26 +08:00
parent 6200e0ad48
commit 3d2336fa04
23 changed files with 337 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lms/nladmin-ui/src/views/wms/basedata/vehicle/group/index.vue
View File

@@ -19,11 +19,11 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<rrOperation />
<rrOperation/>
</el-form>
</div>
<!--如果想在工具栏加入更多按钮，可以使用插槽方式， slot = 'left' or 'right'-->
<crudOperation :permission="permission" />
<crudOperation :permission="permission"/>
<!--表单组件-->
<el-dialog
:close-on-click-modal="false"
@@ -51,16 +51,16 @@
</el-select>
</el-form-item>
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" style="width: 370px;" />
<el-input v-model="form.vehicle_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="数量" prop="qty">
<el-input v-model="form.qty" style="width: 370px;" />
<el-input v-model="form.qty" style="width: 370px;"/>
</el-form-item>
<el-form-item label="重量" prop="weight">
<el-input v-model="form.weight" style="width: 370px;" />
<el-input v-model="form.weight" style="width: 370px;"/>
</el-form-item>
<el-form-item label="点位编码">
<el-input v-model="form.point_code" style="width: 370px;" />
<el-input v-model="form.point_code" style="width: 370px;"/>
</el-form-item>
<el-form-item label="是否满垛" prop="is_full">
<el-radio v-model="form.is_full" label="0">否</el-radio>
@@ -85,11 +85,12 @@
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="vehicle_type"
label="载具类型"
:min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
:min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
@@ -99,21 +100,17 @@
label="载具编码"
:min-width="flexWidth('vehicle_code',crud.data,'载具编码')"
/>
<el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')">
<el-table-column prop="qty" label="数量" :min-width="flexWidth('qty',crud.data,'数量')"/>
<el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')"/>
<!-- <el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')"/>-->
<el-table-column prop="is_full" label="是否满垛" :min-width="flexWidth('is_full',crud.data,'是否满垛')">
<template slot-scope="scope">
{{scope.row.qty}}/块
</template>
</el-table-column>
<el-table-column prop="weight" label="重量" :min-width="flexWidth('weight',crud.data,'重量')" />
<el-table-column prop="point_name" label="点位名称" :min-width="flexWidth('point_name',crud.data,'点位名称')" />
<el-table-column prop="is_full" label="是否满垛" :min-width="flexWidth('is_full',crud.data,'是否满垛')" >
<template slot-scope="scope">
{{scope.row.is_full=='1'?'是':'否'}}
{{ scope.row.is_full == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column prop="is_fire" label="是否烧制" :min-width="flexWidth('is_fire',crud.data,'是否烧制')">
<template slot-scope="scope">
{{scope.row.is_fire=='1'?'是':'否'}}
{{ scope.row.is_fire == '1' ? '是' : '否' }}
</template>
</el-table-column>
<el-table-column
@@ -146,7 +143,7 @@
</el-table-column>
</el-table>
<!--分页组件-->
<pagination />
<pagination/>
</div>
</div>
</template>

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

@@ -209,7 +209,7 @@
<el-table-column
prop="vehicle_type"
label="载具类型"
:min-width="flexWidth('vehicle_type',crud.data,'载具类型')"
:min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')"
>
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}

2
lms/nladmin-ui/src/views/wms/sch/point/index.vue
View File

@@ -259,7 +259,7 @@
{{ dict.label.true_or_false[scope.row.is_used] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>

2
lms/nladmin-ui/src/views/wms/sch/task/index.vue
View File

@@ -96,7 +96,7 @@
<el-table-column prop="point1_region_name" label="起点区域" :min-width="flexWidth('point1_region_name',crud.data,'起点区域')" />
<el-table-column prop="point2_name" label="终点" :min-width="flexWidth('point2_name',crud.data,'终点')" />
<el-table-column prop="point2_region_name" label="终点区域" :min-width="flexWidth('point2_region_name',crud.data,'终点区域')" />
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型')">
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'类型一木托盘')">
<template slot-scope="scope">
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>