add:新增手持 缓存码变更功能;

rev:点位修改子托盘号增加同步更新组盘记录勾选框;手持所有更新接口增加code字段,1为操作成功0为操作失败
This commit is contained in:
zds
2024-09-11 15:40:56 +08:00
parent 5806db8792
commit ad2f8e2e58
9 changed files with 211 additions and 76 deletions

View File

@@ -33,27 +33,12 @@
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-form-item label="点位编码">
<el-input
v-model="query.blurry"
clearable
size="mini"
placeholder="编码名称"
placeholder="模糊查询"
@keyup.enter.native="crud.toQuery"
/>
</el-form-item>
@@ -91,23 +76,6 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位状态">
<el-select
v-model="query.point_status"
clearable
filterable
size="mini"
placeholder="点位状态"
class="filter-item"
@change="hand"
>
<el-option
v-for="item in pointStatusList"
:label="item.label"
:value="item.value"
/>
</el-select>
</el-form-item>
<el-form-item label="母托盘编码">
<el-input
v-model="query.vehicle_code"
@@ -177,8 +145,8 @@
</el-button>
</crudOperation>
<!--表单组件-->
<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-dialog :close-on-click-modal="false" :before-close="crud.cancelCU" :visible.sync="crud.status.cu > 0" :title="crud.status.title" width="640px">
<el-form ref="form" :model="form" :rules="rules" size="mini" label-width="150px" style="border: 1px solid #cfe0df;margin-top: 10px;padding-top: 10px;">
<el-form-item label="所属车间">
<el-select
v-model="form.workshop_code"
@@ -207,10 +175,10 @@
/>
</el-select>
</el-form-item>
<el-form-item label="点位编码" prop="point_code">
<el-form-item label="点位编码" prop="point_code" disabled >
<el-input v-model="form.point_code" style="width: 370px;" />
</el-form-item>
<el-form-item label="点位名称" prop="point_name">
<el-form-item label="点位名称" prop="point_name" disabled >
<el-input v-model="form.point_name" style="width: 370px;" />
</el-form-item>
<el-form-item v-if="pointStatusDialogList.length > 0" label="点位状态" prop="point_status">
@@ -259,7 +227,7 @@
<el-form-item label="载具数量" prop="vehicle_qty">
<el-input-number v-model="form.vehicle_qty" style="width: 370px;" :controls="false" class="clear-number-input" :min="0" :precision="0" :max="99999" label="载具数量" size="mini" />
</el-form-item>
<el-form-item label="是否有工单">
<el-form-item label="是否更新组盘托盘号">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_has_workder" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="是否自动">
@@ -282,7 +250,6 @@
<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_status_name" label="点位状态" :min-width="flexWidth('point_status_name',crud.data,'点位类型')" />
<el-table-column prop="vehicle_code" label="母托盘编码" :min-width="flexWidth('vehicle_code',crud.data,'母托盘编码')" />
<el-table-column prop="vehicle_code2" label="子托盘编码" :min-width="flexWidth('vehicle_code2',crud.data,'子托盘编码')" />
<el-table-column prop="vehicle_qty" label="载具数量" :min-width="flexWidth('vehicle_qty',crud.data,'载具数量')" />
@@ -296,11 +263,6 @@
<el-table-column prop="row_num" label="" :min-width="flexWidth('row_num',crud.data,'排')" />
<el-table-column prop="col_num" label="" :min-width="flexWidth('col_num',crud.data,'列')" />
<el-table-column prop="layer_num" label="" :min-width="flexWidth('layer_num',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?'是':'否' }}
@@ -312,8 +274,6 @@
{{ scope.row.is_used?'是':'否' }}
</template>
</el-table-column>
<el-table-column prop="create_name" label="创建人" :min-width="flexWidth('create_name',crud.data,'创建人')" />
<el-table-column prop="create_time" label="创建时间" :min-width="flexWidth('create_time',crud.data,'创建时间')" />
<el-table-column prop="update_name" label="修改人" :min-width="flexWidth('update_name',crud.data,'修改人')" />
<el-table-column prop="update_time" label="修改时间" :min-width="flexWidth('update_time',crud.data,'修改时间')" />
<el-table-column v-permission="[]" label="操作" width="120px" align="center" fixed="right">
@@ -379,7 +339,7 @@ const defaultForm = {
parent_point_code: null,
ext_point_code: null,
ing_task_code: null,
is_has_workder: 'true',
is_has_workder: 'false',
workshop_code: null,
is_auto: 'true',
remark: null,
@@ -454,8 +414,10 @@ export default {
return true
},
[CRUD.HOOK.beforeToCU]() {
this.form.is_has_workder = this.form.is_has_workder.toString()
console.log('1beforeToCU'+this.form.is_has_workder.toString())
this.form.is_has_workder = 'false'
this.form.is_auto = this.form.is_auto.toString()
console.log('2beforeToCU'+this.form.is_has_workder)
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_code) {
@@ -584,9 +546,12 @@ export default {
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.crud.loading = true
console.log('提交')
this.crud.submitCU('form')
this.crud.loading = false
}).catch(() => {
this.crud.loading = false
this.$message({
type: 'info',
message: '已取消删除'