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

opt: 取消NDC任务,手持下发任务优化

Browse Source
This commit is contained in:
yanps
2024-11-18 14:34:11 +08:00
parent 3937ed3a3b
commit d92ec484fa
7 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -267,8 +267,8 @@
<el-button :loading="crud.cu === 2" type="primary" @click="crud.submitCU">确认</el-button>
</div>
</el-dialog>
<el-dialog :visible.sync="dialogVisible" title="物料图片">
<img :src="imageUrl" alt="物料图片" style="max-width: 100%;">
<el-dialog :visible.sync="dialogVisible1" title="物料图片">
<img :src="errGif" alt="物料图片" style="max-width: 100%;">
</el-dialog>
<el-dialog
title="创建任务"
@@ -322,10 +322,23 @@
<el-table-column type="selection" width="55" />
<el-table-column v-if="false" prop="group_id" label="组盘编码" :min-width="flexWidth('group_id',crud.data,'组盘编码')" />
<el-table-column prop="vehicle_code" label="载具编码" width="100" />
<el-table-column prop="region_code" label="下道工序" :min-width="flexWidth('region_name',crud.data,'下道工序')" />
<el-table-column prop="region_code" label="下道工序" :min-width="flexWidth('region_code',crud.data,'下道工序')" />
<el-table-column prop="order_code" label="工单编码" :min-width="flexWidth('order_code',crud.data,'工单编码')" />
<el-table-column v-if="false" prop="material_name" label="物料名称" show-overflow-tooltip :min-width="flexWidth('material_name',crud.data,'物料数量')" />
<el-table-column prop="material_id" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_id',crud.data,'物料编码')" @click="showImage" />
<el-table-column prop="material_id" label="物料编码" show-overflow-tooltip :min-width="flexWidth('material_id',crud.data,'物料编码')">
<template slot-scope="scope">
<el-tooltip
class="item"
effect="dark"
content="点击查看图片"
placement="top"
>
<div @click="showImage(scope.row.material_id)">
{{ scope.row.material_id }}
</div>
</el-tooltip>
</template>
</el-table-column>
<el-table-column prop="material_qty" label="物料数量" show-overflow-tooltip :min-width="flexWidth('material_qty',crud.data,'物料数量')" />
<el-table-column prop="job_name" label="jobName" show-overflow-tooltip :min-width="flexWidth('job_name',crud.data,'jobName')" />
<el-table-column prop="due_date" label="交期时间" show-overflow-tooltip :min-width="flexWidth('due_date',crud.data,'交期时间')" />
@@ -375,6 +388,7 @@ import MaterialDialog from '@/views/wms/sch/group/MaterialDialog.vue'
import WorkOrderDialog from '@/views/wms/sch/group/WorkOrderDialog.vue'
import crudSchBasePoint from '@/views/wms/sch/point/schBasePoint'
import crudSchBaseRegion from '@/views/wms/sch/region/schBaseRegion'
import errGif from '@/assets/images/background2.jpg'
const defaultForm = {
group_id: null,
@@ -451,11 +465,13 @@ export default {
materialDialog: false,
workOrderDialog: false,
dialogVisible: false,
dialogVisible1: false,
newTask: {
point_code2: '',
vehicle_code: '',
point_code1: ''
}
},
errGif: errGif
}
},
created() {
@@ -468,6 +484,11 @@ export default {
[CRUD.HOOK.beforeRefresh]() {
return true
},
showImage(materialId) {
console.log('Clicked material_id:', materialId)
this.dialogVisible1 = true
// 在这里处理点击逻辑，例如弹出图片、显示详情等
},
getWorkShopList() { // 获取车间列表
crudMdBaseWorkShop.getWorkShopList().then(res => {
this.workShopList = res