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

fix

Browse Source
This commit is contained in:
psh
2024-03-18 15:32:23 +08:00
parent 5576ca8446
commit caf800fd43
15 changed files with 44 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-ui/src/views/wms/basedata/material/index.vue
View File

@@ -54,7 +54,7 @@
<el-form-item label="物料分类标识">
<el-input v-model="form.class_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-form-item label="回温时间(小时)">
<el-input v-model="form.standing_time" style="width: 370px;" />
</el-form-item>
<el-form-item label="车间编码">
@@ -76,7 +76,7 @@
<el-table-column prop="material_name" label="物料名称 " :min-width="flexWidth('material_name',crud.data,'物料名称 ')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'物料规格')" />
<el-table-column prop="class_id" label="物料分类标识" :min-width="flexWidth('class_id',crud.data,'物料分类标识')" />
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<el-table-column prop="remark" label="备注" :min-width="flexWidth('remark',crud.data,'备注')" />
<el-table-column prop="is_used" label="是否启用" :min-width="flexWidth('is_used',crud.data,'是否启用')">

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

@@ -188,7 +188,7 @@
<el-form-item label="设备名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled />
</el-form-item>
<el-form-item label="静置时间(分钟)" prop="standing_time">
<el-form-item label="回温时间(小时)" prop="standing_time">
<el-input-number
v-model.number="form.standing_time"
:min="0"
@@ -296,8 +296,8 @@
/>
<el-table-column
prop="standing_time"
label="静置时间(分钟)"
:min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')"
label="回温时间(小时)"
:min-width="flexWidth('standing_time',crud.data,'回温时间(小时)')"
/>
<el-table-column prop="is_needmove" label="是否自动搬运" :min-width="flexWidth('is_needmove',crud.data,'是否自动搬运')">
<template slot-scope="scope">

2
lms/nladmin-ui/src/views/wms/sch/group/MaterialDialog.vue
View File

@@ -58,7 +58,7 @@
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<!-- <el-table-column prop="class_name" label="物料分类" width="140" />-->
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="standing_time" label="回温时间(小时)" width="130px" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
</el-table>

12
lms/nladmin-ui/src/views/wms/sch/group/index.vue
View File

@@ -127,7 +127,7 @@
<el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-form-item label="回温时间(小时)">
<el-input-number
v-model.number="form.standing_time"
:min="1"
@@ -234,11 +234,11 @@
<el-table-column prop="region_name" label="所属区域" :min-width="flexWidth('region_name',crud.data,'所属区域')" />
<el-table-column prop="point_code" label="点位编码" :min-width="flexWidth('point_code',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,'是否满托')">
<!--<el-table-column prop="is_full" label="是否满托" :min-width="flexWidth('is_full',crud.data,'是否满托')">
<template slot-scope="scope">
{{ scope.row.is_full?'是':'否' }}
</template>
</el-table-column>
</el-table-column>-->
<el-table-column prop="pcsn" label="批次" :min-width="flexWidth('pcsn',crud.data,'批次')" />
<el-table-column prop="workorder_code" label="工单编码" :min-width="flexWidth('workorder_code',crud.data,'工单编码')" />
<el-table-column prop="instorage_time" label="入库时间" :min-width="flexWidth('instorage_time',crud.data,'入库时间')" />
@@ -247,11 +247,11 @@
{{ dict.label.group_bind_material_status[scope.row.group_bind_material_status] }}
</template>
</el-table-column>
<el-table-column prop="standing_time" label="静置时间(分钟)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="standing_time" label="回温时间(小时)" :min-width="flexWidth('standing_time',crud.data,'静置时间(分钟)')" />
<!--<el-table-column prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_code" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'物料数量')" />-->
<el-table-column prop="material_weight" label="物料重量" :min-width="flexWidth('material_weight',crud.data,'物料重量')" />
<el-table-column prop="group_number" label="组盘次数" :min-width="flexWidth('group_number',crud.data,'组盘次数')" />
<el-table-column prop="task_code" label="任务编码" :min-width="flexWidth('task_code',crud.data,'任务编码')" />

2
lms/nladmin-ui/src/views/wms/sch/material/MaterialDialog.vue
View File

@@ -58,7 +58,7 @@
<el-table-column prop="material_name" label="物料名称" width="180" show-overflow-tooltip />
<el-table-column prop="material_spec" label="物料规格" width="140" />
<!-- <el-table-column prop="class_name" label="物料分类" width="140" />-->
<el-table-column prop="standing_time" label="静置时间（分钟）" width="130px" />
<el-table-column prop="standing_time" label="回温时间(小时)" width="130px" />
<el-table-column prop="update_name" label="修改人" />
<el-table-column prop="update_time" label="修改时间" width="135" />
</el-table>

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

@@ -75,7 +75,7 @@
<el-form-item label="入库时间">
<el-input v-model="groups.instorage_time" style="width: 200px;" />
</el-form-item>
<el-form-item label="静置时间(分)">
<el-form-item label="回温时间(小时)">
<el-input v-model="groups.standing_time" style="width: 200px;" />
</el-form-item>
<el-form-item label="绑定状态">