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

add：新增手持功能

Browse Source
This commit is contained in:
tuqiang
2025-08-19 13:11:48 +08:00
parent aefc80ea27
commit 5141db3113
43 changed files with 2148 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-ui/src/views/system/dept/index.vue
View File

@@ -287,7 +287,7 @@ export default {
// 改变状态
changeEnabled(data, val) {
const satus = this.enabledTypeOptions.find(item => {
return item.key == data.is_used
return item.key === data.is_used
})
this.$confirm(i18n.t('Dept.msg.tip3', { display_name: satus.display_name, name: data.name }), i18n.t('common.Tips'), {
confirmButtonText: i18n.t('common.Confirm'),

2
nladmin-ui/src/views/system/user/dialog/relevanceUserDialog.vue
View File

@@ -121,7 +121,7 @@ export default {
console.log(this.crud.data)
for (var k = 0; k < this.users.length; k++) {
for (var i = 0; i < this.crud.data.length; i++) {
if (this.crud.data[i].user_id == this.users[k]) {
if (this.crud.data[i].user_id === this.users[k]) {
this.$refs.table.toggleRowSelection(this.crud.data[i], true)
break
}

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

@@ -10,21 +10,21 @@
label-width="90px"
label-suffix=":"
>
<el-form-item label="所属车间">
<el-select
v-model="query.workshop_code"
clearable
size="mini"
placeholder="所属车间"
class="filter-item"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="query.workshop_code"-->
<!-- clearable-->
<!-- size="mini"-->
<!-- placeholder="所属车间"-->
<!-- class="filter-item"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="模糊搜索">
<el-input
v-model="query.blurry"
@@ -162,22 +162,22 @@
<!--表单组件-->
<el-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="540px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="110px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item v-if="false" label="点位标识" prop="point_id">
<el-input v-model="form.point_id" style="width: 370px;" />
</el-form-item>
<el-form-item label="所属车间">
<el-select
v-model="form.workshop_code"
placeholder="请选择"
style="width: 370px;"
>
<el-option
v-for="item in workShopList"
:label="item.workshop_name"
:value="item.workshop_code"
/>
</el-select>
</el-form-item>
<!-- <el-form-item v-if="false" label="点位标识" prop="point_id">-->
<!-- <el-input v-model="form.point_id" style="width: 370px;" />-->
<!-- </el-form-item>-->
<!-- <el-form-item label="所属车间">-->
<!-- <el-select-->
<!-- v-model="form.workshop_code"-->
<!-- placeholder="请选择"-->
<!-- style="width: 370px;"-->
<!-- >-->
<!-- <el-option-->
<!-- v-for="item in workShopList"-->
<!-- :label="item.workshop_name"-->
<!-- :value="item.workshop_code"-->
<!-- />-->
<!-- </el-select>-->
<!-- </el-form-item>-->
<el-form-item label="所属区域" prop="region_code">
<el-select
v-model="form.region_code"
@@ -229,13 +229,13 @@
/>
</el-select>
</el-form-item>
<el-form-item label="父类编码" prop="vehicle_code">
<el-form-item label="父类编码" prop="parent_point_code">
<el-input v-model="form.parent_point_code" clearable style="width: 370px;" @focus="getParentPoint" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
<el-form-item v-if="form.point_status !== '1'" label="载具编码" prop="storagevehicle_code">
<el-input v-model="form.storagevehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item v-if="form.point_status !== '1'" label="载具类型" prop="vehicle_code">
<el-form-item v-if="form.point_status !== '1'" label="载具类型" prop="vehicle_type">
<el-select v-model="form.vehicle_type" placeholder="请选择" clearable style="width: 370px;">
<el-option
v-for="item in dict.vehicle_type"
@@ -276,13 +276,13 @@
<!--表格渲染-->
<el-table ref="table" v-loading="crud.loading" :data="crud.data" size="mini" style="width: 100%;" @selection-change="crud.selectionChangeHandler">
<el-table-column type="selection" width="55" />
<el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',crud.data,'车间编码')" />
<!-- <el-table-column prop="workshop_code" label="车间编码" :min-width="flexWidth('workshop_code',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="region_code" label="区域编码" :min-width="flexWidth('region_code',crud.data,'区域编码')" />
<el-table-column prop="region_name" label="区域名称" :min-width="flexWidth('region_name',crud.data,'区域名称')" />
<el-table-column prop="point_type_name" label="点位类型" :min-width="flexWidth('point_type_name',crud.data,'点位类型')" />
<el-table-column prop="point_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
<el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />
<el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />
<!-- <el-table-column prop="point_type" label="点位类型" :min-width="flexWidth('point_type',crud.data,'点位类型')" />-->
<!-- <el-table-column prop="point_status" label="点位状态" :min-width="flexWidth('point_status',crud.data,'点位状态')" />-->
<el-table-column prop="vehicle_type" label="载具类型" :min-width="flexWidth('vehicle_type',crud.data,'载具类型', 30)">
@@ -290,7 +290,7 @@
{{ dict.label.vehicle_type[scope.row.vehicle_type] }}
</template>
</el-table-column>
<el-table-column prop="vehicle_code" label="载具编码" :min-width="flexWidth('vehicle_code',crud.data,'载具编码')" />
<el-table-column prop="storagevehicle_code" label="载具编码" :min-width="flexWidth('storagevehicle_code',crud.data,'载具编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
<el-table-column label="是否锁定" :min-width="flexWidth('vehicle_qty',crud.data,'是否锁定')">
<template slot-scope="scope">
@@ -302,18 +302,18 @@
<el-table-column prop="material_spec" label="物料规格" :min-width="flexWidth('material_spec',crud.data,'载具数量')" />
<el-table-column prop="material_model" label="物料型号" :min-width="flexWidth('material_model',crud.data,'载具数量')" />
<el-table-column prop="material_qty" label="物料数量" :min-width="flexWidth('material_qty',crud.data,'载具数量')" />
<el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />
<el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />
<el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">
<template slot-scope="scope">
{{ scope.row.is_has_workder?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">
<template slot-scope="scope">
{{ scope.row.is_auto?'是':'否' }}
</template>
</el-table-column>
<!-- <el-table-column prop="parent_point_code" label="父点位编码" :min-width="flexWidth('parent_point_code',crud.data,'父点位编码')" />-->
<!-- <el-table-column prop="ing_task_code" label="在执行的任务标识" :min-width="flexWidth('ing_task_code',crud.data,'在执行的任务标识')" />-->
<!-- <el-table-column prop="is_has_workder" label="是否有工单" :min-width="flexWidth('is_has_workder',crud.data,'是否有工单')">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.is_has_workder?'是':'否' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<!-- <el-table-column prop="is_auto" label="是否自动" :min-width="flexWidth('is_auto',crud.data,'是否自动')">-->
<!-- <template slot-scope="scope">-->
<!-- {{ scope.row.is_auto?'是':'否' }}-->
<!-- </template>-->
<!-- </el-table-column>-->
<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,'是否启用')">
<template slot-scope="scope">
@@ -359,7 +359,6 @@ import rrOperation from '@crud/RR.operation'
import crudOperation from '@crud/CRUD.operation'
import udOperation from '@crud/UD.operation'
import pagination from '@crud/Pagination'
import crudMdBaseWorkShop from '@/views/wms/basedata/workshop/mdBaseWorkshop'
import ViewDialog from '@/views/wms/sch/point/ViewDialog.vue'
import PointDialog from '@/views/wms/sch/point/PointDialog.vue'
@@ -374,7 +373,7 @@ const defaultForm = {
can_vehicle_type: null,
vehicle_max_qty: null,
vehicle_type: null,
vehicle_code: null,
storagevehicle_code: null,
vehicle_qty: 0,
block_num: null,
row_num: null,
@@ -388,7 +387,7 @@ const defaultForm = {
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
workshop_code: null,
// workshop_code: null,
is_auto: 'true',
remark: null,
is_used: 'true',
@@ -436,7 +435,7 @@ export default {
{ required: true, message: '区域类型不能为空', trigger: 'blur' }
]
},
workShopList: [],
// workShopList: [],
regionList: [],
pointTypesList: [],
pointStatusList: [],
@@ -446,7 +445,7 @@ export default {
}
},
created() {
this.getWorkShopList()
// this.getWorkShopList()
this.getRegionList()
},
methods: {
@@ -466,13 +465,14 @@ export default {
hand(value) {
this.crud.toQuery()
},
getWorkShopList() { // 获取车间列表
crudMdBaseWorkShop.getWorkShopList().then(res => {
this.workShopList = res
})
},
// getWorkShopList() { // 获取车间列表
// crudMdBaseWorkShop.getWorkShopList().then(res => {
// this.workShopList = res
// })
// },
getRegionList() {
crudSchBaseRegion.getRegionList().then(res => {
debugger
this.regionList = res
})
},