fix: connector上下层取货放货顺序优化,添加点位页面修改锁功能

This commit is contained in:
yanps
2024-11-04 10:09:01 +08:00
parent cacb1f0867
commit 51cad1bd9d
20 changed files with 459 additions and 284 deletions

View File

@@ -101,7 +101,7 @@
@change="hand"
/>
</el-form-item>
<el-form-item label="锁定类型">
<el-form-item label="是否锁定">
<el-switch
v-model="query.lock_type"
:active-value="true"
@@ -228,11 +228,25 @@
<el-form-item label="父类编码" prop="vehicle_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 !== '0'" label="载具编码" prop="vehicle_code">
<el-form-item label="载具编码" prop="vehicle_code">
<el-input v-model="form.vehicle_code" clearable style="width: 370px;" />
</el-form-item>
<el-form-item v-if="form.point_status !== '0'" label="允许载具类型" prop="vehicle_type">
<el-input v-model="form.vehicle_type" clearable style="width: 370px;" />
<el-form-item label="允许载具类型" prop="can_vehicle_type">
<el-select
v-model="form.can_vehicle_type"
size="mini"
placeholder="允许载具类型"
class="filter-item"
style="width: 370px;"
>
<el-option
v-for="item in dict.can_vehicle_type"
:key="item.value"
:label="item.label"
:value="item.value"
/>
</el-select>
<!-- <el-input v-model="form.can_vehicle_type" clearable style="width: 370px;" /> -->
</el-form-item>
<!-- <el-form-item label="可放载具类型" prop="can_vehicle_types">
<el-select v-model="form.can_vehicle_types" multiple placeholder="请选择" clearable style="width: 370px;">
@@ -263,11 +277,11 @@
/>
</el-select>
</el-form-item>
<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 label="是否锁定">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_lock" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="是否自动">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_auto" :label="item.value">{{ item.label }}</el-radio>
<el-form-item label="是否启用">
<el-radio v-for="item in dict.TrueOrFalse" :key="item.id" v-model="form.is_used" :label="item.value">{{ item.label }}</el-radio>
</el-form-item>
<el-form-item label="备注">
<el-input v-model="form.remark" style="width: 370px;" rows="2" type="textarea" />
@@ -397,11 +411,12 @@ const defaultForm = {
is_auto: 'true',
remark: null,
is_used: 'true',
is_lock: 'true',
can_vehicle_types: null
}
export default {
name: 'SchBasePoint',
dicts: ['vehicle_type', 'TrueOrFalse'],
dicts: ['vehicle_type', 'TrueOrFalse', 'can_vehicle_type'],
components: { PointDialog, ViewDialog, pagination, crudOperation, rrOperation, udOperation },
mixins: [presenter(), header(), form(defaultForm), crud()],
cruds() {
@@ -483,8 +498,8 @@ export default {
return true
},
[CRUD.HOOK.beforeToCU]() {
this.form.is_has_workder = this.form.is_has_workder.toString()
this.form.is_auto = this.form.is_auto.toString()
this.form.is_lock = this.form.is_lock.toString()
this.form.is_used = this.form.is_used.toString()
},
[CRUD.HOOK.afterToCU]() {
if (this.form.region_code) {