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

fix: 问题修复,添加打印,托盘显示等功能

Browse Source
This commit is contained in:
yanps
2025-02-07 16:52:49 +08:00
parent 858504acd7
commit 7d9bbd9b4c
26 changed files with 312 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-ui/src/views/wms/produceScreen/index.vue
View File

@@ -380,6 +380,7 @@ export default {
})
} else if (type === 'PALLET') {
crudProduceScreen.selectMaterialAndJpg(this.popData.device_code).then(res => {
this.imgSrc = res.vehiclePath
this.popList = [...res.materialList]
})
this.show = true

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

@@ -49,23 +49,6 @@
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
<!-- <el-form-item label="绑定状态">
<el-select
v-model="query.group_bind_material_status"
clearable
size="mini"
placeholder="绑定状态"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in dict.group_bind_material_status"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
<el-form-item label="jobName">
<el-input
v-model="query.job_name"
@@ -104,12 +87,6 @@
<el-form-item label="载具编码">
<el-input v-model="form.vehicle_code" style="width: 240px;" />
</el-form-item>
<!--<el-form-item label="子载具编码">
<el-input v-model="form.child_vehicle_code" style="width: 240px;" />
</el-form-item>-->
<!-- <el-form-item v-if="false" label="来源载具">
<el-input v-model="form.source_vehicle_code" style="width: 240px;" />
</el-form-item> -->
<el-form-item label="入库时间">
<el-date-picker
v-model="form.create_time"
@@ -119,47 +96,6 @@
placeholder="选择日期时间"
/>
</el-form-item>
<el-form-item label="点位编码">
<el-select
v-model="form.theLocation"
clearable
filterable
placeholder="请选择"
style="width: 240px;"
@change="setPointName"
>
<el-option
v-for="item in pointList"
:key="item.point_code"
:label="item.point_code"
:value="item.point_code"
>
<span style="float: left">{{ item.point_name }}</span>
<span style="float: right; color: #8492a6; font-size: 13px">{{ item.point_code }}</span>
</el-option>
</el-select>
<!-- <el-input v-model="form.point_code" style="width: 240px;" />-->
</el-form-item>
<!-- <el-form-item label="点位名称">
<el-input v-model="form.point_name" style="width: 240px;" disabled />
</el-form-item> -->
<!-- <el-form-item label="是否满托">
<el-radio-group v-model="form.is_full" style="width: 240px">
<el-radio :label="true">是</el-radio>
<el-radio :label="false">否</el-radio>
</el-radio-group>
</el-form-item> -->
<!-- <el-form-item label="批次">
<el-input v-model="form.pcsn" style="width: 240px;" />
</el-form-item>
<el-form-item label="静置时间(分钟)">
<el-input-number
v-model.number="form.standing_time"
:min="1"
:max="999"
style="width: 240px;"
/>
</el-form-item> -->
<el-form-item label="物料数量">
<el-input-number
v-model.number="form.material_qty"
@@ -167,65 +103,13 @@
style="width: 240px;"
/>
</el-form-item>
<!-- <el-form-item label="物料重量">
<el-input-number
v-model.number="form.material_weight"
:min="0"
style="width: 240px;"
/>
</el-form-item> -->
<el-form-item label="订单编码">
<el-input v-model="form.order_code" style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="物料来源">
<el-radio-group v-model="choose" size="mini" style="width: 240px;">
<el-radio-button label="物料" />
<el-radio-button label="工单" />
</el-radio-group>
</el-form-item> -->
<el-form-item label="物料编码">
<el-input v-model="form.material_id" clearable style="width: 240px;" />
</el-form-item>
<!-- <el-form-item label="物料名称">
<el-input v-model="form.material_name" clearable style="width: 240px;" @clear="clearMaterial" @focus="getMaterial" />
</el-form-item>
<el-form-item label="物料编码">
<el-input v-model="form.material_code" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="物料规格">
<el-input v-model="form.material_spec" disabled style="width: 240px;" />
</el-form-item>
<el-form-item label="组盘次数">
<el-input v-model="form.group_number" style="width: 240px;" />
</el-form-item> -->
<!-- <el-form-item label="任务编码">
<el-input v-model="form.task_code" style="width: 240px;" />
</el-form-item> -->
<!--<el-form-item label="车间编码">
<el-input v-model="form.workshop_code" style="width: 240px;" />
</el-form-item>-->
<!-- <el-form-item label="组盘状态">
<el-select
v-model="form.group_status"
size="mini"
placeholder="点位状态"
class="filter-item"
style="width: 240px;"
clearable
>
<el-option
v-for="item in dict.group_status"
:key="item.label"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item> -->
<!--<el-form-item label="是否首个流程任务">
<el-input v-model="form.is_first_flow_task" style="width: 240px;" />
</el-form-item>-->
<el-form-item label="工艺编码">
<!-- <el-input v-model="form.region_code" style="width: 240px;" /> -->
<el-select
v-model="form.region_code"
clearable
@@ -251,12 +135,6 @@
placeholder="选择日期时间"
/>
</el-form-item>
<!-- <el-form-item label="上一任务">
<el-input v-model="form.before_task_code" style="width: 240px;" />
</el-form-item>
<el-form-item label="下一任务">
<el-input v-model="form.next_task_code" style="width: 240px;" />
</el-form-item> -->
<el-form-item label="备注" prop="remark">
<label slot="label">备&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;注:</label>
<el-input v-model.trim="form.remark" style="width: 480px;" rows="2" type="textarea" :disabled="crud.status.view > 0" />
@@ -438,7 +316,7 @@ export default {
idField: 'group_id',
sort: 'vehicle_code,desc',
optShow: {
add: false,
add: true,
edit: true,
del: true,
download: false,
@@ -487,7 +365,7 @@ export default {
this.dialogVisible1 = true
crudSchBaseVehiclematerialgroup.selectMaterialFile(groupId).then(res => {
console.log(res.data)
this.materialFile = res
this.materialFile = 'http://localhost:8081/1.jpg'
})
// 在这里处理点击逻辑，例如弹出图片、显示详情等
},